Skip to content

Commit

Permalink
Tweak values in nanome ad
Browse files Browse the repository at this point in the history
  • Loading branch information
ethandbrand committed Aug 29, 2018
1 parent c0f3822 commit ee2b9d8
Show file tree
Hide file tree
Showing 2 changed files with 210 additions and 10 deletions.
210 changes: 204 additions & 6 deletions Assets/_Scenes/1 - IntroScene.unity
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,12 @@ GameObject:
m_Component:
- component: {fileID: 16928175}
- component: {fileID: 16928174}
- component: {fileID: 16928179}
- component: {fileID: 16928178}
- component: {fileID: 16928177}
- component: {fileID: 16928176}
- component: {fileID: 16928180}
- component: {fileID: 16928181}
m_Layer: 0
m_Name: ComingSoon
m_TagString: Untagged
Expand Down Expand Up @@ -239,7 +245,7 @@ SpriteRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_Sprite: {fileID: 21300000, guid: 424e1a6bb6ff0f1429f86dbee2fc3406, type: 3}
m_Sprite: {fileID: 21300000, guid: e0825090c0c489040a1dac7dd07dc865, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
Expand All @@ -254,13 +260,88 @@ Transform:
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 16928173}
m_LocalRotation: {x: -0.24404405, y: 0.019579487, z: -0.002098896, w: 0.96956426}
m_LocalPosition: {x: -1.6516142, y: 27.123543, z: 19.888504}
m_LocalScale: {x: 1.3284402, y: 1.3284423, z: 1.3284426}
m_LocalRotation: {x: -0, y: -0, z: 4.6566123e-10, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 15
m_Father: {fileID: 1900899897}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &16928176
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 16928173}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 7852cfae7c151834c8a571251f0fcd4e, type: 3}
m_Name:
m_EditorClassIdentifier:
HighlightColor: {r: 0.83137256, g: 0.93333334, b: 0.93333334, a: 1}
--- !u!114 &16928177
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 16928173}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 109150fa351d25442ad7dfe573cfa26c, type: 3}
m_Name:
m_EditorClassIdentifier:
feedback: {fileID: 1234379357}
--- !u!114 &16928178
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 16928173}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 9258c3a4c3547c6468765f979a889e90, type: 3}
m_Name:
m_EditorClassIdentifier:
disabledColor: {r: 0, g: 0, b: 0, a: 0}
verbose: 0
press: 0
--- !u!114 &16928179
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 16928173}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 9ac25ea7332ea4a41bc0f3e760e27af7, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!65 &16928180
BoxCollider:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 16928173}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 30.000002, y: 9, z: 0.20000038}
m_Center: {x: 0, y: -0.0000009536743, z: 0}
--- !u!114 &16928181
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 16928173}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 7bd613ed2eb425d4086c4614609c8c0c, type: 3}
m_Name:
m_EditorClassIdentifier:
disabledColor: {r: 0, g: 0, b: 0, a: 0}
verbose: 0
press: 0
--- !u!1 &18189778
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -2697,6 +2778,23 @@ CanvasRenderer:
type: 2}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 810598862}
--- !u!1 &820625495 stripped
GameObject:
m_PrefabParentObject: {fileID: 1560689181086832, guid: c27f6dd89b1863b41baf6e28f990b1f4,
type: 2}
m_PrefabInternal: {fileID: 170139734}
--- !u!114 &820625506
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 820625495}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 7852cfae7c151834c8a571251f0fcd4e, type: 3}
m_Name:
m_EditorClassIdentifier:
HighlightColor: {r: 0.56078434, g: 0.8, b: 0.8, a: 1}
--- !u!1 &893124666
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -3868,6 +3966,76 @@ MonoBehaviour:
disabledColor: {r: 0, g: 0, b: 0, a: 0}
verbose: 0
press: 0
--- !u!1 &1234379356
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
serializedVersion: 5
m_Component:
- component: {fileID: 1234379357}
- component: {fileID: 1234379363}
m_Layer: 0
m_Name: Clicked
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1234379357
Transform:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1234379356}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -0, y: 0.03, z: -0.06}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1900899897}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &1234379363
SpriteRenderer:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1234379356}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_Materials:
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_SelectedEditorRenderState: 0
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_Sprite: {fileID: 21300000, guid: b3d3c97e16eeb3d4f81826f011dfc8c6, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 0}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 30.000002, y: 9}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
--- !u!1 &1255930407
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -5445,6 +5613,36 @@ CanvasRenderer:
type: 2}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1824945646}
--- !u!1 &1900899896
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
serializedVersion: 5
m_Component:
- component: {fileID: 1900899897}
m_Layer: 0
m_Name: NanomeAd
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1900899897
Transform:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1900899896}
m_LocalRotation: {x: -0.24404405, y: 0.019579487, z: -0.0020988965, w: 0.96956426}
m_LocalPosition: {x: -1.6516141, y: 27.123543, z: 19.888504}
m_LocalScale: {x: 1.3284409, y: 1.3284423, z: 1.3284426}
m_Children:
- {fileID: 16928175}
- {fileID: 1234379357}
m_Father: {fileID: 0}
m_RootOrder: 15
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1912102772
GameObject:
m_ObjectHideFlags: 0
Expand Down
10 changes: 6 additions & 4 deletions Assets/_Scripts/Menus/Buttons/WebRedirect.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,16 @@ private void Update()
protected override void ButtonEnterBehavior(GameObject other)
{
Application.OpenURL("http://nanome.ai/nanome");
StartCoroutine(Darken(feedback, 2f, 1f));
StopAllCoroutines();
StartCoroutine(Darken(feedback, .5f, .3f, 1f));
}

protected override void ButtonExitBehavior(GameObject other)
{

}

IEnumerator Darken(Transform obj, float animTime, float waitDuration){
IEnumerator Darken(Transform obj, float animTime, float animFade, float waitDuration){
float startTime = Time.time;
while (Time.time < startTime + animTime)
{
Expand All @@ -40,16 +41,17 @@ IEnumerator Darken(Transform obj, float animTime, float waitDuration){
yield return null;
}
startTime = Time.time;
while (Time.time < startTime + animTime)
while (Time.time < startTime + animFade)
{
if (obj == null)
{
yield break;
}
float a = Mathf.Lerp(1f, 0f, (Time.time - startTime) / animTime);
float a = Mathf.Lerp(1f, 0f, (Time.time - startTime) / animFade);
obj.GetComponent<SpriteRenderer>().color = new Color(1f,1f,1f,a);
yield return null;
}
obj.GetComponent<SpriteRenderer>().color = new Color(1f,1f,1f,0f);
}

}

0 comments on commit ee2b9d8

Please sign in to comment.