From 81ddc7a479d9b1b01d6ee78fe4233d9df7fb1921 Mon Sep 17 00:00:00 2001 From: uc-hoba Date: Tue, 15 May 2018 14:04:20 +0800 Subject: [PATCH 1/4] update Character --- .../Assets/Frozen/DSAsset/Anna-Standby.asset | 2 +- .../Assets/Frozen/DSAsset/Cloud-Standby.asset | 2 +- .../Assets/Frozen/DSAsset/Elsa-Standby.asset | 2 +- .../Frozen/DSAsset/Kristoff-Standby.asset | 2 +- Unity_2018_Frozen/Assets/Frozen/Frozen.unity | 2852 +++++++++-------- .../Frozen/FrozenNightParticleUniforms.asset | 12 +- .../Assets/Frozen/Material/GiantSnowflake.mat | 2 +- .../Assets/Frozen/Material/Space-Ground.mat | 2 +- .../Assets/Frozen/Material/Space-Wall.mat | 2 +- .../Frozen/Script/CharacterBehaviour.cs | 122 +- .../Assets/Frozen/Script/GiantSnowflake.cs | 2 +- .../Assets/Frozen/Script/SceneController.cs | 8 +- .../Frozen/Texture/Character/Anna-icn.mat | 76 + .../Texture/Character/Anna-icn.mat.meta | 10 + .../Frozen/Texture/Character/Elsa-icn.mat | 76 + .../Texture/Character/Elsa-icn.mat.meta | 10 + .../Texture/Character/Kristoff_Sven-icn.mat | 76 + .../Character/Kristoff_Sven-icn.mat.meta | 10 + .../Texture/Character/Marshmallow-icn.mat | 76 + .../Character/Marshmallow-icn.mat.meta | 10 + .../Frozen/Texture/Character/Olaf-icn.mat | 76 + .../Texture/Character/Olaf-icn.mat.meta | 10 + .../Frozen/Texture/Character/icon_elsa.png | 3 + .../Texture/Character/icon_elsa.png.meta | 88 + .../Frozen/Texture/Effect/Cloud_Snow-icn.mat | 97 + .../Texture/Effect/Cloud_Snow-icn.mat.meta | 10 + .../Texture/Effect/Elsa_Effect_A-icn.mat | 78 + .../Texture/Effect/Elsa_Effect_A-icn.mat.meta | 10 + .../Texture/Effect/Elsa_Effect_B-icn.mat | 78 + .../Texture/Effect/Elsa_Effect_B-icn.mat.meta | 10 + .../Frozen/Texture/Effect/icon_cloud.png | 3 + .../Frozen/Texture/Effect/icon_cloud.png.meta | 88 + .../Frozen/Texture/Effect/icon_snowMagic.png | 3 + .../Texture/Effect/icon_snowMagic.png.meta | 88 + 34 files changed, 2680 insertions(+), 1316 deletions(-) create mode 100644 Unity_2018_Frozen/Assets/Frozen/Texture/Character/Anna-icn.mat create mode 100644 Unity_2018_Frozen/Assets/Frozen/Texture/Character/Anna-icn.mat.meta create mode 100644 Unity_2018_Frozen/Assets/Frozen/Texture/Character/Elsa-icn.mat create mode 100644 Unity_2018_Frozen/Assets/Frozen/Texture/Character/Elsa-icn.mat.meta create mode 100644 Unity_2018_Frozen/Assets/Frozen/Texture/Character/Kristoff_Sven-icn.mat create mode 100644 Unity_2018_Frozen/Assets/Frozen/Texture/Character/Kristoff_Sven-icn.mat.meta create mode 100644 Unity_2018_Frozen/Assets/Frozen/Texture/Character/Marshmallow-icn.mat create mode 100644 Unity_2018_Frozen/Assets/Frozen/Texture/Character/Marshmallow-icn.mat.meta create mode 100644 Unity_2018_Frozen/Assets/Frozen/Texture/Character/Olaf-icn.mat create mode 100644 Unity_2018_Frozen/Assets/Frozen/Texture/Character/Olaf-icn.mat.meta create mode 100644 Unity_2018_Frozen/Assets/Frozen/Texture/Character/icon_elsa.png create mode 100644 Unity_2018_Frozen/Assets/Frozen/Texture/Character/icon_elsa.png.meta create mode 100644 Unity_2018_Frozen/Assets/Frozen/Texture/Effect/Cloud_Snow-icn.mat create mode 100644 Unity_2018_Frozen/Assets/Frozen/Texture/Effect/Cloud_Snow-icn.mat.meta create mode 100644 Unity_2018_Frozen/Assets/Frozen/Texture/Effect/Elsa_Effect_A-icn.mat create mode 100644 Unity_2018_Frozen/Assets/Frozen/Texture/Effect/Elsa_Effect_A-icn.mat.meta create mode 100644 Unity_2018_Frozen/Assets/Frozen/Texture/Effect/Elsa_Effect_B-icn.mat create mode 100644 Unity_2018_Frozen/Assets/Frozen/Texture/Effect/Elsa_Effect_B-icn.mat.meta create mode 100644 Unity_2018_Frozen/Assets/Frozen/Texture/Effect/icon_cloud.png create mode 100644 Unity_2018_Frozen/Assets/Frozen/Texture/Effect/icon_cloud.png.meta create mode 100644 Unity_2018_Frozen/Assets/Frozen/Texture/Effect/icon_snowMagic.png create mode 100644 Unity_2018_Frozen/Assets/Frozen/Texture/Effect/icon_snowMagic.png.meta diff --git a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Anna-Standby.asset b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Anna-Standby.asset index 48159b6..0809b5a 100644 --- a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Anna-Standby.asset +++ b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Anna-Standby.asset @@ -12,4 +12,4 @@ MonoBehaviour: m_Name: Anna-Standby m_EditorClassIdentifier: m_VideoLocation: 1 - m_VideoPath: ../FrozenMaterial/Demo/Olaf-standby.avi + m_VideoPath: ../FrozenMaterial/day/snowball_only_hap.avi diff --git a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Cloud-Standby.asset b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Cloud-Standby.asset index a1e923f..67146ed 100644 --- a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Cloud-Standby.asset +++ b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Cloud-Standby.asset @@ -12,4 +12,4 @@ MonoBehaviour: m_Name: Cloud-Standby m_EditorClassIdentifier: m_VideoLocation: 1 - m_VideoPath: ../FrozenMaterial/Demo/Olaf-standby.avi + m_VideoPath: ../FrozenMaterial/icon/icon_cloud.avi diff --git a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa-Standby.asset b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa-Standby.asset index f871acc..56f2be1 100644 --- a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa-Standby.asset +++ b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa-Standby.asset @@ -12,4 +12,4 @@ MonoBehaviour: m_Name: Elsa-Standby m_EditorClassIdentifier: m_VideoLocation: 1 - m_VideoPath: ../FrozenMaterial/night/Elsa_Icon.avi + m_VideoPath: ../FrozenMaterial/icon/icon_elsa.avi diff --git a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Kristoff-Standby.asset b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Kristoff-Standby.asset index f507836..a226467 100644 --- a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Kristoff-Standby.asset +++ b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Kristoff-Standby.asset @@ -12,4 +12,4 @@ MonoBehaviour: m_Name: Kristoff-Standby m_EditorClassIdentifier: m_VideoLocation: 1 - m_VideoPath: ../FrozenMaterial/Demo/Olaf-standby.avi + m_VideoPath: ../FrozenMaterial/day/snowball_only_hap.avi diff --git a/Unity_2018_Frozen/Assets/Frozen/Frozen.unity b/Unity_2018_Frozen/Assets/Frozen/Frozen.unity index dd1f36d..8554182 100644 --- a/Unity_2018_Frozen/Assets/Frozen/Frozen.unity +++ b/Unity_2018_Frozen/Assets/Frozen/Frozen.unity @@ -138,7 +138,7 @@ Transform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 40068778} m_LocalRotation: {x: 0, y: -0.7071068, z: 0, w: 0.7071068} - m_LocalPosition: {x: -4, y: 0.44900006, z: -0.1} + m_LocalPosition: {x: -3.99, y: 0.44900006, z: -0.1} m_LocalScale: {x: 0.75, y: 0.75, z: 0.75} m_Children: [] m_Father: {fileID: 1247992794} @@ -197,144 +197,42 @@ MeshFilter: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 40068778} m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} ---- !u!1 &102745337 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 - m_Component: - - component: {fileID: 102745338} - m_Layer: 0 - m_Name: '-------------------------------------' - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &102745338 -Transform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 102745337} - m_LocalRotation: {x: 0, y: 0, z: 0, 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: 7 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &145750430 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 - m_Component: - - component: {fileID: 145750431} - m_Layer: 0 - m_Name: '-------------------------------------' - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &145750431 -Transform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 145750430} - m_LocalRotation: {x: 0, y: 0, z: 0, 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: 9 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &147055504 +--- !u!1 &47501849 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} serializedVersion: 5 m_Component: - - component: {fileID: 147055505} - - component: {fileID: 147055510} - - component: {fileID: 147055509} - - component: {fileID: 147055508} - - component: {fileID: 147055507} - - component: {fileID: 147055506} + - component: {fileID: 47501850} + - component: {fileID: 47501852} + - component: {fileID: 47501851} m_Layer: 8 - m_Name: Olaf_CC065056 + m_Name: standby m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &147055505 +--- !u!4 &47501850 Transform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 147055504} + m_GameObject: {fileID: 47501849} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -2.338, y: 0.462, z: 2.49} - m_LocalScale: {x: 0.75, y: 0.75, z: 0.75} + m_LocalPosition: {x: 0, y: 1, z: 0} + m_LocalScale: {x: 0.3, y: 0.3, z: 0.3} m_Children: [] - m_Father: {fileID: 199010598} - m_RootOrder: 2 + m_Father: {fileID: 1973785472} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!54 &147055506 -Rigidbody: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 147055504} - serializedVersion: 2 - m_Mass: 1 - m_Drag: 0 - m_AngularDrag: 0.05 - m_UseGravity: 0 - m_IsKinematic: 0 - m_Interpolate: 0 - m_Constraints: 0 - m_CollisionDetection: 0 ---- !u!114 &147055507 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 147055504} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 12ea4d85cdda0aa4981a82e5e18fed52, type: 3} - m_Name: - m_EditorClassIdentifier: - standby: 1 - disappearTime: 10 - mat: {fileID: 0} - area: 0 - AppearArea: 0000000001000000 - wallRoi: {x: 0, y: 0} - fakeButton: {fileID: 0} - standbyClip: {fileID: 11400000, guid: 52eefee2f9118e04bbb195c0e27b0fc5, type: 2} - triggerClip: {fileID: 11400000, guid: 727d0f386e383414ca58642076340e45, type: 2} - players: [] - color: {r: 1, g: 1, b: 1, a: 1} - videoStopTime: 10 - specificPositions: - - {fileID: 1958951069} - - {fileID: 251596436} - roaming: 0 - isTriggerCollider: 0 ---- !u!23 &147055508 +--- !u!23 &47501851 MeshRenderer: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 147055504} + m_GameObject: {fileID: 47501849} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -343,7 +241,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_Materials: - - {fileID: 2100000, guid: 9b8333bad640d1240ae139400daea38e, type: 2} + - {fileID: 2100000, guid: ddc66ffea59cab24d93933e970aaea4f, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -363,27 +261,69 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 ---- !u!64 &147055509 -MeshCollider: +--- !u!33 &47501852 +MeshFilter: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 147055504} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 0 - serializedVersion: 3 - m_Convex: 1 - m_CookingOptions: 14 - m_SkinWidth: 0.01 + m_GameObject: {fileID: 47501849} m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} ---- !u!33 &147055510 -MeshFilter: +--- !u!1 &102745337 +GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 147055504} - m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 102745338} + m_Layer: 0 + m_Name: '-------------------------------------' + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &102745338 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 102745337} + m_LocalRotation: {x: 0, y: 0, z: 0, 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: 7 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &145750430 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 145750431} + m_Layer: 0 + m_Name: '-------------------------------------' + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &145750431 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 145750430} + m_LocalRotation: {x: 0, y: 0, z: 0, 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: 9 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &151858420 GameObject: m_ObjectHideFlags: 0 @@ -733,8 +673,6 @@ Transform: m_Children: - {fileID: 1906326617} - {fileID: 1247992794} - - {fileID: 147055505} - - {fileID: 2022668215} - {fileID: 411383573} - {fileID: 1933714481} - {fileID: 1690794385} @@ -747,90 +685,6 @@ Transform: m_Father: {fileID: 338663765} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &251596434 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 - m_Component: - - component: {fileID: 251596435} - - component: {fileID: 251596438} - - component: {fileID: 251596437} - - component: {fileID: 251596436} - m_Layer: 8 - m_Name: Olaf_CC065053 (2) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &251596435 -Transform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 251596434} - m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} - m_LocalPosition: {x: 4, y: 0.515, z: -0.624} - m_LocalScale: {x: 0.75, y: 0.75, z: 0.75} - m_Children: [] - m_Father: {fileID: 2022668215} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} ---- !u!114 &251596436 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 251596434} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 86694b20cef756146b118abf35314f9b, type: 3} - m_Name: - m_EditorClassIdentifier: - area: 1 ---- !u!23 &251596437 -MeshRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 251596434} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 0 - m_ReflectionProbeUsage: 0 - m_Materials: - - {fileID: 2100000, guid: 9b8333bad640d1240ae139400daea38e, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 1 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 0 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 ---- !u!33 &251596438 -MeshFilter: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 251596434} - m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &260126567 GameObject: m_ObjectHideFlags: 0 @@ -1017,46 +871,42 @@ MonoBehaviour: particleViewerMesh: {fileID: 776169031} rate: 0.0002 debug: ---- !u!1 &368474576 +--- !u!1 &351311318 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} serializedVersion: 5 m_Component: - - component: {fileID: 368474577} - - component: {fileID: 368474580} - - component: {fileID: 368474579} - - component: {fileID: 368474578} - - component: {fileID: 368474581} - - component: {fileID: 368474583} - - component: {fileID: 368474582} + - component: {fileID: 351311319} + - component: {fileID: 351311321} + - component: {fileID: 351311320} m_Layer: 8 - m_Name: GiantSnowflake + m_Name: trigger m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &368474577 +--- !u!4 &351311319 Transform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 368474576} - m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} - m_LocalPosition: {x: 0, y: 0, z: 1.5} - m_LocalScale: {x: 5, y: 5, z: 1} + m_GameObject: {fileID: 351311318} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0.7, z: 0} + m_LocalScale: {x: 1.38, y: 1.38, z: 1.38} m_Children: [] - m_Father: {fileID: 338663765} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} ---- !u!23 &368474578 + m_Father: {fileID: 1973785472} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &351311320 MeshRenderer: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 368474576} + m_GameObject: {fileID: 351311318} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -1065,7 +915,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_Materials: - - {fileID: 2100000, guid: 3059bdeaeda202b489a491a3025d4843, type: 2} + - {fileID: 2100000, guid: d441d7339e3f6914fb9a8658c10b54bd, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -1085,29 +935,104 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 ---- !u!64 &368474579 -MeshCollider: +--- !u!33 &351311321 +MeshFilter: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 368474576} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 0 - serializedVersion: 3 - m_Convex: 0 - m_CookingOptions: 14 - m_SkinWidth: 0.01 + m_GameObject: {fileID: 351311318} m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} ---- !u!33 &368474580 -MeshFilter: +--- !u!1 &368474576 +GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 368474576} - m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} ---- !u!114 &368474581 -MonoBehaviour: + serializedVersion: 5 + m_Component: + - component: {fileID: 368474577} + - component: {fileID: 368474580} + - component: {fileID: 368474579} + - component: {fileID: 368474578} + - component: {fileID: 368474581} + - component: {fileID: 368474583} + - component: {fileID: 368474582} + m_Layer: 8 + m_Name: GiantSnowflake + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &368474577 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 368474576} + m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0, z: 1.5} + m_LocalScale: {x: 5, y: 5, z: 1} + m_Children: [] + m_Father: {fileID: 338663765} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} +--- !u!23 &368474578 +MeshRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 368474576} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_Materials: + - {fileID: 2100000, guid: 3059bdeaeda202b489a491a3025d4843, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 1 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!64 &368474579 +MeshCollider: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 368474576} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 0 + serializedVersion: 3 + m_Convex: 0 + m_CookingOptions: 14 + m_SkinWidth: 0.01 + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!33 &368474580 +MeshFilter: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 368474576} + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!114 &368474581 +MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} @@ -1278,8 +1203,79 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 199010598} - m_RootOrder: 4 + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &423869583 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 423869584} + - component: {fileID: 423869586} + - component: {fileID: 423869585} + m_Layer: 8 + m_Name: trigger + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &423869584 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 423869583} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0.7, z: 0} + m_LocalScale: {x: 1.78, y: 1.78, z: 1.78} + m_Children: [] + m_Father: {fileID: 1933714481} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &423869585 +MeshRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 423869583} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_Materials: + - {fileID: 2100000, guid: 2969b78c14f1c6f4e941656f8f9cb902, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 1 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!33 &423869586 +MeshFilter: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 423869583} + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &432509337 GameObject: m_ObjectHideFlags: 0 @@ -1308,6 +1304,77 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 19 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &436028452 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 436028453} + - component: {fileID: 436028457} + - component: {fileID: 436028456} + m_Layer: 8 + m_Name: standby + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &436028453 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 436028452} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 1, z: 0} + m_LocalScale: {x: 0.2, y: 0.2, z: 0.2} + m_Children: [] + m_Father: {fileID: 1984882816} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &436028456 +MeshRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 436028452} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_Materials: + - {fileID: 2100000, guid: ef4c4d78f0eeb744baec7916f94db5be, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 1 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!33 &436028457 +MeshFilter: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 436028452} + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &438615021 GameObject: m_ObjectHideFlags: 0 @@ -1449,149 +1516,15 @@ MonoBehaviour: uniform: {fileID: 11400000, guid: 43473f0506b1ba64c86ae17dd11d902a, type: 2} subUniform: {fileID: 11400000, guid: 54b82be1afe58664c8daeb575db89094, type: 2} rate: 0 ---- !u!43 &456004799 -Mesh: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_Name: 'Space Ground Mesh: (8x5x3)' - serializedVersion: 8 - m_SubMeshes: - - serializedVersion: 2 - firstByte: 0 - indexCount: 24 - topology: 0 - baseVertex: 0 - firstVertex: 0 - vertexCount: 16 - localAABB: - m_Center: {x: 0, y: 1.5, z: 0} - m_Extent: {x: 4, y: 1.5, z: 2.5} - m_Shapes: - vertices: [] - shapes: [] - channels: [] - fullWeights: [] - m_BindPose: [] - m_BoneNameHashes: - m_RootBoneNameHash: 0 - m_MeshCompression: 0 - m_IsReadable: 0 - m_KeepVertices: 1 - m_KeepIndices: 1 - m_IndexFormat: 0 - m_IndexBuffer: 000001000200010003000200040005000600050007000600080009000a0009000b000a000c000d000e000d000f000e00 - m_Skin: [] - m_VertexData: - m_CurrentChannels: 11 - m_VertexCount: 16 - m_Channels: - - stream: 0 - offset: 0 - format: 0 - dimension: 3 - - stream: 0 - offset: 12 - format: 0 - dimension: 3 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 24 - format: 0 - dimension: 2 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - m_DataSize: 512 - _typelessdata: 000080c000000000000020c0000000000000803f00000000e4388e3e00000000000080c00000000000002040000000000000803f00000000e4388e3e0000203f0000804000000000000020c0000000000000803f000000008ee3383f00000000000080400000000000002040000000000000803f000000008ee3383f0000203f000080c000000000000020400000000000000000000080bfe4388e3e0000203f000080c000004040000020400000000000000000000080bfe4388e3e0000803f0000804000000000000020400000000000000000000080bf8ee3383f0000203f0000804000004040000020400000000000000000000080bf8ee3383f0000803f000080c000000000000020c00000803f0000000000000000000000000000203f000080c000004040000020c00000803f0000000000000000000000000000803f000080c000000000000020400000803f0000000000000000e4388e3e0000203f000080c000004040000020400000803f0000000000000000e4388e3e0000803f000080400000000000002040000080bf00000000000000008ee3383f0000203f000080400000404000002040000080bf00000000000000008ee3383f0000803f0000804000000000000020c0000080bf00000000000000000000803f0000203f0000804000004040000020c0000080bf00000000000000000000803f0000803f - m_CompressedMesh: - m_Vertices: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_UV: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Normals: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Tangents: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Weights: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_NormalSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_TangentSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_FloatColors: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_BoneIndices: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_Triangles: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_UVInfo: 0 - m_LocalAABB: - m_Center: {x: 0, y: 1.5, z: 0} - m_Extent: {x: 4, y: 1.5, z: 2.5} - m_MeshUsageFlags: 0 - m_BakedConvexCollisionMesh: - m_BakedTriangleCollisionMesh: - m_MeshOptimized: 0 ---- !u!1 &459917734 -GameObject: +--- !u!1 &459917734 +GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} serializedVersion: 5 m_Component: - component: {fileID: 459917735} - - component: {fileID: 459917740} - - component: {fileID: 459917739} - - component: {fileID: 459917738} - component: {fileID: 459917737} - - component: {fileID: 459917736} m_Layer: 8 m_Name: Cloud m_TagString: Untagged @@ -1606,27 +1539,14 @@ Transform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 459917734} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -3.28, y: 1.52, z: 2.49} - m_LocalScale: {x: 2.1557226, y: 2.1557233, z: 2.1557233} - m_Children: [] + m_LocalPosition: {x: -3.28, y: 0, z: 2.49} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1276519162} + - {fileID: 1866235076} m_Father: {fileID: 199010598} - m_RootOrder: 7 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!54 &459917736 -Rigidbody: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 459917734} - serializedVersion: 2 - m_Mass: 1 - m_Drag: 0 - m_AngularDrag: 0.05 - m_UseGravity: 0 - m_IsKinematic: 0 - m_Interpolate: 0 - m_Constraints: 0 - m_CollisionDetection: 0 --- !u!114 &459917737 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1640,74 +1560,19 @@ MonoBehaviour: m_EditorClassIdentifier: standby: 1 disappearTime: 0.1 - mat: {fileID: 0} area: 0 AppearArea: 0000000001000000 - wallRoi: {x: 0, y: 0} fakeButton: {fileID: 0} + specificPositions: [] + roaming: 0.08 + isStandbyLoop: 1 standbyClip: {fileID: 11400000, guid: 5b3dac91b0ced2a46b0785831655c98a, type: 2} - triggerClip: {fileID: 11400000, guid: 708f87d2cbae42445846a25f0ca06829, type: 2} + triggerClips: + - {fileID: 11400000, guid: 708f87d2cbae42445846a25f0ca06829, type: 2} players: [] color: {r: 1, g: 1, b: 1, a: 1} videoStopTime: 1.5 - specificPositions: [] - roaming: 0.08 isTriggerCollider: 0 ---- !u!23 &459917738 -MeshRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 459917734} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 0 - m_ReflectionProbeUsage: 0 - m_Materials: - - {fileID: 2100000, guid: 38c501add24d6eb4fbc6903d634d88f3, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 1 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 0 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 ---- !u!64 &459917739 -MeshCollider: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 459917734} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 0 - serializedVersion: 3 - m_Convex: 1 - m_CookingOptions: 14 - m_SkinWidth: 0.01 - m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} ---- !u!33 &459917740 -MeshFilter: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 459917734} - m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &520040865 GameObject: m_ObjectHideFlags: 0 @@ -1898,6 +1763,77 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: bufferName: KinectVelocityBuffer +--- !u!1 &565906440 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 565906441} + - component: {fileID: 565906445} + - component: {fileID: 565906444} + m_Layer: 8 + m_Name: trigger + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &565906441 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 565906440} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 1.53, z: 0} + m_LocalScale: {x: 3.0327268, y: 3.032728, z: 3.032728} + m_Children: [] + m_Father: {fileID: 1984882816} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &565906444 +MeshRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 565906440} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_Materials: + - {fileID: 2100000, guid: d399e769f1f82344b9f305269a536595, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 1 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!33 &565906445 +MeshFilter: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 565906440} + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!1001 &617692218 Prefab: m_ObjectHideFlags: 0 @@ -2142,81 +2078,165 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 16 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &770059766 +--- !u!1 &768391776 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} serializedVersion: 5 m_Component: - - component: {fileID: 770059767} - - component: {fileID: 770059769} - - component: {fileID: 770059768} - m_Layer: 5 - m_Name: RawImage + - component: {fileID: 768391777} + - component: {fileID: 768391780} + - component: {fileID: 768391779} + - component: {fileID: 768391778} + m_Layer: 8 + m_Name: standby m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &770059767 -RectTransform: +--- !u!4 &768391777 +Transform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 770059766} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_GameObject: {fileID: 768391776} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 1, z: 0} + m_LocalScale: {x: 0.4, y: 0.4, z: 0.4} m_Children: [] - m_Father: {fileID: 439594039} - m_RootOrder: 0 + m_Father: {fileID: 1216863872} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 5040, y: 5040} - m_Pivot: {x: 0.5, y: 1} ---- !u!114 &770059768 +--- !u!114 &768391778 MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 770059766} + m_GameObject: {fileID: 768391776} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -98529514, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: 86694b20cef756146b118abf35314f9b, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Texture: {fileID: 8400000, guid: 1ded3bafa85a18b4f87c48288b4439a1, type: 2} - m_UVRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 ---- !u!222 &770059769 -CanvasRenderer: + area: 2 +--- !u!23 &768391779 +MeshRenderer: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 770059766} ---- !u!1001 &774429922 -Prefab: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 386695297} - m_Modifications: - - target: {fileID: 400000, guid: 0b40c0b4ea4208b4792d95085b850676, type: 2} + m_GameObject: {fileID: 768391776} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_Materials: + - {fileID: 2100000, guid: 42a6e1bacb07f204cb0af72a39066cae, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 1 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!33 &768391780 +MeshFilter: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 768391776} + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &770059766 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 770059767} + - component: {fileID: 770059769} + - component: {fileID: 770059768} + m_Layer: 5 + m_Name: RawImage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &770059767 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 770059766} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 439594039} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 5040, y: 5040} + m_Pivot: {x: 0.5, y: 1} +--- !u!114 &770059768 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 770059766} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -98529514, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Texture: {fileID: 8400000, guid: 1ded3bafa85a18b4f87c48288b4439a1, type: 2} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 +--- !u!222 &770059769 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 770059766} +--- !u!1001 &774429922 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 386695297} + m_Modifications: + - target: {fileID: 400000, guid: 0b40c0b4ea4208b4792d95085b850676, type: 2} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} @@ -2803,6 +2823,77 @@ MonoBehaviour: buffer: {fileID: 438615022} material: {fileID: 2100000, guid: 56457e5f2df74a44c933b2791da81324, type: 2} cullingMask: 1 +--- !u!1 &1061158671 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1061158672} + - component: {fileID: 1061158676} + - component: {fileID: 1061158675} + m_Layer: 8 + m_Name: trigger + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1061158672 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1061158671} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0.861, z: 0} + m_LocalScale: {x: 2.05, y: 2.05, z: 2.05} + m_Children: [] + m_Father: {fileID: 1690794385} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &1061158675 +MeshRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1061158671} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_Materials: + - {fileID: 2100000, guid: ab048f026549e9e4896e951efd521c70, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 1 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!33 &1061158676 +MeshFilter: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1061158671} + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &1071731253 GameObject: m_ObjectHideFlags: 0 @@ -3003,11 +3094,7 @@ GameObject: serializedVersion: 5 m_Component: - component: {fileID: 1216863872} - - component: {fileID: 1216863877} - - component: {fileID: 1216863876} - - component: {fileID: 1216863875} - component: {fileID: 1216863874} - - component: {fileID: 1216863873} - component: {fileID: 1216863878} m_Layer: 8 m_Name: Marshmallow @@ -3023,27 +3110,14 @@ Transform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1216863871} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 1.741, y: 1.802, z: 2.49} - m_LocalScale: {x: 3.6796, y: 3.6796002, z: 3.6796002} - m_Children: [] + m_LocalPosition: {x: 1.741, y: 0, z: 2.49} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1329758487} + - {fileID: 768391777} m_Father: {fileID: 199010598} - m_RootOrder: 10 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!54 &1216863873 -Rigidbody: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1216863871} - serializedVersion: 2 - m_Mass: 1 - m_Drag: 0 - m_AngularDrag: 0.05 - m_UseGravity: 0 - m_IsKinematic: 0 - m_Interpolate: 0 - m_Constraints: 0 - m_CollisionDetection: 0 --- !u!114 &1216863874 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3057,75 +3131,20 @@ MonoBehaviour: m_EditorClassIdentifier: standby: 1 disappearTime: 10 - mat: {fileID: 0} area: 0 AppearArea: 02000000 - wallRoi: {x: 0, y: 0} fakeButton: {fileID: 0} + specificPositions: + - {fileID: 1216863878} + roaming: 0 + isStandbyLoop: 1 standbyClip: {fileID: 11400000, guid: 1691548c0a5a4494ba5e2c29ec477d7d, type: 2} - triggerClip: {fileID: 11400000, guid: 6ccf813116f07944faf4af6bc3b2c1f7, type: 2} + triggerClips: + - {fileID: 11400000, guid: 6ccf813116f07944faf4af6bc3b2c1f7, type: 2} players: [] color: {r: 1, g: 1, b: 1, a: 1} videoStopTime: 10 - specificPositions: - - {fileID: 1216863878} - roaming: 0 isTriggerCollider: 0 ---- !u!23 &1216863875 -MeshRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1216863871} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 0 - m_ReflectionProbeUsage: 0 - m_Materials: - - {fileID: 2100000, guid: 26431f824b7c8384bbc23c36bd054e2b, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 1 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 0 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 ---- !u!64 &1216863876 -MeshCollider: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1216863871} - m_Material: {fileID: 0} - m_IsTrigger: 1 - m_Enabled: 0 - serializedVersion: 3 - m_Convex: 1 - m_CookingOptions: 14 - m_SkinWidth: 0.01 - m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} ---- !u!33 &1216863877 -MeshFilter: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1216863871} - m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!114 &1216863878 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3146,11 +3165,7 @@ GameObject: serializedVersion: 5 m_Component: - component: {fileID: 1225287932} - - component: {fileID: 1225287938} - - component: {fileID: 1225287937} - - component: {fileID: 1225287936} - component: {fileID: 1225287935} - - component: {fileID: 1225287934} - component: {fileID: 1225287933} m_Layer: 8 m_Name: Elsa_Effect_B @@ -3166,11 +3181,13 @@ Transform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1225287931} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -2.59, y: 1.35, z: 2.49} - m_LocalScale: {x: 2.7553, y: 2.7553, z: 2.7553} - m_Children: [] + m_LocalPosition: {x: -2.59, y: 0, z: 2.49} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 2008324329} + - {fileID: 1674052467} m_Father: {fileID: 199010598} - m_RootOrder: 12 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1225287933 MonoBehaviour: @@ -3184,21 +3201,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: area: 2 ---- !u!54 &1225287934 -Rigidbody: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1225287931} - serializedVersion: 2 - m_Mass: 1 - m_Drag: 0 - m_AngularDrag: 0.05 - m_UseGravity: 0 - m_IsKinematic: 0 - m_Interpolate: 0 - m_Constraints: 0 - m_CollisionDetection: 0 --- !u!114 &1225287935 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3211,78 +3213,23 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: standby: 1 - disappearTime: 10 - mat: {fileID: 0} + disappearTime: 1 area: 0 AppearArea: 02000000 - wallRoi: {x: 0, y: 0} fakeButton: {fileID: 0} - standbyClip: {fileID: 11400000, guid: f2f10fb696e1a6145b55378c7c7ec9df, type: 2} - triggerClip: {fileID: 11400000, guid: d3a9925b2d77cce4a8fc3215dbaf41e1, type: 2} - players: [] - color: {r: 1, g: 1, b: 1, a: 1} - videoStopTime: 10 specificPositions: - {fileID: 1225287933} roaming: 0 + isStandbyLoop: 1 + standbyClip: {fileID: 11400000, guid: f2f10fb696e1a6145b55378c7c7ec9df, type: 2} + triggerClips: + - {fileID: 11400000, guid: d3a9925b2d77cce4a8fc3215dbaf41e1, type: 2} + players: [] + color: {r: 1, g: 1, b: 1, a: 1} + videoStopTime: 1 isTriggerCollider: 0 ---- !u!23 &1225287936 -MeshRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1225287931} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 0 - m_ReflectionProbeUsage: 0 - m_Materials: - - {fileID: 2100000, guid: 5f6b94c6b2a653d439fba4373746dade, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 1 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 0 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 ---- !u!64 &1225287937 -MeshCollider: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1225287931} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 0 - serializedVersion: 3 - m_Convex: 0 - m_CookingOptions: 14 - m_SkinWidth: 0.01 - m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} ---- !u!33 &1225287938 -MeshFilter: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1225287931} - m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} ---- !u!1 &1227078084 -GameObject: +--- !u!1 &1227078084 +GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} @@ -3357,7 +3304,7 @@ GameObject: m_Component: - component: {fileID: 1247992794} m_Layer: 8 - m_Name: Olaf_CC065053-dummy + m_Name: Olaf-dummy m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -3375,9 +3322,81 @@ Transform: m_Children: - {fileID: 1191975163} - {fileID: 40068779} + - {fileID: 1718259913} m_Father: {fileID: 199010598} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1276519161 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1276519162} + - component: {fileID: 1276519164} + - component: {fileID: 1276519163} + m_Layer: 8 + m_Name: trigger + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1276519162 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1276519161} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.172, y: 1.754, z: 0} + m_LocalScale: {x: 1.8760327, y: 1.8760332, z: 1.8760332} + m_Children: [] + m_Father: {fileID: 459917735} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &1276519163 +MeshRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1276519161} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_Materials: + - {fileID: 2100000, guid: 38c501add24d6eb4fbc6903d634d88f3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 1 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!33 &1276519164 +MeshFilter: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1276519161} + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &1283180266 GameObject: m_ObjectHideFlags: 0 @@ -3456,6 +3475,161 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 17 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1329758486 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1329758487} + - component: {fileID: 1329758490} + - component: {fileID: 1329758489} + - component: {fileID: 1329758488} + m_Layer: 8 + m_Name: trigger + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1329758487 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1329758486} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 1.8, z: 0} + m_LocalScale: {x: 3.67, y: 3.67, z: 3.67} + m_Children: [] + m_Father: {fileID: 1216863872} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1329758488 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1329758486} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 86694b20cef756146b118abf35314f9b, type: 3} + m_Name: + m_EditorClassIdentifier: + area: 2 +--- !u!23 &1329758489 +MeshRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1329758486} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_Materials: + - {fileID: 2100000, guid: 26431f824b7c8384bbc23c36bd054e2b, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 1 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!33 &1329758490 +MeshFilter: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1329758486} + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &1355871871 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1355871872} + - component: {fileID: 1355871874} + - component: {fileID: 1355871873} + m_Layer: 8 + m_Name: standby + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1355871872 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1355871871} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0.5, z: 0} + m_LocalScale: {x: 0.3, y: 0.3, z: 0.3} + m_Children: [] + m_Father: {fileID: 1906326617} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &1355871873 +MeshRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1355871871} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_Materials: + - {fileID: 2100000, guid: 2069c9e41aee9e04e89470e60c57b764, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 1 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!33 &1355871874 +MeshFilter: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1355871871} + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &1379541361 GameObject: m_ObjectHideFlags: 0 @@ -3526,7 +3700,7 @@ MeshFilter: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1379541361} - m_Mesh: {fileID: 456004799} + m_Mesh: {fileID: 1792131387} --- !u!1 &1390635887 GameObject: m_ObjectHideFlags: 0 @@ -3636,88 +3810,113 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} ---- !u!1 &1690794384 +--- !u!1 &1561705233 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} serializedVersion: 5 m_Component: - - component: {fileID: 1690794385} - - component: {fileID: 1690794390} - - component: {fileID: 1690794389} - - component: {fileID: 1690794388} - - component: {fileID: 1690794387} - - component: {fileID: 1690794386} - - component: {fileID: 1690794391} + - component: {fileID: 1561705234} + - component: {fileID: 1561705236} + - component: {fileID: 1561705235} m_Layer: 8 - m_Name: Kristoff & Sven + m_Name: trigger m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1690794385 +--- !u!4 &1561705234 Transform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1690794384} + m_GameObject: {fileID: 1561705233} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.206, y: 0.878, z: 2.49} - m_LocalScale: {x: 2.150855, y: 2.1508515, z: 2.1508515} + m_LocalPosition: {x: 0, y: 0.45, z: 0} + m_LocalScale: {x: 0.75, y: 0.75, z: 0.75} m_Children: [] - m_Father: {fileID: 199010598} - m_RootOrder: 6 + m_Father: {fileID: 1906326617} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!54 &1690794386 -Rigidbody: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1690794384} - serializedVersion: 2 - m_Mass: 1 - m_Drag: 0 - m_AngularDrag: 0.05 - m_UseGravity: 0 - m_IsKinematic: 0 - m_Interpolate: 0 - m_Constraints: 0 - m_CollisionDetection: 0 ---- !u!114 &1690794387 -MonoBehaviour: +--- !u!23 &1561705235 +MeshRenderer: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1690794384} + m_GameObject: {fileID: 1561705233} m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 12ea4d85cdda0aa4981a82e5e18fed52, type: 3} - m_Name: - m_EditorClassIdentifier: - standby: 1 - disappearTime: 10 - mat: {fileID: 0} - area: 2 - AppearArea: 02000000 - wallRoi: {x: 0, y: 0} - fakeButton: {fileID: 0} - standbyClip: {fileID: 11400000, guid: dfdc3af2e37491840b05776ce71e1ca8, type: 2} - triggerClip: {fileID: 11400000, guid: a6af2089baf7ed8489a4e941dae4e928, type: 2} - players: [] - color: {r: 1, g: 1, b: 1, a: 1} - videoStopTime: 10 - specificPositions: - - {fileID: 1690794391} - roaming: 0 - isTriggerCollider: 0 ---- !u!23 &1690794388 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_Materials: + - {fileID: 2100000, guid: 8ba933f3f4401b34ead3e5f188561901, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 1 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!33 &1561705236 +MeshFilter: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1561705233} + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &1674052466 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1674052467} + - component: {fileID: 1674052469} + - component: {fileID: 1674052468} + m_Layer: 8 + m_Name: standby + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1674052467 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1674052466} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 1, z: 0} + m_LocalScale: {x: 0.2, y: 0.2, z: 0.2} + m_Children: [] + m_Father: {fileID: 1225287932} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &1674052468 MeshRenderer: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1690794384} + m_GameObject: {fileID: 1674052466} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -3726,7 +3925,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_Materials: - - {fileID: 2100000, guid: ab048f026549e9e4896e951efd521c70, type: 2} + - {fileID: 2100000, guid: 8c39c22eb38d35d469dada1042a71ea9, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -3746,27 +3945,72 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 ---- !u!64 &1690794389 -MeshCollider: +--- !u!33 &1674052469 +MeshFilter: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1690794384} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 0 - serializedVersion: 3 - m_Convex: 1 - m_CookingOptions: 14 - m_SkinWidth: 0.01 + m_GameObject: {fileID: 1674052466} m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} ---- !u!33 &1690794390 -MeshFilter: +--- !u!1 &1690794384 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1690794385} + - component: {fileID: 1690794387} + - component: {fileID: 1690794391} + m_Layer: 8 + m_Name: Kristoff & Sven + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1690794385 +Transform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1690794384} - m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 1.92, y: 0, z: 2.49} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1061158672} + - {fileID: 1858061293} + m_Father: {fileID: 199010598} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1690794387 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1690794384} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 12ea4d85cdda0aa4981a82e5e18fed52, type: 3} + m_Name: + m_EditorClassIdentifier: + standby: 1 + disappearTime: 10 + area: 2 + AppearArea: 02000000 + fakeButton: {fileID: 0} + specificPositions: + - {fileID: 1690794391} + roaming: 0 + isStandbyLoop: 0 + standbyClip: {fileID: 11400000, guid: dfdc3af2e37491840b05776ce71e1ca8, type: 2} + triggerClips: + - {fileID: 11400000, guid: a6af2089baf7ed8489a4e941dae4e928, type: 2} + players: [] + color: {r: 1, g: 1, b: 1, a: 1} + videoStopTime: 10 + isTriggerCollider: 0 --- !u!114 &1690794391 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3779,6 +4023,90 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: area: 2 +--- !u!1 &1718259912 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1718259913} + - component: {fileID: 1718259916} + - component: {fileID: 1718259915} + - component: {fileID: 1718259914} + m_Layer: 8 + m_Name: Olaf_CC065053 (3) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1718259913 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1718259912} + m_LocalRotation: {x: -0, y: -0.7071068, z: 0, w: -0.7071068} + m_LocalPosition: {x: 3.99, y: 0.44900006, z: -1.14} + m_LocalScale: {x: 0.7500005, y: 0.75, z: 0.7500005} + m_Children: [] + m_Father: {fileID: 1247992794} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: -270, z: 0} +--- !u!114 &1718259914 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1718259912} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 86694b20cef756146b118abf35314f9b, type: 3} + m_Name: + m_EditorClassIdentifier: + area: 0 +--- !u!23 &1718259915 +MeshRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1718259912} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_Materials: + - {fileID: 2100000, guid: 8ba933f3f4401b34ead3e5f188561901, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 1 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!33 &1718259916 +MeshFilter: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1718259912} + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &1761700811 GameObject: m_ObjectHideFlags: 0 @@ -4009,72 +4337,202 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1774693141} ---- !u!1 &1817143146 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 - m_Component: - - component: {fileID: 1817143149} - - component: {fileID: 1817143148} - - component: {fileID: 1817143150} - - component: {fileID: 1817143147} - - component: {fileID: 1817143151} - m_Layer: 0 - m_Name: Spout Camera - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1817143147 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1817143146} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 542c4b2aee71a0142928f8b82f70141f, type: 3} - m_Name: - m_EditorClassIdentifier: - sharingName: FrozenSpout - textureFormat: 28 - yFlip: 1 - output: {fileID: 0} - m_Shader: {fileID: 4800000, guid: ca95743014f24fd49897e12abbe931fc, type: 3} ---- !u!20 &1817143148 -Camera: +--- !u!43 &1792131387 +Mesh: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1817143146} - m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 2 - m_BackGroundColor: {r: 0, g: 0, b: 0, a: 1} - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: 0.3 - far clip plane: 1000 - field of view: 60 - orthographic: 0 - orthographic size: 5 - m_Depth: 0 - m_CullingMask: - serializedVersion: 2 - m_Bits: 32 - m_RenderingPath: 1 - m_TargetTexture: {fileID: 8400000, guid: b8e6ff168206f134585d024c016832b6, type: 2} - m_TargetDisplay: 0 - m_TargetEye: 3 - m_HDR: 0 - m_AllowMSAA: 0 + m_Name: 'Space Ground Mesh: (8x5x3)' + serializedVersion: 8 + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 24 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 16 + localAABB: + m_Center: {x: 0, y: 1.5, z: 0} + m_Extent: {x: 4, y: 1.5, z: 2.5} + m_Shapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + m_BindPose: [] + m_BoneNameHashes: + m_RootBoneNameHash: 0 + m_MeshCompression: 0 + m_IsReadable: 0 + m_KeepVertices: 1 + m_KeepIndices: 1 + m_IndexFormat: 0 + m_IndexBuffer: 000001000200010003000200040005000600050007000600080009000a0009000b000a000c000d000e000d000f000e00 + m_Skin: [] + m_VertexData: + m_CurrentChannels: 11 + m_VertexCount: 16 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 12 + format: 0 + dimension: 3 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 24 + format: 0 + dimension: 2 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 512 + _typelessdata: 000080c000000000000020c0000000000000803f00000000e4388e3e00000000000080c00000000000002040000000000000803f00000000e4388e3e0000203f0000804000000000000020c0000000000000803f000000008ee3383f00000000000080400000000000002040000000000000803f000000008ee3383f0000203f000080c000000000000020400000000000000000000080bfe4388e3e0000203f000080c000004040000020400000000000000000000080bfe4388e3e0000803f0000804000000000000020400000000000000000000080bf8ee3383f0000203f0000804000004040000020400000000000000000000080bf8ee3383f0000803f000080c000000000000020c00000803f0000000000000000000000000000203f000080c000004040000020c00000803f0000000000000000000000000000803f000080c000000000000020400000803f0000000000000000e4388e3e0000203f000080c000004040000020400000803f0000000000000000e4388e3e0000803f000080400000000000002040000080bf00000000000000008ee3383f0000203f000080400000404000002040000080bf00000000000000008ee3383f0000803f0000804000000000000020c0000080bf00000000000000000000803f0000203f0000804000004040000020c0000080bf00000000000000000000803f0000803f + m_CompressedMesh: + m_Vertices: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_UV: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Normals: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Tangents: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Weights: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_NormalSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_TangentSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_FloatColors: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_BoneIndices: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_Triangles: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_UVInfo: 0 + m_LocalAABB: + m_Center: {x: 0, y: 1.5, z: 0} + m_Extent: {x: 4, y: 1.5, z: 2.5} + m_MeshUsageFlags: 0 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + m_MeshOptimized: 0 +--- !u!1 &1817143146 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1817143149} + - component: {fileID: 1817143148} + - component: {fileID: 1817143150} + - component: {fileID: 1817143147} + - component: {fileID: 1817143151} + m_Layer: 0 + m_Name: Spout Camera + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1817143147 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1817143146} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 542c4b2aee71a0142928f8b82f70141f, type: 3} + m_Name: + m_EditorClassIdentifier: + sharingName: FrozenSpout + textureFormat: 28 + yFlip: 1 + output: {fileID: 0} + m_Shader: {fileID: 4800000, guid: ca95743014f24fd49897e12abbe931fc, type: 3} +--- !u!20 &1817143148 +Camera: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1817143146} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 2 + m_BackGroundColor: {r: 0, g: 0, b: 0, a: 1} + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 32 + m_RenderingPath: 1 + m_TargetTexture: {fileID: 8400000, guid: b8e6ff168206f134585d024c016832b6, type: 2} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 0 + m_AllowMSAA: 0 m_AllowDynamicResolution: 0 m_ForceIntoRT: 1 m_OcclusionCulling: 1 @@ -4261,116 +4719,113 @@ MonoBehaviour: debug: 0 colorize: 1 debugMaterial: {fileID: 2100000, guid: 95b4d9b25b7a7e3449627228b10d9009, type: 2} ---- !u!1 &1878556045 +--- !u!1 &1858061292 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} serializedVersion: 5 m_Component: - - component: {fileID: 1878556046} + - component: {fileID: 1858061293} + - component: {fileID: 1858061297} + - component: {fileID: 1858061296} m_Layer: 8 - m_Name: '---- Night Character ----' + m_Name: standby m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1878556046 +--- !u!4 &1858061293 Transform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1878556045} + m_GameObject: {fileID: 1858061292} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalPosition: {x: 0, y: 0.861, z: 0} + m_LocalScale: {x: 2.05, y: 2.05, z: 2.05} m_Children: [] - m_Father: {fileID: 199010598} - m_RootOrder: 8 + m_Father: {fileID: 1690794385} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1906326616 +--- !u!23 &1858061296 +MeshRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1858061292} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_Materials: + - {fileID: 2100000, guid: df84a14e3cc728849a322f8fade47789, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 1 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!33 &1858061297 +MeshFilter: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1858061292} + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &1866235075 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} serializedVersion: 5 m_Component: - - component: {fileID: 1906326617} - - component: {fileID: 1906326622} - - component: {fileID: 1906326621} - - component: {fileID: 1906326620} - - component: {fileID: 1906326619} - - component: {fileID: 1906326618} + - component: {fileID: 1866235076} + - component: {fileID: 1866235078} + - component: {fileID: 1866235077} m_Layer: 8 - m_Name: Olaf_CC065053 + m_Name: standby m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1906326617 +--- !u!4 &1866235076 Transform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1906326616} + m_GameObject: {fileID: 1866235075} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 3.17, y: 0.44900006, z: 2.49} - m_LocalScale: {x: 0.75, y: 0.75, z: 0.75} + m_LocalPosition: {x: 0, y: 1, z: 0} + m_LocalScale: {x: 0.3, y: 0.3, z: 0.3} m_Children: [] - m_Father: {fileID: 199010598} - m_RootOrder: 0 + m_Father: {fileID: 459917735} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!54 &1906326618 -Rigidbody: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1906326616} - serializedVersion: 2 - m_Mass: 1 - m_Drag: 0 - m_AngularDrag: 0.05 - m_UseGravity: 0 - m_IsKinematic: 0 - m_Interpolate: 0 - m_Constraints: 0 - m_CollisionDetection: 0 ---- !u!114 &1906326619 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1906326616} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 12ea4d85cdda0aa4981a82e5e18fed52, type: 3} - m_Name: - m_EditorClassIdentifier: - standby: 1 - disappearTime: 10 - mat: {fileID: 0} - area: 0 - AppearArea: 000000000100000002000000 - wallRoi: {x: 0, y: 0} - fakeButton: {fileID: 0} - standbyClip: {fileID: 11400000, guid: fb02941bf56531748886776e54c8f2d0, type: 2} - triggerClip: {fileID: 11400000, guid: 86cfefcea0dbaf349b192625aa06ef6a, type: 2} - players: [] - color: {r: 1, g: 1, b: 1, a: 1} - videoStopTime: 10 - specificPositions: - - {fileID: 40068780} - - {fileID: 1191975164} - roaming: 0 - isTriggerCollider: 0 ---- !u!23 &1906326620 +--- !u!23 &1866235077 MeshRenderer: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1906326616} + m_GameObject: {fileID: 1866235075} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -4379,7 +4834,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_Materials: - - {fileID: 2100000, guid: 8ba933f3f4401b34ead3e5f188561901, type: 2} + - {fileID: 2100000, guid: 482d068533c073147b880ef1a3cbbbdc, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -4399,27 +4854,101 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 ---- !u!64 &1906326621 -MeshCollider: +--- !u!33 &1866235078 +MeshFilter: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1906326616} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 0 - serializedVersion: 3 - m_Convex: 1 - m_CookingOptions: 14 - m_SkinWidth: 0.01 + m_GameObject: {fileID: 1866235075} m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} ---- !u!33 &1906326622 -MeshFilter: +--- !u!1 &1878556045 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1878556046} + m_Layer: 8 + m_Name: '---- Night Character ----' + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1878556046 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1878556045} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 199010598} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1906326616 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1906326617} + - component: {fileID: 1906326619} + m_Layer: 8 + m_Name: Olaf + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1906326617 +Transform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1906326616} - m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 3.17, y: 0, z: 2.49} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1561705234} + - {fileID: 1355871872} + m_Father: {fileID: 199010598} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1906326619 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1906326616} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 12ea4d85cdda0aa4981a82e5e18fed52, type: 3} + m_Name: + m_EditorClassIdentifier: + standby: 1 + disappearTime: 1 + area: 0 + AppearArea: 000000000100000002000000 + fakeButton: {fileID: 0} + specificPositions: + - {fileID: 40068780} + - {fileID: 1191975164} + roaming: 0 + isStandbyLoop: 1 + standbyClip: {fileID: 11400000, guid: fb02941bf56531748886776e54c8f2d0, type: 2} + triggerClips: + - {fileID: 11400000, guid: 86cfefcea0dbaf349b192625aa06ef6a, type: 2} + - {fileID: 11400000, guid: 727d0f386e383414ca58642076340e45, type: 2} + players: [] + color: {r: 1, g: 1, b: 1, a: 1} + videoStopTime: 1 + isTriggerCollider: 0 --- !u!1 &1908931425 GameObject: m_ObjectHideFlags: 0 @@ -4494,11 +5023,7 @@ GameObject: serializedVersion: 5 m_Component: - component: {fileID: 1933714481} - - component: {fileID: 1933714486} - - component: {fileID: 1933714485} - - component: {fileID: 1933714484} - component: {fileID: 1933714483} - - component: {fileID: 1933714482} - component: {fileID: 1933714487} m_Layer: 8 m_Name: Anna @@ -4514,27 +5039,14 @@ Transform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1933714480} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.477, y: 0.699, z: 2.49} - m_LocalScale: {x: 1.7966619, y: 1.7966619, z: 1.7966619} - m_Children: [] + m_LocalPosition: {x: -1.79, y: 0, z: 2.49} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 423869584} + - {fileID: 2086317001} m_Father: {fileID: 199010598} - m_RootOrder: 5 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!54 &1933714482 -Rigidbody: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1933714480} - serializedVersion: 2 - m_Mass: 1 - m_Drag: 0 - m_AngularDrag: 0.05 - m_UseGravity: 0 - m_IsKinematic: 0 - m_Interpolate: 0 - m_Constraints: 0 - m_CollisionDetection: 0 --- !u!114 &1933714483 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4544,175 +5056,36 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 12ea4d85cdda0aa4981a82e5e18fed52, type: 3} - m_Name: - m_EditorClassIdentifier: - standby: 1 - disappearTime: 10 - mat: {fileID: 0} - area: 2 - AppearArea: 02000000 - wallRoi: {x: 0, y: 0} - fakeButton: {fileID: 0} - standbyClip: {fileID: 11400000, guid: 6d7b66e288bf3924fbd7a716ae3ac255, type: 2} - triggerClip: {fileID: 11400000, guid: 2845fcd21d061464f8f97219a167ba7a, type: 2} - players: [] - color: {r: 1, g: 1, b: 1, a: 1} - videoStopTime: 10 - specificPositions: - - {fileID: 1933714487} - roaming: 0 - isTriggerCollider: 0 ---- !u!23 &1933714484 -MeshRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1933714480} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 0 - m_ReflectionProbeUsage: 0 - m_Materials: - - {fileID: 2100000, guid: 2969b78c14f1c6f4e941656f8f9cb902, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 1 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 0 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 ---- !u!64 &1933714485 -MeshCollider: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1933714480} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 0 - serializedVersion: 3 - m_Convex: 1 - m_CookingOptions: 14 - m_SkinWidth: 0.01 - m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} ---- !u!33 &1933714486 -MeshFilter: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1933714480} - m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} ---- !u!114 &1933714487 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1933714480} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 86694b20cef756146b118abf35314f9b, type: 3} - m_Name: - m_EditorClassIdentifier: - area: 2 ---- !u!1 &1958951067 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 - m_Component: - - component: {fileID: 1958951068} - - component: {fileID: 1958951071} - - component: {fileID: 1958951070} - - component: {fileID: 1958951069} - m_Layer: 8 - m_Name: Olaf_CC065053 (1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1958951068 -Transform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1958951067} - m_LocalRotation: {x: 0, y: -0.7071068, z: 0, w: 0.7071068} - m_LocalPosition: {x: -4, y: 0.462, z: -1.64} - m_LocalScale: {x: 0.75, y: 0.75, z: 0.75} - m_Children: [] - m_Father: {fileID: 2022668215} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0} ---- !u!114 &1958951069 + m_Name: + m_EditorClassIdentifier: + standby: 1 + disappearTime: 10 + area: 2 + AppearArea: 02000000 + fakeButton: {fileID: 0} + specificPositions: + - {fileID: 1933714487} + roaming: 0 + isStandbyLoop: 0 + standbyClip: {fileID: 11400000, guid: 6d7b66e288bf3924fbd7a716ae3ac255, type: 2} + triggerClips: + - {fileID: 11400000, guid: 2845fcd21d061464f8f97219a167ba7a, type: 2} + players: [] + color: {r: 1, g: 1, b: 1, a: 1} + videoStopTime: 10 + isTriggerCollider: 0 +--- !u!114 &1933714487 MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1958951067} + m_GameObject: {fileID: 1933714480} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 86694b20cef756146b118abf35314f9b, type: 3} m_Name: m_EditorClassIdentifier: - area: 0 ---- !u!23 &1958951070 -MeshRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1958951067} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 0 - m_ReflectionProbeUsage: 0 - m_Materials: - - {fileID: 2100000, guid: 9b8333bad640d1240ae139400daea38e, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 1 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 0 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 ---- !u!33 &1958951071 -MeshFilter: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1958951067} - m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} + area: 2 --- !u!1 &1973785471 GameObject: m_ObjectHideFlags: 0 @@ -4721,11 +5094,7 @@ GameObject: serializedVersion: 5 m_Component: - component: {fileID: 1973785472} - - component: {fileID: 1973785477} - - component: {fileID: 1973785476} - - component: {fileID: 1973785475} - component: {fileID: 1973785474} - - component: {fileID: 1973785473} - component: {fileID: 1973785478} m_Layer: 8 m_Name: Elsa @@ -4741,27 +5110,14 @@ Transform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1973785471} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.075, y: 0.702, z: 2.49} - m_LocalScale: {x: 1.3805976, y: 1.3805978, z: 1.3805978} - m_Children: [] + m_LocalPosition: {x: -0.075, y: 0, z: 2.49} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 351311319} + - {fileID: 47501850} m_Father: {fileID: 199010598} - m_RootOrder: 9 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!54 &1973785473 -Rigidbody: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1973785471} - serializedVersion: 2 - m_Mass: 1 - m_Drag: 0 - m_AngularDrag: 0.05 - m_UseGravity: 0 - m_IsKinematic: 0 - m_Interpolate: 0 - m_Constraints: 0 - m_CollisionDetection: 0 --- !u!114 &1973785474 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4775,75 +5131,20 @@ MonoBehaviour: m_EditorClassIdentifier: standby: 1 disappearTime: 10 - mat: {fileID: 0} area: 0 AppearArea: 02000000 - wallRoi: {x: 0, y: 0} fakeButton: {fileID: 0} + specificPositions: + - {fileID: 1973785478} + roaming: 0 + isStandbyLoop: 1 standbyClip: {fileID: 11400000, guid: aa1bbb3d5a802fb47880c1cf0237dc60, type: 2} - triggerClip: {fileID: 11400000, guid: 2ea2925de6b8a934fa0ea7a7020103b1, type: 2} + triggerClips: + - {fileID: 11400000, guid: 2ea2925de6b8a934fa0ea7a7020103b1, type: 2} players: [] color: {r: 1, g: 1, b: 1, a: 1} videoStopTime: 10 - specificPositions: - - {fileID: 1973785478} - roaming: 0 isTriggerCollider: 0 ---- !u!23 &1973785475 -MeshRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1973785471} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 0 - m_ReflectionProbeUsage: 0 - m_Materials: - - {fileID: 2100000, guid: d441d7339e3f6914fb9a8658c10b54bd, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 1 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 0 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 ---- !u!64 &1973785476 -MeshCollider: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1973785471} - m_Material: {fileID: 0} - m_IsTrigger: 1 - m_Enabled: 0 - serializedVersion: 3 - m_Convex: 1 - m_CookingOptions: 14 - m_SkinWidth: 0.01 - m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} ---- !u!33 &1973785477 -MeshFilter: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1973785471} - m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!114 &1973785478 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4864,11 +5165,7 @@ GameObject: serializedVersion: 5 m_Component: - component: {fileID: 1984882816} - - component: {fileID: 1984882822} - - component: {fileID: 1984882821} - - component: {fileID: 1984882820} - component: {fileID: 1984882819} - - component: {fileID: 1984882818} - component: {fileID: 1984882817} m_Layer: 8 m_Name: Elsa_Effect_A @@ -4884,11 +5181,13 @@ Transform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1984882815} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.84, y: 1.35, z: 2.49} - m_LocalScale: {x: 2.7552948, y: 2.755295, z: 2.755295} - m_Children: [] + m_LocalPosition: {x: -0.84, y: 0, z: 2.49} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 565906441} + - {fileID: 436028453} m_Father: {fileID: 199010598} - m_RootOrder: 11 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1984882817 MonoBehaviour: @@ -4902,21 +5201,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: area: 2 ---- !u!54 &1984882818 -Rigidbody: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1984882815} - serializedVersion: 2 - m_Mass: 1 - m_Drag: 0 - m_AngularDrag: 0.05 - m_UseGravity: 0 - m_IsKinematic: 0 - m_Interpolate: 0 - m_Constraints: 0 - m_CollisionDetection: 0 --- !u!114 &1984882819 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4929,27 +5213,57 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: standby: 1 - disappearTime: 10 - mat: {fileID: 0} + disappearTime: 1 area: 0 AppearArea: 02000000 - wallRoi: {x: 0, y: 0} fakeButton: {fileID: 0} - standbyClip: {fileID: 11400000, guid: 7b0a38d5d484cf54089379ebbe5c1d9d, type: 2} - triggerClip: {fileID: 11400000, guid: 23773c4900ad46e4f9ba5cb3d1c28912, type: 2} - players: [] - color: {r: 1, g: 1, b: 1, a: 1} - videoStopTime: 10 specificPositions: - {fileID: 1984882817} roaming: 0 + isStandbyLoop: 1 + standbyClip: {fileID: 11400000, guid: 7b0a38d5d484cf54089379ebbe5c1d9d, type: 2} + triggerClips: + - {fileID: 11400000, guid: 23773c4900ad46e4f9ba5cb3d1c28912, type: 2} + players: [] + color: {r: 1, g: 1, b: 1, a: 1} + videoStopTime: 1 isTriggerCollider: 0 ---- !u!23 &1984882820 +--- !u!1 &2008324328 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 2008324329} + - component: {fileID: 2008324331} + - component: {fileID: 2008324330} + m_Layer: 8 + m_Name: trigger + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2008324329 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2008324328} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.39, y: 1.52, z: 0} + m_LocalScale: {x: 2.7489872, y: 2.7489867, z: 2.7489867} + m_Children: [] + m_Father: {fileID: 1225287932} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &2008324330 MeshRenderer: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1984882815} + m_GameObject: {fileID: 2008324328} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -4958,7 +5272,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_Materials: - - {fileID: 2100000, guid: d399e769f1f82344b9f305269a536595, type: 2} + - {fileID: 2100000, guid: 5f6b94c6b2a653d439fba4373746dade, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -4978,57 +5292,13 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 ---- !u!64 &1984882821 -MeshCollider: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1984882815} - m_Material: {fileID: 0} - m_IsTrigger: 1 - m_Enabled: 0 - serializedVersion: 3 - m_Convex: 1 - m_CookingOptions: 14 - m_SkinWidth: 0.01 - m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} ---- !u!33 &1984882822 +--- !u!33 &2008324331 MeshFilter: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1984882815} + m_GameObject: {fileID: 2008324328} m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} ---- !u!1 &2022668214 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 - m_Component: - - component: {fileID: 2022668215} - m_Layer: 8 - m_Name: Olaf_CC065056-dummy - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2022668215 -Transform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 2022668214} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 1958951068} - - {fileID: 251596435} - m_Father: {fileID: 199010598} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2024329733 GameObject: m_ObjectHideFlags: 0 @@ -5176,13 +5446,12 @@ MonoBehaviour: - {fileID: 1906326619} - {fileID: 1933714483} - {fileID: 1690794387} - - {fileID: 147055507} - {fileID: 459917737} nightCharacters: - - {fileID: 147055507} - - {fileID: 1973785474} - {fileID: 1216863874} - - {fileID: 1906326619} + - {fileID: 1973785474} + - {fileID: 1984882819} + - {fileID: 1225287935} debug: 0 --- !u!4 &2084936104 Transform: @@ -5197,3 +5466,74 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2086317000 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 2086317001} + - component: {fileID: 2086317003} + - component: {fileID: 2086317002} + m_Layer: 8 + m_Name: standby + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2086317001 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2086317000} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0.7, z: 0} + m_LocalScale: {x: 1.78, y: 1.78, z: 1.78} + m_Children: [] + m_Father: {fileID: 1933714481} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &2086317002 +MeshRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2086317000} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_Materials: + - {fileID: 2100000, guid: 1cdc8e8858ddf8a48ae2acc576bc1ead, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 1 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!33 &2086317003 +MeshFilter: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2086317000} + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} diff --git a/Unity_2018_Frozen/Assets/Frozen/FrozenNightParticleUniforms.asset b/Unity_2018_Frozen/Assets/Frozen/FrozenNightParticleUniforms.asset index 1660f63..0f11763 100644 --- a/Unity_2018_Frozen/Assets/Frozen/FrozenNightParticleUniforms.asset +++ b/Unity_2018_Frozen/Assets/Frozen/FrozenNightParticleUniforms.asset @@ -13,18 +13,18 @@ MonoBehaviour: m_EditorClassIdentifier: numRate: 1 movement: 1 - geomSize: 0.094 - velocityDamping: 1 - lifeDuration: 10 + geomSize: 0.02 + velocityDamping: 0.98 + lifeDuration: 5 lifeVariation: 0 convergence: 0 - homeStrength: 0 + homeStrength: 0.243 noiseStrength: 0.055 noiseSeed: 0.5 noiseTimeScale: 1 - noiseFrequency: 0.731 + noiseFrequency: 0.733 forceDirection: {x: 0, y: 0, z: 1} forceStrength: 0 impulsePosition: {x: 0, y: 0, z: 0} impulseRadius: 3 - impulseStrength: 0.06 + impulseStrength: 0.1 diff --git a/Unity_2018_Frozen/Assets/Frozen/Material/GiantSnowflake.mat b/Unity_2018_Frozen/Assets/Frozen/Material/GiantSnowflake.mat index b1cfbd1..31a27a3 100644 --- a/Unity_2018_Frozen/Assets/Frozen/Material/GiantSnowflake.mat +++ b/Unity_2018_Frozen/Assets/Frozen/Material/GiantSnowflake.mat @@ -72,5 +72,5 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 0} + - _Color: {r: 1, g: 1, b: 1, a: 0.99999887} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/Unity_2018_Frozen/Assets/Frozen/Material/Space-Ground.mat b/Unity_2018_Frozen/Assets/Frozen/Material/Space-Ground.mat index acc56b1..ab10d50 100644 --- a/Unity_2018_Frozen/Assets/Frozen/Material/Space-Ground.mat +++ b/Unity_2018_Frozen/Assets/Frozen/Material/Space-Ground.mat @@ -70,7 +70,7 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 - - _Rate: 0 + - _Rate: 1 - _SmoothnessTextureChannel: 0 - _SpaceRate: 0 - _SpecularHighlights: 1 diff --git a/Unity_2018_Frozen/Assets/Frozen/Material/Space-Wall.mat b/Unity_2018_Frozen/Assets/Frozen/Material/Space-Wall.mat index c168cfb..91d954a 100644 --- a/Unity_2018_Frozen/Assets/Frozen/Material/Space-Wall.mat +++ b/Unity_2018_Frozen/Assets/Frozen/Material/Space-Wall.mat @@ -70,7 +70,7 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 - - _Rate: 0 + - _Rate: 1 - _SmoothnessTextureChannel: 0 - _SpaceRate: 0 - _SpecularHighlights: 1 diff --git a/Unity_2018_Frozen/Assets/Frozen/Script/CharacterBehaviour.cs b/Unity_2018_Frozen/Assets/Frozen/Script/CharacterBehaviour.cs index f782f3d..8309c8e 100644 --- a/Unity_2018_Frozen/Assets/Frozen/Script/CharacterBehaviour.cs +++ b/Unity_2018_Frozen/Assets/Frozen/Script/CharacterBehaviour.cs @@ -14,41 +14,60 @@ public class CharacterBehaviour : MonoBehaviour [Range(0, 15)] public float disappearTime = 5; - public Material mat; + //public Material mat; public Area area; public List AppearArea = new List(); - public Vector2 wallRoi; + Vector2 wallRoi; float origin_height = 0.0f; [SerializeField] private RectTransform fakeButton; + private const float checktriggerColliderTime = 0.5f; + private float triggerColliderTimer; + + [SerializeField] + List specificPositions = new List(); + + [SerializeField, Range(0, 1)] + float roaming = 0.0f; + float roaming_seed = 0.0f; + + [Header("Direct Show Player")] + [SerializeField] + bool isStandbyLoop = true; public DShowClip standbyClip; - public DShowClip triggerClip; + public List triggerClips = new List(); + int trigger_clip_index = 0; [SerializeField] private DShowMoviePlayer[] players; - private MeshRenderer m_meshRender; + //private MeshRenderer m_meshRender; public Color color; private bool isSleep; public float videoStopTime = 1.5f; - private const float checktriggerColliderTime = 0.5f; - private float triggerColliderTimer; - - [SerializeField] - List specificPositions = new List(); + const int TRIGGER = 0; + const int STANDBY = 1; - [SerializeField, Range(0, 1)] - float roaming = 0.0f; - float roaming_seed = 0.0f; + int Status { get { return System.Convert.ToInt32(standby); } } + + + List renderers; + + private void Awake() { - m_meshRender = GetComponent(); - mat = new Material(Shader.Find("Unlit/ColorTransparent")); - m_meshRender.material = mat; + renderers = new List(); + renderers.AddRange(GetComponentsInChildren()); + if (renderers.Count != 2) + Debug.LogWarningFormat("{0} renderer count is {1}", gameObject.name, renderers.Count); + //m_meshRender = GetComponent(); + //mat = new Material(Shader.Find("Unlit/ColorTransparent")); + //m_meshRender.material = mat; + origin_height = transform.position.y; @@ -57,7 +76,7 @@ public class CharacterBehaviour : MonoBehaviour void InitialiseDSPlayer() { - CreateDSPlayer(triggerClip); + CreateDSPlayer(triggerClips[0]); CreateDSPlayer(standbyClip); players = GetComponentsInChildren(); } @@ -81,7 +100,8 @@ public class CharacterBehaviour : MonoBehaviour fakeButton.anchorMin = new Vector2(0, 0); fakeButton.anchorMax = new Vector2(0, 0); fakeButton.pivot = new Vector2(0.5f, 0.5f); - fakeButton.sizeDelta = new Vector2(transform.localScale.x, transform.localScale.y) * FrozenScreenToWorldSpace.Instance.finalPixelsByMeter; + var standby_scale = renderers[STANDBY].transform.localScale; + fakeButton.sizeDelta = new Vector2(standby_scale.x, standby_scale.y) * FrozenScreenToWorldSpace.Instance.finalPixelsByMeter; fakeButton.anchoredPosition3D = new Vector3(0, 0, 0); fakeButton.localScale = Vector3.one; fakeButton.gameObject.AddComponent(); @@ -93,23 +113,22 @@ public class CharacterBehaviour : MonoBehaviour private void Start() { - //standby = true; - //isSleep = false; - mat.mainTextureScale = new Vector2(1, -1); - mat.mainTextureOffset = new Vector2(0, -1); - //StartCoroutine(PlayOnStart()); - //InitialTouchButton(); - //StartCoroutine(RandomPosNoTriggerOther()); + foreach (var rdr in renderers) + { + //rdr.sharedMaterial = new Material(rdr.sharedMaterial); + rdr.material.mainTextureScale = new Vector2(1, -1); + rdr.material.mainTextureOffset = new Vector2(0, -1); + } } private void OnEnable() { standby = true; isSleep = false; - StartCoroutine(PlayOnStart()); + StartCoroutine(PlayStandbyOnStart()); InitialTouchButton(); StartCoroutine(RandomPosNoTriggerOther()); - color = new Color(1,1,1,0); + color = new Color(1, 1, 1, 0); StartCoroutine(Sleep()); if (fakeButton != null) fakeButton.gameObject.SetActive(true); @@ -121,27 +140,27 @@ public class CharacterBehaviour : MonoBehaviour fakeButton.gameObject.SetActive(false); } - IEnumerator PlayOnStart() + IEnumerator PlayStandbyOnStart() { - DShowMoviePlayer player = currentPlayer; - player.Loop = true; + DShowMoviePlayer player = CurrentPlayer; + player.Loop = isStandbyLoop; while (!player.IsPlaying) { player.Play(); - mat.mainTexture = player.Texture; + renderers[STANDBY].material.mainTexture = player.Texture; yield return null; } } void Update() { - + /* if (Input.GetKeyDown(KeyCode.R)) { if (!isTriggerCollider) StartCoroutine(RandomPosNoTriggerOther()); } - + */ UpdateMaterial(); if (isSleep == false) @@ -149,6 +168,10 @@ public class CharacterBehaviour : MonoBehaviour if (standby == false) { CheckPlayFinished(); + + var mat = renderers[STANDBY].material; + float a = Mathf.Lerp(mat.color.a, 0.0f, Time.deltaTime); + mat.color = new Color(1, 1, 1, a); } else if (standby && roaming > 0.0f) { @@ -174,7 +197,8 @@ public class CharacterBehaviour : MonoBehaviour { float noise = Mathf.PerlinNoise(Time.time * 0.4f, roaming_seed) > 0.5f ? 1.0f : -1.0f; noise *= roaming * Time.deltaTime; - float padding = transform.localScale.x * 0.5f; + //float padding = transform.localScale.x * 0.5f; + float padding = renderers[TRIGGER].transform.localScale.x * 0.5f; Vector3 pos = transform.position; switch (area) { @@ -198,13 +222,14 @@ public class CharacterBehaviour : MonoBehaviour void UpdateMaterial() { - mat.mainTexture = currentPlayer.Texture; + var mat = CurrentRenderer.material; + mat.mainTexture = CurrentPlayer.Texture; mat.SetColor("_Color", color); } void CheckPlayFinished() { - if (currentPlayer.IsFinished) + if (CurrentPlayer.IsFinished) { StartCoroutine(Sleep()); } @@ -237,7 +262,7 @@ public class CharacterBehaviour : MonoBehaviour void RandomPos() { - float minX = transform.localScale.x / 2; + float minX = renderers[TRIGGER].transform.localScale.x / 2; #if true switch (area) { @@ -292,7 +317,9 @@ public class CharacterBehaviour : MonoBehaviour void UpdateButtonPos() { - Vector2 newScreenPos = FrozenScreenToWorldSpace.Instance.GetFinalScreenPos(area, wallRoi); + //Vector2 newScreenPos = FrozenScreenToWorldSpace.Instance.GetFinalScreenPos(area, wallRoi); + var roi = FrozenScreenToWorldSpace.Instance.GetWallRoiFromPosition(area, renderers[STANDBY].transform.position); + Vector2 newScreenPos = FrozenScreenToWorldSpace.Instance.GetFinalScreenPos(area, roi); fakeButton.anchoredPosition = newScreenPos; } @@ -317,17 +344,18 @@ public class CharacterBehaviour : MonoBehaviour if (!standby || isSleep) return; standby = false; - currentPlayer.Play(); - mat.mainTexture = currentPlayer.Texture; + CurrentPlayer.Play(); + CurrentRenderer.material.mainTexture = CurrentPlayer.Texture; } void Idle() { standby = true; - currentPlayer.Play(); + CurrentPlayer.Play(); } - DShowMoviePlayer currentPlayer { get { return players[System.Convert.ToInt32(standby)]; } } + DShowMoviePlayer CurrentPlayer { get { return players[Status]; } } + MeshRenderer CurrentRenderer { get { return renderers[Status]; } } IEnumerator Sleep() { @@ -357,8 +385,8 @@ public class CharacterBehaviour : MonoBehaviour IEnumerator WaitVideoStandbyFadeIn() { standby = true; - currentPlayer.Play(); - mat.mainTexture = currentPlayer.Texture; + CurrentPlayer.Play(); + CurrentRenderer.material.mainTexture = CurrentPlayer.Texture; yield return StartCoroutine(Fade(1)); } @@ -366,8 +394,8 @@ public class CharacterBehaviour : MonoBehaviour { yield return new WaitForSeconds(videoStopTime); yield return StartCoroutine(Fade(0)); - currentPlayer.Pause(); - currentPlayer.Frame = 0; + CurrentPlayer.Pause(); + CurrentPlayer.Frame = 0; } @@ -420,6 +448,10 @@ public class CharacterBehaviour : MonoBehaviour } roaming_seed = Random.Range(0.0f, 1.0f); + + trigger_clip_index = ++trigger_clip_index % triggerClips.Count; + players[0].VideoAsset = triggerClips[trigger_clip_index]; + yield return null; } } diff --git a/Unity_2018_Frozen/Assets/Frozen/Script/GiantSnowflake.cs b/Unity_2018_Frozen/Assets/Frozen/Script/GiantSnowflake.cs index 0148d7a..303b730 100644 --- a/Unity_2018_Frozen/Assets/Frozen/Script/GiantSnowflake.cs +++ b/Unity_2018_Frozen/Assets/Frozen/Script/GiantSnowflake.cs @@ -27,7 +27,7 @@ namespace UltraCombos.Frozen private void Start() { - material = GetComponent().sharedMaterial; + material = GetComponent().material; player = GetComponent(); root = transform.position; diff --git a/Unity_2018_Frozen/Assets/Frozen/Script/SceneController.cs b/Unity_2018_Frozen/Assets/Frozen/Script/SceneController.cs index 4e1fa5d..52652ce 100644 --- a/Unity_2018_Frozen/Assets/Frozen/Script/SceneController.cs +++ b/Unity_2018_Frozen/Assets/Frozen/Script/SceneController.cs @@ -41,6 +41,7 @@ namespace UltraCombos.Frozen [SerializeField] bool debug = false; + float target_rate = 0.0f; private void Start() { @@ -51,7 +52,12 @@ namespace UltraCombos.Frozen { if (debug) { - rate = Mathf.Sin(Time.time * 0.2f) * 0.5f + 0.5f; + //rate = Mathf.Sin(Time.time * 0.2f) * 0.5f + 0.5f; + if (Input.GetKeyDown(KeyCode.Q)) + { + target_rate = 1.0f - target_rate; + } + rate = Mathf.Lerp(rate, target_rate, 0.02f); } uniform.rate = rate; diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Anna-icn.mat b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Anna-icn.mat new file mode 100644 index 0000000..b1e8d86 --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Anna-icn.mat @@ -0,0 +1,76 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: Anna-icn + m_Shader: {fileID: 4800000, guid: a76fe72ab9c198948a9233662c9407f3, type: 3} + m_ShaderKeywords: _ALPHATEST_ON _EMISSION + m_LightmapFlags: 1 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 2800000, guid: 0a8eed7dd69bbac43ab277a7cc6074e1, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: d2326e93b3259884bb63ae615548d026, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 1 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Anna-icn.mat.meta b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Anna-icn.mat.meta new file mode 100644 index 0000000..9333b54 --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Anna-icn.mat.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 1cdc8e8858ddf8a48ae2acc576bc1ead +timeCreated: 1525245333 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Elsa-icn.mat b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Elsa-icn.mat new file mode 100644 index 0000000..65217b6 --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Elsa-icn.mat @@ -0,0 +1,76 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: Elsa-icn + m_Shader: {fileID: 4800000, guid: a76fe72ab9c198948a9233662c9407f3, type: 3} + m_ShaderKeywords: _ALPHATEST_ON _EMISSION + m_LightmapFlags: 1 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 2800000, guid: 0a8eed7dd69bbac43ab277a7cc6074e1, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: fd36f1b4effedff4e9d335c04982acfd, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 1 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Elsa-icn.mat.meta b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Elsa-icn.mat.meta new file mode 100644 index 0000000..ed41d51 --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Elsa-icn.mat.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: ddc66ffea59cab24d93933e970aaea4f +timeCreated: 1525245333 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Kristoff_Sven-icn.mat b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Kristoff_Sven-icn.mat new file mode 100644 index 0000000..0176713 --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Kristoff_Sven-icn.mat @@ -0,0 +1,76 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: Kristoff_Sven-icn + m_Shader: {fileID: 4800000, guid: a76fe72ab9c198948a9233662c9407f3, type: 3} + m_ShaderKeywords: _ALPHATEST_ON _EMISSION + m_LightmapFlags: 1 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 2800000, guid: 0a8eed7dd69bbac43ab277a7cc6074e1, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: d2326e93b3259884bb63ae615548d026, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 1 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Kristoff_Sven-icn.mat.meta b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Kristoff_Sven-icn.mat.meta new file mode 100644 index 0000000..066d7bb --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Kristoff_Sven-icn.mat.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: df84a14e3cc728849a322f8fade47789 +timeCreated: 1525245333 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Marshmallow-icn.mat b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Marshmallow-icn.mat new file mode 100644 index 0000000..992f526 --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Marshmallow-icn.mat @@ -0,0 +1,76 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: Marshmallow-icn + m_Shader: {fileID: 4800000, guid: a76fe72ab9c198948a9233662c9407f3, type: 3} + m_ShaderKeywords: _ALPHATEST_ON _EMISSION + m_LightmapFlags: 1 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 2800000, guid: 0a8eed7dd69bbac43ab277a7cc6074e1, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: fd36f1b4effedff4e9d335c04982acfd, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 1 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Marshmallow-icn.mat.meta b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Marshmallow-icn.mat.meta new file mode 100644 index 0000000..d6083d3 --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Marshmallow-icn.mat.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 42a6e1bacb07f204cb0af72a39066cae +timeCreated: 1525245333 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Olaf-icn.mat b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Olaf-icn.mat new file mode 100644 index 0000000..86ff6c8 --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Olaf-icn.mat @@ -0,0 +1,76 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: Olaf-icn + m_Shader: {fileID: 4800000, guid: a76fe72ab9c198948a9233662c9407f3, type: 3} + m_ShaderKeywords: _ALPHATEST_ON _EMISSION + m_LightmapFlags: 1 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 2800000, guid: 0a8eed7dd69bbac43ab277a7cc6074e1, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: fd36f1b4effedff4e9d335c04982acfd, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 1 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Olaf-icn.mat.meta b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Olaf-icn.mat.meta new file mode 100644 index 0000000..f72fb80 --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/Olaf-icn.mat.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 2069c9e41aee9e04e89470e60c57b764 +timeCreated: 1525245333 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/Character/icon_elsa.png b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/icon_elsa.png new file mode 100644 index 0000000..9961d66 --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/icon_elsa.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2704e08b626b1b963f3d4d822e3ed169474d87b2a40395ba15489d94b11016b2 +size 238374 diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/Character/icon_elsa.png.meta b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/icon_elsa.png.meta new file mode 100644 index 0000000..2119da1 --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/Texture/Character/icon_elsa.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: fd36f1b4effedff4e9d335c04982acfd +timeCreated: 1526358761 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/Effect/Cloud_Snow-icn.mat b/Unity_2018_Frozen/Assets/Frozen/Texture/Effect/Cloud_Snow-icn.mat new file mode 100644 index 0000000..f9b9ab7 --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/Texture/Effect/Cloud_Snow-icn.mat @@ -0,0 +1,97 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: Cloud_Snow-icn + m_Shader: {fileID: 4800000, guid: a76fe72ab9c198948a9233662c9407f3, type: 3} + m_ShaderKeywords: _ALPHATEST_ON + m_LightmapFlags: 0 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 2800000, guid: 0a8eed7dd69bbac43ab277a7cc6074e1, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BlendOp: 0 + - _BumpScale: 1 + - _CameraFadingEnabled: 0 + - _CameraFarFadeDistance: 2 + - _CameraNearFadeDistance: 1 + - _ColorMode: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DistortionBlend: 0.5 + - _DistortionEnabled: 0 + - _DistortionStrength: 1 + - _DistortionStrengthScaled: 0 + - _DstBlend: 0 + - _EmissionEnabled: 0 + - _FlipbookMode: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _InvFade: 1 + - _LightingEnabled: 0 + - _Metallic: 0 + - _Mode: 1 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SoftParticlesEnabled: 0 + - _SoftParticlesFarFadeDistance: 1 + - _SoftParticlesNearFadeDistance: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0} + - _Color: {r: 1, g: 1, b: 1, a: 0.0036816131} + - _ColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} + - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} + - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} + - _TintColor: {r: 1, g: 1, b: 1, a: 0.5} diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/Effect/Cloud_Snow-icn.mat.meta b/Unity_2018_Frozen/Assets/Frozen/Texture/Effect/Cloud_Snow-icn.mat.meta new file mode 100644 index 0000000..666c283 --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/Texture/Effect/Cloud_Snow-icn.mat.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 482d068533c073147b880ef1a3cbbbdc +timeCreated: 1525245333 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/Effect/Elsa_Effect_A-icn.mat b/Unity_2018_Frozen/Assets/Frozen/Texture/Effect/Elsa_Effect_A-icn.mat new file mode 100644 index 0000000..85e3206 --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/Texture/Effect/Elsa_Effect_A-icn.mat @@ -0,0 +1,78 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: Elsa_Effect_A-icn + m_Shader: {fileID: 200, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: _ALPHATEST_ON _EMISSION + m_LightmapFlags: 1 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 2800000, guid: 0a8eed7dd69bbac43ab277a7cc6074e1, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 298e413853ea27d4986d37d1c19947b3, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _InvFade: 1 + - _Metallic: 0 + - _Mode: 1 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} + - _TintColor: {r: 1, g: 1, b: 1, a: 0.5} diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/Effect/Elsa_Effect_A-icn.mat.meta b/Unity_2018_Frozen/Assets/Frozen/Texture/Effect/Elsa_Effect_A-icn.mat.meta new file mode 100644 index 0000000..a78f6ea --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/Texture/Effect/Elsa_Effect_A-icn.mat.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: ef4c4d78f0eeb744baec7916f94db5be +timeCreated: 1525245333 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/Effect/Elsa_Effect_B-icn.mat b/Unity_2018_Frozen/Assets/Frozen/Texture/Effect/Elsa_Effect_B-icn.mat new file mode 100644 index 0000000..8595068 --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/Texture/Effect/Elsa_Effect_B-icn.mat @@ -0,0 +1,78 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: Elsa_Effect_B-icn + m_Shader: {fileID: 200, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: _ALPHATEST_ON _EMISSION + m_LightmapFlags: 1 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 2800000, guid: 0a8eed7dd69bbac43ab277a7cc6074e1, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 298e413853ea27d4986d37d1c19947b3, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _InvFade: 1 + - _Metallic: 0 + - _Mode: 1 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} + - _TintColor: {r: 1, g: 1, b: 1, a: 0.5} diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/Effect/Elsa_Effect_B-icn.mat.meta b/Unity_2018_Frozen/Assets/Frozen/Texture/Effect/Elsa_Effect_B-icn.mat.meta new file mode 100644 index 0000000..2ad00e1 --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/Texture/Effect/Elsa_Effect_B-icn.mat.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 8c39c22eb38d35d469dada1042a71ea9 +timeCreated: 1525245333 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/Effect/icon_cloud.png b/Unity_2018_Frozen/Assets/Frozen/Texture/Effect/icon_cloud.png new file mode 100644 index 0000000..744e354 --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/Texture/Effect/icon_cloud.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:55e3ac35f39440370fe5cd28ad5a81736f769324a4e6af0a67caf4a5136d13d4 +size 159719 diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/Effect/icon_cloud.png.meta b/Unity_2018_Frozen/Assets/Frozen/Texture/Effect/icon_cloud.png.meta new file mode 100644 index 0000000..9404646 --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/Texture/Effect/icon_cloud.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 517858b313ed84b42a71bdec163b4b6a +timeCreated: 1526355549 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/Effect/icon_snowMagic.png b/Unity_2018_Frozen/Assets/Frozen/Texture/Effect/icon_snowMagic.png new file mode 100644 index 0000000..f4268f7 --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/Texture/Effect/icon_snowMagic.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b39ddb5ae279078aac95cc3822c26ab049842c348ca0f21fbb64d3386ec0a267 +size 208049 diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/Effect/icon_snowMagic.png.meta b/Unity_2018_Frozen/Assets/Frozen/Texture/Effect/icon_snowMagic.png.meta new file mode 100644 index 0000000..d730347 --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/Texture/Effect/icon_snowMagic.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 298e413853ea27d4986d37d1c19947b3 +timeCreated: 1526355549 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: From 3c8dd8b144e20c1d5c73537a445128b3a61aecf2 Mon Sep 17 00:00:00 2001 From: uc-hoba Date: Tue, 15 May 2018 15:18:26 +0800 Subject: [PATCH 2/4] rewrite CharacterBehaviour Flow --- Unity_2018_Frozen/Assets/Frozen/Frozen.unity | 301 +++++++------- .../Frozen/Script/CharacterBehaviour.cs | 374 +++++++++--------- 2 files changed, 327 insertions(+), 348 deletions(-) diff --git a/Unity_2018_Frozen/Assets/Frozen/Frozen.unity b/Unity_2018_Frozen/Assets/Frozen/Frozen.unity index 8554182..ffc961b 100644 --- a/Unity_2018_Frozen/Assets/Frozen/Frozen.unity +++ b/Unity_2018_Frozen/Assets/Frozen/Frozen.unity @@ -951,7 +951,6 @@ GameObject: m_Component: - component: {fileID: 368474577} - component: {fileID: 368474580} - - component: {fileID: 368474579} - component: {fileID: 368474578} - component: {fileID: 368474581} - component: {fileID: 368474583} @@ -1010,20 +1009,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 ---- !u!64 &368474579 -MeshCollider: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 368474576} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 0 - serializedVersion: 3 - m_Convex: 0 - m_CookingOptions: 14 - m_SkinWidth: 0.01 - m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!33 &368474580 MeshFilter: m_ObjectHideFlags: 0 @@ -1570,9 +1555,8 @@ MonoBehaviour: triggerClips: - {fileID: 11400000, guid: 708f87d2cbae42445846a25f0ca06829, type: 2} players: [] - color: {r: 1, g: 1, b: 1, a: 1} videoStopTime: 1.5 - isTriggerCollider: 0 + debugString: --- !u!1 &520040865 GameObject: m_ObjectHideFlags: 0 @@ -3142,9 +3126,8 @@ MonoBehaviour: triggerClips: - {fileID: 11400000, guid: 6ccf813116f07944faf4af6bc3b2c1f7, type: 2} players: [] - color: {r: 1, g: 1, b: 1, a: 1} videoStopTime: 10 - isTriggerCollider: 0 + debugString: --- !u!114 &1216863878 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3225,9 +3208,8 @@ MonoBehaviour: triggerClips: - {fileID: 11400000, guid: d3a9925b2d77cce4a8fc3215dbaf41e1, type: 2} players: [] - color: {r: 1, g: 1, b: 1, a: 1} videoStopTime: 1 - isTriggerCollider: 0 + debugString: --- !u!1 &1227078084 GameObject: m_ObjectHideFlags: 0 @@ -3700,7 +3682,7 @@ MeshFilter: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1379541361} - m_Mesh: {fileID: 1792131387} + m_Mesh: {fileID: 2039303666} --- !u!1 &1390635887 GameObject: m_ObjectHideFlags: 0 @@ -4008,9 +3990,8 @@ MonoBehaviour: triggerClips: - {fileID: 11400000, guid: a6af2089baf7ed8489a4e941dae4e928, type: 2} players: [] - color: {r: 1, g: 1, b: 1, a: 1} videoStopTime: 10 - isTriggerCollider: 0 + debugString: --- !u!114 &1690794391 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4337,136 +4318,6 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1774693141} ---- !u!43 &1792131387 -Mesh: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_Name: 'Space Ground Mesh: (8x5x3)' - serializedVersion: 8 - m_SubMeshes: - - serializedVersion: 2 - firstByte: 0 - indexCount: 24 - topology: 0 - baseVertex: 0 - firstVertex: 0 - vertexCount: 16 - localAABB: - m_Center: {x: 0, y: 1.5, z: 0} - m_Extent: {x: 4, y: 1.5, z: 2.5} - m_Shapes: - vertices: [] - shapes: [] - channels: [] - fullWeights: [] - m_BindPose: [] - m_BoneNameHashes: - m_RootBoneNameHash: 0 - m_MeshCompression: 0 - m_IsReadable: 0 - m_KeepVertices: 1 - m_KeepIndices: 1 - m_IndexFormat: 0 - m_IndexBuffer: 000001000200010003000200040005000600050007000600080009000a0009000b000a000c000d000e000d000f000e00 - m_Skin: [] - m_VertexData: - m_CurrentChannels: 11 - m_VertexCount: 16 - m_Channels: - - stream: 0 - offset: 0 - format: 0 - dimension: 3 - - stream: 0 - offset: 12 - format: 0 - dimension: 3 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 24 - format: 0 - dimension: 2 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - m_DataSize: 512 - _typelessdata: 000080c000000000000020c0000000000000803f00000000e4388e3e00000000000080c00000000000002040000000000000803f00000000e4388e3e0000203f0000804000000000000020c0000000000000803f000000008ee3383f00000000000080400000000000002040000000000000803f000000008ee3383f0000203f000080c000000000000020400000000000000000000080bfe4388e3e0000203f000080c000004040000020400000000000000000000080bfe4388e3e0000803f0000804000000000000020400000000000000000000080bf8ee3383f0000203f0000804000004040000020400000000000000000000080bf8ee3383f0000803f000080c000000000000020c00000803f0000000000000000000000000000203f000080c000004040000020c00000803f0000000000000000000000000000803f000080c000000000000020400000803f0000000000000000e4388e3e0000203f000080c000004040000020400000803f0000000000000000e4388e3e0000803f000080400000000000002040000080bf00000000000000008ee3383f0000203f000080400000404000002040000080bf00000000000000008ee3383f0000803f0000804000000000000020c0000080bf00000000000000000000803f0000203f0000804000004040000020c0000080bf00000000000000000000803f0000803f - m_CompressedMesh: - m_Vertices: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_UV: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Normals: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Tangents: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Weights: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_NormalSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_TangentSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_FloatColors: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_BoneIndices: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_Triangles: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_UVInfo: 0 - m_LocalAABB: - m_Center: {x: 0, y: 1.5, z: 0} - m_Extent: {x: 4, y: 1.5, z: 2.5} - m_MeshUsageFlags: 0 - m_BakedConvexCollisionMesh: - m_BakedTriangleCollisionMesh: - m_MeshOptimized: 0 --- !u!1 &1817143146 GameObject: m_ObjectHideFlags: 0 @@ -4946,9 +4797,8 @@ MonoBehaviour: - {fileID: 11400000, guid: 86cfefcea0dbaf349b192625aa06ef6a, type: 2} - {fileID: 11400000, guid: 727d0f386e383414ca58642076340e45, type: 2} players: [] - color: {r: 1, g: 1, b: 1, a: 1} videoStopTime: 1 - isTriggerCollider: 0 + debugString: --- !u!1 &1908931425 GameObject: m_ObjectHideFlags: 0 @@ -5071,9 +4921,8 @@ MonoBehaviour: triggerClips: - {fileID: 11400000, guid: 2845fcd21d061464f8f97219a167ba7a, type: 2} players: [] - color: {r: 1, g: 1, b: 1, a: 1} videoStopTime: 10 - isTriggerCollider: 0 + debugString: --- !u!114 &1933714487 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5142,9 +4991,8 @@ MonoBehaviour: triggerClips: - {fileID: 11400000, guid: 2ea2925de6b8a934fa0ea7a7020103b1, type: 2} players: [] - color: {r: 1, g: 1, b: 1, a: 1} videoStopTime: 10 - isTriggerCollider: 0 + debugString: --- !u!114 &1973785478 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5225,9 +5073,8 @@ MonoBehaviour: triggerClips: - {fileID: 11400000, guid: 23773c4900ad46e4f9ba5cb3d1c28912, type: 2} players: [] - color: {r: 1, g: 1, b: 1, a: 1} videoStopTime: 1 - isTriggerCollider: 0 + debugString: --- !u!1 &2008324328 GameObject: m_ObjectHideFlags: 0 @@ -5327,6 +5174,136 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 22 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!43 &2039303666 +Mesh: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: 'Space Ground Mesh: (8x5x3)' + serializedVersion: 8 + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 24 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 16 + localAABB: + m_Center: {x: 0, y: 1.5, z: 0} + m_Extent: {x: 4, y: 1.5, z: 2.5} + m_Shapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + m_BindPose: [] + m_BoneNameHashes: + m_RootBoneNameHash: 0 + m_MeshCompression: 0 + m_IsReadable: 0 + m_KeepVertices: 1 + m_KeepIndices: 1 + m_IndexFormat: 0 + m_IndexBuffer: 000001000200010003000200040005000600050007000600080009000a0009000b000a000c000d000e000d000f000e00 + m_Skin: [] + m_VertexData: + m_CurrentChannels: 11 + m_VertexCount: 16 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 12 + format: 0 + dimension: 3 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 24 + format: 0 + dimension: 2 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 512 + _typelessdata: 000080c000000000000020c0000000000000803f00000000e4388e3e00000000000080c00000000000002040000000000000803f00000000e4388e3e0000203f0000804000000000000020c0000000000000803f000000008ee3383f00000000000080400000000000002040000000000000803f000000008ee3383f0000203f000080c000000000000020400000000000000000000080bfe4388e3e0000203f000080c000004040000020400000000000000000000080bfe4388e3e0000803f0000804000000000000020400000000000000000000080bf8ee3383f0000203f0000804000004040000020400000000000000000000080bf8ee3383f0000803f000080c000000000000020c00000803f0000000000000000000000000000203f000080c000004040000020c00000803f0000000000000000000000000000803f000080c000000000000020400000803f0000000000000000e4388e3e0000203f000080c000004040000020400000803f0000000000000000e4388e3e0000803f000080400000000000002040000080bf00000000000000008ee3383f0000203f000080400000404000002040000080bf00000000000000008ee3383f0000803f0000804000000000000020c0000080bf00000000000000000000803f0000203f0000804000004040000020c0000080bf00000000000000000000803f0000803f + m_CompressedMesh: + m_Vertices: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_UV: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Normals: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Tangents: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Weights: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_NormalSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_TangentSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_FloatColors: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_BoneIndices: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_Triangles: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_UVInfo: 0 + m_LocalAABB: + m_Center: {x: 0, y: 1.5, z: 0} + m_Extent: {x: 4, y: 1.5, z: 2.5} + m_MeshUsageFlags: 0 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + m_MeshOptimized: 0 --- !u!1 &2084135709 GameObject: m_ObjectHideFlags: 0 diff --git a/Unity_2018_Frozen/Assets/Frozen/Script/CharacterBehaviour.cs b/Unity_2018_Frozen/Assets/Frozen/Script/CharacterBehaviour.cs index 8309c8e..c834680 100644 --- a/Unity_2018_Frozen/Assets/Frozen/Script/CharacterBehaviour.cs +++ b/Unity_2018_Frozen/Assets/Frozen/Script/CharacterBehaviour.cs @@ -10,12 +10,9 @@ public class CharacterBehaviour : MonoBehaviour [SerializeField] private bool standby = true; - [Range(0, 15)] public float disappearTime = 5; - //public Material mat; - public Area area; public List AppearArea = new List(); @@ -24,9 +21,6 @@ public class CharacterBehaviour : MonoBehaviour [SerializeField] private RectTransform fakeButton; - private const float checktriggerColliderTime = 0.5f; - private float triggerColliderTimer; - [SerializeField] List specificPositions = new List(); @@ -42,28 +36,34 @@ public class CharacterBehaviour : MonoBehaviour int trigger_clip_index = 0; [SerializeField] private DShowMoviePlayer[] players; - //private MeshRenderer m_meshRender; - public Color color; - private bool isSleep; public float videoStopTime = 1.5f; - const int TRIGGER = 0; - const int STANDBY = 1; + enum State + { + TRIGGER = 0, + STANDBY = 1, + SLEEP = 2 + } + + State state = State.SLEEP; + DShowMoviePlayer StatePlayer { get { return players[(int)state]; } } + MeshRenderer StateRenderer { get { return renderers[(int)state]; } } + + MeshRenderer[] renderers; - int Status { get { return System.Convert.ToInt32(standby); } } + bool isTriggered = false; + Coroutine flow = null; - List renderers; - - + [SerializeField] + string debugString; private void Awake() { - renderers = new List(); - renderers.AddRange(GetComponentsInChildren()); - if (renderers.Count != 2) - Debug.LogWarningFormat("{0} renderer count is {1}", gameObject.name, renderers.Count); + renderers = GetComponentsInChildren(); + if (renderers.Length != 2) + Debug.LogWarningFormat("{0} renderer count is {1}", gameObject.name, renderers.Length); //m_meshRender = GetComponent(); //mat = new Material(Shader.Find("Unlit/ColorTransparent")); //m_meshRender.material = mat; @@ -100,7 +100,7 @@ public class CharacterBehaviour : MonoBehaviour fakeButton.anchorMin = new Vector2(0, 0); fakeButton.anchorMax = new Vector2(0, 0); fakeButton.pivot = new Vector2(0.5f, 0.5f); - var standby_scale = renderers[STANDBY].transform.localScale; + var standby_scale = renderers[(int)State.STANDBY].transform.localScale; fakeButton.sizeDelta = new Vector2(standby_scale.x, standby_scale.y) * FrozenScreenToWorldSpace.Instance.finalPixelsByMeter; fakeButton.anchoredPosition3D = new Vector3(0, 0, 0); fakeButton.localScale = Vector3.one; @@ -115,7 +115,6 @@ public class CharacterBehaviour : MonoBehaviour { foreach (var rdr in renderers) { - //rdr.sharedMaterial = new Material(rdr.sharedMaterial); rdr.material.mainTextureScale = new Vector2(1, -1); rdr.material.mainTextureOffset = new Vector2(0, -1); } @@ -123,13 +122,15 @@ public class CharacterBehaviour : MonoBehaviour private void OnEnable() { - standby = true; - isSleep = false; - StartCoroutine(PlayStandbyOnStart()); InitialTouchButton(); - StartCoroutine(RandomPosNoTriggerOther()); - color = new Color(1, 1, 1, 0); - StartCoroutine(Sleep()); + ResetFlow(); + //standby = true; + //isSleep = false; + //StartCoroutine(PlayStandbyOnStart()); + + //StartCoroutine(RandomPosNoTriggerOther()); + //color = new Color(1, 1, 1, 0); + //StartCoroutine(Sleep()); if (fakeButton != null) fakeButton.gameObject.SetActive(true); } @@ -140,6 +141,108 @@ public class CharacterBehaviour : MonoBehaviour fakeButton.gameObject.SetActive(false); } + private void ResetFlow() + { + if (flow != null) + { + StopCoroutine(flow); + flow = null; + } + + isTriggered = false; + foreach (var rdr in renderers) + { + rdr.material.color = new Color(1, 1, 1, 0); + } + foreach (var ply in players) + { + ply.Pause(); + ply.Frame = 0; + } + + flow = StartCoroutine(Flow()); + } + + IEnumerator Flow() + { + debugString = "setup"; + // setup + { + if (specificPositions.Count > 0) + { + SetSpecificPos(); + } + else + { + RandomAppearWall(); + } + + roaming_seed = Random.Range(0.0f, 1.0f); + + trigger_clip_index = ++trigger_clip_index % triggerClips.Count; + players[(int)State.TRIGGER].VideoAsset = triggerClips[trigger_clip_index]; + + yield return null; + } + + debugString = "STANDBY"; + // standby + { + state = State.STANDBY; + var player = StatePlayer; + player.Loop = isStandbyLoop; + player.Play(); + + while (isTriggered == false) + { + debugString = "STANDBY is not triggered"; + + if (player.Loop == false) + { + if (player.IsPlaying == false) + { + player.Pause(); + player.Frame = player.TotalNumFrames; + } + } + + yield return null; + } + + + } + + debugString = "TRIGGER"; + // trigger + { + state = State.TRIGGER; + var player = StatePlayer; + player.Play(); + + while (player.IsPlaying) + { + debugString = "TRIGGER is playing"; + yield return null; + } + + player.Pause(); + player.Frame = player.TotalNumFrames; + + debugString = "TRIGGER is stopped"; + yield return new WaitForSeconds(videoStopTime); + } + + debugString = "SLEEP"; + // sleep + { + state = State.SLEEP; + yield return new WaitForSeconds(disappearTime); + } + + flow = null; + yield return null; + } + /* IEnumerator PlayStandbyOnStart() { DShowMoviePlayer player = CurrentPlayer; @@ -151,46 +254,68 @@ public class CharacterBehaviour : MonoBehaviour yield return null; } } - + */ void Update() { - /* - if (Input.GetKeyDown(KeyCode.R)) + for (int i = 0; i < players.Length; i++) { - if (!isTriggerCollider) - StartCoroutine(RandomPosNoTriggerOther()); - } - */ - UpdateMaterial(); + if (players[i].IsPlaying) + renderers[i].material.mainTexture = players[i].Texture; + } - if (isSleep == false) + // standby material { - if (standby == false) - { - CheckPlayFinished(); + float smooth = Time.deltaTime * 2.0f; + if (state != State.STANDBY && isStandbyLoop == false) + smooth = 1.0f; + float alpha = System.Convert.ToInt32(state == State.STANDBY); + var mat = renderers[(int)State.STANDBY].material; + mat.color = new Color(1, 1, 1, Mathf.Lerp(mat.color.a, alpha, smooth)); + } - var mat = renderers[STANDBY].material; - float a = Mathf.Lerp(mat.color.a, 0.0f, Time.deltaTime); - mat.color = new Color(1, 1, 1, a); - } - else if (standby && roaming > 0.0f) - { - UpdateRoamingPosition(); - UpdateWallRoiFromPosition(); - UpdateButtonPos(); - } - + // trigger material + { + float smooth = Time.deltaTime * 2.0f; + if (state == State.TRIGGER) + smooth = 1.0f; + float alpha = System.Convert.ToInt32(state == State.TRIGGER); + var mat = renderers[(int)State.TRIGGER].material; + mat.color = new Color(1, 1, 1, Mathf.Lerp(mat.color.a, alpha, smooth)); } + - if (isTriggerCollider) - CheckTriggerCollider(); - } + switch (state) + { + case State.STANDBY: + { + if (roaming > 0.0f) + { + UpdateRoamingPosition(); + UpdateWallRoiFromPosition(); + UpdateButtonPos(); + } + } + break; + case State.TRIGGER: + { - void CheckTriggerCollider() - { - triggerColliderTimer -= Time.deltaTime; - if (triggerColliderTimer <= 0) - isTriggerCollider = false; + } + break; + case State.SLEEP: + { + + } + break; + } + + + if (Input.GetKeyDown(KeyCode.R)) + { + ResetFlow(); + } + + if (flow == null) + ResetFlow(); } void UpdateRoamingPosition() @@ -198,7 +323,7 @@ public class CharacterBehaviour : MonoBehaviour float noise = Mathf.PerlinNoise(Time.time * 0.4f, roaming_seed) > 0.5f ? 1.0f : -1.0f; noise *= roaming * Time.deltaTime; //float padding = transform.localScale.x * 0.5f; - float padding = renderers[TRIGGER].transform.localScale.x * 0.5f; + float padding = renderers[(int)State.TRIGGER].transform.localScale.x * 0.5f; Vector3 pos = transform.position; switch (area) { @@ -220,21 +345,6 @@ public class CharacterBehaviour : MonoBehaviour } } - void UpdateMaterial() - { - var mat = CurrentRenderer.material; - mat.mainTexture = CurrentPlayer.Texture; - mat.SetColor("_Color", color); - } - - void CheckPlayFinished() - { - if (CurrentPlayer.IsFinished) - { - StartCoroutine(Sleep()); - } - } - void RandomAppearWall() { Vector3 newPos = Vector3.zero; @@ -262,7 +372,7 @@ public class CharacterBehaviour : MonoBehaviour void RandomPos() { - float minX = renderers[TRIGGER].transform.localScale.x / 2; + float minX = renderers[(int)State.TRIGGER].transform.localScale.x / 2; #if true switch (area) { @@ -318,7 +428,7 @@ public class CharacterBehaviour : MonoBehaviour void UpdateButtonPos() { //Vector2 newScreenPos = FrozenScreenToWorldSpace.Instance.GetFinalScreenPos(area, wallRoi); - var roi = FrozenScreenToWorldSpace.Instance.GetWallRoiFromPosition(area, renderers[STANDBY].transform.position); + var roi = FrozenScreenToWorldSpace.Instance.GetWallRoiFromPosition(area, renderers[(int)State.STANDBY].transform.position); Vector2 newScreenPos = FrozenScreenToWorldSpace.Instance.GetFinalScreenPos(area, roi); fakeButton.anchoredPosition = newScreenPos; } @@ -341,117 +451,9 @@ public class CharacterBehaviour : MonoBehaviour private void Trigger(PointerEventData data) { - if (!standby || isSleep) + if (state != State.STANDBY) return; - standby = false; - CurrentPlayer.Play(); - CurrentRenderer.material.mainTexture = CurrentPlayer.Texture; - } - - void Idle() - { - standby = true; - CurrentPlayer.Play(); - } - DShowMoviePlayer CurrentPlayer { get { return players[Status]; } } - MeshRenderer CurrentRenderer { get { return renderers[Status]; } } - - IEnumerator Sleep() - { - standby = false; - isSleep = true; - yield return StartCoroutine(WaitVideoStopTimeFadeOut()); - yield return new WaitForSeconds(GetDisappear()); - yield return StartCoroutine(RandomPosNoTriggerOther()); - yield return StartCoroutine(WaitVideoStandbyFadeIn()); - isSleep = false; - Idle(); - } - - IEnumerator Fade(float targetA) - { - float value = 0; - float origin = color.a; - while (value < 1) - { - value = Mathf.Clamp(value + Time.deltaTime, 0, 1); - color.a = Mathf.Lerp(origin, targetA, value); - yield return null; - } - color.a = targetA; - } - - IEnumerator WaitVideoStandbyFadeIn() - { - standby = true; - CurrentPlayer.Play(); - CurrentRenderer.material.mainTexture = CurrentPlayer.Texture; - yield return StartCoroutine(Fade(1)); - } - - IEnumerator WaitVideoStopTimeFadeOut() - { - yield return new WaitForSeconds(videoStopTime); - yield return StartCoroutine(Fade(0)); - CurrentPlayer.Pause(); - CurrentPlayer.Frame = 0; - } - - - public bool isTriggerCollider; - - private void OnTriggerExit(Collider other) - { - isTriggerCollider = false; - } - - void OnTriggerStay(Collider other) - { - isTriggerCollider = true; - triggerColliderTimer = checktriggerColliderTime; - } - - private void OnTriggerEnter(Collider other) - { - isTriggerCollider = true; - triggerColliderTimer = checktriggerColliderTime; - } - - - public float GetDisappear() - { - return disappearTime; - /* - float distime = disappearTime - Random.Range(0, disappearTime / 2); - distime = disappearTime * distime - distime * distime + 0.5f * distime; - return distime; - */ - } - - IEnumerator RandomPosNoTriggerOther() - { - if (specificPositions.Count > 0) - { - SetSpecificPos(); - yield return null; - } - else - { - RandomAppearWall(); - yield return new WaitForSeconds(0.1f); - while (isTriggerCollider) - { - RandomAppearWall(); - yield return null; - } - } - - roaming_seed = Random.Range(0.0f, 1.0f); - - trigger_clip_index = ++trigger_clip_index % triggerClips.Count; - players[0].VideoAsset = triggerClips[trigger_clip_index]; - - yield return null; + isTriggered = true; } } From 7dd5bcdb9af0ea1de106d21f4180abde9d32c342 Mon Sep 17 00:00:00 2001 From: uc-hoba Date: Tue, 15 May 2018 17:38:08 +0800 Subject: [PATCH 3/4] refine and fix some issue --- .../DSAsset/Elsa_Effect_A-Standby.asset | 2 +- .../DSAsset/Elsa_Effect_B-Standby.asset | 2 +- ...65053-Standby.asset => Olaf-Standby.asset} | 4 +- ...dby.asset.meta => Olaf-Standby.asset.meta} | 0 .../DSAsset/Olaf_CC065056-Standby.asset | 15 - .../DSAsset/Olaf_CC065056-Standby.asset.meta | 10 - .../Assets/Frozen/DSAsset/Space-Day.asset | 2 +- .../Assets/Frozen/DSAsset/Space-Night.asset | 2 +- Unity_2018_Frozen/Assets/Frozen/Frozen.unity | 368 ++++++++---------- .../Assets/Frozen/Material/GiantSnowflake.mat | 2 +- .../Assets/Frozen/Material/Space-Ground.mat | 2 +- .../Assets/Frozen/Material/Space-Wall.mat | 4 +- .../Frozen/Script/CharacterBehaviour.cs | 41 +- .../Frozen/Script/ElsaEffectGenerator.cs | 85 ---- .../Frozen/Script/ElsaEffectGenerator.cs.meta | 13 - .../Assets/Frozen/Script/GiantSnowflake.cs | 92 +++-- .../Assets/Frozen/Script/SceneController.cs | 8 +- .../Frozen/Script/SpaceMeshGenerator.cs | 2 +- .../Frozen/Texture/Effect/Elsa_Effect_A.mat | 2 +- 19 files changed, 263 insertions(+), 393 deletions(-) rename Unity_2018_Frozen/Assets/Frozen/DSAsset/{Olaf_CC065053-Standby.asset => Olaf-Standby.asset} (80%) rename Unity_2018_Frozen/Assets/Frozen/DSAsset/{Olaf_CC065053-Standby.asset.meta => Olaf-Standby.asset.meta} (100%) delete mode 100644 Unity_2018_Frozen/Assets/Frozen/DSAsset/Olaf_CC065056-Standby.asset delete mode 100644 Unity_2018_Frozen/Assets/Frozen/DSAsset/Olaf_CC065056-Standby.asset.meta delete mode 100644 Unity_2018_Frozen/Assets/Frozen/Script/ElsaEffectGenerator.cs delete mode 100644 Unity_2018_Frozen/Assets/Frozen/Script/ElsaEffectGenerator.cs.meta diff --git a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa_Effect_A-Standby.asset b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa_Effect_A-Standby.asset index c367f70..054aa56 100644 --- a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa_Effect_A-Standby.asset +++ b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa_Effect_A-Standby.asset @@ -12,4 +12,4 @@ MonoBehaviour: m_Name: Elsa_Effect_A-Standby m_EditorClassIdentifier: m_VideoLocation: 1 - m_VideoPath: ../FrozenMaterial/Demo/Olaf-standby.avi + m_VideoPath: ../FrozenMaterial/icon/icon_snowMagic.avi diff --git a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa_Effect_B-Standby.asset b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa_Effect_B-Standby.asset index a7197f4..a0c184d 100644 --- a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa_Effect_B-Standby.asset +++ b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Elsa_Effect_B-Standby.asset @@ -12,4 +12,4 @@ MonoBehaviour: m_Name: Elsa_Effect_B-Standby m_EditorClassIdentifier: m_VideoLocation: 1 - m_VideoPath: ../FrozenMaterial/Demo/Olaf-standby.avi + m_VideoPath: ../FrozenMaterial/icon/icon_snowMagic.avi diff --git a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Olaf_CC065053-Standby.asset b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Olaf-Standby.asset similarity index 80% rename from Unity_2018_Frozen/Assets/Frozen/DSAsset/Olaf_CC065053-Standby.asset rename to Unity_2018_Frozen/Assets/Frozen/DSAsset/Olaf-Standby.asset index 5c94cc9..2ba42d0 100644 --- a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Olaf_CC065053-Standby.asset +++ b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Olaf-Standby.asset @@ -9,7 +9,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: b7eca376a120a0e49a97afa024778843, type: 3} - m_Name: Olaf_CC065053-Standby + m_Name: Olaf-Standby m_EditorClassIdentifier: m_VideoLocation: 1 - m_VideoPath: ../FrozenMaterial/Demo/Olaf-standby.avi + m_VideoPath: ../FrozenMaterial/icon/icon_snowMagic.avi diff --git a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Olaf_CC065053-Standby.asset.meta b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Olaf-Standby.asset.meta similarity index 100% rename from Unity_2018_Frozen/Assets/Frozen/DSAsset/Olaf_CC065053-Standby.asset.meta rename to Unity_2018_Frozen/Assets/Frozen/DSAsset/Olaf-Standby.asset.meta diff --git a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Olaf_CC065056-Standby.asset b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Olaf_CC065056-Standby.asset deleted file mode 100644 index fbc336b..0000000 --- a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Olaf_CC065056-Standby.asset +++ /dev/null @@ -1,15 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b7eca376a120a0e49a97afa024778843, type: 3} - m_Name: Olaf_CC065056-Standby - m_EditorClassIdentifier: - m_VideoLocation: 1 - m_VideoPath: ../FrozenMaterial/Demo/Olaf-standby.avi diff --git a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Olaf_CC065056-Standby.asset.meta b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Olaf_CC065056-Standby.asset.meta deleted file mode 100644 index f457c3e..0000000 --- a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Olaf_CC065056-Standby.asset.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: 52eefee2f9118e04bbb195c0e27b0fc5 -timeCreated: 1524210684 -licenseType: Free -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Space-Day.asset b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Space-Day.asset index 0f74183..9974e01 100644 --- a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Space-Day.asset +++ b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Space-Day.asset @@ -12,4 +12,4 @@ MonoBehaviour: m_Name: Space-Day m_EditorClassIdentifier: m_VideoLocation: 1 - m_VideoPath: ../FrozenMaterial/space-dark-mountain-sq.avi + m_VideoPath: ../FrozenMaterial/space-ice-forest-sq.avi diff --git a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Space-Night.asset b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Space-Night.asset index dec713b..74b3e2d 100644 --- a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Space-Night.asset +++ b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Space-Night.asset @@ -12,4 +12,4 @@ MonoBehaviour: m_Name: Space-Night m_EditorClassIdentifier: m_VideoLocation: 1 - m_VideoPath: ../FrozenMaterial/space-dark-mountain-v1.avi + m_VideoPath: ../FrozenMaterial/space-dark-mountain-sq.avi diff --git a/Unity_2018_Frozen/Assets/Frozen/Frozen.unity b/Unity_2018_Frozen/Assets/Frozen/Frozen.unity index ffc961b..7b7528c 100644 --- a/Unity_2018_Frozen/Assets/Frozen/Frozen.unity +++ b/Unity_2018_Frozen/Assets/Frozen/Frozen.unity @@ -953,8 +953,6 @@ GameObject: - component: {fileID: 368474580} - component: {fileID: 368474578} - component: {fileID: 368474581} - - component: {fileID: 368474583} - - component: {fileID: 368474582} m_Layer: 8 m_Name: GiantSnowflake m_TagString: Untagged @@ -1027,43 +1025,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9126593cba11d9145b83a6ab86efc050, type: 3} m_Name: m_EditorClassIdentifier: + clip: {fileID: 11400000, guid: ff53ec8ce37139a4eb553b1d7fcd2837, type: 2} kinect: {fileID: 712882417} triggerRadius: 1.6 cooldown: 30 offset: 1.5 breakProgress: 0.1 ---- !u!114 &368474582 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 368474576} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 03dae28dfe6734f4eb76c922ac72dd34, type: 3} - m_Name: - m_EditorClassIdentifier: - target: 2 - materials: - - {fileID: 2100000, guid: 3059bdeaeda202b489a491a3025d4843, type: 2} - attributeName: _MainTex - autoSize: 0 ---- !u!114 &368474583 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 368474576} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 10f07b3f9fb96524db93eb42d89c229c, type: 3} - m_Name: - m_EditorClassIdentifier: - VideoAsset: {fileID: 11400000, guid: ff53ec8ce37139a4eb553b1d7fcd2837, type: 2} - LoadOnAwake: 1 - PlayOnStart: 0 - Looping: 0 - AudioVolume: 1 --- !u!1 &368967883 GameObject: m_ObjectHideFlags: 0 @@ -1556,6 +1523,7 @@ MonoBehaviour: - {fileID: 11400000, guid: 708f87d2cbae42445846a25f0ca06829, type: 2} players: [] videoStopTime: 1.5 + debug: 0 debugString: --- !u!1 &520040865 GameObject: @@ -1566,6 +1534,7 @@ GameObject: m_Component: - component: {fileID: 520040869} - component: {fileID: 520040868} + - component: {fileID: 520040866} m_Layer: 0 m_Name: Final Camera m_TagString: Untagged @@ -1573,6 +1542,22 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!114 &520040866 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 520040865} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 542c4b2aee71a0142928f8b82f70141f, type: 3} + m_Name: + m_EditorClassIdentifier: + sharingName: MiniFrozenSpout + textureFormat: 28 + yFlip: 1 + output: {fileID: 0} + m_Shader: {fileID: 4800000, guid: ca95743014f24fd49897e12abbe931fc, type: 3} --- !u!20 &520040868 Camera: m_ObjectHideFlags: 0 @@ -2634,7 +2619,7 @@ MonoBehaviour: width: 8 length: 5 height: 3 - isAnimated: 0 + isAnimated: 1 --- !u!1 &952607033 GameObject: m_ObjectHideFlags: 0 @@ -2697,6 +2682,136 @@ MonoBehaviour: PlayOnStart: 1 Looping: 1 AudioVolume: 1 +--- !u!43 &973459541 +Mesh: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: 'Space Ground Mesh: (8x5x3)' + serializedVersion: 8 + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 24 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 16 + localAABB: + m_Center: {x: 0, y: 1.5, z: 0} + m_Extent: {x: 4, y: 1.5, z: 2.5} + m_Shapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + m_BindPose: [] + m_BoneNameHashes: + m_RootBoneNameHash: 0 + m_MeshCompression: 0 + m_IsReadable: 0 + m_KeepVertices: 1 + m_KeepIndices: 1 + m_IndexFormat: 0 + m_IndexBuffer: 000001000200010003000200040005000600050007000600080009000a0009000b000a000c000d000e000d000f000e00 + m_Skin: [] + m_VertexData: + m_CurrentChannels: 11 + m_VertexCount: 16 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 12 + format: 0 + dimension: 3 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 24 + format: 0 + dimension: 2 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 512 + _typelessdata: 000080c000000000000020c0000000000000803f00000000e4388e3e00000000000080c00000000000002040000000000000803f00000000e4388e3e0000203f0000804000000000000020c0000000000000803f000000008ee3383f00000000000080400000000000002040000000000000803f000000008ee3383f0000203f000080c000000000000020400000000000000000000080bfe4388e3e0000203f000080c000004040000020400000000000000000000080bfe4388e3e0000803f0000804000000000000020400000000000000000000080bf8ee3383f0000203f0000804000004040000020400000000000000000000080bf8ee3383f0000803f000080c000000000000020c00000803f0000000000000000000000000000203f000080c000004040000020c00000803f0000000000000000000000000000803f000080c000000000000020400000803f0000000000000000e4388e3e0000203f000080c000004040000020400000803f0000000000000000e4388e3e0000803f000080400000000000002040000080bf00000000000000008ee3383f0000203f000080400000404000002040000080bf00000000000000008ee3383f0000803f0000804000000000000020c0000080bf00000000000000000000803f0000203f0000804000004040000020c0000080bf00000000000000000000803f0000803f + m_CompressedMesh: + m_Vertices: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_UV: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Normals: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Tangents: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Weights: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_NormalSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_TangentSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_FloatColors: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_BoneIndices: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_Triangles: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_UVInfo: 0 + m_LocalAABB: + m_Center: {x: 0, y: 1.5, z: 0} + m_Extent: {x: 4, y: 1.5, z: 2.5} + m_MeshUsageFlags: 0 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + m_MeshOptimized: 0 --- !u!1 &1000268178 GameObject: m_ObjectHideFlags: 0 @@ -3114,7 +3229,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: standby: 1 - disappearTime: 10 + disappearTime: 1 area: 0 AppearArea: 02000000 fakeButton: {fileID: 0} @@ -3127,6 +3242,7 @@ MonoBehaviour: - {fileID: 11400000, guid: 6ccf813116f07944faf4af6bc3b2c1f7, type: 2} players: [] videoStopTime: 10 + debug: 0 debugString: --- !u!114 &1216863878 MonoBehaviour: @@ -3149,7 +3265,6 @@ GameObject: m_Component: - component: {fileID: 1225287932} - component: {fileID: 1225287935} - - component: {fileID: 1225287933} m_Layer: 8 m_Name: Elsa_Effect_B m_TagString: Untagged @@ -3172,18 +3287,6 @@ Transform: m_Father: {fileID: 199010598} m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1225287933 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1225287931} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 86694b20cef756146b118abf35314f9b, type: 3} - m_Name: - m_EditorClassIdentifier: - area: 2 --- !u!114 &1225287935 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3198,10 +3301,9 @@ MonoBehaviour: standby: 1 disappearTime: 1 area: 0 - AppearArea: 02000000 + AppearArea: 000000000100000002000000 fakeButton: {fileID: 0} - specificPositions: - - {fileID: 1225287933} + specificPositions: [] roaming: 0 isStandbyLoop: 1 standbyClip: {fileID: 11400000, guid: f2f10fb696e1a6145b55378c7c7ec9df, type: 2} @@ -3209,6 +3311,7 @@ MonoBehaviour: - {fileID: 11400000, guid: d3a9925b2d77cce4a8fc3215dbaf41e1, type: 2} players: [] videoStopTime: 1 + debug: 0 debugString: --- !u!1 &1227078084 GameObject: @@ -3682,7 +3785,7 @@ MeshFilter: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1379541361} - m_Mesh: {fileID: 2039303666} + m_Mesh: {fileID: 973459541} --- !u!1 &1390635887 GameObject: m_ObjectHideFlags: 0 @@ -3978,7 +4081,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: standby: 1 - disappearTime: 10 + disappearTime: 1 area: 2 AppearArea: 02000000 fakeButton: {fileID: 0} @@ -3991,6 +4094,7 @@ MonoBehaviour: - {fileID: 11400000, guid: a6af2089baf7ed8489a4e941dae4e928, type: 2} players: [] videoStopTime: 10 + debug: 0 debugString: --- !u!114 &1690794391 MonoBehaviour: @@ -4798,6 +4902,7 @@ MonoBehaviour: - {fileID: 11400000, guid: 727d0f386e383414ca58642076340e45, type: 2} players: [] videoStopTime: 1 + debug: 0 debugString: --- !u!1 &1908931425 GameObject: @@ -4909,7 +5014,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: standby: 1 - disappearTime: 10 + disappearTime: 1 area: 2 AppearArea: 02000000 fakeButton: {fileID: 0} @@ -4922,6 +5027,7 @@ MonoBehaviour: - {fileID: 11400000, guid: 2845fcd21d061464f8f97219a167ba7a, type: 2} players: [] videoStopTime: 10 + debug: 0 debugString: --- !u!114 &1933714487 MonoBehaviour: @@ -4979,7 +5085,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: standby: 1 - disappearTime: 10 + disappearTime: 1 area: 0 AppearArea: 02000000 fakeButton: {fileID: 0} @@ -4992,6 +5098,7 @@ MonoBehaviour: - {fileID: 11400000, guid: 2ea2925de6b8a934fa0ea7a7020103b1, type: 2} players: [] videoStopTime: 10 + debug: 0 debugString: --- !u!114 &1973785478 MonoBehaviour: @@ -5014,7 +5121,6 @@ GameObject: m_Component: - component: {fileID: 1984882816} - component: {fileID: 1984882819} - - component: {fileID: 1984882817} m_Layer: 8 m_Name: Elsa_Effect_A m_TagString: Untagged @@ -5037,18 +5143,6 @@ Transform: m_Father: {fileID: 199010598} m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1984882817 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1984882815} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 86694b20cef756146b118abf35314f9b, type: 3} - m_Name: - m_EditorClassIdentifier: - area: 2 --- !u!114 &1984882819 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5063,10 +5157,9 @@ MonoBehaviour: standby: 1 disappearTime: 1 area: 0 - AppearArea: 02000000 + AppearArea: 000000000100000002000000 fakeButton: {fileID: 0} - specificPositions: - - {fileID: 1984882817} + specificPositions: [] roaming: 0 isStandbyLoop: 1 standbyClip: {fileID: 11400000, guid: 7b0a38d5d484cf54089379ebbe5c1d9d, type: 2} @@ -5074,6 +5167,7 @@ MonoBehaviour: - {fileID: 11400000, guid: 23773c4900ad46e4f9ba5cb3d1c28912, type: 2} players: [] videoStopTime: 1 + debug: 0 debugString: --- !u!1 &2008324328 GameObject: @@ -5174,136 +5268,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 22 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!43 &2039303666 -Mesh: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_Name: 'Space Ground Mesh: (8x5x3)' - serializedVersion: 8 - m_SubMeshes: - - serializedVersion: 2 - firstByte: 0 - indexCount: 24 - topology: 0 - baseVertex: 0 - firstVertex: 0 - vertexCount: 16 - localAABB: - m_Center: {x: 0, y: 1.5, z: 0} - m_Extent: {x: 4, y: 1.5, z: 2.5} - m_Shapes: - vertices: [] - shapes: [] - channels: [] - fullWeights: [] - m_BindPose: [] - m_BoneNameHashes: - m_RootBoneNameHash: 0 - m_MeshCompression: 0 - m_IsReadable: 0 - m_KeepVertices: 1 - m_KeepIndices: 1 - m_IndexFormat: 0 - m_IndexBuffer: 000001000200010003000200040005000600050007000600080009000a0009000b000a000c000d000e000d000f000e00 - m_Skin: [] - m_VertexData: - m_CurrentChannels: 11 - m_VertexCount: 16 - m_Channels: - - stream: 0 - offset: 0 - format: 0 - dimension: 3 - - stream: 0 - offset: 12 - format: 0 - dimension: 3 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 24 - format: 0 - dimension: 2 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - m_DataSize: 512 - _typelessdata: 000080c000000000000020c0000000000000803f00000000e4388e3e00000000000080c00000000000002040000000000000803f00000000e4388e3e0000203f0000804000000000000020c0000000000000803f000000008ee3383f00000000000080400000000000002040000000000000803f000000008ee3383f0000203f000080c000000000000020400000000000000000000080bfe4388e3e0000203f000080c000004040000020400000000000000000000080bfe4388e3e0000803f0000804000000000000020400000000000000000000080bf8ee3383f0000203f0000804000004040000020400000000000000000000080bf8ee3383f0000803f000080c000000000000020c00000803f0000000000000000000000000000203f000080c000004040000020c00000803f0000000000000000000000000000803f000080c000000000000020400000803f0000000000000000e4388e3e0000203f000080c000004040000020400000803f0000000000000000e4388e3e0000803f000080400000000000002040000080bf00000000000000008ee3383f0000203f000080400000404000002040000080bf00000000000000008ee3383f0000803f0000804000000000000020c0000080bf00000000000000000000803f0000203f0000804000004040000020c0000080bf00000000000000000000803f0000803f - m_CompressedMesh: - m_Vertices: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_UV: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Normals: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Tangents: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Weights: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_NormalSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_TangentSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_FloatColors: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_BoneIndices: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_Triangles: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_UVInfo: 0 - m_LocalAABB: - m_Center: {x: 0, y: 1.5, z: 0} - m_Extent: {x: 4, y: 1.5, z: 2.5} - m_MeshUsageFlags: 0 - m_BakedConvexCollisionMesh: - m_BakedTriangleCollisionMesh: - m_MeshOptimized: 0 --- !u!1 &2084135709 GameObject: m_ObjectHideFlags: 0 diff --git a/Unity_2018_Frozen/Assets/Frozen/Material/GiantSnowflake.mat b/Unity_2018_Frozen/Assets/Frozen/Material/GiantSnowflake.mat index 31a27a3..5558434 100644 --- a/Unity_2018_Frozen/Assets/Frozen/Material/GiantSnowflake.mat +++ b/Unity_2018_Frozen/Assets/Frozen/Material/GiantSnowflake.mat @@ -39,7 +39,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 86f3cfc9597a8cb439f8b1a059e766c5, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: diff --git a/Unity_2018_Frozen/Assets/Frozen/Material/Space-Ground.mat b/Unity_2018_Frozen/Assets/Frozen/Material/Space-Ground.mat index ab10d50..acc56b1 100644 --- a/Unity_2018_Frozen/Assets/Frozen/Material/Space-Ground.mat +++ b/Unity_2018_Frozen/Assets/Frozen/Material/Space-Ground.mat @@ -70,7 +70,7 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 - - _Rate: 1 + - _Rate: 0 - _SmoothnessTextureChannel: 0 - _SpaceRate: 0 - _SpecularHighlights: 1 diff --git a/Unity_2018_Frozen/Assets/Frozen/Material/Space-Wall.mat b/Unity_2018_Frozen/Assets/Frozen/Material/Space-Wall.mat index 91d954a..4e966b9 100644 --- a/Unity_2018_Frozen/Assets/Frozen/Material/Space-Wall.mat +++ b/Unity_2018_Frozen/Assets/Frozen/Material/Space-Wall.mat @@ -70,14 +70,14 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 - - _Rate: 1 + - _Rate: 0 - _SmoothnessTextureChannel: 0 - _SpaceRate: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 - _UVSec: 0 - _ZWrite: 1 - - _isGamma: 0 + - _isGamma: 1 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/Unity_2018_Frozen/Assets/Frozen/Script/CharacterBehaviour.cs b/Unity_2018_Frozen/Assets/Frozen/Script/CharacterBehaviour.cs index c834680..c244a03 100644 --- a/Unity_2018_Frozen/Assets/Frozen/Script/CharacterBehaviour.cs +++ b/Unity_2018_Frozen/Assets/Frozen/Script/CharacterBehaviour.cs @@ -6,10 +6,6 @@ using UnityEngine.UI; public class CharacterBehaviour : MonoBehaviour { - - [SerializeField] - private bool standby = true; - [Range(0, 15)] public float disappearTime = 5; @@ -28,7 +24,7 @@ public class CharacterBehaviour : MonoBehaviour float roaming = 0.0f; float roaming_seed = 0.0f; - [Header("Direct Show Player")] + [Header("DShow Player")] [SerializeField] bool isStandbyLoop = true; public DShowClip standbyClip; @@ -56,6 +52,8 @@ public class CharacterBehaviour : MonoBehaviour Coroutine flow = null; + [SerializeField, Header("Debug")] + bool debug = false; [SerializeField] string debugString; @@ -153,6 +151,7 @@ public class CharacterBehaviour : MonoBehaviour foreach (var rdr in renderers) { rdr.material.color = new Color(1, 1, 1, 0); + rdr.material.SetColor("_TintColor", new Color(1, 1, 1, 0)); } foreach (var ply in players) { @@ -165,7 +164,7 @@ public class CharacterBehaviour : MonoBehaviour IEnumerator Flow() { - debugString = "setup"; + if (debug) debugString = "setup"; // setup { if (specificPositions.Count > 0) @@ -185,7 +184,7 @@ public class CharacterBehaviour : MonoBehaviour yield return null; } - debugString = "STANDBY"; + if (debug) debugString = "STANDBY"; // standby { state = State.STANDBY; @@ -195,14 +194,15 @@ public class CharacterBehaviour : MonoBehaviour while (isTriggered == false) { - debugString = "STANDBY is not triggered"; + if (debug) debugString = "STANDBY is not triggered"; if (player.Loop == false) { if (player.IsPlaying == false) { - player.Pause(); - player.Frame = player.TotalNumFrames; + //player.Pause(); + //player.Frame = player.TotalNumFrames; + if (debug) debugString = "STANDBY is not triggered and set frame"; } } @@ -212,7 +212,7 @@ public class CharacterBehaviour : MonoBehaviour } - debugString = "TRIGGER"; + if (debug) debugString = "TRIGGER"; // trigger { state = State.TRIGGER; @@ -221,18 +221,18 @@ public class CharacterBehaviour : MonoBehaviour while (player.IsPlaying) { - debugString = "TRIGGER is playing"; + if (debug) debugString = "TRIGGER is playing"; yield return null; } player.Pause(); player.Frame = player.TotalNumFrames; - debugString = "TRIGGER is stopped"; + if (debug) debugString = "TRIGGER is stopped"; yield return new WaitForSeconds(videoStopTime); } - debugString = "SLEEP"; + if (debug) debugString = "SLEEP"; // sleep { state = State.SLEEP; @@ -260,7 +260,10 @@ public class CharacterBehaviour : MonoBehaviour for (int i = 0; i < players.Length; i++) { if (players[i].IsPlaying) + { renderers[i].material.mainTexture = players[i].Texture; + } + } // standby material @@ -270,7 +273,9 @@ public class CharacterBehaviour : MonoBehaviour smooth = 1.0f; float alpha = System.Convert.ToInt32(state == State.STANDBY); var mat = renderers[(int)State.STANDBY].material; - mat.color = new Color(1, 1, 1, Mathf.Lerp(mat.color.a, alpha, smooth)); + var col = new Color(1, 1, 1, Mathf.Lerp(mat.color.a, alpha, smooth)); + mat.color = col; + mat.SetColor("_TintColor", col); } // trigger material @@ -280,7 +285,9 @@ public class CharacterBehaviour : MonoBehaviour smooth = 1.0f; float alpha = System.Convert.ToInt32(state == State.TRIGGER); var mat = renderers[(int)State.TRIGGER].material; - mat.color = new Color(1, 1, 1, Mathf.Lerp(mat.color.a, alpha, smooth)); + var col = new Color(1, 1, 1, Mathf.Lerp(mat.color.a, alpha, smooth)); + mat.color = col; + mat.SetColor("_TintColor", col); } @@ -366,7 +373,7 @@ public class CharacterBehaviour : MonoBehaviour q.SetLookRotation(Vector3.forward); } transform.rotation = q; - transform.position = newPos + FrozenScreenToWorldSpace.Instance.Position; + transform.position = newPos;// + FrozenScreenToWorldSpace.Instance.Position; RandomPos(); } diff --git a/Unity_2018_Frozen/Assets/Frozen/Script/ElsaEffectGenerator.cs b/Unity_2018_Frozen/Assets/Frozen/Script/ElsaEffectGenerator.cs deleted file mode 100644 index 6c08a29..0000000 --- a/Unity_2018_Frozen/Assets/Frozen/Script/ElsaEffectGenerator.cs +++ /dev/null @@ -1,85 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -namespace UltraCombos.Frozen -{ - public class ElsaEffectGenerator : MonoBehaviour - { - [SerializeField] - KinectOpticalFlowMath kinectMath; - - bool isHit = false; - Vector3 hitPoint = Vector3.zero; - - private void Start() - { - - } - - private void Update() - { - /* - float padding = 0.5f; - Ray ray = new Ray(Vector3.zero, -new Vector3(kinectMath.averageVelocity.x, 0, kinectMath.averageVelocity.z)); - - float enter = 0.0f; - isHit = false; - Vector3 hit_point = Vector3.zero; - if (isHit == false) - { - if (FrozenScreenToWorldSpace.Instance.GetWallPlane(Area.LeftWall).Raycast(ray, out enter)) - { - hit_point = ray.GetPoint(enter); - if (Mathf.Abs(hit_point.z) < FrozenScreenToWorldSpace.Instance.length * 0.5f - padding) - { - isHit = true; - } - } - } - - if (isHit == false) - { - if (FrozenScreenToWorldSpace.Instance.GetWallPlane(Area.RightWall).Raycast(ray, out enter)) - { - hit_point = ray.GetPoint(enter); - if (Mathf.Abs(hit_point.z) < FrozenScreenToWorldSpace.Instance.length * 0.5f - padding) - { - isHit = true; - } - } - } - - if (isHit == false) - { - if (FrozenScreenToWorldSpace.Instance.GetWallPlane(Area.TopWall).Raycast(ray, out enter)) - { - hit_point = ray.GetPoint(enter); - if (Mathf.Abs(hit_point.x) < FrozenScreenToWorldSpace.Instance.width * 0.5f - padding) - { - isHit = true; - } - } - } - - - if (isHit) - { - hitPoint = hit_point + transform.position; - } - */ - } - - private void OnDrawGizmosSelected() - { - /* - Gizmos.DrawLine(transform.position, transform.position - new Vector3(kinectMath.averageVelocity.x, 0, kinectMath.averageVelocity.z) * 50.0f); - if (isHit == false) - return; - Gizmos.DrawWireCube(hitPoint, Vector3.one); - */ - } - } - -} - diff --git a/Unity_2018_Frozen/Assets/Frozen/Script/ElsaEffectGenerator.cs.meta b/Unity_2018_Frozen/Assets/Frozen/Script/ElsaEffectGenerator.cs.meta deleted file mode 100644 index f9a266c..0000000 --- a/Unity_2018_Frozen/Assets/Frozen/Script/ElsaEffectGenerator.cs.meta +++ /dev/null @@ -1,13 +0,0 @@ -fileFormatVersion: 2 -guid: a7fe449ac7fdb6943ac4f06843bce261 -timeCreated: 1525923394 -licenseType: Free -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Unity_2018_Frozen/Assets/Frozen/Script/GiantSnowflake.cs b/Unity_2018_Frozen/Assets/Frozen/Script/GiantSnowflake.cs index 303b730..cf51e65 100644 --- a/Unity_2018_Frozen/Assets/Frozen/Script/GiantSnowflake.cs +++ b/Unity_2018_Frozen/Assets/Frozen/Script/GiantSnowflake.cs @@ -10,6 +10,8 @@ namespace UltraCombos.Frozen float alpha = 0.0f; float smooth = 0.025f; + [SerializeField] + DShowClip clip; DShowMoviePlayer player; [SerializeField] @@ -25,13 +27,31 @@ namespace UltraCombos.Frozen float offset = 1.5f; Vector3 root; + Coroutine flow = null; + private void Start() { - material = GetComponent().material; - player = GetComponent(); root = transform.position; - StartCoroutine(Flow()); + //StartCoroutine(Flow()); + } + + private void OnEnable() + { + if (material == null) + material = GetComponent().material; + + if (player == null) + { + player = gameObject.AddComponent(); + player.VideoAsset = clip; + player.Load(); + } + + if (flow != null) + StopCoroutine(flow); + + flow = StartCoroutine(Flow()); } private void FixedUpdate() @@ -47,7 +67,10 @@ namespace UltraCombos.Frozen material.color = new Color(1.0f, 1.0f, 1.0f, alpha); - + material.mainTexture = player.Texture; + + if (flow == null) + flow = StartCoroutine(Flow()); } private void OnDrawGizmosSelected() @@ -70,44 +93,43 @@ namespace UltraCombos.Frozen { float video_stamp = 0.0f; float progress = 0.0f; - while (true) + + + video_stamp = Time.time; + progress = 0.0f; + player.Pause(); + player.Frame = 0; + //Debug.Log("Begin"); + while (progress < breakProgress) { - video_stamp = Time.time; - progress = 0.0f; - player.Pause(); - player.Frame = 0; - //Debug.Log("Begin"); - while (progress < breakProgress) + var pos = kinect.averagePositinon; + float dist = new Vector2(pos.x - transform.position.x, pos.z - transform.position.z).magnitude; + + if (dist < triggerRadius) { - var pos = kinect.averagePositinon; - float dist = new Vector2(pos.x - transform.position.x, pos.z - transform.position.z).magnitude; - - if (dist < triggerRadius) - { - //Debug.Log("OK"); - progress += 0.001f; - } - else - { - progress = Mathf.Max(progress - 0.001f, 0.0f); - } - - player.Frame = (uint)(player.TotalNumFrames * progress); - yield return null; + //Debug.Log("OK"); + progress += 0.001f; } - //Debug.Log("Play the rest"); - player.Play(); - while (player.IsFinished == false) + else { - yield return null; + progress = Mathf.Max(progress - 0.001f, 0.0f); } - yield return new WaitForSeconds(cooldown); - - transform.position = root + new Vector3(Random.Range(-offset, offset), 0, 0); + player.Frame = (uint)(player.TotalNumFrames * progress); + yield return null; + } + //Debug.Log("Play the rest"); + player.Play(); + while (player.IsFinished == false) + { yield return null; - //Debug.Log("Flow done"); - } + } + + yield return new WaitForSeconds(cooldown); + + transform.position = root + new Vector3(Random.Range(-offset, offset), 0, 0); + yield return null; + //Debug.Log("Flow done"); } } diff --git a/Unity_2018_Frozen/Assets/Frozen/Script/SceneController.cs b/Unity_2018_Frozen/Assets/Frozen/Script/SceneController.cs index 52652ce..bc0c19f 100644 --- a/Unity_2018_Frozen/Assets/Frozen/Script/SceneController.cs +++ b/Unity_2018_Frozen/Assets/Frozen/Script/SceneController.cs @@ -39,8 +39,8 @@ namespace UltraCombos.Frozen [SerializeField] List nightCharacters = new List(); - [SerializeField] - bool debug = false; + //[SerializeField] + //bool debug = false; float target_rate = 0.0f; private void Start() @@ -50,10 +50,10 @@ namespace UltraCombos.Frozen private void Update() { - if (debug) + //if (debug) { //rate = Mathf.Sin(Time.time * 0.2f) * 0.5f + 0.5f; - if (Input.GetKeyDown(KeyCode.Q)) + if (Input.GetKeyDown(KeyCode.PageDown) || Input.GetKeyDown(KeyCode.PageUp)) { target_rate = 1.0f - target_rate; } diff --git a/Unity_2018_Frozen/Assets/Frozen/Script/SpaceMeshGenerator.cs b/Unity_2018_Frozen/Assets/Frozen/Script/SpaceMeshGenerator.cs index 3620709..e860bcf 100644 --- a/Unity_2018_Frozen/Assets/Frozen/Script/SpaceMeshGenerator.cs +++ b/Unity_2018_Frozen/Assets/Frozen/Script/SpaceMeshGenerator.cs @@ -32,7 +32,7 @@ namespace UltraCombos.Frozen { if (isAnimated) { - var players = GetComponentsInChildren(); + var players = GetComponentsInChildren(true); foreach (var mp in players) { mp.gameObject.SetActive(true); diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/Effect/Elsa_Effect_A.mat b/Unity_2018_Frozen/Assets/Frozen/Texture/Effect/Elsa_Effect_A.mat index be7014f..521c263 100644 --- a/Unity_2018_Frozen/Assets/Frozen/Texture/Effect/Elsa_Effect_A.mat +++ b/Unity_2018_Frozen/Assets/Frozen/Texture/Effect/Elsa_Effect_A.mat @@ -75,4 +75,4 @@ Material: m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} - - _TintColor: {r: 1, g: 1, b: 1, a: 0.5} + - _TintColor: {r: 1, g: 1, b: 1, a: 1} From 1f4a59c7cdf4e9e886b762991995348cc14444a3 Mon Sep 17 00:00:00 2001 From: uc-hoba Date: Tue, 15 May 2018 18:43:51 +0800 Subject: [PATCH 4/4] refine --- .../Frozen/DSAsset/Marshmallow-Standby.asset | 2 +- .../Assets/Frozen/DSAsset/Space-Day.asset | 2 +- .../Assets/Frozen/DSAsset/Space-Night.asset | 2 +- Unity_2018_Frozen/Assets/Frozen/Frozen.unity | 297 ++++++++---------- 4 files changed, 134 insertions(+), 169 deletions(-) diff --git a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Marshmallow-Standby.asset b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Marshmallow-Standby.asset index 2d2b9a2..a1558a7 100644 --- a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Marshmallow-Standby.asset +++ b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Marshmallow-Standby.asset @@ -12,4 +12,4 @@ MonoBehaviour: m_Name: Marshmallow-Standby m_EditorClassIdentifier: m_VideoLocation: 1 - m_VideoPath: ../FrozenMaterial/Demo/Olaf-standby.avi + m_VideoPath: ../FrozenMaterial/icon/icon_elsa.avi diff --git a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Space-Day.asset b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Space-Day.asset index 9974e01..7298edb 100644 --- a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Space-Day.asset +++ b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Space-Day.asset @@ -12,4 +12,4 @@ MonoBehaviour: m_Name: Space-Day m_EditorClassIdentifier: m_VideoLocation: 1 - m_VideoPath: ../FrozenMaterial/space-ice-forest-sq.avi + m_VideoPath: ../FrozenMaterial/space-ice-forest-sq_720p.avi diff --git a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Space-Night.asset b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Space-Night.asset index 74b3e2d..cd1103c 100644 --- a/Unity_2018_Frozen/Assets/Frozen/DSAsset/Space-Night.asset +++ b/Unity_2018_Frozen/Assets/Frozen/DSAsset/Space-Night.asset @@ -12,4 +12,4 @@ MonoBehaviour: m_Name: Space-Night m_EditorClassIdentifier: m_VideoLocation: 1 - m_VideoPath: ../FrozenMaterial/space-dark-mountain-sq.avi + m_VideoPath: ../FrozenMaterial/space-dark-mountain-sq_720p.avi diff --git a/Unity_2018_Frozen/Assets/Frozen/Frozen.unity b/Unity_2018_Frozen/Assets/Frozen/Frozen.unity index 7b7528c..d2216c7 100644 --- a/Unity_2018_Frozen/Assets/Frozen/Frozen.unity +++ b/Unity_2018_Frozen/Assets/Frozen/Frozen.unity @@ -788,6 +788,136 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!43 &321841692 +Mesh: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: 'Space Ground Mesh: (8x5x3)' + serializedVersion: 8 + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 24 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 16 + localAABB: + m_Center: {x: 0, y: 1.5, z: 0} + m_Extent: {x: 4, y: 1.5, z: 2.5} + m_Shapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + m_BindPose: [] + m_BoneNameHashes: + m_RootBoneNameHash: 0 + m_MeshCompression: 0 + m_IsReadable: 0 + m_KeepVertices: 1 + m_KeepIndices: 1 + m_IndexFormat: 0 + m_IndexBuffer: 000001000200010003000200040005000600050007000600080009000a0009000b000a000c000d000e000d000f000e00 + m_Skin: [] + m_VertexData: + m_CurrentChannels: 11 + m_VertexCount: 16 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 12 + format: 0 + dimension: 3 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 24 + format: 0 + dimension: 2 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 512 + _typelessdata: 000080c000000000000020c0000000000000803f00000000e4388e3e00000000000080c00000000000002040000000000000803f00000000e4388e3e0000203f0000804000000000000020c0000000000000803f000000008ee3383f00000000000080400000000000002040000000000000803f000000008ee3383f0000203f000080c000000000000020400000000000000000000080bfe4388e3e0000203f000080c000004040000020400000000000000000000080bfe4388e3e0000803f0000804000000000000020400000000000000000000080bf8ee3383f0000203f0000804000004040000020400000000000000000000080bf8ee3383f0000803f000080c000000000000020c00000803f0000000000000000000000000000203f000080c000004040000020c00000803f0000000000000000000000000000803f000080c000000000000020400000803f0000000000000000e4388e3e0000203f000080c000004040000020400000803f0000000000000000e4388e3e0000803f000080400000000000002040000080bf00000000000000008ee3383f0000203f000080400000404000002040000080bf00000000000000008ee3383f0000803f0000804000000000000020c0000080bf00000000000000000000803f0000203f0000804000004040000020c0000080bf00000000000000000000803f0000803f + m_CompressedMesh: + m_Vertices: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_UV: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Normals: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Tangents: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Weights: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_NormalSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_TangentSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_FloatColors: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_BoneIndices: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_Triangles: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_UVInfo: 0 + m_LocalAABB: + m_Center: {x: 0, y: 1.5, z: 0} + m_Extent: {x: 4, y: 1.5, z: 2.5} + m_MeshUsageFlags: 0 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + m_MeshOptimized: 0 --- !u!1 &338663764 GameObject: m_ObjectHideFlags: 0 @@ -1510,7 +1640,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 12ea4d85cdda0aa4981a82e5e18fed52, type: 3} m_Name: m_EditorClassIdentifier: - standby: 1 disappearTime: 0.1 area: 0 AppearArea: 0000000001000000 @@ -2057,7 +2186,6 @@ GameObject: - component: {fileID: 768391777} - component: {fileID: 768391780} - component: {fileID: 768391779} - - component: {fileID: 768391778} m_Layer: 8 m_Name: standby m_TagString: Untagged @@ -2078,18 +2206,6 @@ Transform: m_Father: {fileID: 1216863872} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &768391778 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 768391776} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 86694b20cef756146b118abf35314f9b, type: 3} - m_Name: - m_EditorClassIdentifier: - area: 2 --- !u!23 &768391779 MeshRenderer: m_ObjectHideFlags: 0 @@ -2682,136 +2798,6 @@ MonoBehaviour: PlayOnStart: 1 Looping: 1 AudioVolume: 1 ---- !u!43 &973459541 -Mesh: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_Name: 'Space Ground Mesh: (8x5x3)' - serializedVersion: 8 - m_SubMeshes: - - serializedVersion: 2 - firstByte: 0 - indexCount: 24 - topology: 0 - baseVertex: 0 - firstVertex: 0 - vertexCount: 16 - localAABB: - m_Center: {x: 0, y: 1.5, z: 0} - m_Extent: {x: 4, y: 1.5, z: 2.5} - m_Shapes: - vertices: [] - shapes: [] - channels: [] - fullWeights: [] - m_BindPose: [] - m_BoneNameHashes: - m_RootBoneNameHash: 0 - m_MeshCompression: 0 - m_IsReadable: 0 - m_KeepVertices: 1 - m_KeepIndices: 1 - m_IndexFormat: 0 - m_IndexBuffer: 000001000200010003000200040005000600050007000600080009000a0009000b000a000c000d000e000d000f000e00 - m_Skin: [] - m_VertexData: - m_CurrentChannels: 11 - m_VertexCount: 16 - m_Channels: - - stream: 0 - offset: 0 - format: 0 - dimension: 3 - - stream: 0 - offset: 12 - format: 0 - dimension: 3 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 24 - format: 0 - dimension: 2 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - m_DataSize: 512 - _typelessdata: 000080c000000000000020c0000000000000803f00000000e4388e3e00000000000080c00000000000002040000000000000803f00000000e4388e3e0000203f0000804000000000000020c0000000000000803f000000008ee3383f00000000000080400000000000002040000000000000803f000000008ee3383f0000203f000080c000000000000020400000000000000000000080bfe4388e3e0000203f000080c000004040000020400000000000000000000080bfe4388e3e0000803f0000804000000000000020400000000000000000000080bf8ee3383f0000203f0000804000004040000020400000000000000000000080bf8ee3383f0000803f000080c000000000000020c00000803f0000000000000000000000000000203f000080c000004040000020c00000803f0000000000000000000000000000803f000080c000000000000020400000803f0000000000000000e4388e3e0000203f000080c000004040000020400000803f0000000000000000e4388e3e0000803f000080400000000000002040000080bf00000000000000008ee3383f0000203f000080400000404000002040000080bf00000000000000008ee3383f0000803f0000804000000000000020c0000080bf00000000000000000000803f0000203f0000804000004040000020c0000080bf00000000000000000000803f0000803f - m_CompressedMesh: - m_Vertices: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_UV: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Normals: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Tangents: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Weights: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_NormalSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_TangentSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_FloatColors: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_BoneIndices: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_Triangles: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_UVInfo: 0 - m_LocalAABB: - m_Center: {x: 0, y: 1.5, z: 0} - m_Extent: {x: 4, y: 1.5, z: 2.5} - m_MeshUsageFlags: 0 - m_BakedConvexCollisionMesh: - m_BakedTriangleCollisionMesh: - m_MeshOptimized: 0 --- !u!1 &1000268178 GameObject: m_ObjectHideFlags: 0 @@ -3228,7 +3214,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 12ea4d85cdda0aa4981a82e5e18fed52, type: 3} m_Name: m_EditorClassIdentifier: - standby: 1 disappearTime: 1 area: 0 AppearArea: 02000000 @@ -3298,7 +3283,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 12ea4d85cdda0aa4981a82e5e18fed52, type: 3} m_Name: m_EditorClassIdentifier: - standby: 1 disappearTime: 1 area: 0 AppearArea: 000000000100000002000000 @@ -3570,7 +3554,6 @@ GameObject: - component: {fileID: 1329758487} - component: {fileID: 1329758490} - component: {fileID: 1329758489} - - component: {fileID: 1329758488} m_Layer: 8 m_Name: trigger m_TagString: Untagged @@ -3591,18 +3574,6 @@ Transform: m_Father: {fileID: 1216863872} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1329758488 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1329758486} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 86694b20cef756146b118abf35314f9b, type: 3} - m_Name: - m_EditorClassIdentifier: - area: 2 --- !u!23 &1329758489 MeshRenderer: m_ObjectHideFlags: 0 @@ -3785,7 +3756,7 @@ MeshFilter: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1379541361} - m_Mesh: {fileID: 973459541} + m_Mesh: {fileID: 321841692} --- !u!1 &1390635887 GameObject: m_ObjectHideFlags: 0 @@ -4080,7 +4051,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 12ea4d85cdda0aa4981a82e5e18fed52, type: 3} m_Name: m_EditorClassIdentifier: - standby: 1 disappearTime: 1 area: 2 AppearArea: 02000000 @@ -4886,7 +4856,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 12ea4d85cdda0aa4981a82e5e18fed52, type: 3} m_Name: m_EditorClassIdentifier: - standby: 1 disappearTime: 1 area: 0 AppearArea: 000000000100000002000000 @@ -5013,7 +4982,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 12ea4d85cdda0aa4981a82e5e18fed52, type: 3} m_Name: m_EditorClassIdentifier: - standby: 1 disappearTime: 1 area: 2 AppearArea: 02000000 @@ -5084,7 +5052,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 12ea4d85cdda0aa4981a82e5e18fed52, type: 3} m_Name: m_EditorClassIdentifier: - standby: 1 disappearTime: 1 area: 0 AppearArea: 02000000 @@ -5154,7 +5121,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 12ea4d85cdda0aa4981a82e5e18fed52, type: 3} m_Name: m_EditorClassIdentifier: - standby: 1 disappearTime: 1 area: 0 AppearArea: 000000000100000002000000 @@ -5393,7 +5359,6 @@ MonoBehaviour: - {fileID: 1973785474} - {fileID: 1984882819} - {fileID: 1225287935} - debug: 0 --- !u!4 &2084936104 Transform: m_ObjectHideFlags: 0