diff --git a/Unity-19050-05-BallPool/Assets/Frozen/Character.prefab b/Unity-19050-05-BallPool/Assets/Frozen/Character.prefab index 3297a3c..89c50b0 100644 --- a/Unity-19050-05-BallPool/Assets/Frozen/Character.prefab +++ b/Unity-19050-05-BallPool/Assets/Frozen/Character.prefab @@ -57,7 +57,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 2969b78c14f1c6f4e941656f8f9cb902, type: 2} + - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -134,7 +134,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 1cdc8e8858ddf8a48ae2acc576bc1ead, type: 2} + - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -166,7 +166,7 @@ GameObject: - component: {fileID: 54049355739133181} - component: {fileID: 54049355739133177} m_Layer: 8 - m_Name: Anna_day + m_Name: Character m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -200,34 +200,22 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 12ea4d85cdda0aa4981a82e5e18fed52, type: 3} m_Name: m_EditorClassIdentifier: - appearSataes: 01000000 - videoStopTime: 10 - disappearTime: 1 - area: 2 + appearSataes: + List: + videoStopTime: 1.5 + disappearTime: 5 + area: 0 appearAreas: - specificPositions: - - {fileID: 54049355739133177} + specificPositions: [] roaming: 0 fakeButton: {fileID: 0} - isStandbyLoop: 0 - standbyClip: {fileID: 11400000, guid: 6d7b66e288bf3924fbd7a716ae3ac255, type: 2} - triggerClips: - - {fileID: 11400000, guid: 2845fcd21d061464f8f97219a167ba7a, type: 2} - triggerFrame: 45 + isStandbyLoop: 1 + standbyClip: {fileID: 0} + triggerClips: [] + triggerFrame: 0 onTrigger: m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 0} - m_MethodName: PlayOneShot - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 + m_Calls: [] mode: 0 info: --- !u!114 &54049355739133177 diff --git a/Unity-19050-05-BallPool/Assets/Frozen/Frozen.unity b/Unity-19050-05-BallPool/Assets/Frozen/Frozen.unity index 67e3599..b260455 100644 --- a/Unity-19050-05-BallPool/Assets/Frozen/Frozen.unity +++ b/Unity-19050-05-BallPool/Assets/Frozen/Frozen.unity @@ -198,6 +198,8 @@ GameObject: - component: {fileID: 38018604} - component: {fileID: 38018606} - component: {fileID: 38018605} + - component: {fileID: 38018607} + - component: {fileID: 38018609} m_Layer: 8 m_Name: standby m_TagString: Untagged @@ -264,6 +266,44 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 38018603} m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!64 &38018607 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 38018603} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Convex: 0 + m_CookingOptions: 14 + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!114 &38018609 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 38018603} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 03a44ad9104fd3349addf7d3ff2435a6, type: 3} + m_Name: + m_EditorClassIdentifier: + onPointerDown: + m_PersistentCalls: + m_Calls: [] + onPointerUp: + m_PersistentCalls: + m_Calls: [] + onPointerDrag: + m_PersistentCalls: + m_Calls: [] + onPointerExit: + m_PersistentCalls: + m_Calls: [] --- !u!1 &40068778 GameObject: m_ObjectHideFlags: 0 @@ -366,6 +406,8 @@ GameObject: - component: {fileID: 47501850} - component: {fileID: 47501852} - component: {fileID: 47501851} + - component: {fileID: 47501854} + - component: {fileID: 47501853} m_Layer: 8 m_Name: standby m_TagString: Untagged @@ -432,6 +474,44 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 47501849} m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!114 &47501853 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 47501849} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 03a44ad9104fd3349addf7d3ff2435a6, type: 3} + m_Name: + m_EditorClassIdentifier: + onPointerDown: + m_PersistentCalls: + m_Calls: [] + onPointerUp: + m_PersistentCalls: + m_Calls: [] + onPointerDrag: + m_PersistentCalls: + m_Calls: [] + onPointerExit: + m_PersistentCalls: + m_Calls: [] +--- !u!64 &47501854 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 47501849} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Convex: 0 + m_CookingOptions: 14 + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &60963458 GameObject: m_ObjectHideFlags: 0 @@ -475,6 +555,8 @@ GameObject: - component: {fileID: 64793644} - component: {fileID: 64793646} - component: {fileID: 64793645} + - component: {fileID: 64793648} + - component: {fileID: 64793647} m_Layer: 8 m_Name: standby m_TagString: Untagged @@ -541,6 +623,44 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 64793643} m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!114 &64793647 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 64793643} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 03a44ad9104fd3349addf7d3ff2435a6, type: 3} + m_Name: + m_EditorClassIdentifier: + onPointerDown: + m_PersistentCalls: + m_Calls: [] + onPointerUp: + m_PersistentCalls: + m_Calls: [] + onPointerDrag: + m_PersistentCalls: + m_Calls: [] + onPointerExit: + m_PersistentCalls: + m_Calls: [] +--- !u!64 &64793648 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 64793643} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Convex: 0 + m_CookingOptions: 14 + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &66098174 GameObject: m_ObjectHideFlags: 0 @@ -830,6 +950,8 @@ GameObject: - component: {fileID: 188375361} - component: {fileID: 188375363} - component: {fileID: 188375362} + - component: {fileID: 188375365} + - component: {fileID: 188375364} m_Layer: 8 m_Name: standby m_TagString: Untagged @@ -896,6 +1018,44 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 188375360} m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!114 &188375364 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 188375360} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 03a44ad9104fd3349addf7d3ff2435a6, type: 3} + m_Name: + m_EditorClassIdentifier: + onPointerDown: + m_PersistentCalls: + m_Calls: [] + onPointerUp: + m_PersistentCalls: + m_Calls: [] + onPointerDrag: + m_PersistentCalls: + m_Calls: [] + onPointerExit: + m_PersistentCalls: + m_Calls: [] +--- !u!64 &188375365 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 188375360} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Convex: 0 + m_CookingOptions: 14 + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &199010597 GameObject: m_ObjectHideFlags: 0 @@ -958,6 +1118,8 @@ GameObject: - component: {fileID: 216370229} - component: {fileID: 216370231} - component: {fileID: 216370230} + - component: {fileID: 216370233} + - component: {fileID: 216370232} m_Layer: 8 m_Name: standby m_TagString: Untagged @@ -1024,6 +1186,44 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 216370228} m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!114 &216370232 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 216370228} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 03a44ad9104fd3349addf7d3ff2435a6, type: 3} + m_Name: + m_EditorClassIdentifier: + onPointerDown: + m_PersistentCalls: + m_Calls: [] + onPointerUp: + m_PersistentCalls: + m_Calls: [] + onPointerDrag: + m_PersistentCalls: + m_Calls: [] + onPointerExit: + m_PersistentCalls: + m_Calls: [] +--- !u!64 &216370233 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 216370228} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Convex: 0 + m_CookingOptions: 14 + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &234989373 GameObject: m_ObjectHideFlags: 0 @@ -2068,6 +2268,8 @@ GameObject: - component: {fileID: 436028453} - component: {fileID: 436028457} - component: {fileID: 436028456} + - component: {fileID: 436028455} + - component: {fileID: 436028454} m_Layer: 8 m_Name: standby m_TagString: Untagged @@ -2089,6 +2291,44 @@ Transform: m_Father: {fileID: 1984882816} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &436028454 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 436028452} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 03a44ad9104fd3349addf7d3ff2435a6, type: 3} + m_Name: + m_EditorClassIdentifier: + onPointerDown: + m_PersistentCalls: + m_Calls: [] + onPointerUp: + m_PersistentCalls: + m_Calls: [] + onPointerDrag: + m_PersistentCalls: + m_Calls: [] + onPointerExit: + m_PersistentCalls: + m_Calls: [] +--- !u!64 &436028455 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 436028452} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Convex: 0 + m_CookingOptions: 14 + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!23 &436028456 MeshRenderer: m_ObjectHideFlags: 0 @@ -2429,6 +2669,8 @@ GameObject: - component: {fileID: 575691239} - component: {fileID: 575691241} - component: {fileID: 575691240} + - component: {fileID: 575691243} + - component: {fileID: 575691242} m_Layer: 8 m_Name: standby m_TagString: Untagged @@ -2495,6 +2737,44 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 575691238} m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!114 &575691242 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 575691238} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 03a44ad9104fd3349addf7d3ff2435a6, type: 3} + m_Name: + m_EditorClassIdentifier: + onPointerDown: + m_PersistentCalls: + m_Calls: [] + onPointerUp: + m_PersistentCalls: + m_Calls: [] + onPointerDrag: + m_PersistentCalls: + m_Calls: [] + onPointerExit: + m_PersistentCalls: + m_Calls: [] +--- !u!64 &575691243 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 575691238} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Convex: 0 + m_CookingOptions: 14 + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &603456584 GameObject: m_ObjectHideFlags: 0 @@ -2634,12 +2914,12 @@ PrefabInstance: - target: {fileID: 114872970294644716, guid: 1f68bf7cec2600e49a46d2f0554453c8, type: 3} propertyPath: customRoi.height - value: 800 + value: 1260 objectReference: {fileID: 0} - target: {fileID: 114872970294644716, guid: 1f68bf7cec2600e49a46d2f0554453c8, type: 3} propertyPath: customRoi.x - value: 570 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1f68bf7cec2600e49a46d2f0554453c8, type: 3} @@ -3130,6 +3410,8 @@ GameObject: - component: {fileID: 768391777} - component: {fileID: 768391780} - component: {fileID: 768391779} + - component: {fileID: 768391781} + - component: {fileID: 768391778} m_Layer: 8 m_Name: standby m_TagString: Untagged @@ -3151,6 +3433,30 @@ Transform: m_Father: {fileID: 1216863872} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &768391778 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 768391776} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 03a44ad9104fd3349addf7d3ff2435a6, type: 3} + m_Name: + m_EditorClassIdentifier: + onPointerDown: + m_PersistentCalls: + m_Calls: [] + onPointerUp: + m_PersistentCalls: + m_Calls: [] + onPointerDrag: + m_PersistentCalls: + m_Calls: [] + onPointerExit: + m_PersistentCalls: + m_Calls: [] --- !u!23 &768391779 MeshRenderer: m_ObjectHideFlags: 0 @@ -3196,6 +3502,20 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 768391776} m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!64 &768391781 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 768391776} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Convex: 0 + m_CookingOptions: 14 + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &770059766 GameObject: m_ObjectHideFlags: 0 @@ -3712,168 +4032,8 @@ MonoBehaviour: m_CallState: 2 mode: 0 info: ---- !u!43 &1011445328 -Mesh: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: 'Space Ground Mesh: (8x5x3)' - serializedVersion: 9 - 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_VertexData: - serializedVersion: 2 - 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: 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 - - 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 - - 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_MeshMetrics[0]: 1 - m_MeshMetrics[1]: 1 - m_MeshOptimized: 0 - m_StreamData: - offset: 0 - size: 0 - path: ---- !u!1 &1061158671 -GameObject: +--- !u!1 &1061158671 +GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -4334,12 +4494,12 @@ PrefabInstance: - target: {fileID: 114802992808559142, guid: 65310f6d57df29045b6fa71ac0ceb175, type: 3} propertyPath: resolution.x - value: 1830 + value: 1260 objectReference: {fileID: 0} - target: {fileID: 114802992808559142, guid: 65310f6d57df29045b6fa71ac0ceb175, type: 3} propertyPath: resolution.y - value: 800 + value: 1260 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 65310f6d57df29045b6fa71ac0ceb175, type: 3} @@ -4535,6 +4695,8 @@ GameObject: - component: {fileID: 1216801759} - component: {fileID: 1216801761} - component: {fileID: 1216801760} + - component: {fileID: 1216801763} + - component: {fileID: 1216801762} m_Layer: 8 m_Name: standby m_TagString: Untagged @@ -4601,6 +4763,44 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1216801758} m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!114 &1216801762 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1216801758} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 03a44ad9104fd3349addf7d3ff2435a6, type: 3} + m_Name: + m_EditorClassIdentifier: + onPointerDown: + m_PersistentCalls: + m_Calls: [] + onPointerUp: + m_PersistentCalls: + m_Calls: [] + onPointerDrag: + m_PersistentCalls: + m_Calls: [] + onPointerExit: + m_PersistentCalls: + m_Calls: [] +--- !u!64 &1216801763 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1216801758} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Convex: 0 + m_CookingOptions: 14 + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &1216863871 GameObject: m_ObjectHideFlags: 0 @@ -4798,11 +4998,11 @@ RectTransform: m_Father: {fileID: 1765914297} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 570, y: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 1260, y: 800} - m_Pivot: {x: 0, y: 1} + m_Pivot: {x: 1, y: 1} --- !u!114 &1227078087 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5238,6 +5438,8 @@ GameObject: - component: {fileID: 1355871872} - component: {fileID: 1355871874} - component: {fileID: 1355871873} + - component: {fileID: 1355871876} + - component: {fileID: 1355871875} m_Layer: 8 m_Name: standby m_TagString: Untagged @@ -5304,6 +5506,44 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1355871871} m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!114 &1355871875 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1355871871} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 03a44ad9104fd3349addf7d3ff2435a6, type: 3} + m_Name: + m_EditorClassIdentifier: + onPointerDown: + m_PersistentCalls: + m_Calls: [] + onPointerUp: + m_PersistentCalls: + m_Calls: [] + onPointerDrag: + m_PersistentCalls: + m_Calls: [] + onPointerExit: + m_PersistentCalls: + m_Calls: [] +--- !u!64 &1355871876 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1355871871} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Convex: 0 + m_CookingOptions: 14 + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &1373766506 GameObject: m_ObjectHideFlags: 0 @@ -5431,7 +5671,7 @@ MeshFilter: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1379541361} - m_Mesh: {fileID: 1011445328} + m_Mesh: {fileID: 1559577838} --- !u!114 &1379541365 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5725,6 +5965,7 @@ GameObject: - component: {fileID: 1451842897} - component: {fileID: 1451842900} - component: {fileID: 1451842899} + - component: {fileID: 1451842901} m_Layer: 10 m_Name: Scene Camera m_TagString: Untagged @@ -5755,7 +5996,7 @@ Camera: width: 1 height: 1 near clip plane: 0.3 - far clip plane: 1000 + far clip plane: 8 field of view: 90 orthographic: 0 orthographic size: 5 @@ -5865,6 +6106,23 @@ MonoBehaviour: m_BeforeTransparentBundles: [] m_BeforeStackBundles: [] m_AfterStackBundles: [] +--- !u!114 &1451842901 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1451842896} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 786e3b3eed9b8394dbf067cd406ca814, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EventMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_MaxRayIntersections: 0 + MonitorCamera: {fileID: 520040868} --- !u!1 &1470412008 GameObject: m_ObjectHideFlags: 0 @@ -5876,6 +6134,8 @@ GameObject: - component: {fileID: 1470412009} - component: {fileID: 1470412011} - component: {fileID: 1470412010} + - component: {fileID: 1470412013} + - component: {fileID: 1470412012} m_Layer: 8 m_Name: standby m_TagString: Untagged @@ -5942,6 +6202,44 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1470412008} m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!114 &1470412012 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1470412008} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 03a44ad9104fd3349addf7d3ff2435a6, type: 3} + m_Name: + m_EditorClassIdentifier: + onPointerDown: + m_PersistentCalls: + m_Calls: [] + onPointerUp: + m_PersistentCalls: + m_Calls: [] + onPointerDrag: + m_PersistentCalls: + m_Calls: [] + onPointerExit: + m_PersistentCalls: + m_Calls: [] +--- !u!64 &1470412013 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1470412008} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Convex: 0 + m_CookingOptions: 14 + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &1533221621 GameObject: m_ObjectHideFlags: 0 @@ -5976,6 +6274,166 @@ Transform: m_Father: {fileID: 96822206} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!43 &1559577838 +Mesh: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: 'Space Ground Mesh: (8x5x3)' + serializedVersion: 9 + 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_VertexData: + serializedVersion: 2 + 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: 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 + - 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 + - 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_MeshMetrics[0]: 1 + m_MeshMetrics[1]: 1 + m_MeshOptimized: 0 + m_StreamData: + offset: 0 + size: 0 + path: --- !u!1 &1561705233 GameObject: m_ObjectHideFlags: 0 @@ -6051,8 +6509,78 @@ MeshFilter: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1561705233} - m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} + m_GameObject: {fileID: 1561705233} + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &1640244022 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1640244023} + - component: {fileID: 1640244025} + - component: {fileID: 1640244024} + m_Layer: 5 + m_Name: RawImage Scene + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1640244023 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1640244022} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.25, y: 0.25, z: 0.25} + m_Children: [] + m_Father: {fileID: 1765914297} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 5040, y: 5040} + m_Pivot: {x: 1, y: 1} +--- !u!114 &1640244024 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1640244022} + 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: 8400000, guid: 1ded3bafa85a18b4f87c48288b4439a1, type: 2} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 +--- !u!222 &1640244025 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1640244022} + m_CullTransparentMesh: 0 --- !u!1 &1653619180 GameObject: m_ObjectHideFlags: 0 @@ -6141,6 +6669,8 @@ GameObject: - component: {fileID: 1674052467} - component: {fileID: 1674052469} - component: {fileID: 1674052468} + - component: {fileID: 1674052471} + - component: {fileID: 1674052470} m_Layer: 8 m_Name: standby m_TagString: Untagged @@ -6207,6 +6737,44 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1674052466} m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!114 &1674052470 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1674052466} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 03a44ad9104fd3349addf7d3ff2435a6, type: 3} + m_Name: + m_EditorClassIdentifier: + onPointerDown: + m_PersistentCalls: + m_Calls: [] + onPointerUp: + m_PersistentCalls: + m_Calls: [] + onPointerDrag: + m_PersistentCalls: + m_Calls: [] + onPointerExit: + m_PersistentCalls: + m_Calls: [] +--- !u!64 &1674052471 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1674052466} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Convex: 0 + m_CookingOptions: 14 + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &1679617815 GameObject: m_ObjectHideFlags: 0 @@ -6279,6 +6847,8 @@ GameObject: - component: {fileID: 1686473287} - component: {fileID: 1686473289} - component: {fileID: 1686473288} + - component: {fileID: 1686473291} + - component: {fileID: 1686473290} m_Layer: 8 m_Name: standby m_TagString: Untagged @@ -6345,6 +6915,44 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1686473286} m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!114 &1686473290 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1686473286} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 03a44ad9104fd3349addf7d3ff2435a6, type: 3} + m_Name: + m_EditorClassIdentifier: + onPointerDown: + m_PersistentCalls: + m_Calls: [] + onPointerUp: + m_PersistentCalls: + m_Calls: [] + onPointerDrag: + m_PersistentCalls: + m_Calls: [] + onPointerExit: + m_PersistentCalls: + m_Calls: [] +--- !u!64 &1686473291 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1686473286} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Convex: 0 + m_CookingOptions: 14 + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &1690794384 GameObject: m_ObjectHideFlags: 0 @@ -6537,6 +7145,8 @@ GameObject: - component: {fileID: 1719420170} - component: {fileID: 1719420172} - component: {fileID: 1719420171} + - component: {fileID: 1719420174} + - component: {fileID: 1719420173} m_Layer: 8 m_Name: standby m_TagString: Untagged @@ -6603,6 +7213,44 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1719420169} m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!114 &1719420173 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1719420169} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 03a44ad9104fd3349addf7d3ff2435a6, type: 3} + m_Name: + m_EditorClassIdentifier: + onPointerDown: + m_PersistentCalls: + m_Calls: [] + onPointerUp: + m_PersistentCalls: + m_Calls: [] + onPointerDrag: + m_PersistentCalls: + m_Calls: [] + onPointerExit: + m_PersistentCalls: + m_Calls: [] +--- !u!64 &1719420174 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1719420169} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Convex: 0 + m_CookingOptions: 14 + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &1722222726 GameObject: m_ObjectHideFlags: 0 @@ -6614,6 +7262,8 @@ GameObject: - component: {fileID: 1722222727} - component: {fileID: 1722222729} - component: {fileID: 1722222728} + - component: {fileID: 1722222731} + - component: {fileID: 1722222730} m_Layer: 8 m_Name: standby m_TagString: Untagged @@ -6680,6 +7330,44 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1722222726} m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!114 &1722222730 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1722222726} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 03a44ad9104fd3349addf7d3ff2435a6, type: 3} + m_Name: + m_EditorClassIdentifier: + onPointerDown: + m_PersistentCalls: + m_Calls: [] + onPointerUp: + m_PersistentCalls: + m_Calls: [] + onPointerDrag: + m_PersistentCalls: + m_Calls: [] + onPointerExit: + m_PersistentCalls: + m_Calls: [] +--- !u!64 &1722222731 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1722222726} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Convex: 0 + m_CookingOptions: 14 + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &1765914293 GameObject: m_ObjectHideFlags: 0 @@ -6772,6 +7460,7 @@ RectTransform: m_Children: - {fileID: 1227078085} - {fileID: 1901892189} + - {fileID: 1640244023} m_Father: {fileID: 0} m_RootOrder: 23 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -7040,6 +7729,8 @@ GameObject: - component: {fileID: 1858061293} - component: {fileID: 1858061297} - component: {fileID: 1858061296} + - component: {fileID: 1858061295} + - component: {fileID: 1858061294} m_Layer: 8 m_Name: standby m_TagString: Untagged @@ -7061,6 +7752,44 @@ Transform: m_Father: {fileID: 1690794385} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1858061294 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1858061292} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 03a44ad9104fd3349addf7d3ff2435a6, type: 3} + m_Name: + m_EditorClassIdentifier: + onPointerDown: + m_PersistentCalls: + m_Calls: [] + onPointerUp: + m_PersistentCalls: + m_Calls: [] + onPointerDrag: + m_PersistentCalls: + m_Calls: [] + onPointerExit: + m_PersistentCalls: + m_Calls: [] +--- !u!64 &1858061295 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1858061292} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Convex: 0 + m_CookingOptions: 14 + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!23 &1858061296 MeshRenderer: m_ObjectHideFlags: 0 @@ -7117,6 +7846,8 @@ GameObject: - component: {fileID: 1866235076} - component: {fileID: 1866235078} - component: {fileID: 1866235077} + - component: {fileID: 1866235080} + - component: {fileID: 1866235079} m_Layer: 8 m_Name: standby m_TagString: Untagged @@ -7183,6 +7914,44 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1866235075} m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!114 &1866235079 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1866235075} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 03a44ad9104fd3349addf7d3ff2435a6, type: 3} + m_Name: + m_EditorClassIdentifier: + onPointerDown: + m_PersistentCalls: + m_Calls: [] + onPointerUp: + m_PersistentCalls: + m_Calls: [] + onPointerDrag: + m_PersistentCalls: + m_Calls: [] + onPointerExit: + m_PersistentCalls: + m_Calls: [] +--- !u!64 &1866235080 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1866235075} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Convex: 0 + m_CookingOptions: 14 + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &1878556045 GameObject: m_ObjectHideFlags: 0 @@ -7301,6 +8070,10 @@ PrefabInstance: propertyPath: m_Name value: Control Panel objectReference: {fileID: 0} + - target: {fileID: 1346705160736784, guid: 7aba709da85d1c2439af18a2c2e1548c, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 224152212506828798, guid: 7aba709da85d1c2439af18a2c2e1548c, type: 3} propertyPath: m_LocalPosition.x @@ -7524,12 +8297,12 @@ PrefabInstance: - target: {fileID: 5748129664144205097, guid: 7aba709da85d1c2439af18a2c2e1548c, type: 3} propertyPath: controls.List.Array.data[0].member - value: rate + value: standbyTime objectReference: {fileID: 0} - target: {fileID: 5748129664144205097, guid: 7aba709da85d1c2439af18a2c2e1548c, type: 3} propertyPath: controls.List.Array.data[0].prettyName - value: Rate + value: Standby Time objectReference: {fileID: 0} - target: {fileID: 224343345892171400, guid: 7aba709da85d1c2439af18a2c2e1548c, type: 3} @@ -7813,17 +8586,17 @@ PrefabInstance: - target: {fileID: 6552662589959395768, guid: 7aba709da85d1c2439af18a2c2e1548c, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 0.8045 objectReference: {fileID: 0} - target: {fileID: 6552662589959395768, guid: 7aba709da85d1c2439af18a2c2e1548c, type: 3} propertyPath: m_AnchorMax.x - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6552662589959395768, guid: 7aba709da85d1c2439af18a2c2e1548c, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 0.9995 objectReference: {fileID: 0} - target: {fileID: 5140708528803904765, guid: 7aba709da85d1c2439af18a2c2e1548c, type: 3} @@ -7970,25 +8743,29 @@ MonoBehaviour: PixelsByMeter: 360 finalPixelsByMeter: 90 LeftWall: - X: 0 - Y: 0 - ROI_X: 0 - ROI_Y: 0 + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 TopWall: - X: 0 - Y: 0 - ROI_X: 0 - ROI_Y: 0 + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 RightWall: - X: 0 - Y: 0 - ROI_X: 0 - ROI_Y: 0 + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 Floor: - X: 0 - Y: 0 - ROI_X: 0 - ROI_Y: 0 + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 --- !u!4 &1908931427 Transform: m_ObjectHideFlags: 0 @@ -8490,13 +9267,6 @@ MonoBehaviour: persistance: 1 state: 2 standbyTime: 10 - rate: 0 - spaceMaterials: [] - daySnowSize: 0.01 - nightSnowSize: 0.02 - snowMaterial: {fileID: 2100000, guid: 56457e5f2df74a44c933b2791da81324, type: 2} - nightKinectAmount: 30 - dayParticleRate: 0.1 onSceneStandby: m_PersistentCalls: m_Calls: @@ -8573,6 +9343,9 @@ MonoBehaviour: m_BoolArgument: 0 m_CallState: 2 stamp: 0 + rate: 0 + spaceMaterials: [] + characters: [] --- !u!4 &2084936104 Transform: m_ObjectHideFlags: 0 @@ -8598,6 +9371,8 @@ GameObject: - component: {fileID: 2086317001} - component: {fileID: 2086317003} - component: {fileID: 2086317002} + - component: {fileID: 2086317005} + - component: {fileID: 2086317004} m_Layer: 8 m_Name: standby m_TagString: Untagged @@ -8664,3 +9439,41 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2086317000} m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!114 &2086317004 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2086317000} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 03a44ad9104fd3349addf7d3ff2435a6, type: 3} + m_Name: + m_EditorClassIdentifier: + onPointerDown: + m_PersistentCalls: + m_Calls: [] + onPointerUp: + m_PersistentCalls: + m_Calls: [] + onPointerDrag: + m_PersistentCalls: + m_Calls: [] + onPointerExit: + m_PersistentCalls: + m_Calls: [] +--- !u!64 &2086317005 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2086317000} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Convex: 0 + m_CookingOptions: 14 + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} diff --git a/Unity-19050-05-BallPool/Assets/Frozen/Script/CharacterBehaviour.cs b/Unity-19050-05-BallPool/Assets/Frozen/Script/CharacterBehaviour.cs index fb6c24f..11ce227 100644 --- a/Unity-19050-05-BallPool/Assets/Frozen/Script/CharacterBehaviour.cs +++ b/Unity-19050-05-BallPool/Assets/Frozen/Script/CharacterBehaviour.cs @@ -33,7 +33,7 @@ namespace UltraCombos.Frozen [SerializeField] private RectTransform fakeButton; - private CanvasGroup canvas_group; + // private CanvasGroup canvas_group; [Header("DShow Player")] [SerializeField] @@ -109,26 +109,32 @@ namespace UltraCombos.Frozen { if (fakeButton != null) return; - GameObject obj = new GameObject(gameObject.name); - obj.transform.parent = GameObject.Find("Final Canvas").transform.Find("RawImage"); - fakeButton = obj.AddComponent(); - fakeButton.anchorMin = new Vector2(0, 0); - fakeButton.anchorMax = new Vector2(0, 0); - fakeButton.pivot = new Vector2(0.5f, 0.5f); - var standby_scale = renderers[(int)Status.STANDBY].transform.localScale; - fakeButton.sizeDelta = new Vector2(standby_scale.x, standby_scale.y) * FrozenScreenToWorldSpace.Instance.finalPixelsByMeter; - fakeButton.sizeDelta = Vector2.Min(fakeButton.sizeDelta, Vector2.one * 100.0f); - fakeButton.sizeDelta = Vector2.Max(fakeButton.sizeDelta, Vector2.one * 60.0f); - fakeButton.anchoredPosition3D = new Vector3(0, 0, 0); - fakeButton.localScale = Vector3.one; - fakeButton.gameObject.AddComponent(); - fakeButton.GetComponent().color = new Color(1, 1, 1, 0); - TouchArea touch_area = fakeButton.gameObject.AddComponent(); - touch_area.PointerDown.AddListener((data) => { Trigger(data); }); - touch_area.PointerDrag.AddListener((data) => { Trigger(data); }); - canvas_group = fakeButton.gameObject.AddComponent(); - canvas_group.blocksRaycasts = true; - canvas_group.interactable = true; + // GameObject obj = new GameObject(gameObject.name); + // obj.transform.parent = GameObject.Find("Final Canvas").transform.Find("RawImage"); + // fakeButton = obj.AddComponent(); + // fakeButton.anchorMin = new Vector2(0, 0); + // fakeButton.anchorMax = new Vector2(0, 0); + // fakeButton.pivot = new Vector2(0.5f, 0.5f); + // var standby_scale = renderers[(int)Status.STANDBY].transform.localScale; + // fakeButton.sizeDelta = new Vector2(standby_scale.x, standby_scale.y) * FrozenScreenToWorldSpace.Instance.finalPixelsByMeter; + // fakeButton.sizeDelta = Vector2.Min(fakeButton.sizeDelta, Vector2.one * 100.0f); + // fakeButton.sizeDelta = Vector2.Max(fakeButton.sizeDelta, Vector2.one * 60.0f); + // fakeButton.anchoredPosition3D = new Vector3(0, 0, 0); + // fakeButton.localScale = Vector3.one; + // fakeButton.gameObject.AddComponent(); + // fakeButton.GetComponent().color = new Color(1, 1, 1, 0); + // TouchArea touch_area = fakeButton.gameObject.AddComponent(); + // touch_area.PointerDown.AddListener((data) => { Trigger(data); }); + // touch_area.PointerDrag.AddListener((data) => { Trigger(data); }); + TestTouch test_touch = GetComponentInChildren(); + if (test_touch != null) + { + test_touch.onPointerDown.AddListener((data) => { Trigger(data); }); + test_touch.onPointerDrag.AddListener((data) => { Trigger(data); }); + } + // canvas_group = fakeButton.gameObject.AddComponent(); + // canvas_group.blocksRaycasts = true; + // canvas_group.interactable = true; } private void Start() @@ -154,10 +160,9 @@ namespace UltraCombos.Frozen if (fakeButton != null) { fakeButton.gameObject.SetActive(true); - canvas_group.interactable = true; - canvas_group.blocksRaycasts = true; + // canvas_group.interactable = true; + // canvas_group.blocksRaycasts = true; } - } private void OnDisable() @@ -165,8 +170,8 @@ namespace UltraCombos.Frozen if (fakeButton != null) { fakeButton.gameObject.SetActive(false); - canvas_group.interactable = false; - canvas_group.blocksRaycasts = false; + // canvas_group.interactable = false; + // canvas_group.blocksRaycasts = false; } } @@ -246,8 +251,8 @@ namespace UltraCombos.Frozen if (mode) info = "STANDBY"; // standby { - canvas_group.interactable = true; - canvas_group.blocksRaycasts = true; + // canvas_group.interactable = true; + // canvas_group.blocksRaycasts = true; status = Status.STANDBY; var player = StatePlayer; player.Loop = isStandbyLoop; @@ -274,8 +279,8 @@ namespace UltraCombos.Frozen if (mode) info = "TRIGGER"; // trigger { - canvas_group.interactable = false; - canvas_group.blocksRaycasts = false; + // canvas_group.interactable = false; + // canvas_group.blocksRaycasts = false; onTrigger.Invoke(); status = Status.TRIGGER; var player = StatePlayer; @@ -451,7 +456,6 @@ namespace UltraCombos.Frozen void RandomPos() { float minX = renderers[(int)Status.TRIGGER].transform.localScale.x / 2; -#if true switch (area) { case Area.TopWall: @@ -462,13 +466,7 @@ namespace UltraCombos.Frozen wallRoi.x = Random.Range(minX, FrozenScreenToWorldSpace.Instance.depth - minX) / FrozenScreenToWorldSpace.Instance.depth; break; } -#else - Vector3 randomPos = transform.localPosition; - if (randomPos.x == 0) - wallRoi.x = Random.Range(minX, FrozenScreenToWorldSpace.Instance.width - minX) / FrozenScreenToWorldSpace.Instance.width; - else - wallRoi.x = Random.Range(minX, FrozenScreenToWorldSpace.Instance.length - minX) / FrozenScreenToWorldSpace.Instance.length; -#endif + wallRoi.y = origin_height / FrozenScreenToWorldSpace.Instance.height; UpdatePos(); UpdateButtonPos(); @@ -476,7 +474,6 @@ namespace UltraCombos.Frozen void UpdatePos() { -#if true Vector3 n_pos = transform.position; switch (area) { @@ -490,16 +487,6 @@ namespace UltraCombos.Frozen } n_pos.y = Mathf.Lerp(0.0f, FrozenScreenToWorldSpace.Instance.height, wallRoi.y); transform.position = n_pos + FrozenScreenToWorldSpace.Instance.Position; -#else - Vector3 n_pos = transform.localPosition; - - if (area == Area.TopWall) - n_pos.x = Mathf.Lerp(-FrozenScreenToWorldSpace.Instance.width / 2, FrozenScreenToWorldSpace.Instance.width / 2, wallRoi.x); - else - n_pos.z = Mathf.Lerp(-FrozenScreenToWorldSpace.Instance.length / 2, FrozenScreenToWorldSpace.Instance.length / 2, wallRoi.x); - n_pos.y = Mathf.Lerp(0, (float)FrozenScreenToWorldSpace.Instance.height, wallRoi.y); - transform.localPosition = n_pos; -#endif //SetButtonPos(); } @@ -508,8 +495,8 @@ namespace UltraCombos.Frozen //Vector2 newScreenPos = FrozenScreenToWorldSpace.Instance.GetFinalScreenPos(area, wallRoi); var roi = FrozenScreenToWorldSpace.Instance.GetWallRoiFromPosition(area, renderers[(int)Status.STANDBY].transform.position); Vector2 newScreenPos = FrozenScreenToWorldSpace.Instance.GetFinalScreenPos(area, roi); - newScreenPos.x = newScreenPos.x / 1830 * 1260; - fakeButton.anchoredPosition = newScreenPos; + // newScreenPos.x = newScreenPos.x / 1830 * 1260; + // fakeButton.anchoredPosition = newScreenPos; } void SetSpecificPos() @@ -536,6 +523,5 @@ namespace UltraCombos.Frozen isTriggered = true; } } - } diff --git a/Unity-19050-05-BallPool/Assets/Frozen/Script/SceneController.cs b/Unity-19050-05-BallPool/Assets/Frozen/Script/SceneController.cs index d28f1e9..6537d87 100644 --- a/Unity-19050-05-BallPool/Assets/Frozen/Script/SceneController.cs +++ b/Unity-19050-05-BallPool/Assets/Frozen/Script/SceneController.cs @@ -3,6 +3,8 @@ using System.Collections.Generic; using UnityEngine; using UnityEngine.Events; using UltraCombos.Utility; +using System.Linq; +using UltraCombos.Utility.Attributes; namespace UltraCombos.Frozen { @@ -18,33 +20,24 @@ namespace UltraCombos.Frozen public State state = State.Standby; public float standbyTime = 10.0f; - [Range(0, 1)] - public float rate = 0.0f; - - public List spaceMaterials = new List(); - - [SerializeField, Range(0.0f, 0.1f)] - float daySnowSize = 0.01f; - [SerializeField, Range(0.0f, 0.1f)] - float nightSnowSize = 0.01f; - [SerializeField] - Material snowMaterial; - - List characters; - - float target_rate = 0.0f; - public UnityEvent onSceneStandby = new UnityEvent(); public UnityEvent onSceneDay = new UnityEvent(); public UnityEvent onSceneNight = new UnityEvent(); - [SerializeField, Header("Debug")] + [Header("Debug")] + [SerializeField] float stamp = 0.0f; + [Range(0, 1), ReadOnly] + public float rate = 0.0f; + float target_rate = 0.0f; + [ReadOnly] + public List spaceMaterials = new List(); + [ReadOnly, SerializeField] + List characters; private void Start() { - var cbs = FindObjectsOfType(); - characters = new List(cbs); + characters = FindObjectsOfType().ToList(); } private void Update() @@ -61,26 +54,15 @@ namespace UltraCombos.Frozen } } - if (state == State.Standby) - { - target_rate = 0.0f; - } - else if (state == State.Day) - { + if (state == State.Standby || state == State.Day) target_rate = 0.0f; - } else if (state == State.Night) - { target_rate = 1.0f; - } rate = Mathf.Lerp(rate, target_rate, 0.02f); foreach (var mat in spaceMaterials) mat.SetFloat("_Rate", rate); - - snowMaterial.SetFloat("_Size", Mathf.Lerp(daySnowSize, nightSnowSize, rate)); - foreach (var chr in characters) { chr.Active = chr.appearSataes.List.Contains(state); diff --git a/Unity-19050-05-BallPool/Assets/Frozen/Script/SpaceMeshGenerator.cs b/Unity-19050-05-BallPool/Assets/Frozen/Script/SpaceMeshGenerator.cs index 0694ded..a7a9399 100644 --- a/Unity-19050-05-BallPool/Assets/Frozen/Script/SpaceMeshGenerator.cs +++ b/Unity-19050-05-BallPool/Assets/Frozen/Script/SpaceMeshGenerator.cs @@ -27,7 +27,7 @@ namespace UltraCombos.Frozen private void Start() { update = true; - + if (Application.isPlaying) { var renderers = GetComponentsInChildren(); @@ -49,15 +49,13 @@ namespace UltraCombos.Frozen { mp.gameObject.SetActive(true); } - + var texture_applys = GetComponentsInChildren(true); foreach (var ta in texture_applys) { ta.materials.Clear(); ta.materials.Add(renderers[1].material); } - - } } } @@ -165,7 +163,7 @@ namespace UltraCombos.Frozen uvs.Add(new Vector2(0.0f, height * 2.0f / tex_size.y)); uvs.Add(new Vector2(length / tex_size.x, height * 3.0f / tex_size.y)); uvs.Add(new Vector2(length / tex_size.x, height * 2.0f / tex_size.y)); - + if (isAnimated == false) { for (int i = 0; i < uvs.Count; i++) diff --git a/Unity-19050-05-BallPool/Assets/Frozen/Script/TestTouch.cs b/Unity-19050-05-BallPool/Assets/Frozen/Script/TestTouch.cs new file mode 100644 index 0000000..7370b66 --- /dev/null +++ b/Unity-19050-05-BallPool/Assets/Frozen/Script/TestTouch.cs @@ -0,0 +1,55 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.Events; +using UnityEngine.EventSystems; +using Random = UnityEngine.Random; +public class TestTouch : MonoBehaviour, IPointerDownHandler, IPointerUpHandler, IDragHandler, IPointerExitHandler +{ + public bool MouseOnly = false; + + [System.Serializable] + public class PointerEvent : UnityEvent { }; + public PointerEvent onPointerDown = new PointerEvent(); + public PointerEvent onPointerUp = new PointerEvent(); + public PointerEvent onPointerDrag = new PointerEvent(); + public PointerEvent onPointerExit = new PointerEvent(); + + + public void OnPointerDown(PointerEventData eventData) + { + LogPointerEvent(eventData); + onPointerDown.Invoke(eventData); + } + + public void OnPointerUp(PointerEventData eventData) + { + LogPointerEvent(eventData); + onPointerUp.Invoke(eventData); + } + + public void OnDrag(PointerEventData eventData) + { + LogPointerEvent(eventData); + onPointerDrag.Invoke(eventData); + } + + public void OnPointerExit(PointerEventData eventData) + { + LogPointerEvent(eventData); + // if (skip_on_mouse_only(eventData)) + // return; + onPointerExit.Invoke(eventData); + } + + void LogPointerEvent(PointerEventData eventData) + { + // Debug.Log(eventData); + } + + // private bool skip_on_mouse_only(PointerEventData eventData) + // { + // return MouseOnly && eventData.pointerId != -1; + // } +} diff --git a/Unity-19050-05-BallPool/Assets/UnityUtilityNativePlugin/Script/NativeBufferPool.cs.meta b/Unity-19050-05-BallPool/Assets/Frozen/Script/TestTouch.cs.meta similarity index 83% rename from Unity-19050-05-BallPool/Assets/UnityUtilityNativePlugin/Script/NativeBufferPool.cs.meta rename to Unity-19050-05-BallPool/Assets/Frozen/Script/TestTouch.cs.meta index 9c3b25c..82f3217 100644 --- a/Unity-19050-05-BallPool/Assets/UnityUtilityNativePlugin/Script/NativeBufferPool.cs.meta +++ b/Unity-19050-05-BallPool/Assets/Frozen/Script/TestTouch.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 977dba8f8a298824fb413e7f143abbd4 +guid: 03a44ad9104fd3349addf7d3ff2435a6 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Unity-19050-05-BallPool/Assets/Frozen/Script/TouchArea.cs b/Unity-19050-05-BallPool/Assets/Frozen/Script/TouchArea.cs index 503c6e8..d0245e2 100644 --- a/Unity-19050-05-BallPool/Assets/Frozen/Script/TouchArea.cs +++ b/Unity-19050-05-BallPool/Assets/Frozen/Script/TouchArea.cs @@ -5,7 +5,7 @@ using UnityEngine; using UnityEngine.EventSystems; using UnityEngine.Events; using UnityEngine.UI; -public class TouchArea : MonoBehaviour ,IPointerDownHandler,IDragHandler,IPointerExitHandler, IPointerUpHandler +public class TouchArea : MonoBehaviour, IPointerDownHandler, IDragHandler, IPointerExitHandler, IPointerUpHandler { [HideInInspector] public Image img; diff --git a/Unity-19050-05-BallPool/Assets/UnityUtilityNativePlugin.meta b/Unity-19050-05-BallPool/Assets/UnityUtilityNativePlugin.meta deleted file mode 100644 index 4926956..0000000 --- a/Unity-19050-05-BallPool/Assets/UnityUtilityNativePlugin.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: 89866ed2890c65949bb4f6c771ffac15 -folderAsset: yes -timeCreated: 1519716678 -licenseType: Free -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Unity-19050-05-BallPool/Assets/UnityUtilityNativePlugin/Plugins.meta b/Unity-19050-05-BallPool/Assets/UnityUtilityNativePlugin/Plugins.meta deleted file mode 100644 index 91e1960..0000000 --- a/Unity-19050-05-BallPool/Assets/UnityUtilityNativePlugin/Plugins.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: 59275d3d928b20244807781974ba2018 -folderAsset: yes -timeCreated: 1519716678 -licenseType: Free -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Unity-19050-05-BallPool/Assets/UnityUtilityNativePlugin/Plugins/UnityUtilityNativePlugin.dll b/Unity-19050-05-BallPool/Assets/UnityUtilityNativePlugin/Plugins/UnityUtilityNativePlugin.dll deleted file mode 100644 index 19dd249..0000000 Binary files a/Unity-19050-05-BallPool/Assets/UnityUtilityNativePlugin/Plugins/UnityUtilityNativePlugin.dll and /dev/null differ diff --git a/Unity-19050-05-BallPool/Assets/UnityUtilityNativePlugin/Plugins/UnityUtilityNativePlugin.dll.meta b/Unity-19050-05-BallPool/Assets/UnityUtilityNativePlugin/Plugins/UnityUtilityNativePlugin.dll.meta deleted file mode 100644 index 2a387e1..0000000 --- a/Unity-19050-05-BallPool/Assets/UnityUtilityNativePlugin/Plugins/UnityUtilityNativePlugin.dll.meta +++ /dev/null @@ -1,86 +0,0 @@ -fileFormatVersion: 2 -guid: c65d1765230ad954980c187315d86736 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - isPreloaded: 0 - isOverridable: 0 - platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Editor: 0 - Exclude Linux: 0 - Exclude Linux64: 0 - Exclude LinuxUniversal: 0 - Exclude OSXUniversal: 0 - Exclude Win: 1 - Exclude Win64: 0 - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 1 - settings: - CPU: x86_64 - DefaultValueInitialized: true - OS: Windows - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: None - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Linux - second: - enabled: 1 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 1 - settings: - CPU: x86_64 - - first: - Standalone: LinuxUniversal - second: - enabled: 1 - settings: - CPU: AnyCPU - - first: - Standalone: OSXUniversal - second: - enabled: 1 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: None - - first: - Standalone: Win64 - second: - enabled: 1 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Unity-19050-05-BallPool/Assets/UnityUtilityNativePlugin/Script.meta b/Unity-19050-05-BallPool/Assets/UnityUtilityNativePlugin/Script.meta deleted file mode 100644 index 7a2c58b..0000000 --- a/Unity-19050-05-BallPool/Assets/UnityUtilityNativePlugin/Script.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: 0ee950eb7409c6a47adf64c4fd3c860b -folderAsset: yes -timeCreated: 1519716678 -licenseType: Free -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Unity-19050-05-BallPool/Assets/UnityUtilityNativePlugin/Script/DrawLine.cs b/Unity-19050-05-BallPool/Assets/UnityUtilityNativePlugin/Script/DrawLine.cs deleted file mode 100644 index 4f87f07..0000000 --- a/Unity-19050-05-BallPool/Assets/UnityUtilityNativePlugin/Script/DrawLine.cs +++ /dev/null @@ -1,80 +0,0 @@ -using System; -using UnityEngine; - -public class Drawing -{ - //**************************************************************************************************** - // static function DrawLine(rect : Rect) : void - // static function DrawLine(rect : Rect, color : Color) : void - // static function DrawLine(rect : Rect, width : float) : void - // static function DrawLine(rect : Rect, color : Color, width : float) : void - // static function DrawLine(Vector2 pointA, Vector2 pointB) : void - // static function DrawLine(Vector2 pointA, Vector2 pointB, color : Color) : void - // static function DrawLine(Vector2 pointA, Vector2 pointB, width : float) : void - // static function DrawLine(Vector2 pointA, Vector2 pointB, color : Color, width : float) : void - // - // Draws a GUI line on the screen. - // - // DrawLine makes up for the severe lack of 2D line rendering in the Unity runtime GUI system. - // This function works by drawing a 1x1 texture filled with a color, which is then scaled - // and rotated by altering the GUI matrix. The matrix is restored afterwards. - //**************************************************************************************************** - - public static Texture2D lineTex; - - public static void DrawLine(Rect rect) { DrawLine(rect, GUI.contentColor, 1.0f); } - public static void DrawLine(Rect rect, Color color) { DrawLine(rect, color, 1.0f); } - public static void DrawLine(Rect rect, float width) { DrawLine(rect, GUI.contentColor, width); } - public static void DrawLine(Rect rect, Color color, float width) { DrawLine(new Vector2(rect.x, rect.y), new Vector2(rect.x + rect.width, rect.y + rect.height), color, width); } - public static void DrawLine(Vector2 pointA, Vector2 pointB) { DrawLine(pointA, pointB, GUI.contentColor, 1.0f); } - public static void DrawLine(Vector2 pointA, Vector2 pointB, Color color) { DrawLine(pointA, pointB, color, 1.0f); } - public static void DrawLine(Vector2 pointA, Vector2 pointB, float width) { DrawLine(pointA, pointB, GUI.contentColor, width); } - public static void DrawLine(Vector2 pointA, Vector2 pointB, Color color, float width) - { - // Save the current GUI matrix, since we're going to make changes to it. - Matrix4x4 matrix = GUI.matrix; - - // Generate a single pixel texture if it doesn't exist - if (!lineTex) { lineTex = new Texture2D(1, 1); } - - // Store current GUI color, so we can switch it back later, - // and set the GUI color to the color parameter - Color savedColor = GUI.color; - GUI.color = color; - - // Determine the angle of the line. - float angle = Vector3.Angle(pointB - pointA, Vector2.right); - - // Vector3.Angle always returns a positive number. - // If pointB is above pointA, then angle needs to be negative. - if (pointA.y > pointB.y) { angle = -angle; } - - // Use ScaleAroundPivot to adjust the size of the line. - // We could do this when we draw the texture, but by scaling it here we can use - // non-integer values for the width and length (such as sub 1 pixel widths). - // Note that the pivot point is at +.5 from pointA.y, this is so that the width of the line - // is centered on the origin at pointA. - GUIUtility.ScaleAroundPivot(new Vector2((pointB - pointA).magnitude, width), new Vector2(pointA.x, pointA.y + 0.5f)); - - // Set the rotation for the line. - // The angle was calculated with pointA as the origin. - GUIUtility.RotateAroundPivot(angle, pointA); - - // Finally, draw the actual line. - // We're really only drawing a 1x1 texture from pointA. - // The matrix operations done with ScaleAroundPivot and RotateAroundPivot will make this - // render with the proper width, length, and angle. - GUI.DrawTexture(new Rect(pointA.x, pointA.y, 1, 1), lineTex); - - // We're done. Restore the GUI matrix and GUI color to whatever they were before. - GUI.matrix = matrix; - GUI.color = savedColor; - } - - public static void DrawPoint(Vector2 point, float size) { DrawPoint(point, GUI.contentColor, size); } - public static void DrawPoint(Vector2 point, Color color, float size) - { - var offset = new Vector2(size, 0); - DrawLine(point - offset, point + offset, color, size * 2); - } -} \ No newline at end of file diff --git a/Unity-19050-05-BallPool/Assets/UnityUtilityNativePlugin/Script/DrawLine.cs.meta b/Unity-19050-05-BallPool/Assets/UnityUtilityNativePlugin/Script/DrawLine.cs.meta deleted file mode 100644 index 3d54e53..0000000 --- a/Unity-19050-05-BallPool/Assets/UnityUtilityNativePlugin/Script/DrawLine.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 1bb6e5028f6629747a492c9dd625d83d -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Unity-19050-05-BallPool/Assets/UnityUtilityNativePlugin/Script/NativeBufferPool.cs b/Unity-19050-05-BallPool/Assets/UnityUtilityNativePlugin/Script/NativeBufferPool.cs deleted file mode 100644 index d0a7755..0000000 --- a/Unity-19050-05-BallPool/Assets/UnityUtilityNativePlugin/Script/NativeBufferPool.cs +++ /dev/null @@ -1,28 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -namespace UltraCombos.Utility -{ - public sealed class NativeBufferPool : Singleton - { - private NativeBufferPool() { } - - Dictionary references = new Dictionary(); - - public System.IntPtr GetReference(System.IntPtr bufferHandle) - { - if (references.ContainsKey(bufferHandle) == false) - references.Add(bufferHandle, Buffer.Create(bufferHandle)); - return references[bufferHandle]; - } - - private void OnDestroy() - { - foreach (var buf in references.Values) - { - Buffer.Release(buf); - } - } - } -} diff --git a/Unity-19050-05-BallPool/Assets/UnityUtilityNativePlugin/Script/TextureScale.cs b/Unity-19050-05-BallPool/Assets/UnityUtilityNativePlugin/Script/TextureScale.cs deleted file mode 100644 index f479996..0000000 --- a/Unity-19050-05-BallPool/Assets/UnityUtilityNativePlugin/Script/TextureScale.cs +++ /dev/null @@ -1,158 +0,0 @@ -// Only works on ARGB32, RGB24 and Alpha8 textures that are marked readable - -using System.Threading; -using UnityEngine; - -public class TextureScale -{ - public class ThreadData - { - public int start; - public int end; - public ThreadData(int s, int e) - { - start = s; - end = e; - } - } - - private static Color[] texColors; - private static Color[] newColors; - private static int w; - private static float ratioX; - private static float ratioY; - private static int w2; - private static int finishCount; - private static Mutex mutex; - - public static void Point(Texture2D tex, int newWidth, int newHeight) - { - ThreadedScale(tex, newWidth, newHeight, false); - } - - public static void Bilinear(Texture2D tex, int newWidth, int newHeight) - { - ThreadedScale(tex, newWidth, newHeight, true); - } - - private static void ThreadedScale(Texture2D tex, int newWidth, int newHeight, bool useBilinear) - { - texColors = tex.GetPixels(); - newColors = new Color[newWidth * newHeight]; - if (useBilinear) - { - ratioX = 1.0f / ((float)newWidth / (tex.width - 1)); - ratioY = 1.0f / ((float)newHeight / (tex.height - 1)); - } - else - { - ratioX = ((float)tex.width) / newWidth; - ratioY = ((float)tex.height) / newHeight; - } - w = tex.width; - w2 = newWidth; - var cores = Mathf.Min(SystemInfo.processorCount, newHeight); - var slice = newHeight / cores; - - finishCount = 0; - if (mutex == null) - { - mutex = new Mutex(false); - } - if (cores > 1) - { - int i = 0; - ThreadData threadData; - for (i = 0; i < cores - 1; i++) - { - threadData = new ThreadData(slice * i, slice * (i + 1)); - ParameterizedThreadStart ts = useBilinear ? new ParameterizedThreadStart(BilinearScale) : new ParameterizedThreadStart(PointScale); - Thread thread = new Thread(ts); - thread.Start(threadData); - } - threadData = new ThreadData(slice * i, newHeight); - if (useBilinear) - { - BilinearScale(threadData); - } - else - { - PointScale(threadData); - } - while (finishCount < cores) - { - Thread.Sleep(1); - } - } - else - { - ThreadData threadData = new ThreadData(0, newHeight); - if (useBilinear) - { - BilinearScale(threadData); - } - else - { - PointScale(threadData); - } - } - - tex.Resize(newWidth, newHeight); - tex.SetPixels(newColors); - tex.Apply(); - - texColors = null; - newColors = null; - } - - public static void BilinearScale(System.Object obj) - { - ThreadData threadData = (ThreadData)obj; - for (var y = threadData.start; y < threadData.end; y++) - { - int yFloor = (int)Mathf.Floor(y * ratioY); - var y1 = yFloor * w; - var y2 = (yFloor + 1) * w; - var yw = y * w2; - - for (var x = 0; x < w2; x++) - { - int xFloor = (int)Mathf.Floor(x * ratioX); - var xLerp = x * ratioX - xFloor; - newColors[yw + x] = ColorLerpUnclamped(ColorLerpUnclamped(texColors[y1 + xFloor], texColors[y1 + xFloor + 1], xLerp), - ColorLerpUnclamped(texColors[y2 + xFloor], texColors[y2 + xFloor + 1], xLerp), - y * ratioY - yFloor); - } - } - - mutex.WaitOne(); - finishCount++; - mutex.ReleaseMutex(); - } - - public static void PointScale(System.Object obj) - { - ThreadData threadData = (ThreadData)obj; - for (var y = threadData.start; y < threadData.end; y++) - { - var thisY = (int)(ratioY * y) * w; - var yw = y * w2; - for (var x = 0; x < w2; x++) - { - newColors[yw + x] = texColors[(int)(thisY + ratioX * x)]; - } - } - - mutex.WaitOne(); - finishCount++; - mutex.ReleaseMutex(); - } - - private static Color ColorLerpUnclamped(Color c1, Color c2, float value) - { - return new Color(c1.r + (c2.r - c1.r) * value, - c1.g + (c2.g - c1.g) * value, - c1.b + (c2.b - c1.b) * value, - c1.a + (c2.a - c1.a) * value); - } -} \ No newline at end of file diff --git a/Unity-19050-05-BallPool/Assets/UnityUtilityNativePlugin/Script/TextureScale.cs.meta b/Unity-19050-05-BallPool/Assets/UnityUtilityNativePlugin/Script/TextureScale.cs.meta deleted file mode 100644 index f67e33e..0000000 --- a/Unity-19050-05-BallPool/Assets/UnityUtilityNativePlugin/Script/TextureScale.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 152cd88bb1500e64599b85d755e284eb -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Unity-19050-05-BallPool/Assets/UnityUtilityNativePlugin/Script/UtilityNativePlugin.cs b/Unity-19050-05-BallPool/Assets/UnityUtilityNativePlugin/Script/UtilityNativePlugin.cs deleted file mode 100644 index 2706b28..0000000 --- a/Unity-19050-05-BallPool/Assets/UnityUtilityNativePlugin/Script/UtilityNativePlugin.cs +++ /dev/null @@ -1,117 +0,0 @@ -using System; -using System.Collections; -using System.Collections.Generic; -using System.Runtime.InteropServices; -using UnityEngine; - -namespace UltraCombos.Utility -{ - public class D3D - { - const string dllName = "UnityUtilityNativePlugin"; - - [DllImport(dllName, EntryPoint = "GetDevice")] - public static extern IntPtr GetDevice(); - - [DllImport(dllName, EntryPoint = "GetContext")] - public static extern IntPtr GetContext(); - - [DllImport(dllName, EntryPoint = "ReleaseContext")] - public static extern void ReleaseContext(IntPtr context); - } - - public class Buffer - { - const string dllName = "UnityUtilityNativePlugin"; - - [DllImport(dllName, EntryPoint = "CreateBuffer")] - public static extern IntPtr Create(IntPtr bufferHandle); - - [DllImport(dllName, EntryPoint = "SetBufferData")] - public static extern bool SetData(IntPtr bufferHandle, IntPtr data, int dataSize); - - [DllImport(dllName, EntryPoint = "GetBufferData")] - public static extern bool GetData(IntPtr bufferHandle, IntPtr data, int dataSize); - - [DllImport(dllName, EntryPoint = "CopyResource")] - public static extern void Copy(IntPtr dstHandle, IntPtr srcHandle); - - [DllImport(dllName, EntryPoint = "ReleaseBuffer")] - public static extern void Release(IntPtr bufferHandle); - - [DllImport(dllName, EntryPoint = "GetBufferSize")] - public static extern int GetSize(IntPtr bufferHandle); - - [DllImport(dllName, EntryPoint = "GetBufferStride")] - public static extern int GetStride(IntPtr bufferHandle); - - public static void GetDataImpl(IntPtr bufferHandle, IntPtr data, int dataSize) - { - IntPtr handle = NativeBufferPool.Instance.GetReference(bufferHandle); - Copy(handle, bufferHandle); - if (GetData(handle, data, dataSize) == false) - Debug.Log("GetDataImpl fail"); - } - - public static void SetDataImpl(IntPtr bufferHandle, IntPtr data, int dataSize) - { - IntPtr handle = NativeBufferPool.Instance.GetReference(bufferHandle); - if (SetData(handle, data, dataSize)) - Copy(bufferHandle, handle); - else Debug.Log("SetDataImpl fail"); - } - } - - public class Texture - { - const string dllName = "UnityUtilityNativePlugin"; - - [DllImport(dllName, EntryPoint = "CreateTexture")] - public static extern IntPtr Create(IntPtr textureHandle, ref int height, ref int width); - - [DllImport(dllName, EntryPoint = "SetTextureData")] - public static extern void SetData(IntPtr textureHandle, IntPtr data, int height, int width); - - [DllImport(dllName, EntryPoint = "GetTextureData")] - public static extern void GetData(IntPtr textureHandle, IntPtr data, int height, int width); - - [DllImport(dllName, EntryPoint = "CopyResource")] - public static extern void Copy(IntPtr dstHandle, IntPtr srcHandle); - - [DllImport(dllName, EntryPoint = "ReleaseTexture")] - public static extern void Release(IntPtr textureHandle); - /* - public static void SetDataImpl(IntPtr bufferHandle, IntPtr data, int dataSize) - { - IntPtr handle = NativeBufferPool.Instance.GetReference(bufferHandle); - SetData(handle, data, dataSize); - Copy(bufferHandle, handle); - } - */ - } - - public class Flatbuffers - { - const string dllName = "UnityUtilityNativePlugin"; - - [DllImport(dllName, EntryPoint = "FlatbuffersParse")] - public static extern IntPtr Parse([MarshalAs(UnmanagedType.LPStr)]string schemafile, IntPtr flatbuffer); - } - - public class Memory - { - [DllImport("msvcrt.dll", EntryPoint = "memcpy")] - public static extern void Copy(IntPtr dst, IntPtr src, int size); - - [DllImport("msvcrt.dll", EntryPoint = "memset")] - public static extern void Set(IntPtr dst, int val, int size); - - public static void Swap(ref T lhs, ref T rhs) - { - T temp = lhs; - lhs = rhs; - rhs = temp; - } - } -} - diff --git a/Unity-19050-05-BallPool/Assets/UnityUtilityNativePlugin/Script/UtilityNativePlugin.cs.meta b/Unity-19050-05-BallPool/Assets/UnityUtilityNativePlugin/Script/UtilityNativePlugin.cs.meta deleted file mode 100644 index 22b9896..0000000 --- a/Unity-19050-05-BallPool/Assets/UnityUtilityNativePlugin/Script/UtilityNativePlugin.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: f1983112498f3184585e273b1f48bc20 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Unity-19050-05-BallPool/Packages/com.ultracombos.chwan1 b/Unity-19050-05-BallPool/Packages/com.ultracombos.chwan1 index 831947f..cf7a223 160000 --- a/Unity-19050-05-BallPool/Packages/com.ultracombos.chwan1 +++ b/Unity-19050-05-BallPool/Packages/com.ultracombos.chwan1 @@ -1 +1 @@ -Subproject commit 831947fd2875cfbbedb0bf0dbe8bf53b60d88dfe +Subproject commit cf7a223b2a1d2d77fe6eec0d7c4c9c25f1a9de2a