diff --git a/Unity_2018_Frozen/Assets/Frozen/Frozen.unity b/Unity_2018_Frozen/Assets/Frozen/Frozen.unity index d2216c7..485db7a 100644 --- a/Unity_2018_Frozen/Assets/Frozen/Frozen.unity +++ b/Unity_2018_Frozen/Assets/Frozen/Frozen.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 1071731254} - m_IndirectSpecularColor: {r: 0.021216419, g: 0.053037524, b: 0.08577964, a: 1} + m_IndirectSpecularColor: {r: 0.021216419, g: 0.053037528, b: 0.08577964, a: 1} --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 @@ -294,7 +294,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 7 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &145750430 GameObject: @@ -322,7 +322,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 9 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &151858420 GameObject: @@ -788,136 +788,6 @@ 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 @@ -947,7 +817,7 @@ Transform: - {fileID: 199010598} - {fileID: 368474577} m_Father: {fileID: 0} - m_RootOrder: 15 + m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &350883107 GameObject: @@ -1224,7 +1094,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 10 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!1 &386695295 GameObject: @@ -1257,7 +1127,7 @@ Transform: - {fileID: 887356093} - {fileID: 712882416} m_Father: {fileID: 0} - m_RootOrder: 8 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &411383572 GameObject: @@ -1384,7 +1254,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 19 + m_RootOrder: 18 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &436028452 GameObject: @@ -1547,7 +1417,7 @@ RectTransform: - {fileID: 770059767} - {fileID: 1774693142} m_Father: {fileID: 0} - m_RootOrder: 18 + m_RootOrder: 17 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1640,20 +1510,19 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 12ea4d85cdda0aa4981a82e5e18fed52, type: 3} m_Name: m_EditorClassIdentifier: + videoStopTime: 1.5 disappearTime: 0.1 area: 0 AppearArea: 0000000001000000 - fakeButton: {fileID: 0} specificPositions: [] roaming: 0.08 + fakeButton: {fileID: 0} isStandbyLoop: 1 standbyClip: {fileID: 11400000, guid: 5b3dac91b0ced2a46b0785831655c98a, type: 2} triggerClips: - {fileID: 11400000, guid: 708f87d2cbae42445846a25f0ca06829, type: 2} - players: [] - videoStopTime: 1.5 - debug: 0 - debugString: + mode: 0 + info: --- !u!1 &520040865 GameObject: m_ObjectHideFlags: 0 @@ -1734,7 +1603,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 23 + m_RootOrder: 22 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &528715328 GameObject: @@ -2010,7 +1879,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 12 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &712882415 GameObject: @@ -2091,7 +1960,7 @@ Transform: - {fileID: 1167120023} - {fileID: 165270301} m_Father: {fileID: 0} - m_RootOrder: 11 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &750667758 GameObject: @@ -2141,7 +2010,7 @@ RectTransform: m_Children: - {fileID: 1000268179} m_Father: {fileID: 0} - m_RootOrder: 21 + m_RootOrder: 20 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -2174,7 +2043,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 16 + m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &768391776 GameObject: @@ -2553,6 +2422,136 @@ MonoBehaviour: material: {fileID: 2100000, guid: 0858735f439783448b9cc855a56a9e94, type: 2} shader: {fileID: 7200000, guid: 12722f65bf7d89d448b703b34b9e4dcb, type: 3} references: [] +--- !u!43 &778926529 +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 &810572921 GameObject: m_ObjectHideFlags: 0 @@ -3214,21 +3213,20 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 12ea4d85cdda0aa4981a82e5e18fed52, type: 3} m_Name: m_EditorClassIdentifier: + videoStopTime: 10 disappearTime: 1 area: 0 AppearArea: 02000000 - fakeButton: {fileID: 0} specificPositions: - {fileID: 1216863878} roaming: 0 + fakeButton: {fileID: 0} isStandbyLoop: 1 standbyClip: {fileID: 11400000, guid: 1691548c0a5a4494ba5e2c29ec477d7d, type: 2} triggerClips: - {fileID: 11400000, guid: 6ccf813116f07944faf4af6bc3b2c1f7, type: 2} - players: [] - videoStopTime: 10 - debug: 0 - debugString: + mode: 0 + info: --- !u!114 &1216863878 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3283,20 +3281,19 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 12ea4d85cdda0aa4981a82e5e18fed52, type: 3} m_Name: m_EditorClassIdentifier: - disappearTime: 1 + videoStopTime: 0.5 + disappearTime: 0.5 area: 0 - AppearArea: 000000000100000002000000 - fakeButton: {fileID: 0} + AppearArea: 0000000001000000 specificPositions: [] roaming: 0 + fakeButton: {fileID: 0} isStandbyLoop: 1 standbyClip: {fileID: 11400000, guid: f2f10fb696e1a6145b55378c7c7ec9df, type: 2} triggerClips: - {fileID: 11400000, guid: d3a9925b2d77cce4a8fc3215dbaf41e1, type: 2} - players: [] - videoStopTime: 1 - debug: 0 - debugString: + mode: 0 + info: --- !u!1 &1227078084 GameObject: m_ObjectHideFlags: 0 @@ -3542,7 +3539,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 17 + m_RootOrder: 16 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1329758486 GameObject: @@ -3756,7 +3753,7 @@ MeshFilter: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1379541361} - m_Mesh: {fileID: 321841692} + m_Mesh: {fileID: 778926529} --- !u!1 &1390635887 GameObject: m_ObjectHideFlags: 0 @@ -3864,7 +3861,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 13 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!1 &1561705233 GameObject: @@ -4051,21 +4048,20 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 12ea4d85cdda0aa4981a82e5e18fed52, type: 3} m_Name: m_EditorClassIdentifier: + videoStopTime: 10 disappearTime: 1 area: 2 AppearArea: 02000000 - fakeButton: {fileID: 0} specificPositions: - {fileID: 1690794391} roaming: 0 + fakeButton: {fileID: 0} isStandbyLoop: 0 standbyClip: {fileID: 11400000, guid: dfdc3af2e37491840b05776ce71e1ca8, type: 2} triggerClips: - {fileID: 11400000, guid: a6af2089baf7ed8489a4e941dae4e928, type: 2} - players: [] - videoStopTime: 10 - debug: 0 - debugString: + mode: 0 + info: --- !u!114 &1690794391 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4162,61 +4158,6 @@ MeshFilter: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1718259912} m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} ---- !u!1 &1761700811 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 - m_Component: - - component: {fileID: 1761700813} - - component: {fileID: 1761700812} - m_Layer: 0 - m_Name: GrpcNetworkDiscovery - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1761700812 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1761700811} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2bd8ad095eeba3e4faab18e84e7fae76, type: 3} - m_Name: - m_EditorClassIdentifier: - m_BroadcastPort: 47777 - m_BroadcastKey: 2222 - m_BroadcastVersion: 1 - m_BroadcastSubVersion: 1 - m_BroadcastInterval: 1000 - m_UseNetworkManager: 0 - m_BroadcastData: HELLO - m_ShowGUI: 0 - m_OffsetX: 0 - m_OffsetY: 0 - onReceivedBroadcast: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UltraCombos.GrpcNetworkDiscovery+MessageEvent, Assembly-CSharp, Version=0.0.0.0, - Culture=neutral, PublicKeyToken=null ---- !u!4 &1761700813 -Transform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1761700811} - 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: 6 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1765914293 GameObject: m_ObjectHideFlags: 0 @@ -4306,7 +4247,7 @@ RectTransform: - {fileID: 1227078085} - {fileID: 2084135710} m_Father: {fileID: 0} - m_RootOrder: 24 + m_RootOrder: 23 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -4474,7 +4415,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 20 + m_RootOrder: 19 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1817143150 MonoBehaviour: @@ -4856,23 +4797,22 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 12ea4d85cdda0aa4981a82e5e18fed52, type: 3} m_Name: m_EditorClassIdentifier: + videoStopTime: 1 disappearTime: 1 area: 0 AppearArea: 000000000100000002000000 - fakeButton: {fileID: 0} specificPositions: - {fileID: 40068780} - {fileID: 1191975164} roaming: 0 + fakeButton: {fileID: 0} isStandbyLoop: 1 standbyClip: {fileID: 11400000, guid: fb02941bf56531748886776e54c8f2d0, type: 2} triggerClips: - {fileID: 11400000, guid: 86cfefcea0dbaf349b192625aa06ef6a, type: 2} - {fileID: 11400000, guid: 727d0f386e383414ca58642076340e45, type: 2} - players: [] - videoStopTime: 1 - debug: 0 - debugString: + mode: 0 + info: --- !u!1 &1908931425 GameObject: m_ObjectHideFlags: 0 @@ -4937,7 +4877,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 14 + m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1933714480 GameObject: @@ -4982,21 +4922,20 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 12ea4d85cdda0aa4981a82e5e18fed52, type: 3} m_Name: m_EditorClassIdentifier: + videoStopTime: 10 disappearTime: 1 area: 2 AppearArea: 02000000 - fakeButton: {fileID: 0} specificPositions: - {fileID: 1933714487} roaming: 0 + fakeButton: {fileID: 0} isStandbyLoop: 0 standbyClip: {fileID: 11400000, guid: 6d7b66e288bf3924fbd7a716ae3ac255, type: 2} triggerClips: - {fileID: 11400000, guid: 2845fcd21d061464f8f97219a167ba7a, type: 2} - players: [] - videoStopTime: 10 - debug: 0 - debugString: + mode: 0 + info: --- !u!114 &1933714487 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5052,21 +4991,20 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 12ea4d85cdda0aa4981a82e5e18fed52, type: 3} m_Name: m_EditorClassIdentifier: + videoStopTime: 10 disappearTime: 1 area: 0 AppearArea: 02000000 - fakeButton: {fileID: 0} specificPositions: - {fileID: 1973785478} roaming: 0 + fakeButton: {fileID: 0} isStandbyLoop: 1 standbyClip: {fileID: 11400000, guid: aa1bbb3d5a802fb47880c1cf0237dc60, type: 2} triggerClips: - {fileID: 11400000, guid: 2ea2925de6b8a934fa0ea7a7020103b1, type: 2} - players: [] - videoStopTime: 10 - debug: 0 - debugString: + mode: 0 + info: --- !u!114 &1973785478 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5121,20 +5059,19 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 12ea4d85cdda0aa4981a82e5e18fed52, type: 3} m_Name: m_EditorClassIdentifier: - disappearTime: 1 + videoStopTime: 0.5 + disappearTime: 0.5 area: 0 - AppearArea: 000000000100000002000000 - fakeButton: {fileID: 0} + AppearArea: 0000000001000000 specificPositions: [] roaming: 0 + fakeButton: {fileID: 0} isStandbyLoop: 1 standbyClip: {fileID: 11400000, guid: 7b0a38d5d484cf54089379ebbe5c1d9d, type: 2} triggerClips: - {fileID: 11400000, guid: 23773c4900ad46e4f9ba5cb3d1c28912, type: 2} - players: [] - videoStopTime: 1 - debug: 0 - debugString: + mode: 0 + info: --- !u!1 &2008324328 GameObject: m_ObjectHideFlags: 0 @@ -5232,7 +5169,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 22 + m_RootOrder: 21 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2084135709 GameObject: @@ -5359,6 +5296,7 @@ MonoBehaviour: - {fileID: 1973785474} - {fileID: 1984882819} - {fileID: 1225287935} + mode: 0 --- !u!4 &2084936104 Transform: m_ObjectHideFlags: 0 diff --git a/Unity_2018_Frozen/Assets/Frozen/Script/CharacterBehaviour.cs b/Unity_2018_Frozen/Assets/Frozen/Script/CharacterBehaviour.cs index c244a03..9ffe30c 100644 --- a/Unity_2018_Frozen/Assets/Frozen/Script/CharacterBehaviour.cs +++ b/Unity_2018_Frozen/Assets/Frozen/Script/CharacterBehaviour.cs @@ -6,6 +6,7 @@ using UnityEngine.UI; public class CharacterBehaviour : MonoBehaviour { + public float videoStopTime = 1.5f; [Range(0, 15)] public float disappearTime = 5; @@ -14,8 +15,6 @@ public class CharacterBehaviour : MonoBehaviour Vector2 wallRoi; float origin_height = 0.0f; - [SerializeField] - private RectTransform fakeButton; [SerializeField] List specificPositions = new List(); @@ -24,16 +23,19 @@ public class CharacterBehaviour : MonoBehaviour float roaming = 0.0f; float roaming_seed = 0.0f; + [SerializeField] + private RectTransform fakeButton; + [Header("DShow Player")] [SerializeField] bool isStandbyLoop = true; public DShowClip standbyClip; public List triggerClips = new List(); int trigger_clip_index = 0; - [SerializeField] + //[SerializeField] private DShowMoviePlayer[] players; - public float videoStopTime = 1.5f; + enum State { @@ -53,9 +55,9 @@ public class CharacterBehaviour : MonoBehaviour Coroutine flow = null; [SerializeField, Header("Debug")] - bool debug = false; + bool mode = false; [SerializeField] - string debugString; + string info; private void Awake() { @@ -164,7 +166,7 @@ public class CharacterBehaviour : MonoBehaviour IEnumerator Flow() { - if (debug) debugString = "setup"; + if (mode) info = "setup"; // setup { if (specificPositions.Count > 0) @@ -184,7 +186,7 @@ public class CharacterBehaviour : MonoBehaviour yield return null; } - if (debug) debugString = "STANDBY"; + if (mode) info = "STANDBY"; // standby { state = State.STANDBY; @@ -194,7 +196,7 @@ public class CharacterBehaviour : MonoBehaviour while (isTriggered == false) { - if (debug) debugString = "STANDBY is not triggered"; + if (mode) info = "STANDBY is not triggered"; if (player.Loop == false) { @@ -202,7 +204,7 @@ public class CharacterBehaviour : MonoBehaviour { //player.Pause(); //player.Frame = player.TotalNumFrames; - if (debug) debugString = "STANDBY is not triggered and set frame"; + if (mode) info = "STANDBY is not triggered and set frame"; } } @@ -212,7 +214,7 @@ public class CharacterBehaviour : MonoBehaviour } - if (debug) debugString = "TRIGGER"; + if (mode) info = "TRIGGER"; // trigger { state = State.TRIGGER; @@ -221,18 +223,18 @@ public class CharacterBehaviour : MonoBehaviour while (player.IsPlaying) { - if (debug) debugString = "TRIGGER is playing"; + if (mode) info = "TRIGGER is playing"; yield return null; } player.Pause(); player.Frame = player.TotalNumFrames; - if (debug) debugString = "TRIGGER is stopped"; + if (mode) info = "TRIGGER is stopped"; yield return new WaitForSeconds(videoStopTime); } - if (debug) debugString = "SLEEP"; + if (mode) info = "SLEEP"; // sleep { state = State.SLEEP; @@ -315,10 +317,12 @@ public class CharacterBehaviour : MonoBehaviour break; } - - if (Input.GetKeyDown(KeyCode.R)) + if (mode) { - ResetFlow(); + if (Input.GetKeyDown(KeyCode.R)) + { + ResetFlow(); + } } if (flow == null) @@ -337,7 +341,8 @@ public class CharacterBehaviour : MonoBehaviour case Area.TopWall: { float minmax = Mathf.Abs(padding - FrozenScreenToWorldSpace.Instance.width * 0.5f); - float x = Mathf.Clamp(pos.x + noise, -minmax, minmax); + float shift = FrozenScreenToWorldSpace.Instance.Position.x; + float x = Mathf.Clamp(pos.x + noise, -minmax + shift, minmax + shift); transform.position = new Vector3(x, pos.y, pos.z); } break; @@ -345,7 +350,8 @@ public class CharacterBehaviour : MonoBehaviour case Area.RightWall: { float minmax = Mathf.Abs(padding - FrozenScreenToWorldSpace.Instance.length * 0.5f); - float z = Mathf.Clamp(pos.z + noise, -minmax, minmax); + float shift = FrozenScreenToWorldSpace.Instance.Position.z; + float z = Mathf.Clamp(pos.z + noise, -minmax + shift, minmax + shift); transform.position = new Vector3(pos.x, pos.y, z); } break; diff --git a/Unity_2018_Frozen/Assets/Frozen/Script/SceneController.cs b/Unity_2018_Frozen/Assets/Frozen/Script/SceneController.cs index bc0c19f..a293e0c 100644 --- a/Unity_2018_Frozen/Assets/Frozen/Script/SceneController.cs +++ b/Unity_2018_Frozen/Assets/Frozen/Script/SceneController.cs @@ -39,10 +39,13 @@ namespace UltraCombos.Frozen [SerializeField] List nightCharacters = new List(); - //[SerializeField] - //bool debug = false; + float target_rate = 0.0f; + [SerializeField] + bool mode = false; + float stamp = 0.0f; + private void Start() { //debug = false; @@ -50,7 +53,15 @@ namespace UltraCombos.Frozen private void Update() { - //if (debug) + if (mode) + { + if (Time.time - stamp > 10.0f) + { + stamp = Time.time; + target_rate = 1.0f - target_rate; + } + } + { //rate = Mathf.Sin(Time.time * 0.2f) * 0.5f + 0.5f; if (Input.GetKeyDown(KeyCode.PageDown) || Input.GetKeyDown(KeyCode.PageUp)) diff --git a/Unity_2018_Frozen/ProjectSettings/QualitySettings.asset b/Unity_2018_Frozen/ProjectSettings/QualitySettings.asset index 932d866..8d42590 100644 --- a/Unity_2018_Frozen/ProjectSettings/QualitySettings.asset +++ b/Unity_2018_Frozen/ProjectSettings/QualitySettings.asset @@ -162,7 +162,7 @@ QualitySettings: textureQuality: 0 anisotropicTextures: 2 antiAliasing: 0 - softParticles: 1 + softParticles: 0 softVegetation: 1 realtimeReflectionProbes: 1 billboardsFaceCameraPosition: 1 @@ -174,4 +174,5 @@ QualitySettings: asyncUploadBufferSize: 4 resolutionScalingFixedDPIFactor: 1 excludedTargetPlatforms: [] - m_PerPlatformDefaultQuality: {} + m_PerPlatformDefaultQuality: + Standalone: 0