From 60499331ef6dcf73f1c27a7cb563355dfd481ab5 Mon Sep 17 00:00:00 2001 From: uc deploy Date: Thu, 28 Nov 2019 23:43:58 +0800 Subject: [PATCH 1/4] [IceSlide] add test video --- .../Assets/Frozen/DsAssets.meta | 8 + .../Assets/Frozen/DsAssets/BG.asset | 17 + .../Assets/Frozen/DsAssets/BG.asset.meta | 8 + .../Assets/Frozen/DsAssets/Snowflake.asset | 17 + .../Frozen/DsAssets/Snowflake.asset.meta | 8 + .../Assets/Main_IceSlide.unity | 330 +++++++++++++++++- 6 files changed, 369 insertions(+), 19 deletions(-) create mode 100644 Unity-19050-04-IceSlide/Assets/Frozen/DsAssets.meta create mode 100644 Unity-19050-04-IceSlide/Assets/Frozen/DsAssets/BG.asset create mode 100644 Unity-19050-04-IceSlide/Assets/Frozen/DsAssets/BG.asset.meta create mode 100644 Unity-19050-04-IceSlide/Assets/Frozen/DsAssets/Snowflake.asset create mode 100644 Unity-19050-04-IceSlide/Assets/Frozen/DsAssets/Snowflake.asset.meta diff --git a/Unity-19050-04-IceSlide/Assets/Frozen/DsAssets.meta b/Unity-19050-04-IceSlide/Assets/Frozen/DsAssets.meta new file mode 100644 index 0000000..15d0dab --- /dev/null +++ b/Unity-19050-04-IceSlide/Assets/Frozen/DsAssets.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8f2f4499452413d42824eccbf8aaec89 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity-19050-04-IceSlide/Assets/Frozen/DsAssets/BG.asset b/Unity-19050-04-IceSlide/Assets/Frozen/DsAssets/BG.asset new file mode 100644 index 0000000..71eb2d0 --- /dev/null +++ b/Unity-19050-04-IceSlide/Assets/Frozen/DsAssets/BG.asset @@ -0,0 +1,17 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b7eca376a120a0e49a97afa024778843, type: 3} + m_Name: BG + m_EditorClassIdentifier: + m_VideoLocation: 1 + m_VideoPath: ..\..\Build-19050-Frozen2-04-IceSlide\slide_bg_loop.avi + animationClip: {fileID: 0} diff --git a/Unity-19050-04-IceSlide/Assets/Frozen/DsAssets/BG.asset.meta b/Unity-19050-04-IceSlide/Assets/Frozen/DsAssets/BG.asset.meta new file mode 100644 index 0000000..8ea26c0 --- /dev/null +++ b/Unity-19050-04-IceSlide/Assets/Frozen/DsAssets/BG.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c6720f91e0b2b844bb4f8c4052f8f4f3 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity-19050-04-IceSlide/Assets/Frozen/DsAssets/Snowflake.asset b/Unity-19050-04-IceSlide/Assets/Frozen/DsAssets/Snowflake.asset new file mode 100644 index 0000000..64cc101 --- /dev/null +++ b/Unity-19050-04-IceSlide/Assets/Frozen/DsAssets/Snowflake.asset @@ -0,0 +1,17 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b7eca376a120a0e49a97afa024778843, type: 3} + m_Name: Snowflake + m_EditorClassIdentifier: + m_VideoLocation: 1 + m_VideoPath: ..\..\Build-19050-Frozen2-04-IceSlide\snowflake3_shatter.avi + animationClip: {fileID: 0} diff --git a/Unity-19050-04-IceSlide/Assets/Frozen/DsAssets/Snowflake.asset.meta b/Unity-19050-04-IceSlide/Assets/Frozen/DsAssets/Snowflake.asset.meta new file mode 100644 index 0000000..6dd8544 --- /dev/null +++ b/Unity-19050-04-IceSlide/Assets/Frozen/DsAssets/Snowflake.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1104b3ddb03cd0346a58d2801aa5d273 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity-19050-04-IceSlide/Assets/Main_IceSlide.unity b/Unity-19050-04-IceSlide/Assets/Main_IceSlide.unity index 14fbff6..0b717f8 100644 --- a/Unity-19050-04-IceSlide/Assets/Main_IceSlide.unity +++ b/Unity-19050-04-IceSlide/Assets/Main_IceSlide.unity @@ -120,6 +120,113 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &629481240 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 629481241} + - component: {fileID: 629481243} + - component: {fileID: 629481242} + - component: {fileID: 629481244} + - component: {fileID: 629481245} + m_Layer: 5 + m_Name: RawImage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &629481241 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 629481240} + 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: 748540200} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 1920, y: 888} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &629481242 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 629481240} + 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: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 +--- !u!222 &629481243 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 629481240} + m_CullTransparentMesh: 0 +--- !u!114 &629481244 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 629481240} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 10f07b3f9fb96524db93eb42d89c229c, type: 3} + m_Name: + m_EditorClassIdentifier: + VideoAsset: {fileID: 11400000, guid: 1104b3ddb03cd0346a58d2801aa5d273, type: 2} + LoadOnAwake: 1 + PlayOnStart: 1 + Looping: 1 + AudioVolume: 1 +--- !u!114 &629481245 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 629481240} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 03dae28dfe6734f4eb76c922ac72dd34, type: 3} + m_Name: + m_EditorClassIdentifier: + target: 0 + materials: [] + attributeName: + targetObject: {fileID: 629481240} --- !u!1 &653645955 GameObject: m_ObjectHideFlags: 0 @@ -150,6 +257,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0, y: 0, z: 0} m_Children: + - {fileID: 1608519591} - {fileID: 1933408803} m_Father: {fileID: 1482923423} m_RootOrder: 0 @@ -310,6 +418,105 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} +--- !u!1 &748540199 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 748540200} + - component: {fileID: 748540203} + - component: {fileID: 748540202} + - component: {fileID: 748540201} + m_Layer: 5 + m_Name: Canvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &748540200 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 748540199} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_Children: + - {fileID: 629481241} + m_Father: {fileID: 963194228} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} +--- !u!114 &748540201 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 748540199} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1301386320, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &748540202 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 748540199} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1980459831, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 +--- !u!223 &748540203 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 748540199} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 1 + m_Camera: {fileID: 963194227} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 --- !u!1 &963194225 GameObject: m_ObjectHideFlags: 0 @@ -345,8 +552,8 @@ Camera: m_GameObject: {fileID: 963194225} m_Enabled: 1 serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_ClearFlags: 2 + m_BackGroundColor: {r: 0, g: 0, b: 0, a: 0} m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 @@ -369,7 +576,7 @@ Camera: serializedVersion: 2 m_Bits: 4294967295 m_RenderingPath: -1 - m_TargetTexture: {fileID: 0} + m_TargetTexture: {fileID: 8400000, guid: 561033ecb80c2b649847dfbc986cfed8, type: 2} m_TargetDisplay: 0 m_TargetEye: 3 m_HDR: 1 @@ -389,7 +596,8 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 1, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] + m_Children: + - {fileID: 748540200} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -460,8 +668,6 @@ GameObject: m_Component: - component: {fileID: 1482923423} - component: {fileID: 1482923422} - - component: {fileID: 1482923421} - - component: {fileID: 1482923424} m_Layer: 0 m_Name: SpoutCamera m_TagString: Untagged @@ -469,14 +675,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!81 &1482923421 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1482923420} - m_Enabled: 1 --- !u!20 &1482923422 Camera: m_ObjectHideFlags: 0 @@ -535,19 +733,113 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1482923424 +--- !u!1 &1608519590 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1608519591} + - component: {fileID: 1608519593} + - component: {fileID: 1608519592} + - component: {fileID: 1608519595} + - component: {fileID: 1608519594} + m_Layer: 5 + m_Name: BG + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1608519591 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1608519590} + 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: 653645956} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 1920, y: 888} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1608519592 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1482923420} + m_GameObject: {fileID: 1608519590} + 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: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 +--- !u!222 &1608519593 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1608519590} + m_CullTransparentMesh: 0 +--- !u!114 &1608519594 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1608519590} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 45099d624c1e6c14e9514f4e5ea1ed9c, type: 3} + m_Script: {fileID: 11500000, guid: 03dae28dfe6734f4eb76c922ac72dd34, type: 3} m_Name: m_EditorClassIdentifier: - _clearAlpha: 1 + target: 0 + materials: [] + attributeName: + targetObject: {fileID: 1608519590} +--- !u!114 &1608519595 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1608519590} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 10f07b3f9fb96524db93eb42d89c229c, type: 3} + m_Name: + m_EditorClassIdentifier: + VideoAsset: {fileID: 11400000, guid: c6720f91e0b2b844bb4f8c4052f8f4f3, type: 2} + LoadOnAwake: 1 + PlayOnStart: 1 + Looping: 1 + AudioVolume: 1 --- !u!1 &1933408802 GameObject: m_ObjectHideFlags: 0 @@ -578,7 +870,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 653645956} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} From b8433f2bdd7453c0811b56c82a99f928965f6a11 Mon Sep 17 00:00:00 2001 From: uc deploy Date: Fri, 29 Nov 2019 00:00:23 +0800 Subject: [PATCH 2/4] [IceSlide] update --- Unity-19050-04-IceSlide/Assets/Animator.meta | 8 + .../Assets/Animator/Snowflake.controller | 147 ++++++++++++++ .../Assets/Animator/Snowflake.controller.meta | 8 + .../Frozen/DsAssets/Snowflake_Shatter.anim | 79 ++++++++ .../DsAssets/Snowflake_Shatter.anim.meta | 8 + ...nowflake.asset => Snowflake_Shatter.asset} | 2 +- ...sset.meta => Snowflake_Shatter.asset.meta} | 0 .../Frozen/DsAssets/Snowflake_Spawn.anim | 79 ++++++++ .../Frozen/DsAssets/Snowflake_Spawn.anim.meta | 8 + .../Frozen/DsAssets/Snowflake_Spawn.asset | 17 ++ .../DsAssets/Snowflake_Spawn.asset.meta | 8 + .../Assets/Main_IceSlide.unity | 185 ++++++++++++++++-- 12 files changed, 537 insertions(+), 12 deletions(-) create mode 100644 Unity-19050-04-IceSlide/Assets/Animator.meta create mode 100644 Unity-19050-04-IceSlide/Assets/Animator/Snowflake.controller create mode 100644 Unity-19050-04-IceSlide/Assets/Animator/Snowflake.controller.meta create mode 100644 Unity-19050-04-IceSlide/Assets/Frozen/DsAssets/Snowflake_Shatter.anim create mode 100644 Unity-19050-04-IceSlide/Assets/Frozen/DsAssets/Snowflake_Shatter.anim.meta rename Unity-19050-04-IceSlide/Assets/Frozen/DsAssets/{Snowflake.asset => Snowflake_Shatter.asset} (94%) rename Unity-19050-04-IceSlide/Assets/Frozen/DsAssets/{Snowflake.asset.meta => Snowflake_Shatter.asset.meta} (100%) create mode 100644 Unity-19050-04-IceSlide/Assets/Frozen/DsAssets/Snowflake_Spawn.anim create mode 100644 Unity-19050-04-IceSlide/Assets/Frozen/DsAssets/Snowflake_Spawn.anim.meta create mode 100644 Unity-19050-04-IceSlide/Assets/Frozen/DsAssets/Snowflake_Spawn.asset create mode 100644 Unity-19050-04-IceSlide/Assets/Frozen/DsAssets/Snowflake_Spawn.asset.meta diff --git a/Unity-19050-04-IceSlide/Assets/Animator.meta b/Unity-19050-04-IceSlide/Assets/Animator.meta new file mode 100644 index 0000000..75cdff0 --- /dev/null +++ b/Unity-19050-04-IceSlide/Assets/Animator.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b3d2d6b8e8ed2a24f8e1b1be6d257792 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity-19050-04-IceSlide/Assets/Animator/Snowflake.controller b/Unity-19050-04-IceSlide/Assets/Animator/Snowflake.controller new file mode 100644 index 0000000..ca81615 --- /dev/null +++ b/Unity-19050-04-IceSlide/Assets/Animator/Snowflake.controller @@ -0,0 +1,147 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1101 &-5879950363583209725 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -5204081279454011557} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 1 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &-5204081279454011557 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Snowflake_Shatter + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 4505030418162680149} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 51a18b7c2043a5440a3e2282f150a2d1, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &-3980762192105778586 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Snowflake_Spawn + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -5879950363583209725} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 47f0465b8f41b794cbc49c7ba473d0a9, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Snowflake + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 2106951520893035423} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1107 &2106951520893035423 +AnimatorStateMachine: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: -3980762192105778586} + m_Position: {x: 146, y: 221, z: 0} + - serializedVersion: 1 + m_State: {fileID: -5204081279454011557} + m_Position: {x: 170, y: 330, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: -3980762192105778586} +--- !u!1101 &4505030418162680149 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -3980762192105778586} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 1 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 diff --git a/Unity-19050-04-IceSlide/Assets/Animator/Snowflake.controller.meta b/Unity-19050-04-IceSlide/Assets/Animator/Snowflake.controller.meta new file mode 100644 index 0000000..5127217 --- /dev/null +++ b/Unity-19050-04-IceSlide/Assets/Animator/Snowflake.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2ed9a47d37292e44a84bc2c674c8ce74 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity-19050-04-IceSlide/Assets/Frozen/DsAssets/Snowflake_Shatter.anim b/Unity-19050-04-IceSlide/Assets/Frozen/DsAssets/Snowflake_Shatter.anim new file mode 100644 index 0000000..620ac16 --- /dev/null +++ b/Unity-19050-04-IceSlide/Assets/Frozen/DsAssets/Snowflake_Shatter.anim @@ -0,0 +1,79 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Snowflake_Shatter + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0.1 + value: {fileID: 0} + - time: 5 + value: {fileID: 0} + attribute: videoAsset + path: + classID: 114 + script: {fileID: 11500000, guid: f4c0b11838629ea45a4e7bfdf436a57c, type: 3} + m_SampleRate: 60 + m_WrapMode: 2 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 2581354655 + script: {fileID: 11500000, guid: f4c0b11838629ea45a4e7bfdf436a57c, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 0} + - {fileID: 0} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 5.016667 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: + - time: 0 + functionName: Play + data: + objectReferenceParameter: {fileID: 11400000, guid: 1104b3ddb03cd0346a58d2801aa5d273, + type: 2} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 diff --git a/Unity-19050-04-IceSlide/Assets/Frozen/DsAssets/Snowflake_Shatter.anim.meta b/Unity-19050-04-IceSlide/Assets/Frozen/DsAssets/Snowflake_Shatter.anim.meta new file mode 100644 index 0000000..4b767a2 --- /dev/null +++ b/Unity-19050-04-IceSlide/Assets/Frozen/DsAssets/Snowflake_Shatter.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 51a18b7c2043a5440a3e2282f150a2d1 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity-19050-04-IceSlide/Assets/Frozen/DsAssets/Snowflake.asset b/Unity-19050-04-IceSlide/Assets/Frozen/DsAssets/Snowflake_Shatter.asset similarity index 94% rename from Unity-19050-04-IceSlide/Assets/Frozen/DsAssets/Snowflake.asset rename to Unity-19050-04-IceSlide/Assets/Frozen/DsAssets/Snowflake_Shatter.asset index 64cc101..caced1a 100644 --- a/Unity-19050-04-IceSlide/Assets/Frozen/DsAssets/Snowflake.asset +++ b/Unity-19050-04-IceSlide/Assets/Frozen/DsAssets/Snowflake_Shatter.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: b7eca376a120a0e49a97afa024778843, type: 3} - m_Name: Snowflake + m_Name: Snowflake_Shatter m_EditorClassIdentifier: m_VideoLocation: 1 m_VideoPath: ..\..\Build-19050-Frozen2-04-IceSlide\snowflake3_shatter.avi diff --git a/Unity-19050-04-IceSlide/Assets/Frozen/DsAssets/Snowflake.asset.meta b/Unity-19050-04-IceSlide/Assets/Frozen/DsAssets/Snowflake_Shatter.asset.meta similarity index 100% rename from Unity-19050-04-IceSlide/Assets/Frozen/DsAssets/Snowflake.asset.meta rename to Unity-19050-04-IceSlide/Assets/Frozen/DsAssets/Snowflake_Shatter.asset.meta diff --git a/Unity-19050-04-IceSlide/Assets/Frozen/DsAssets/Snowflake_Spawn.anim b/Unity-19050-04-IceSlide/Assets/Frozen/DsAssets/Snowflake_Spawn.anim new file mode 100644 index 0000000..a715e75 --- /dev/null +++ b/Unity-19050-04-IceSlide/Assets/Frozen/DsAssets/Snowflake_Spawn.anim @@ -0,0 +1,79 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Snowflake_Spawn + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0.1 + value: {fileID: 0} + - time: 2.4333334 + value: {fileID: 0} + attribute: videoAsset + path: + classID: 114 + script: {fileID: 11500000, guid: f4c0b11838629ea45a4e7bfdf436a57c, type: 3} + m_SampleRate: 60 + m_WrapMode: 2 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 2581354655 + script: {fileID: 11500000, guid: f4c0b11838629ea45a4e7bfdf436a57c, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 0} + - {fileID: 0} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 2.45 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: + - time: 0 + functionName: Play + data: + objectReferenceParameter: {fileID: 11400000, guid: bae2c836d3fd1ab45b196b46a353088a, + type: 2} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 diff --git a/Unity-19050-04-IceSlide/Assets/Frozen/DsAssets/Snowflake_Spawn.anim.meta b/Unity-19050-04-IceSlide/Assets/Frozen/DsAssets/Snowflake_Spawn.anim.meta new file mode 100644 index 0000000..025f7d1 --- /dev/null +++ b/Unity-19050-04-IceSlide/Assets/Frozen/DsAssets/Snowflake_Spawn.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 47f0465b8f41b794cbc49c7ba473d0a9 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity-19050-04-IceSlide/Assets/Frozen/DsAssets/Snowflake_Spawn.asset b/Unity-19050-04-IceSlide/Assets/Frozen/DsAssets/Snowflake_Spawn.asset new file mode 100644 index 0000000..f8aea07 --- /dev/null +++ b/Unity-19050-04-IceSlide/Assets/Frozen/DsAssets/Snowflake_Spawn.asset @@ -0,0 +1,17 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b7eca376a120a0e49a97afa024778843, type: 3} + m_Name: Snowflake_Spawn + m_EditorClassIdentifier: + m_VideoLocation: 1 + m_VideoPath: ..\..\Build-19050-Frozen2-04-IceSlide\snowflake3_spawn.avi + animationClip: {fileID: 0} diff --git a/Unity-19050-04-IceSlide/Assets/Frozen/DsAssets/Snowflake_Spawn.asset.meta b/Unity-19050-04-IceSlide/Assets/Frozen/DsAssets/Snowflake_Spawn.asset.meta new file mode 100644 index 0000000..db69317 --- /dev/null +++ b/Unity-19050-04-IceSlide/Assets/Frozen/DsAssets/Snowflake_Spawn.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: bae2c836d3fd1ab45b196b46a353088a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity-19050-04-IceSlide/Assets/Main_IceSlide.unity b/Unity-19050-04-IceSlide/Assets/Main_IceSlide.unity index 0b717f8..70b3f58 100644 --- a/Unity-19050-04-IceSlide/Assets/Main_IceSlide.unity +++ b/Unity-19050-04-IceSlide/Assets/Main_IceSlide.unity @@ -120,6 +120,54 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &408817923 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 408817924} + - component: {fileID: 408817925} + m_Layer: 0 + m_Name: Snowflake_Shatter + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &408817924 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 408817923} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: -7.49978, z: -674.9802} + m_LocalScale: {x: 7.49978, y: 7.49978, z: 7.49978} + m_Children: [] + m_Father: {fileID: 629481241} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &408817925 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 408817923} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 10f07b3f9fb96524db93eb42d89c229c, type: 3} + m_Name: + m_EditorClassIdentifier: + VideoAsset: {fileID: 11400000, guid: 1104b3ddb03cd0346a58d2801aa5d273, type: 2} + LoadOnAwake: 1 + PlayOnStart: 0 + Looping: 0 + AudioVolume: 1 --- !u!1 &629481240 GameObject: m_ObjectHideFlags: 0 @@ -131,10 +179,11 @@ GameObject: - component: {fileID: 629481241} - component: {fileID: 629481243} - component: {fileID: 629481242} - - component: {fileID: 629481244} - component: {fileID: 629481245} + - component: {fileID: 629481244} + - component: {fileID: 629481246} m_Layer: 5 - m_Name: RawImage + m_Name: Snow m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -150,7 +199,9 @@ RectTransform: 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_Children: + - {fileID: 1934643411} + - {fileID: 408817924} m_Father: {fileID: 748540200} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -179,7 +230,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Texture: {fileID: 0} + m_Texture: {fileID: 1564796240} m_UVRect: serializedVersion: 2 x: 0 @@ -203,15 +254,39 @@ MonoBehaviour: m_GameObject: {fileID: 629481240} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 10f07b3f9fb96524db93eb42d89c229c, type: 3} + m_Script: {fileID: 11500000, guid: f4c0b11838629ea45a4e7bfdf436a57c, type: 3} m_Name: m_EditorClassIdentifier: - VideoAsset: {fileID: 11400000, guid: 1104b3ddb03cd0346a58d2801aa5d273, type: 2} - LoadOnAwake: 1 - PlayOnStart: 1 - Looping: 1 - AudioVolume: 1 ---- !u!114 &629481245 + VideoAsset: {fileID: 0} + PlayerList: + - {fileID: 1934643412} + - {fileID: 408817925} + PausePlayerListWhenDisable: 0 + playerPlayEvent: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UltraCombos.DShowAnimatorMoviePlayer+PlayerPlayEvent, UltraCombos.MoviePlayer.Runtime, + Version=0.0.0.0, Culture=neutral, PublicKeyToken=null +--- !u!95 &629481245 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 629481240} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 2ed9a47d37292e44a84bc2c674c8ce74, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!114 &629481246 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -733,6 +808,46 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!28 &1564796240 +Texture2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_ImageContentsHash: + serializedVersion: 2 + Hash: 00000000000000000000000000000000 + m_ForcedFallbackFormat: 4 + m_DownscaleFallback: 0 + serializedVersion: 2 + m_Width: 2 + m_Height: 2 + m_CompleteImageSize: 16 + m_TextureFormat: 5 + m_MipCount: 1 + m_IsReadable: 1 + m_StreamingMipmaps: 0 + m_StreamingMipmapsPriority: 0 + m_AlphaIsTransparency: 0 + m_ImageCount: 1 + m_TextureDimension: 2 + m_TextureSettings: + serializedVersion: 2 + m_FilterMode: 1 + m_Aniso: 1 + m_MipBias: 0 + m_WrapU: 0 + m_WrapV: 0 + m_WrapW: 0 + m_LightmapFormat: 0 + m_ColorSpace: 0 + image data: 16 + _typelessdata: 00000000000000000000000000000000 + m_StreamData: + offset: 0 + size: 0 + path: --- !u!1 &1608519590 GameObject: m_ObjectHideFlags: 0 @@ -912,3 +1027,51 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1933408802} m_CullTransparentMesh: 0 +--- !u!1 &1934643410 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1934643411} + - component: {fileID: 1934643412} + m_Layer: 0 + m_Name: Snowflake_Spawn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1934643411 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1934643410} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: -7.49978, z: -674.9802} + m_LocalScale: {x: 7.49978, y: 7.49978, z: 7.49978} + m_Children: [] + m_Father: {fileID: 629481241} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1934643412 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1934643410} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 10f07b3f9fb96524db93eb42d89c229c, type: 3} + m_Name: + m_EditorClassIdentifier: + VideoAsset: {fileID: 11400000, guid: bae2c836d3fd1ab45b196b46a353088a, type: 2} + LoadOnAwake: 1 + PlayOnStart: 0 + Looping: 0 + AudioVolume: 1 From 1445632204237acf1afb5377e7eefbe769f6b6f3 Mon Sep 17 00:00:00 2001 From: tigerchen Date: Fri, 29 Nov 2019 15:25:55 +0800 Subject: [PATCH 3/4] Add List & prefab --- Unity-19050-08-DarkSea/Assets/Prefabs.meta | 8 + .../Assets/Prefabs/RawImage.prefab | 88 ++++ .../Assets/Prefabs/RawImage.prefab.meta | 7 + .../Assets/Scenes/DarkSea.unity | 379 +++++++----------- .../Assets/Scripts/ScaleActivity.cs | 32 -- .../Assets/Scripts/movieController.cs | 60 +++ ...tivity.cs.meta => movieController.cs.meta} | 2 +- .../Assets/Scripts/tuio_event.cs | 65 ++- 8 files changed, 360 insertions(+), 281 deletions(-) create mode 100644 Unity-19050-08-DarkSea/Assets/Prefabs.meta create mode 100644 Unity-19050-08-DarkSea/Assets/Prefabs/RawImage.prefab create mode 100644 Unity-19050-08-DarkSea/Assets/Prefabs/RawImage.prefab.meta delete mode 100644 Unity-19050-08-DarkSea/Assets/Scripts/ScaleActivity.cs create mode 100644 Unity-19050-08-DarkSea/Assets/Scripts/movieController.cs rename Unity-19050-08-DarkSea/Assets/Scripts/{ScaleActivity.cs.meta => movieController.cs.meta} (83%) diff --git a/Unity-19050-08-DarkSea/Assets/Prefabs.meta b/Unity-19050-08-DarkSea/Assets/Prefabs.meta new file mode 100644 index 0000000..2cbe30b --- /dev/null +++ b/Unity-19050-08-DarkSea/Assets/Prefabs.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1e76c375938ec5844a0b11073e6f9da4 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity-19050-08-DarkSea/Assets/Prefabs/RawImage.prefab b/Unity-19050-08-DarkSea/Assets/Prefabs/RawImage.prefab new file mode 100644 index 0000000..372409f --- /dev/null +++ b/Unity-19050-08-DarkSea/Assets/Prefabs/RawImage.prefab @@ -0,0 +1,88 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &2142686115215515793 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2142686115215515796} + - component: {fileID: 2142686115215515799} + - component: {fileID: 2142686115215515798} + - component: {fileID: 2829506254029656376} + m_Layer: 5 + m_Name: RawImage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2142686115215515796 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2142686115215515793} + 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: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 300, y: 300} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2142686115215515799 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2142686115215515793} + m_CullTransparentMesh: 0 +--- !u!114 &2142686115215515798 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2142686115215515793} + 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_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 +--- !u!114 &2829506254029656376 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2142686115215515793} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0a7db5ab031d8b640914e599456b9b21, type: 3} + m_Name: + m_EditorClassIdentifier: + totalTime: 0.5 + id: 0 + tuio_event: {fileID: 0} diff --git a/Unity-19050-08-DarkSea/Assets/Prefabs/RawImage.prefab.meta b/Unity-19050-08-DarkSea/Assets/Prefabs/RawImage.prefab.meta new file mode 100644 index 0000000..74f4451 --- /dev/null +++ b/Unity-19050-08-DarkSea/Assets/Prefabs/RawImage.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 8bbc036a3be21954681613cbe4f0e9a8 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity-19050-08-DarkSea/Assets/Scenes/DarkSea.unity b/Unity-19050-08-DarkSea/Assets/Scenes/DarkSea.unity index 6a8c4f2..333ec4e 100644 --- a/Unity-19050-08-DarkSea/Assets/Scenes/DarkSea.unity +++ b/Unity-19050-08-DarkSea/Assets/Scenes/DarkSea.unity @@ -296,6 +296,136 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &490275147 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 798465533} + m_Modifications: + - target: {fileID: 2142686115215515793, guid: 8bbc036a3be21954681613cbe4f0e9a8, + type: 3} + propertyPath: m_Name + value: RawImage + objectReference: {fileID: 0} + - target: {fileID: 2142686115215515796, guid: 8bbc036a3be21954681613cbe4f0e9a8, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2142686115215515796, guid: 8bbc036a3be21954681613cbe4f0e9a8, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2142686115215515796, guid: 8bbc036a3be21954681613cbe4f0e9a8, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2142686115215515796, guid: 8bbc036a3be21954681613cbe4f0e9a8, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2142686115215515796, guid: 8bbc036a3be21954681613cbe4f0e9a8, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2142686115215515796, guid: 8bbc036a3be21954681613cbe4f0e9a8, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2142686115215515796, guid: 8bbc036a3be21954681613cbe4f0e9a8, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2142686115215515796, guid: 8bbc036a3be21954681613cbe4f0e9a8, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2142686115215515796, guid: 8bbc036a3be21954681613cbe4f0e9a8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2142686115215515796, guid: 8bbc036a3be21954681613cbe4f0e9a8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2142686115215515796, guid: 8bbc036a3be21954681613cbe4f0e9a8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2142686115215515796, guid: 8bbc036a3be21954681613cbe4f0e9a8, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2142686115215515796, guid: 8bbc036a3be21954681613cbe4f0e9a8, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2142686115215515796, guid: 8bbc036a3be21954681613cbe4f0e9a8, + type: 3} + propertyPath: m_SizeDelta.x + value: 300 + objectReference: {fileID: 0} + - target: {fileID: 2142686115215515796, guid: 8bbc036a3be21954681613cbe4f0e9a8, + type: 3} + propertyPath: m_SizeDelta.y + value: 300 + objectReference: {fileID: 0} + - target: {fileID: 2142686115215515796, guid: 8bbc036a3be21954681613cbe4f0e9a8, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2142686115215515796, guid: 8bbc036a3be21954681613cbe4f0e9a8, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2142686115215515796, guid: 8bbc036a3be21954681613cbe4f0e9a8, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2142686115215515796, guid: 8bbc036a3be21954681613cbe4f0e9a8, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2142686115215515796, guid: 8bbc036a3be21954681613cbe4f0e9a8, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2142686115215515796, guid: 8bbc036a3be21954681613cbe4f0e9a8, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2829506254029656376, guid: 8bbc036a3be21954681613cbe4f0e9a8, + type: 3} + propertyPath: tuio_event + value: + objectReference: {fileID: 914806966} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 8bbc036a3be21954681613cbe4f0e9a8, type: 3} +--- !u!224 &490275148 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2142686115215515796, guid: 8bbc036a3be21954681613cbe4f0e9a8, + type: 3} + m_PrefabInstance: {fileID: 490275147} + m_PrefabAsset: {fileID: 0} --- !u!1 &503604495 GameObject: m_ObjectHideFlags: 0 @@ -326,7 +456,7 @@ RectTransform: m_LocalScale: {x: 1, y: -1, z: 1} m_Children: [] m_Father: {fileID: 798465533} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -366,93 +496,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 503604495} m_CullTransparentMesh: 0 ---- !u!1 &508356619 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 508356622} - - component: {fileID: 508356621} - - component: {fileID: 508356620} - - component: {fileID: 508356623} - m_Layer: 5 - m_Name: RawImage - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &508356620 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 508356619} - 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_Texture: {fileID: 0} - m_UVRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 ---- !u!222 &508356621 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 508356619} - m_CullTransparentMesh: 0 ---- !u!224 &508356622 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 508356619} - 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: 798465533} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 300, y: 300} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &508356623 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 508356619} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f2f060315d279d141a05deb0236dde0e, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Delegates: [] - articulatingActivities: [] - introTime: 0.5 - outroTime: 0.5 --- !u!1001 &513889829 PrefabInstance: m_ObjectHideFlags: 0 @@ -527,7 +570,7 @@ PrefabInstance: type: 3} propertyPath: RemoveTuioBlobEvent.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: - objectReference: {fileID: 1221340186} + objectReference: {fileID: 0} - target: {fileID: 114540009425154000, guid: 1f68bf7cec2600e49a46d2f0554453c8, type: 3} propertyPath: RemoveTuioBlobEvent.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName @@ -542,7 +585,7 @@ PrefabInstance: type: 3} propertyPath: RemoveTuioBlobEvent.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgument value: - objectReference: {fileID: 1056573855} + objectReference: {fileID: 0} - target: {fileID: 114872970294644716, guid: 1f68bf7cec2600e49a46d2f0554453c8, type: 3} propertyPath: customRoi.width @@ -738,7 +781,7 @@ RectTransform: m_LocalScale: {x: 1, y: -1, z: 1} m_Children: [] m_Father: {fileID: 798465533} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -868,9 +911,9 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0, y: 0, z: 0} m_Children: + - {fileID: 490275148} - {fileID: 503604496} - {fileID: 797223804} - - {fileID: 508356622} m_Father: {fileID: 0} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -934,11 +977,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e7eda42473bde25468ccb55d2b565cf9, type: 3} m_Name: m_EditorClassIdentifier: - img: {fileID: 508356619} + img: {fileID: 1996081105} + canvas: {fileID: 798465529} tuio_input: {fileID: 846725642} - act_pool: {fileID: 1221340186} - act_in: {fileID: 1136321091} - act_out: {fileID: 1056573855} --- !u!1 &963194225 GameObject: m_ObjectHideFlags: 0 @@ -964,7 +1005,7 @@ AudioListener: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 963194225} - m_Enabled: 1 + m_Enabled: 0 --- !u!20 &963194227 Camera: m_ObjectHideFlags: 0 @@ -1021,144 +1062,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1056573853 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1056573854} - - component: {fileID: 1056573855} - m_Layer: 0 - m_Name: State_out - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1056573854 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1056573853} - 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: 1221340187} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1056573855 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1056573853} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2af6d95f21a93714e944186ff0e29f68, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Delegates: [] - articulatingActivities: - - {fileID: 0} ---- !u!1 &1136321089 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1136321090} - - component: {fileID: 1136321091} - m_Layer: 0 - m_Name: State_in - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &1136321090 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1136321089} - 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: 1221340187} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1136321091 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1136321089} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2af6d95f21a93714e944186ff0e29f68, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Delegates: [] - articulatingActivities: - - {fileID: 0} ---- !u!1 &1221340185 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1221340187} - - component: {fileID: 1221340186} - m_Layer: 0 - m_Name: Activity Pool - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1221340186 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1221340185} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bc899c78f8612294097669c6627e2b0f, type: 3} - m_Name: - m_EditorClassIdentifier: - _current: {fileID: 1056573855} ---- !u!4 &1221340187 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1221340185} - 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: 1136321090} - - {fileID: 1056573854} - m_Father: {fileID: 0} - m_RootOrder: 10 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1395462205 GameObject: m_ObjectHideFlags: 0 @@ -1238,6 +1141,12 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1996081105 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 2142686115215515793, guid: 8bbc036a3be21954681613cbe4f0e9a8, + type: 3} + m_PrefabInstance: {fileID: 490275147} + m_PrefabAsset: {fileID: 0} --- !u!1 &2044104306 GameObject: m_ObjectHideFlags: 0 diff --git a/Unity-19050-08-DarkSea/Assets/Scripts/ScaleActivity.cs b/Unity-19050-08-DarkSea/Assets/Scripts/ScaleActivity.cs deleted file mode 100644 index 5b2a352..0000000 --- a/Unity-19050-08-DarkSea/Assets/Scripts/ScaleActivity.cs +++ /dev/null @@ -1,32 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; -using UltraCombos; -public class ScaleActivity : Activity -{ - public float introTime = 1; - public float outroTime = 1; - - protected override IEnumerator OnEnter() - { - yield return DoScaling( 1, introTime); - } - protected override IEnumerator OnLeave() - { - yield return DoScaling( 0, outroTime); - } - IEnumerator DoScaling( float to, float totalTime) - { - float from = transform.localScale.x; - float scale = from; - float startTime = Time.time; - while (scale != to) - { - float duration = Time.time - startTime; - scale = Mathf.Lerp(from, to, duration / totalTime); - transform.localScale = new Vector3(scale, scale, 1); - yield return null; - } - yield break; - } -} diff --git a/Unity-19050-08-DarkSea/Assets/Scripts/movieController.cs b/Unity-19050-08-DarkSea/Assets/Scripts/movieController.cs new file mode 100644 index 0000000..9d3cd89 --- /dev/null +++ b/Unity-19050-08-DarkSea/Assets/Scripts/movieController.cs @@ -0,0 +1,60 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; + +public class movieController : MonoBehaviour +{ + public float totalTime = 0.5f; + public int id; + public tuio_event tuio_event; + //public Transform trans; + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void Update() + { + if(name == "RawImage") + { + GetComponent().enabled = false; + } + else + { + GetComponent().enabled = true; + } + if (tuio_event.tuio_input.touchCount > 0) + { + transform.gameObject.SetActive(true); + Vector2 pos = tuio_event.tuio_input.GetTouch(id).position; + GetComponent().position = new Vector3(pos.x, pos.y, 0); + } + } + + void wake() + { + doScaling(1); + } + + void die() + { + doScaling(0); + Destroy(this); + } + + void doScaling(float to) + { + float from = transform.localScale.x; + float scale = from; + float startTime = Time.time; + while (scale != to) + { + float duration = Time.time - startTime; + scale = Mathf.Lerp(from, to, duration / totalTime); + transform.localScale = new Vector3(scale, scale, 1); + } + } +} diff --git a/Unity-19050-08-DarkSea/Assets/Scripts/ScaleActivity.cs.meta b/Unity-19050-08-DarkSea/Assets/Scripts/movieController.cs.meta similarity index 83% rename from Unity-19050-08-DarkSea/Assets/Scripts/ScaleActivity.cs.meta rename to Unity-19050-08-DarkSea/Assets/Scripts/movieController.cs.meta index 4e56fb8..35dd030 100644 --- a/Unity-19050-08-DarkSea/Assets/Scripts/ScaleActivity.cs.meta +++ b/Unity-19050-08-DarkSea/Assets/Scripts/movieController.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f2f060315d279d141a05deb0236dde0e +guid: 0a7db5ab031d8b640914e599456b9b21 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Unity-19050-08-DarkSea/Assets/Scripts/tuio_event.cs b/Unity-19050-08-DarkSea/Assets/Scripts/tuio_event.cs index 72cf73b..3f3fc06 100644 --- a/Unity-19050-08-DarkSea/Assets/Scripts/tuio_event.cs +++ b/Unity-19050-08-DarkSea/Assets/Scripts/tuio_event.cs @@ -6,30 +6,69 @@ public class tuio_event : MonoBehaviour { // Start is called before the first frame update public GameObject img; + public GameObject canvas; public UltraCombos.GlobalMKHookInput tuio_input; - public UltraCombos.ActivityPool act_pool; - public UltraCombos.Activity act_in; - public UltraCombos.Activity act_out; + + List cur_ids = new List(); + List pre_ids = new List(); + + int pre_count; + int cur_count; void Start() { - + cur_count = 0; } // Update is called once per frame void Update() { - int c = tuio_input.touchCount; - Debug.Log(c); - if(c > 0) + if (Input.GetKeyDown(KeyCode.K)) + { + Destroy(GameObject.Find("eee")); + } + pre_count = cur_count; + pre_ids.Clear(); + cur_ids.ForEach(i => pre_ids.Add(i)); + + cur_count = tuio_input.touchCount; + cur_ids.Clear(); + + for (int i = 0; i < cur_count; i++) + { + cur_ids.Add(tuio_input.GetTouch(i).fingerId); + } + + if (cur_count > pre_count) // Add { - act_pool.SwitchTo(act_in); - Vector2 pos = tuio_input.GetTouch(0).position; - img.GetComponent().position = new Vector3(pos.x, pos.y, 0); - } else + //Debug.Log("Add"); + for (int i = 0; i < cur_count; i++) + { + int _id = tuio_input.GetTouch(i).fingerId; + bool isOldTouch = pre_ids.Contains(_id); + if (isOldTouch == false) + { + GameObject g = Instantiate(img, canvas.GetComponent()); + g.name = _id.ToString(); + g.GetComponent().id = i; + } + } + } + + else if (cur_count < pre_count) // Remove { - act_pool.SwitchTo(act_out); + //Debug.Log("Remove"); + for (int i = 0; i < pre_count; i++) + { + int _id = pre_ids[i]; + bool isExitTouch = cur_ids.Contains(_id); + if (isExitTouch == false) + { + Destroy(GameObject.Find(_id.ToString())); + } + } } - + //Vector2 pos = tuio_input.GetTouch(0).position; + //img.GetComponent().position = new Vector3(pos.x, pos.y, 0); } } From 2c442661c859394e3f04a0f22ec64ab61e17daec Mon Sep 17 00:00:00 2001 From: tigerchen Date: Fri, 29 Nov 2019 19:15:51 +0800 Subject: [PATCH 4/4] add enable & destroy event --- .../Assets/Prefabs/RawImage.prefab | 1 + .../Assets/Scripts/movieController.cs | 14 ++++++++++++++ 2 files changed, 15 insertions(+) diff --git a/Unity-19050-08-DarkSea/Assets/Prefabs/RawImage.prefab b/Unity-19050-08-DarkSea/Assets/Prefabs/RawImage.prefab index 372409f..a57cad5 100644 --- a/Unity-19050-08-DarkSea/Assets/Prefabs/RawImage.prefab +++ b/Unity-19050-08-DarkSea/Assets/Prefabs/RawImage.prefab @@ -85,4 +85,5 @@ MonoBehaviour: m_EditorClassIdentifier: totalTime: 0.5 id: 0 + stat: 0 tuio_event: {fileID: 0} diff --git a/Unity-19050-08-DarkSea/Assets/Scripts/movieController.cs b/Unity-19050-08-DarkSea/Assets/Scripts/movieController.cs index 9d3cd89..0ee6d54 100644 --- a/Unity-19050-08-DarkSea/Assets/Scripts/movieController.cs +++ b/Unity-19050-08-DarkSea/Assets/Scripts/movieController.cs @@ -25,7 +25,9 @@ public class movieController : MonoBehaviour else { GetComponent().enabled = true; + //Debug.Log(stat); } + if (tuio_event.tuio_input.touchCount > 0) { transform.gameObject.SetActive(true); @@ -57,4 +59,16 @@ public class movieController : MonoBehaviour transform.localScale = new Vector3(scale, scale, 1); } } + + private void OnEnable() + { + //doScaling(1); + Debug.Log("Hi"); + } + + private void OnDestroy() + { + //doScaling(0); + Debug.Log("Bye"); + } }