19050-Frozen2
/
Develop-19050-Frozen2
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor(20038-05)

Browse Source
master
chwan1 5 years ago
parent 95be9fdfca
commit b20eaba0d4
2 changed files with 181 additions and 183 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 336
      Unity-20038-05-BallPool-8M/Assets/Frozen/Frozen.unity
  2. 28
      Unity-20038-05-BallPool-8M/Assets/Frozen/Script/FrozenPointerEventFilter.cs

336
Unity-20038-05-BallPool-8M/Assets/Frozen/Frozen.unity
Unescape View File

@ -1859,169 +1859,6 @@ 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
@ -3023,6 +2860,169 @@ Transform:
m_Father: {fileID: 199010598}
m_RootOrder: 21
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!43 &402391584
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 &409590975
GameObject:
m_ObjectHideFlags: 0
@ -4259,12 +4259,8 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_roiSrc: {fileID: 1227078085}
m_roiSrcRoot: {fileID: 1765914297}
roi:
serializedVersion: 2
x: 0
y: 0
width: 1920
height: 1080
m_roiDst: {fileID: 439594039}
m_roiDstRoot: {fileID: 1774693142}
roiDst:
serializedVersion: 2
x: 0
@ -9060,7 +9056,7 @@ MeshFilter:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1379541361}
m_Mesh: {fileID: 260702827}
m_Mesh: {fileID: 402391584}
--- !u!114 &1379541365
MonoBehaviour:
m_ObjectHideFlags: 0

28
Unity-20038-05-BallPool-8M/Assets/Frozen/Script/FrozenPointerEventFilter.cs
Unescape View File

@ -10,12 +10,12 @@ namespace UltraCombos
[Header("Event Source")]
public RectTransform m_roiSrc;
public RectTransform m_roiSrcRoot;
public Rect roi = new Rect(0, 0, 1920, 1080);
Rect roi = new Rect(0, 0, 1920, 1080);
// [Header("Event Target")]
// public RectTransform m_roiDst;
// public RectTransform m_roiDstRoot;
public Rect roiDst = new Rect(0, 0, 1920, 1080);
[Header("Event Target")]
public RectTransform m_roiDst;
public RectTransform m_roiDstRoot;
Rect roiDst = new Rect(0, 0, 1920, 1080);
[Space]
public Vector3 space;
@ -102,14 +102,16 @@ namespace UltraCombos
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);
// }
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]);
var w = p1.x - p0.x;
var h = p1.y - p0.y;
roiDst = new Rect(p0.x + m_roiDstRoot.rect.width / 2, w - h, w, h);//magic function
}
}
public override void Filter(PointerEventData eventData)

Write Preview
Loading…
Cancel
Save