From 95be9fdfca892c64d8124215a188d38decbb21c1 Mon Sep 17 00:00:00 2001 From: chwan1 Date: Wed, 28 Oct 2020 12:39:45 +0800 Subject: [PATCH] refactor(20038-05) --- .../Assets/Frozen/Frozen.unity | 444 +++++++++--------- .../Assets/Frozen/Script/FlakeSpawner.cs | 2 +- .../Frozen/Script/FrozenPointerEventFilter.cs | 26 +- .../Script/StackedPointeraEventFilter.cs | 22 + .../Script/StackedPointeraEventFilter.cs.meta | 11 + 5 files changed, 292 insertions(+), 213 deletions(-) create mode 100644 Unity-20038-05-BallPool-8M/Assets/Frozen/Script/StackedPointeraEventFilter.cs create mode 100644 Unity-20038-05-BallPool-8M/Assets/Frozen/Script/StackedPointeraEventFilter.cs.meta diff --git a/Unity-20038-05-BallPool-8M/Assets/Frozen/Frozen.unity b/Unity-20038-05-BallPool-8M/Assets/Frozen/Frozen.unity index ca8742b..61d9f29 100644 --- a/Unity-20038-05-BallPool-8M/Assets/Frozen/Frozen.unity +++ b/Unity-20038-05-BallPool-8M/Assets/Frozen/Frozen.unity @@ -1859,6 +1859,169 @@ MonoBehaviour: PlayOnStart: 1 Looping: 1 AudioVolume: 1 +--- !u!43 &260702827 +Mesh: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: 'Space Ground Mesh: (9.6x6x3.6)' + serializedVersion: 10 + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 24 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 16 + localAABB: + m_Center: {x: 0, y: 1.8, z: 0} + m_Extent: {x: 4.8, y: 1.8, z: 3} + m_Shapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + m_BindPose: [] + m_BoneNameHashes: + m_RootBoneNameHash: 0 + m_BonesAABB: [] + m_VariableBoneCountWeights: + m_Data: + m_MeshCompression: 0 + m_IsReadable: 0 + m_KeepVertices: 1 + m_KeepIndices: 1 + m_IndexFormat: 0 + m_IndexBuffer: 000001000200010003000200040005000600050007000600080009000a0009000b000a000c000d000e000d000f000e00 + m_VertexData: + serializedVersion: 3 + 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: 9a9999c000000000000040c0000000000000803f00000000e3388e3e000000009a9999c00000000000004040000000000000803f00000000e3388e3e0000203f9a99994000000000000040c0000000000000803f000000008ee3383f000000009a9999400000000000004040000000000000803f000000008ee3383f0000203f9a9999c000000000000040400000000000000000000080bfe3388e3e0000203f9a9999c066666640000040400000000000000000000080bfe3388e3effff7f3f9a99994000000000000040400000000000000000000080bf8ee3383f0000203f9a99994066666640000040400000000000000000000080bf8ee3383fffff7f3f9a9999c000000000000040c00000803f0000000000000000000000000000203f9a9999c066666640000040c00000803f000000000000000000000000ffff7f3f9a9999c000000000000040400000803f0000000000000000e3388e3e0000203f9a9999c066666640000040400000803f0000000000000000e3388e3effff7f3f9a9999400000000000004040000080bf00000000000000008ee3383f0000203f9a9999406666664000004040000080bf00000000000000008ee3383fffff7f3f9a99994000000000000040c0000080bf00000000000000000000803f0000203f9a99994066666640000040c0000080bf00000000000000000000803fffff7f3f + 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.8, z: 0} + m_Extent: {x: 4.8, y: 1.8, z: 3} + m_MeshUsageFlags: 0 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + m_MeshMetrics[0]: 1 + m_MeshMetrics[1]: 1 + m_MeshOptimizationFlags: 1 + m_StreamData: + offset: 0 + size: 0 + path: --- !u!1 &276089015 GameObject: m_ObjectHideFlags: 0 @@ -3503,6 +3666,7 @@ GameObject: m_Component: - component: {fileID: 520040869} - component: {fileID: 520040868} + - component: {fileID: 520040866} m_Layer: 0 m_Name: Monitor Camera m_TagString: MainCamera @@ -3510,6 +3674,14 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!81 &520040866 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 520040865} + m_Enabled: 1 --- !u!20 &520040868 Camera: m_ObjectHideFlags: 0 @@ -4042,6 +4214,64 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 603456584} m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &610201530 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 610201531} + - component: {fileID: 610201532} + m_Layer: 10 + m_Name: Frozen Pointer Event Filter + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &610201531 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 610201530} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1451842898} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &610201532 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 610201530} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: adfcbd7a73e557e4aa57c51c4b86a917, type: 3} + m_Name: + m_EditorClassIdentifier: + m_roiSrc: {fileID: 1227078085} + m_roiSrcRoot: {fileID: 1765914297} + roi: + serializedVersion: 2 + x: 0 + y: 0 + width: 1920 + height: 1080 + roiDst: + serializedVersion: 2 + x: 0 + y: 1840 + width: 5040 + height: 3200 + space: {x: 2880, y: 1800, z: 1080} --- !u!1 &619390427 GameObject: m_ObjectHideFlags: 0 @@ -4552,169 +4782,6 @@ MonoBehaviour: m_CallState: 2 mode: 0 info: ---- !u!43 &700336209 -Mesh: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: 'Space Ground Mesh: (9.6x6x3.6)' - serializedVersion: 10 - m_SubMeshes: - - serializedVersion: 2 - firstByte: 0 - indexCount: 24 - topology: 0 - baseVertex: 0 - firstVertex: 0 - vertexCount: 16 - localAABB: - m_Center: {x: 0, y: 1.8, z: 0} - m_Extent: {x: 4.8, y: 1.8, z: 3} - m_Shapes: - vertices: [] - shapes: [] - channels: [] - fullWeights: [] - m_BindPose: [] - m_BoneNameHashes: - m_RootBoneNameHash: 0 - m_BonesAABB: [] - m_VariableBoneCountWeights: - m_Data: - m_MeshCompression: 0 - m_IsReadable: 0 - m_KeepVertices: 1 - m_KeepIndices: 1 - m_IndexFormat: 0 - m_IndexBuffer: 000001000200010003000200040005000600050007000600080009000a0009000b000a000c000d000e000d000f000e00 - m_VertexData: - serializedVersion: 3 - 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: 9a9999c000000000000040c0000000000000803f00000000e3388e3e000000009a9999c00000000000004040000000000000803f00000000e3388e3e0000203f9a99994000000000000040c0000000000000803f000000008ee3383f000000009a9999400000000000004040000000000000803f000000008ee3383f0000203f9a9999c000000000000040400000000000000000000080bfe3388e3e0000203f9a9999c066666640000040400000000000000000000080bfe3388e3effff7f3f9a99994000000000000040400000000000000000000080bf8ee3383f0000203f9a99994066666640000040400000000000000000000080bf8ee3383fffff7f3f9a9999c000000000000040c00000803f0000000000000000000000000000203f9a9999c066666640000040c00000803f000000000000000000000000ffff7f3f9a9999c000000000000040400000803f0000000000000000e3388e3e0000203f9a9999c066666640000040400000803f0000000000000000e3388e3effff7f3f9a9999400000000000004040000080bf00000000000000008ee3383f0000203f9a9999406666664000004040000080bf00000000000000008ee3383fffff7f3f9a99994000000000000040c0000080bf00000000000000000000803f0000203f9a99994066666640000040c0000080bf00000000000000000000803fffff7f3f - 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.8, z: 0} - m_Extent: {x: 4.8, y: 1.8, z: 3} - m_MeshUsageFlags: 0 - m_BakedConvexCollisionMesh: - m_BakedTriangleCollisionMesh: - m_MeshMetrics[0]: 1 - m_MeshMetrics[1]: 1 - m_MeshOptimizationFlags: 1 - m_StreamData: - offset: 0 - size: 0 - path: --- !u!1 &728697566 GameObject: m_ObjectHideFlags: 0 @@ -4966,7 +5033,6 @@ GameObject: m_Component: - component: {fileID: 750667763} - component: {fileID: 750667762} - - component: {fileID: 750667759} m_Layer: 5 m_Name: Spout Canvas m_TagString: Untagged @@ -4974,23 +5040,6 @@ 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: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreReversedGraphics: 1 - m_BlockingObjects: 0 - m_BlockingMask: - serializedVersion: 2 - m_Bits: 4294967295 --- !u!223 &750667762 Canvas: m_ObjectHideFlags: 0 @@ -9011,7 +9060,7 @@ MeshFilter: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1379541361} - m_Mesh: {fileID: 700336209} + m_Mesh: {fileID: 260702827} --- !u!114 &1379541365 MonoBehaviour: m_ObjectHideFlags: 0 @@ -9482,7 +9531,8 @@ Transform: m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: 0, y: 8.4, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] + m_Children: + - {fileID: 610201531} m_Father: {fileID: 0} m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} @@ -9579,7 +9629,7 @@ MonoBehaviour: serializedVersion: 2 m_Bits: 4294967295 m_MaxRayIntersections: 0 - pointerEventFilter: {fileID: 1817143150} + pointerEventFilter: {fileID: 610201532} --- !u!1 &1470412008 GameObject: m_ObjectHideFlags: 0 @@ -11609,7 +11659,6 @@ GameObject: m_Component: - component: {fileID: 1817143149} - component: {fileID: 1817143148} - - component: {fileID: 1817143150} - component: {fileID: 1817143147} m_Layer: 0 m_Name: Spout Camera @@ -11689,31 +11738,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 20 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: adfcbd7a73e557e4aa57c51c4b86a917, type: 3} - m_Name: - m_EditorClassIdentifier: - roi: - serializedVersion: 2 - x: 370 - y: 0 - width: 1260 - height: 800 - roiDst: - serializedVersion: 2 - x: 0 - y: 1840 - width: 5040 - height: 3200 - space: {x: 2880, y: 1800, z: 1080} --- !u!1 &1841553264 GameObject: m_ObjectHideFlags: 0 diff --git a/Unity-20038-05-BallPool-8M/Assets/Frozen/Script/FlakeSpawner.cs b/Unity-20038-05-BallPool-8M/Assets/Frozen/Script/FlakeSpawner.cs index a94126c..59dac50 100644 --- a/Unity-20038-05-BallPool-8M/Assets/Frozen/Script/FlakeSpawner.cs +++ b/Unity-20038-05-BallPool-8M/Assets/Frozen/Script/FlakeSpawner.cs @@ -24,7 +24,7 @@ public class FlakeSpawner : MonoBehaviour if (found) return; - GameObject obj = Instantiate(prefab, transform.parent); + GameObject obj = Instantiate(prefab, transform); (obj.transform as RectTransform).anchoredPosition = position; obj.GetComponent().VideoAsset = clips[Random.Range(0, clips.Length)]; obj.SetActive(true); diff --git a/Unity-20038-05-BallPool-8M/Assets/Frozen/Script/FrozenPointerEventFilter.cs b/Unity-20038-05-BallPool-8M/Assets/Frozen/Script/FrozenPointerEventFilter.cs index 3cbbbd6..167d270 100644 --- a/Unity-20038-05-BallPool-8M/Assets/Frozen/Script/FrozenPointerEventFilter.cs +++ b/Unity-20038-05-BallPool-8M/Assets/Frozen/Script/FrozenPointerEventFilter.cs @@ -8,11 +8,16 @@ namespace UltraCombos public class FrozenPointerEventFilter : PointerEventFilter { [Header("Event Source")] + public RectTransform m_roiSrc; + public RectTransform m_roiSrcRoot; public Rect roi = new Rect(0, 0, 1920, 1080); - [Header("Event Target")] + // [Header("Event Target")] + // public RectTransform m_roiDst; + // public RectTransform m_roiDstRoot; public Rect roiDst = new Rect(0, 0, 1920, 1080); + [Space] public Vector3 space; List homos = new List(); @@ -25,7 +30,6 @@ namespace UltraCombos { float dim = space.x + space.z * 2.0f; - float offset = 0.5f; var src = new List(); var dst = new List(); @@ -88,6 +92,24 @@ namespace UltraCombos FindHomography(dst.ToArray(), src.ToArray(), ref matrix); homos.Add(matrix); } + + if (m_roiSrc != null || m_roiSrcRoot != null) + { + var corners = new Vector3[4]; + m_roiSrc.GetWorldCorners(corners); + var p0 = m_roiSrcRoot.InverseTransformPoint(corners[0]); + var p1 = m_roiSrcRoot.InverseTransformPoint(corners[2]); + roi = new Rect(p0.x + m_roiSrcRoot.rect.width / 2, p0.y + m_roiSrcRoot.rect.height / 2, p1.x - p0.x, p1.y - p0.y); + } + + // if (m_roiDst != null || m_roiDstRoot != null) + // { + // var corners = new Vector3[4]; + // m_roiDst.GetWorldCorners(corners); + // var p0 = m_roiDstRoot.InverseTransformPoint(corners[0]); + // var p1 = m_roiDstRoot.InverseTransformPoint(corners[2]); + // roiDst = new Rect(p0.x + m_roiDstRoot.rect.width / 2, p0.y + m_roiDstRoot.rect.height / 2, p1.x - p0.x, p1.y - p0.y); + // } } public override void Filter(PointerEventData eventData) diff --git a/Unity-20038-05-BallPool-8M/Assets/Frozen/Script/StackedPointeraEventFilter.cs b/Unity-20038-05-BallPool-8M/Assets/Frozen/Script/StackedPointeraEventFilter.cs new file mode 100644 index 0000000..7e27d7d --- /dev/null +++ b/Unity-20038-05-BallPool-8M/Assets/Frozen/Script/StackedPointeraEventFilter.cs @@ -0,0 +1,22 @@ +using UnityEngine; +using UnityEngine.EventSystems; + +namespace UltraCombos.Chwan1 +{ + public class StackedPointeraEventFilter : PointerEventFilter + { + public PointerEventFilterList filterList; + + [System.Serializable] + public class PointerEventFilterList : ReorderableList { } + + public override void Filter(PointerEventData eventData) + { + Debug.Log("test"); + foreach (var filter in filterList.List) + { + filter.Filter(eventData); + } + } + } +} \ No newline at end of file diff --git a/Unity-20038-05-BallPool-8M/Assets/Frozen/Script/StackedPointeraEventFilter.cs.meta b/Unity-20038-05-BallPool-8M/Assets/Frozen/Script/StackedPointeraEventFilter.cs.meta new file mode 100644 index 0000000..d697ad7 --- /dev/null +++ b/Unity-20038-05-BallPool-8M/Assets/Frozen/Script/StackedPointeraEventFilter.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 532eda49ec5fcdc40878d598a3f4bc9b +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: