diff --git a/Unity-19050-05-BallPool/Assets/Frozen/Frozen.unity b/Unity-19050-05-BallPool/Assets/Frozen/Frozen.unity index 968418e..961646e 100644 --- a/Unity-19050-05-BallPool/Assets/Frozen/Frozen.unity +++ b/Unity-19050-05-BallPool/Assets/Frozen/Frozen.unity @@ -51,8 +51,8 @@ LightmapSettings: m_IndirectOutputScale: 1 m_AlbedoBoost: 1 m_EnvironmentLightingMode: 0 - m_EnableBakedLightmaps: 1 - m_EnableRealtimeLightmaps: 1 + m_EnableBakedLightmaps: 0 + m_EnableRealtimeLightmaps: 0 m_LightmapEditorSettings: serializedVersion: 10 m_Resolution: 2 @@ -165,7 +165,6 @@ MonoBehaviour: appearAreas: 01000000 specificPositions: [] roaming: 0 - fakeButton: {fileID: 0} isStandbyLoop: 1 standbyClip: {fileID: 11400000, guid: e19cadcb21fdcbf449164a9d5995a365, type: 2} triggerClips: @@ -292,7 +291,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 03a44ad9104fd3349addf7d3ff2435a6, type: 3} m_Name: m_EditorClassIdentifier: - MouseOnly: 0 onPointerDown: m_PersistentCalls: m_Calls: [] @@ -487,7 +485,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 03a44ad9104fd3349addf7d3ff2435a6, type: 3} m_Name: m_EditorClassIdentifier: - MouseOnly: 0 onPointerDown: m_PersistentCalls: m_Calls: [] @@ -637,7 +634,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 03a44ad9104fd3349addf7d3ff2435a6, type: 3} m_Name: m_EditorClassIdentifier: - MouseOnly: 0 onPointerDown: m_PersistentCalls: m_Calls: [] @@ -1033,7 +1029,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 03a44ad9104fd3349addf7d3ff2435a6, type: 3} m_Name: m_EditorClassIdentifier: - MouseOnly: 0 onPointerDown: m_PersistentCalls: m_Calls: [] @@ -1202,7 +1197,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 03a44ad9104fd3349addf7d3ff2435a6, type: 3} m_Name: m_EditorClassIdentifier: - MouseOnly: 0 onPointerDown: m_PersistentCalls: m_Calls: [] @@ -1282,7 +1276,6 @@ MonoBehaviour: appearAreas: 01000000 specificPositions: [] roaming: 0.21 - fakeButton: {fileID: 0} isStandbyLoop: 1 standbyClip: {fileID: 11400000, guid: 696d013e4c412744fb94ecf601816f51, type: 2} triggerClips: @@ -1357,7 +1350,6 @@ MonoBehaviour: appearAreas: 02000000 specificPositions: [] roaming: 0 - fakeButton: {fileID: 0} isStandbyLoop: 1 standbyClip: {fileID: 11400000, guid: e83615d38d3560c488a57ce710881f59, type: 2} triggerClips: @@ -1575,7 +1567,6 @@ MonoBehaviour: appearAreas: 02000000 specificPositions: [] roaming: 0 - fakeButton: {fileID: 0} isStandbyLoop: 1 standbyClip: {fileID: 11400000, guid: b2664ad4b776f9f42a9b467e62fcf93b, type: 2} triggerClips: @@ -1870,7 +1861,7 @@ Camera: m_Bits: 512 m_RenderingPath: 1 m_TargetTexture: {fileID: 8400000, guid: 6921d0717fba0654597a7ad3fb5c47e7, type: 2} - m_TargetDisplay: 1 + m_TargetDisplay: 0 m_TargetEye: 3 m_HDR: 0 m_AllowMSAA: 0 @@ -2210,7 +2201,6 @@ MonoBehaviour: appearAreas: 01000000 specificPositions: [] roaming: 0.19 - fakeButton: {fileID: 0} isStandbyLoop: 1 standbyClip: {fileID: 11400000, guid: bddde81afd2a6774fb8fa0cb3e4751c1, type: 2} triggerClips: @@ -2308,7 +2298,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 03a44ad9104fd3349addf7d3ff2435a6, type: 3} m_Name: m_EditorClassIdentifier: - MouseOnly: 0 onPointerDown: m_PersistentCalls: m_Calls: [] @@ -2492,7 +2481,6 @@ MonoBehaviour: appearAreas: 00000000 specificPositions: [] roaming: 0.2 - fakeButton: {fileID: 0} isStandbyLoop: 1 standbyClip: {fileID: 11400000, guid: 5b3dac91b0ced2a46b0785831655c98a, type: 2} triggerClips: @@ -2585,7 +2573,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 22 + m_RootOrder: 23 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &565906440 GameObject: @@ -2755,7 +2743,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 03a44ad9104fd3349addf7d3ff2435a6, type: 3} m_Name: m_EditorClassIdentifier: - MouseOnly: 0 onPointerDown: m_PersistentCalls: m_Calls: [] @@ -2927,7 +2914,6 @@ MonoBehaviour: specificPositions: - {fileID: 639322482} roaming: 0 - fakeButton: {fileID: 0} isStandbyLoop: 0 standbyClip: {fileID: 11400000, guid: d695b444261b7244b9ff121652bf969c, type: 2} triggerClips: @@ -3237,6 +3223,9 @@ GameObject: m_Component: - component: {fileID: 750667763} - component: {fileID: 750667762} + - component: {fileID: 750667759} + - component: {fileID: 750667761} + - component: {fileID: 750667760} m_Layer: 5 m_Name: Spout Canvas m_TagString: Untagged @@ -3244,6 +3233,65 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!114 &750667759 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 750667758} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0e1589dd66686b747ac2d919a9a70be1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + m_Bits: 4294967295 + m_Canvas: {fileID: 0} +--- !u!114 &750667760 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 750667758} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f6dd33a398e6ac64b8c06da0cc5d9d89, type: 3} + m_Name: + m_EditorClassIdentifier: + roi: + serializedVersion: 2 + x: 370 + y: 0 + width: 1260 + height: 800 + eventCamera: {fileID: 1817143148} +--- !u!114 &750667761 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 750667758} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0c29cacbda07285449365329adeb3b02, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 + castMouseOnly: 0 + pointerEventFilter: {fileID: 750667760} --- !u!223 &750667762 Canvas: m_ObjectHideFlags: 0 @@ -3277,8 +3325,9 @@ RectTransform: m_LocalScale: {x: 0, y: 0, z: 0} m_Children: - {fileID: 1000268179} + - {fileID: 2047208673} m_Father: {fileID: 0} - m_RootOrder: 20 + m_RootOrder: 21 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -3361,7 +3410,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 03a44ad9104fd3349addf7d3ff2435a6, type: 3} m_Name: m_EditorClassIdentifier: - MouseOnly: 0 onPointerDown: m_PersistentCalls: m_Calls: [] @@ -3716,7 +3764,6 @@ MonoBehaviour: appearAreas: 00000000 specificPositions: [] roaming: 0.23 - fakeButton: {fileID: 0} isStandbyLoop: 1 standbyClip: {fileID: 11400000, guid: 9e519da1c7293b645b3c2bce2455acf6, type: 2} triggerClips: @@ -3836,10 +3883,10 @@ RectTransform: m_Father: {fileID: 750667763} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 5040, y: 3200} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &1000268181 MonoBehaviour: @@ -3855,7 +3902,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 2100000, guid: f05d2e0d0f372ae48998e59e3d376a63, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -3927,7 +3974,6 @@ MonoBehaviour: appearAreas: 01000000 specificPositions: [] roaming: 0 - fakeButton: {fileID: 0} isStandbyLoop: 1 standbyClip: {fileID: 11400000, guid: c4b4ef67857577d4fb6e9761b359839a, type: 2} triggerClips: @@ -3949,6 +3995,51 @@ MonoBehaviour: m_CallState: 2 mode: 0 info: +--- !u!1 &1054041993 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1054041994} + - component: {fileID: 1054041995} + m_Layer: 0 + m_Name: Spout Sender + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1054041994 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1054041993} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 25, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 20 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1054041995 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1054041993} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 45099d624c1e6c14e9514f4e5ea1ed9c, type: 3} + m_Name: + m_EditorClassIdentifier: + _sourceTexture: {fileID: 8400000, guid: b8e6ff168206f134585d024c016832b6, type: 2} + _alphaSupport: 0 --- !u!1 &1061158671 GameObject: m_ObjectHideFlags: 0 @@ -4095,6 +4186,166 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} +--- !u!43 &1077106957 +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 &1164756621 GameObject: m_ObjectHideFlags: 0 @@ -4240,7 +4491,6 @@ MonoBehaviour: specificPositions: - {fileID: 1186117296} roaming: 0 - fakeButton: {fileID: 0} isStandbyLoop: 0 standbyClip: {fileID: 11400000, guid: e01bda1b2f4d30449943b9721c77f15a, type: 2} triggerClips: @@ -4579,7 +4829,6 @@ MonoBehaviour: appearAreas: 02000000 specificPositions: [] roaming: 0.25 - fakeButton: {fileID: 0} isStandbyLoop: 1 standbyClip: {fileID: 11400000, guid: afc5f33340232ac4699f173d79fdfbd1, type: 2} triggerClips: @@ -4692,7 +4941,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 03a44ad9104fd3349addf7d3ff2435a6, type: 3} m_Name: m_EditorClassIdentifier: - MouseOnly: 0 onPointerDown: m_PersistentCalls: m_Calls: [] @@ -4774,7 +5022,6 @@ MonoBehaviour: specificPositions: - {fileID: 1216863878} roaming: 0 - fakeButton: {fileID: 0} isStandbyLoop: 1 standbyClip: {fileID: 11400000, guid: 1691548c0a5a4494ba5e2c29ec477d7d, type: 2} triggerClips: @@ -4862,7 +5109,6 @@ MonoBehaviour: appearAreas: 00000000 specificPositions: [] roaming: 0 - fakeButton: {fileID: 0} isStandbyLoop: 1 standbyClip: {fileID: 11400000, guid: f2f10fb696e1a6145b55378c7c7ec9df, type: 2} triggerClips: @@ -5436,7 +5682,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 03a44ad9104fd3349addf7d3ff2435a6, type: 3} m_Name: m_EditorClassIdentifier: - MouseOnly: 0 onPointerDown: m_PersistentCalls: m_Calls: [] @@ -5590,7 +5835,7 @@ MeshFilter: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1379541361} - m_Mesh: {fileID: 1925169124} + m_Mesh: {fileID: 1077106957} --- !u!114 &1379541365 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5925,7 +6170,7 @@ Camera: m_Bits: 256 m_RenderingPath: 1 m_TargetTexture: {fileID: 8400000, guid: 1ded3bafa85a18b4f87c48288b4439a1, type: 2} - m_TargetDisplay: 1 + m_TargetDisplay: 0 m_TargetEye: 3 m_HDR: 0 m_AllowMSAA: 0 @@ -6041,7 +6286,7 @@ MonoBehaviour: serializedVersion: 2 m_Bits: 4294967295 m_MaxRayIntersections: 0 - pointerEventFilter: {fileID: 1817143151} + pointerEventFilter: {fileID: 1817143150} --- !u!1 &1470412008 GameObject: m_ObjectHideFlags: 0 @@ -6133,7 +6378,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 03a44ad9104fd3349addf7d3ff2435a6, type: 3} m_Name: m_EditorClassIdentifier: - MouseOnly: 0 onPointerDown: m_PersistentCalls: m_Calls: [] @@ -6271,77 +6515,7 @@ MeshFilter: m_PrefabAsset: {fileID: 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: 0 ---- !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: 1 - 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: 3200} - 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: 0 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Texture: {fileID: 8400000, guid: e222b09ab4f80eb4eae6760ed0503d87, 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 +--- !u!1 &1653619180 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -6509,7 +6683,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 03a44ad9104fd3349addf7d3ff2435a6, type: 3} m_Name: m_EditorClassIdentifier: - MouseOnly: 0 onPointerDown: m_PersistentCalls: m_Calls: [] @@ -6688,7 +6861,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 03a44ad9104fd3349addf7d3ff2435a6, type: 3} m_Name: m_EditorClassIdentifier: - MouseOnly: 0 onPointerDown: m_PersistentCalls: m_Calls: [] @@ -6770,7 +6942,6 @@ MonoBehaviour: specificPositions: - {fileID: 1690794391} roaming: 0 - fakeButton: {fileID: 0} isStandbyLoop: 0 standbyClip: {fileID: 11400000, guid: dfdc3af2e37491840b05776ce71e1ca8, type: 2} triggerClips: @@ -6987,7 +7158,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 03a44ad9104fd3349addf7d3ff2435a6, type: 3} m_Name: m_EditorClassIdentifier: - MouseOnly: 0 onPointerDown: m_PersistentCalls: m_Calls: [] @@ -7105,7 +7275,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 03a44ad9104fd3349addf7d3ff2435a6, type: 3} m_Name: m_EditorClassIdentifier: - MouseOnly: 0 onPointerDown: m_PersistentCalls: m_Calls: [] @@ -7143,7 +7312,7 @@ GameObject: - component: {fileID: 1765914297} - component: {fileID: 1765914296} - component: {fileID: 1765914295} - - component: {fileID: 1765914298} + - component: {fileID: 1765914294} m_Layer: 5 m_Name: Final Canvas m_TagString: Untagged @@ -7151,6 +7320,23 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!114 &1765914294 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1765914293} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1301386320, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 --- !u!114 &1765914295 MonoBehaviour: m_ObjectHideFlags: 0 @@ -7206,34 +7392,15 @@ RectTransform: m_LocalScale: {x: 0, y: 0, z: 0} m_Children: - {fileID: 1227078085} - - {fileID: 1640244023} - {fileID: 1901892189} m_Father: {fileID: 0} - m_RootOrder: 23 + m_RootOrder: 24 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} ---- !u!114 &1765914298 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1765914293} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0c29cacbda07285449365329adeb3b02, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreReversedGraphics: 1 - m_BlockingObjects: 0 - m_BlockingMask: - serializedVersion: 2 - m_Bits: 4294967295 - castMouseOnly: 0 --- !u!1 &1774693141 GameObject: m_ObjectHideFlags: 0 @@ -7393,7 +7560,6 @@ GameObject: - component: {fileID: 1817143148} - component: {fileID: 1817143150} - component: {fileID: 1817143147} - - component: {fileID: 1817143151} m_Layer: 0 m_Name: Spout Camera m_TagString: Untagged @@ -7410,10 +7576,11 @@ MonoBehaviour: m_GameObject: {fileID: 1817143146} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 45099d624c1e6c14e9514f4e5ea1ed9c, type: 3} + m_Script: {fileID: 11500000, guid: 7cf1e6cce802d3c49a437b3125a95960, type: 3} m_Name: m_EditorClassIdentifier: - _clearAlpha: 1 + space: {x: 2880, y: 1800, z: 1080} + material: {fileID: 2100000, guid: f05d2e0d0f372ae48998e59e3d376a63, type: 2} --- !u!20 &1817143148 Camera: m_ObjectHideFlags: 0 @@ -7471,20 +7638,6 @@ Transform: m_RootOrder: 19 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1817143150 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1817143146} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7cf1e6cce802d3c49a437b3125a95960, type: 3} - m_Name: - m_EditorClassIdentifier: - space: {x: 2880, y: 1800, z: 1080} - material: {fileID: 2100000, guid: f05d2e0d0f372ae48998e59e3d376a63, type: 2} ---- !u!114 &1817143151 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -7555,7 +7708,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 03a44ad9104fd3349addf7d3ff2435a6, type: 3} m_Name: m_EditorClassIdentifier: - MouseOnly: 0 onPointerDown: m_PersistentCalls: m_Calls: [] @@ -7718,7 +7870,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 03a44ad9104fd3349addf7d3ff2435a6, type: 3} m_Name: m_EditorClassIdentifier: - MouseOnly: 0 onPointerDown: m_PersistentCalls: m_Calls: [] @@ -7880,7 +8031,7 @@ PrefabInstance: - target: {fileID: 224152212506828798, guid: 7aba709da85d1c2439af18a2c2e1548c, type: 3} propertyPath: m_RootOrder - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 224152212506828798, guid: 7aba709da85d1c2439af18a2c2e1548c, type: 3} @@ -7905,7 +8056,7 @@ PrefabInstance: - target: {fileID: 5748129664144205097, guid: 7aba709da85d1c2439af18a2c2e1548c, type: 3} propertyPath: infos.List.Array.size - value: 3 + value: 4 objectReference: {fileID: 0} - target: {fileID: 5748129664144205097, guid: 7aba709da85d1c2439af18a2c2e1548c, type: 3} @@ -7946,11 +8097,11 @@ PrefabInstance: type: 3} propertyPath: actions.List.Array.data[0].Event.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: - objectReference: {fileID: 0} + objectReference: {fileID: 2047208674} - target: {fileID: 5748129664144205097, guid: 7aba709da85d1c2439af18a2c2e1548c, type: 3} propertyPath: actions.List.Array.data[0].Event.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: ToggleDebug + value: Toggle objectReference: {fileID: 0} - target: {fileID: 5748129664144205097, guid: 7aba709da85d1c2439af18a2c2e1548c, type: 3} @@ -8105,7 +8256,7 @@ PrefabInstance: - target: {fileID: 5748129664144205097, guid: 7aba709da85d1c2439af18a2c2e1548c, type: 3} propertyPath: actions.List.Array.data[4].name - value: Use Single Wall + value: Test objectReference: {fileID: 0} - target: {fileID: 5748129664144205097, guid: 7aba709da85d1c2439af18a2c2e1548c, type: 3} @@ -8167,6 +8318,36 @@ PrefabInstance: propertyPath: infos.List.Array.data[2].prettyName value: Format objectReference: {fileID: 0} + - target: {fileID: 5748129664144205097, guid: 7aba709da85d1c2439af18a2c2e1548c, + type: 3} + propertyPath: infos.List.Array.data[3].instance + value: + objectReference: {fileID: 2047208674} + - target: {fileID: 5748129664144205097, guid: 7aba709da85d1c2439af18a2c2e1548c, + type: 3} + propertyPath: infos.List.Array.data[3].member + value: isActiveAndEnabled + objectReference: {fileID: 0} + - target: {fileID: 5748129664144205097, guid: 7aba709da85d1c2439af18a2c2e1548c, + type: 3} + propertyPath: infos.List.Array.data[3].prettyName + value: Is Active And Enabled + objectReference: {fileID: 0} + - target: {fileID: 5748129664144205097, guid: 7aba709da85d1c2439af18a2c2e1548c, + type: 3} + propertyPath: actions.List.Array.data[0].Event.m_PersistentCalls.m_Calls.Array.data[1].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5748129664144205097, guid: 7aba709da85d1c2439af18a2c2e1548c, + type: 3} + propertyPath: actions.List.Array.data[0].Event.m_PersistentCalls.m_Calls.Array.data[1].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 5748129664144205097, guid: 7aba709da85d1c2439af18a2c2e1548c, + type: 3} + propertyPath: actions.List.Array.data[0].Event.m_PersistentCalls.m_Calls.Array.data[1].m_Target + value: + objectReference: {fileID: 0} - target: {fileID: 224343345892171400, guid: 7aba709da85d1c2439af18a2c2e1548c, type: 3} propertyPath: m_AnchorMax.x @@ -8486,6 +8667,11 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0.001953125 objectReference: {fileID: 0} + - target: {fileID: 9044064709128930019, guid: 7aba709da85d1c2439af18a2c2e1548c, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7aba709da85d1c2439af18a2c2e1548c, type: 3} --- !u!224 &1901892189 stripped @@ -8552,7 +8738,6 @@ MonoBehaviour: - {fileID: 681228292} - {fileID: 66098176} roaming: 0 - fakeButton: {fileID: 0} isStandbyLoop: 1 standbyClip: {fileID: 11400000, guid: fb02941bf56531748886776e54c8f2d0, type: 2} triggerClips: @@ -8648,166 +8833,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!43 &1925169124 -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 &1925824385 GameObject: m_ObjectHideFlags: 0 @@ -8956,7 +8981,6 @@ MonoBehaviour: specificPositions: - {fileID: 1933714487} roaming: 0 - fakeButton: {fileID: 0} isStandbyLoop: 0 standbyClip: {fileID: 11400000, guid: 6d7b66e288bf3924fbd7a716ae3ac255, type: 2} triggerClips: @@ -9046,7 +9070,6 @@ MonoBehaviour: specificPositions: - {fileID: 1973785478} roaming: 0 - fakeButton: {fileID: 0} isStandbyLoop: 1 standbyClip: {fileID: 11400000, guid: aa1bbb3d5a802fb47880c1cf0237dc60, type: 2} triggerClips: @@ -9134,7 +9157,6 @@ MonoBehaviour: appearAreas: 00000000 specificPositions: [] roaming: 0 - fakeButton: {fileID: 0} isStandbyLoop: 1 standbyClip: {fileID: 11400000, guid: 7b0a38d5d484cf54089379ebbe5c1d9d, type: 2} triggerClips: @@ -9261,8 +9283,72 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 21 + m_RootOrder: 22 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2047208672 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2047208673} + - component: {fileID: 2047208675} + - component: {fileID: 2047208674} + m_Layer: 5 + m_Name: Visualizer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2047208673 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2047208672} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 4, y: 4, z: 4} + m_Children: [] + m_Father: {fileID: 750667763} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 1630, y: 800} + m_Pivot: {x: 1, y: 0.5} +--- !u!114 &2047208674 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2047208672} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8aa2387c8e5d92a4581feaf81f0d5da9, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_texture: {fileID: 10912, guid: 0000000000000000f000000000000000, type: 0} +--- !u!222 &2047208675 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2047208672} + m_CullTransparentMesh: 0 --- !u!1 &2084936102 GameObject: m_ObjectHideFlags: 0 @@ -9480,7 +9566,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 03a44ad9104fd3349addf7d3ff2435a6, type: 3} m_Name: m_EditorClassIdentifier: - MouseOnly: 0 onPointerDown: m_PersistentCalls: m_Calls: [] @@ -9507,20 +9592,6 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 14 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} ---- !u!114 &368313725845127793 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2724579458866948347} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7aa9f9acee84c6544ae78641b47946d8, type: 3} - m_Name: - m_EditorClassIdentifier: - ball: {fileID: 10912, guid: 0000000000000000f000000000000000, type: 0} - debugInput: 1 --- !u!1001 &2724579458866948346 PrefabInstance: m_ObjectHideFlags: 0 @@ -9597,9 +9668,3 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1f68bf7cec2600e49a46d2f0554453c8, type: 3} ---- !u!1 &2724579458866948347 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1641997025252556, guid: 1f68bf7cec2600e49a46d2f0554453c8, - type: 3} - m_PrefabInstance: {fileID: 2724579458866948346} - m_PrefabAsset: {fileID: 0} diff --git a/Unity-19050-05-BallPool/Assets/Frozen/Script/FrozenPointerEventFilter.cs b/Unity-19050-05-BallPool/Assets/Frozen/Script/FrozenPointerEventFilter.cs index 0d20b6d..3cbbbd6 100644 --- a/Unity-19050-05-BallPool/Assets/Frozen/Script/FrozenPointerEventFilter.cs +++ b/Unity-19050-05-BallPool/Assets/Frozen/Script/FrozenPointerEventFilter.cs @@ -93,9 +93,12 @@ namespace UltraCombos public override void Filter(PointerEventData eventData) { Vector2 position = eventData.position; + // Debug.Log(position); position = Rect.PointToNormalized(roi, position); + // Debug.Log(position); position = Rect.NormalizedToPoint(roiDst, position); // Debug.Log(position); + // Debug.Log(""); if (homos.Count == 0) { eventData.position = Vector2.negativeInfinity; diff --git a/Unity-19050-05-BallPool/Assets/Frozen/Script/InputVisualizer.cs b/Unity-19050-05-BallPool/Assets/Frozen/Script/InputVisualizer.cs new file mode 100644 index 0000000..e7cce81 --- /dev/null +++ b/Unity-19050-05-BallPool/Assets/Frozen/Script/InputVisualizer.cs @@ -0,0 +1,103 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.EventSystems; +using UnityEngine.UI; + +namespace UltraCombos +{ + public class InputVisualizer : MaskableGraphic + //event system visualizer + { + [SerializeField] + Texture m_texture; + + //event camera + + public override Texture mainTexture + { + get + { + return m_texture == null ? s_WhiteTexture : m_texture; + } + } + + void Update() + { + if (EventSystem.current == null || EventSystem.current.currentInputModule == null) + return; + + BaseInput input = EventSystem.current.currentInputModule.input; + + pointers2.Clear(); + if (input.GetMouseButton(0)) + { + pointers2.Add(input.mousePosition); + } + + for (int i = 0; i < input.touchCount; i++) + { + Touch t = input.GetTouch(i); + pointers2.Add(t.position); + } + SetVerticesDirty(); + } + + public void Toggle() + { + enabled = !enabled; + } + + public void Toggle2() + { + enabled = !enabled; + } + + UIVertex[] CreateQuad(Vector2[] _vertices, Vector2[] _uvs) + { + if (_vertices.Length == 4 && _uvs.Length == 4) + { + UIVertex[] _quad = new UIVertex[4]; + for (var i = 0; i < _quad.Length; i++) + { + var _vert = UIVertex.simpleVert; + _vert.color = Color.white; + _vert.position = _vertices[i]; + _vert.uv0 = _uvs[i]; + _quad[i] = _vert; + } + return _quad; + } + else + return null; + } + + void AddPoint(VertexHelper vh, Vector2 position) + { + Rect r = new Rect(0, 0, 100 / transform.localScale.x, 100 / transform.localScale.y); + r.center = position; + Debug.Log(position); + r.center -= new Vector2(1630, 800 / 2); + + vh.AddUIVertexQuad(CreateQuad(new[] { + Rect.NormalizedToPoint(r, _uv0), + Rect.NormalizedToPoint(r, _uv1), + Rect.NormalizedToPoint(r, _uv2), + Rect.NormalizedToPoint(r, _uv3), + }, new[] { _uv0, _uv1, _uv2, _uv3 })); + } + + Vector2 _uv0 = new Vector2(0, 0); + Vector2 _uv1 = new Vector2(0, 1); + Vector2 _uv2 = new Vector2(1, 1); + Vector2 _uv3 = new Vector2(1, 0); + + private HashSet pointers2 = new HashSet(); + protected override void OnPopulateMesh(VertexHelper vh) + { + vh.Clear(); + foreach (var point in pointers2) + AddPoint(vh, point); + } + } +} \ No newline at end of file diff --git a/Unity-19050-05-BallPool/Assets/Frozen/Script/InputVisualizer.cs.meta b/Unity-19050-05-BallPool/Assets/Frozen/Script/InputVisualizer.cs.meta new file mode 100644 index 0000000..8be83d9 --- /dev/null +++ b/Unity-19050-05-BallPool/Assets/Frozen/Script/InputVisualizer.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 8aa2387c8e5d92a4581feaf81f0d5da9 +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 bee81f5..1d6492f 160000 --- a/Unity-19050-05-BallPool/Packages/com.ultracombos.chwan1 +++ b/Unity-19050-05-BallPool/Packages/com.ultracombos.chwan1 @@ -1 +1 @@ -Subproject commit bee81f5e950c5fd7d4d3fe77fa57018262ed1fc8 +Subproject commit 1d6492ff8067b3ca634e60dda3f69c0a0b5e3e98 diff --git a/Unity-19050-05-BallPool/ProjectSettings/PresetManager.asset b/Unity-19050-05-BallPool/ProjectSettings/PresetManager.asset index de7e261..636a595 100644 Binary files a/Unity-19050-05-BallPool/ProjectSettings/PresetManager.asset and b/Unity-19050-05-BallPool/ProjectSettings/PresetManager.asset differ diff --git a/Unity-19050-05-BallPool/ProjectSettings/VFXManager.asset b/Unity-19050-05-BallPool/ProjectSettings/VFXManager.asset index 4951a05..6e0eaca 100644 Binary files a/Unity-19050-05-BallPool/ProjectSettings/VFXManager.asset and b/Unity-19050-05-BallPool/ProjectSettings/VFXManager.asset differ