From 4000ab25110d0593dfe5ad5eea81a4109a744464 Mon Sep 17 00:00:00 2001 From: Hazim Bin Ijaz Date: Thu, 17 Oct 2024 16:00:08 +0500 Subject: [PATCH] fixed spalsh issue --- Assets/Prefab/PipeCell0.prefab | 4 +- Assets/Prefab/PipeCell1.prefab | 44 +- Assets/Prefab/PipeCell2.prefab | 104 +- Assets/Prefab/PipeCell3.prefab | 152 +- Assets/Prefab/PipeCell4.prefab | 94 +- Assets/Prefab/PipeCell5.prefab | 179 ++- Assets/Prefab/PipeCell6.prefab | 173 +- Assets/Prefab/PipeCell7.prefab | 4 +- Assets/Scripts/Cell.cs | 1865 +++++++++++----------- Assets/water/NewSplash.anim | 96 ++ Assets/water/NewSplash.anim.meta | 8 + Assets/water/WaterSpriteAnimation.prefab | 103 +- Assets/water/water png_0.controller | 2 +- 13 files changed, 1512 insertions(+), 1316 deletions(-) create mode 100644 Assets/water/NewSplash.anim create mode 100644 Assets/water/NewSplash.anim.meta diff --git a/Assets/Prefab/PipeCell0.prefab b/Assets/Prefab/PipeCell0.prefab index d005625d..a89390d2 100644 --- a/Assets/Prefab/PipeCell0.prefab +++ b/Assets/Prefab/PipeCell0.prefab @@ -38,7 +38,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 136, y: 135} + m_SizeDelta: {x: 180, y: 180} m_Pivot: {x: 0, y: 1} --- !u!222 &1790415148045804933 CanvasRenderer: @@ -100,7 +100,7 @@ MonoBehaviour: correctRotateDelta: 4 redundant: 0 _rotationValue: 0 - cellKind: 6 + cellKind: 0 --- !u!114 &1790415148045804974 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Prefab/PipeCell1.prefab b/Assets/Prefab/PipeCell1.prefab index a4ff23a7..7f3b7e6a 100644 --- a/Assets/Prefab/PipeCell1.prefab +++ b/Assets/Prefab/PipeCell1.prefab @@ -74,7 +74,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 136, y: 135} + m_SizeDelta: {x: 180, y: 180} m_Pivot: {x: 0, y: 1} --- !u!222 &1790415148045804929 CanvasRenderer: @@ -316,10 +316,10 @@ RectTransform: - {fileID: 2084683623429159703} m_Father: {fileID: 1790415148045804952} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -63.3} - m_SizeDelta: {x: 128, y: 128} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7268970378912187251 CanvasRenderer: @@ -392,18 +392,13 @@ PrefabInstance: m_Modifications: - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} - propertyPath: m_LocalScale.x - value: 15 - objectReference: {fileID: 0} - - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, - type: 3} - propertyPath: m_LocalScale.y - value: 15 + propertyPath: m_AnchorMax.y + value: 0 objectReference: {fileID: 0} - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} - propertyPath: m_LocalScale.z - value: 15 + propertyPath: m_AnchorMin.y + value: 0 objectReference: {fileID: 0} - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} @@ -413,7 +408,7 @@ PrefabInstance: - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} propertyPath: m_LocalPosition.y - value: 3.1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} @@ -440,6 +435,11 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 1 objectReference: {fileID: 0} + - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -18.5 + objectReference: {fileID: 0} - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -455,28 +455,18 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 180 objectReference: {fileID: 0} - - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, - type: 3} - propertyPath: m_ConstrainProportionsScale - value: 0 - objectReference: {fileID: 0} - target: {fileID: 4375925876578433136, guid: c8f4b60877f9d354baf440225fa74419, type: 3} propertyPath: m_Name value: WaterSpriteAnimation objectReference: {fileID: 0} - - target: {fileID: 4803746489132991462, guid: c8f4b60877f9d354baf440225fa74419, - type: 3} - propertyPath: m_SortingLayer - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c8f4b60877f9d354baf440225fa74419, type: 3} ---- !u!4 &2084683623429159703 stripped -Transform: +--- !u!224 &2084683623429159703 stripped +RectTransform: m_CorrespondingSourceObject: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} m_PrefabInstance: {fileID: 2278523458665403237} diff --git a/Assets/Prefab/PipeCell2.prefab b/Assets/Prefab/PipeCell2.prefab index 681c0ace..de434f29 100644 --- a/Assets/Prefab/PipeCell2.prefab +++ b/Assets/Prefab/PipeCell2.prefab @@ -34,10 +34,10 @@ RectTransform: - {fileID: 8920855111436838328} m_Father: {fileID: 1790415148045804947} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0.8, y: 64.3} - m_SizeDelta: {x: 128, y: 128} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8332820736708600301 CanvasRenderer: @@ -251,7 +251,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 136, y: 135} + m_SizeDelta: {x: 180, y: 180} m_Pivot: {x: 0, y: 1} --- !u!222 &1790415148045804932 CanvasRenderer: @@ -338,7 +338,7 @@ MonoBehaviour: correctRotateDelta: 2 redundant: 0 _rotationValue: 0 - cellKind: 1 + cellKind: 0 --- !u!114 &1790415148045804976 MonoBehaviour: m_ObjectHideFlags: 0 @@ -417,10 +417,10 @@ RectTransform: - {fileID: 5127590893992772179} m_Father: {fileID: 1790415148045804947} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -66} - m_SizeDelta: {x: 128, y: 128} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7475477868267760074 CanvasRenderer: @@ -493,18 +493,13 @@ PrefabInstance: m_Modifications: - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} - propertyPath: m_LocalScale.x - value: 15 - objectReference: {fileID: 0} - - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, - type: 3} - propertyPath: m_LocalScale.y - value: 15 + propertyPath: m_AnchorMax.y + value: 0 objectReference: {fileID: 0} - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} - propertyPath: m_LocalScale.z - value: 15 + propertyPath: m_AnchorMin.y + value: 0 objectReference: {fileID: 0} - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} @@ -514,7 +509,7 @@ PrefabInstance: - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} propertyPath: m_LocalPosition.y - value: 7.6 + value: 0 objectReference: {fileID: 0} - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} @@ -541,6 +536,11 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 1 objectReference: {fileID: 0} + - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -16.099998 + objectReference: {fileID: 0} - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -556,28 +556,18 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 180 objectReference: {fileID: 0} - - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, - type: 3} - propertyPath: m_ConstrainProportionsScale - value: 0 - objectReference: {fileID: 0} - target: {fileID: 4375925876578433136, guid: c8f4b60877f9d354baf440225fa74419, type: 3} propertyPath: m_Name value: WaterSpriteAnimation objectReference: {fileID: 0} - - target: {fileID: 4803746489132991462, guid: c8f4b60877f9d354baf440225fa74419, - type: 3} - propertyPath: m_SortingLayer - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c8f4b60877f9d354baf440225fa74419, type: 3} ---- !u!4 &5127590893992772179 stripped -Transform: +--- !u!224 &5127590893992772179 stripped +RectTransform: m_CorrespondingSourceObject: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} m_PrefabInstance: {fileID: 4924797752430520865} @@ -592,28 +582,33 @@ PrefabInstance: m_Modifications: - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} - propertyPath: m_LocalScale.x - value: 15 + propertyPath: m_AnchorMax.x + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} - propertyPath: m_LocalScale.y - value: 15 + propertyPath: m_AnchorMax.y + value: 0 objectReference: {fileID: 0} - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} - propertyPath: m_LocalScale.z - value: 15 + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 objectReference: {fileID: 0} - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} propertyPath: m_LocalPosition.x - value: -0.7 + value: 0 objectReference: {fileID: 0} - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} propertyPath: m_LocalPosition.y - value: 2.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} @@ -640,6 +635,16 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 1 objectReference: {fileID: 0} + - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -18.5 + objectReference: {fileID: 0} - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -655,33 +660,18 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 180 objectReference: {fileID: 0} - - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, - type: 3} - propertyPath: m_ConstrainProportionsScale - value: 0 - objectReference: {fileID: 0} - target: {fileID: 4375925876578433136, guid: c8f4b60877f9d354baf440225fa74419, type: 3} propertyPath: m_Name value: WaterSpriteAnimation objectReference: {fileID: 0} - - target: {fileID: 4375925876578433136, guid: c8f4b60877f9d354baf440225fa74419, - type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4803746489132991462, guid: c8f4b60877f9d354baf440225fa74419, - type: 3} - propertyPath: m_SortingLayer - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c8f4b60877f9d354baf440225fa74419, type: 3} ---- !u!4 &8920855111436838328 stripped -Transform: +--- !u!224 &8920855111436838328 stripped +RectTransform: m_CorrespondingSourceObject: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} m_PrefabInstance: {fileID: 8700259327348264394} diff --git a/Assets/Prefab/PipeCell3.prefab b/Assets/Prefab/PipeCell3.prefab index 224243c0..ed555cda 100644 --- a/Assets/Prefab/PipeCell3.prefab +++ b/Assets/Prefab/PipeCell3.prefab @@ -34,10 +34,10 @@ RectTransform: - {fileID: 2094938189432496728} m_Father: {fileID: 1790415148045804965} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 88.1, y: -1.5} - m_SizeDelta: {x: 100, y: 100} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5545340838642847434 CanvasRenderer: @@ -134,10 +134,10 @@ RectTransform: - {fileID: 2331552150955914166} m_Father: {fileID: 1790415148045804965} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -79.3} - m_SizeDelta: {x: 100, y: 100} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8036723301328174825 CanvasRenderer: @@ -274,7 +274,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 136, y: 135} + m_SizeDelta: {x: 180, y: 180} m_Pivot: {x: 0, y: 1} --- !u!222 &1790415148045804935 CanvasRenderer: @@ -361,7 +361,7 @@ MonoBehaviour: correctRotateDelta: 4 redundant: 0 _rotationValue: 0 - cellKind: 3 + cellKind: 0 --- !u!114 &1790415148045804995 MonoBehaviour: m_ObjectHideFlags: 0 @@ -518,10 +518,10 @@ RectTransform: - {fileID: 4599630115289059775} m_Father: {fileID: 1790415148045804965} m_LocalEulerAnglesHint: {x: 0, y: 0, z: -90} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -92.3, y: 1.4} - m_SizeDelta: {x: 100, y: 100} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7929008044868877098 CanvasRenderer: @@ -594,18 +594,23 @@ PrefabInstance: m_Modifications: - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} - propertyPath: m_LocalScale.x - value: 15 + propertyPath: m_AnchorMax.x + value: 0.51111114 objectReference: {fileID: 0} - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} - propertyPath: m_LocalScale.y - value: 15 + propertyPath: m_AnchorMax.y + value: 0 objectReference: {fileID: 0} - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} - propertyPath: m_LocalScale.z - value: 15 + propertyPath: m_AnchorMin.x + value: 0.51111114 + objectReference: {fileID: 0} + - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 objectReference: {fileID: 0} - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} @@ -615,7 +620,7 @@ PrefabInstance: - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} propertyPath: m_LocalPosition.y - value: 31.3 + value: 0 objectReference: {fileID: 0} - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} @@ -642,6 +647,16 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 1 objectReference: {fileID: 0} + - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -3.699997 + objectReference: {fileID: 0} + - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -18.100006 + objectReference: {fileID: 0} - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -657,28 +672,18 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 180 objectReference: {fileID: 0} - - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, - type: 3} - propertyPath: m_ConstrainProportionsScale - value: 0 - objectReference: {fileID: 0} - target: {fileID: 4375925876578433136, guid: c8f4b60877f9d354baf440225fa74419, type: 3} propertyPath: m_Name value: WaterSpriteAnimation objectReference: {fileID: 0} - - target: {fileID: 4803746489132991462, guid: c8f4b60877f9d354baf440225fa74419, - type: 3} - propertyPath: m_SortingLayer - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c8f4b60877f9d354baf440225fa74419, type: 3} ---- !u!4 &2094938189432496728 stripped -Transform: +--- !u!224 &2094938189432496728 stripped +RectTransform: m_CorrespondingSourceObject: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} m_PrefabInstance: {fileID: 2189328421869505066} @@ -693,28 +698,23 @@ PrefabInstance: m_Modifications: - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} - propertyPath: m_LocalScale.x - value: 15 - objectReference: {fileID: 0} - - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, - type: 3} - propertyPath: m_LocalScale.y - value: 15 + propertyPath: m_AnchorMax.y + value: 0 objectReference: {fileID: 0} - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} - propertyPath: m_LocalScale.z - value: 15 + propertyPath: m_AnchorMin.y + value: 0 objectReference: {fileID: 0} - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} propertyPath: m_LocalPosition.x - value: -1.6 + value: 0 objectReference: {fileID: 0} - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} propertyPath: m_LocalPosition.y - value: 17.9 + value: 0 objectReference: {fileID: 0} - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} @@ -741,6 +741,11 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 1 objectReference: {fileID: 0} + - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -18.099998 + objectReference: {fileID: 0} - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -756,28 +761,18 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 180 objectReference: {fileID: 0} - - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, - type: 3} - propertyPath: m_ConstrainProportionsScale - value: 0 - objectReference: {fileID: 0} - target: {fileID: 4375925876578433136, guid: c8f4b60877f9d354baf440225fa74419, type: 3} propertyPath: m_Name value: WaterSpriteAnimation objectReference: {fileID: 0} - - target: {fileID: 4803746489132991462, guid: c8f4b60877f9d354baf440225fa74419, - type: 3} - propertyPath: m_SortingLayer - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c8f4b60877f9d354baf440225fa74419, type: 3} ---- !u!4 &2331552150955914166 stripped -Transform: +--- !u!224 &2331552150955914166 stripped +RectTransform: m_CorrespondingSourceObject: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} m_PrefabInstance: {fileID: 2534382972097960900} @@ -792,28 +787,33 @@ PrefabInstance: m_Modifications: - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} - propertyPath: m_LocalScale.x - value: 15 + propertyPath: m_AnchorMax.x + value: 0.47777772 + objectReference: {fileID: 0} + - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.016666673 objectReference: {fileID: 0} - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} - propertyPath: m_LocalScale.y - value: 15 + propertyPath: m_AnchorMin.x + value: 0.47777772 objectReference: {fileID: 0} - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} - propertyPath: m_LocalScale.z - value: 15 + propertyPath: m_AnchorMin.y + value: 0.016666673 objectReference: {fileID: 0} - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} propertyPath: m_LocalPosition.x - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} propertyPath: m_LocalPosition.y - value: 31.8 + value: 0 objectReference: {fileID: 0} - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} @@ -840,6 +840,16 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 1 objectReference: {fileID: 0} + - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0.69999695 + objectReference: {fileID: 0} + - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -18.900002 + objectReference: {fileID: 0} - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -855,28 +865,18 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 180 objectReference: {fileID: 0} - - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, - type: 3} - propertyPath: m_ConstrainProportionsScale - value: 0 - objectReference: {fileID: 0} - target: {fileID: 4375925876578433136, guid: c8f4b60877f9d354baf440225fa74419, type: 3} propertyPath: m_Name value: WaterSpriteAnimation objectReference: {fileID: 0} - - target: {fileID: 4803746489132991462, guid: c8f4b60877f9d354baf440225fa74419, - type: 3} - propertyPath: m_SortingLayer - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c8f4b60877f9d354baf440225fa74419, type: 3} ---- !u!4 &4599630115289059775 stripped -Transform: +--- !u!224 &4599630115289059775 stripped +RectTransform: m_CorrespondingSourceObject: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} m_PrefabInstance: {fileID: 4370060155812493773} diff --git a/Assets/Prefab/PipeCell4.prefab b/Assets/Prefab/PipeCell4.prefab index 5e042a54..c05a2223 100644 --- a/Assets/Prefab/PipeCell4.prefab +++ b/Assets/Prefab/PipeCell4.prefab @@ -38,7 +38,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 136, y: 135} + m_SizeDelta: {x: 180, y: 180} m_Pivot: {x: 0, y: 1} --- !u!222 &1790415148045804931 CanvasRenderer: @@ -125,7 +125,7 @@ MonoBehaviour: correctRotateDelta: 4 redundant: 0 _rotationValue: 0 - cellKind: 2 + cellKind: 0 --- !u!114 &1790415148045804968 MonoBehaviour: m_ObjectHideFlags: 0 @@ -317,10 +317,10 @@ RectTransform: - {fileID: 632798710511410704} m_Father: {fileID: 1790415148045804954} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -3.9, y: -87.2} - m_SizeDelta: {x: 100, y: 100} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8130528192212730555 CanvasRenderer: @@ -417,10 +417,10 @@ RectTransform: - {fileID: 3558886827158185516} m_Father: {fileID: 1790415148045804954} m_LocalEulerAnglesHint: {x: 0, y: 0, z: -90} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -77.2, y: 3.7} - m_SizeDelta: {x: 100, y: 100} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4208892044650297719 CanvasRenderer: @@ -493,28 +493,33 @@ PrefabInstance: m_Modifications: - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} - propertyPath: m_LocalScale.x - value: 15 + propertyPath: m_AnchorMax.x + value: 0.49444443 + objectReference: {fileID: 0} + - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.04444445 objectReference: {fileID: 0} - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} - propertyPath: m_LocalScale.y - value: 15 + propertyPath: m_AnchorMin.x + value: 0.49444443 objectReference: {fileID: 0} - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} - propertyPath: m_LocalScale.z - value: 15 + propertyPath: m_AnchorMin.y + value: 0.04444445 objectReference: {fileID: 0} - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} propertyPath: m_LocalPosition.x - value: -0.6 + value: 0 objectReference: {fileID: 0} - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} propertyPath: m_LocalPosition.y - value: 31.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} @@ -541,6 +546,16 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 1 objectReference: {fileID: 0} + - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -23.699997 + objectReference: {fileID: 0} - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -561,18 +576,13 @@ PrefabInstance: propertyPath: m_Name value: WaterSpriteAnimation objectReference: {fileID: 0} - - target: {fileID: 4803746489132991462, guid: c8f4b60877f9d354baf440225fa74419, - type: 3} - propertyPath: m_SortingLayer - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c8f4b60877f9d354baf440225fa74419, type: 3} ---- !u!4 &632798710511410704 stripped -Transform: +--- !u!224 &632798710511410704 stripped +RectTransform: m_CorrespondingSourceObject: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} m_PrefabInstance: {fileID: 844599364858902114} @@ -587,18 +597,13 @@ PrefabInstance: m_Modifications: - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} - propertyPath: m_LocalScale.x - value: 15 - objectReference: {fileID: 0} - - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, - type: 3} - propertyPath: m_LocalScale.y - value: 15 + propertyPath: m_AnchorMax.y + value: 0 objectReference: {fileID: 0} - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} - propertyPath: m_LocalScale.z - value: 15 + propertyPath: m_AnchorMin.y + value: 0 objectReference: {fileID: 0} - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} @@ -608,7 +613,7 @@ PrefabInstance: - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} propertyPath: m_LocalPosition.y - value: 19 + value: 0 objectReference: {fileID: 0} - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} @@ -635,6 +640,16 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 1 objectReference: {fileID: 0} + - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -7 + objectReference: {fileID: 0} + - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -17.699997 + objectReference: {fileID: 0} - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -655,18 +670,13 @@ PrefabInstance: propertyPath: m_Name value: WaterSpriteAnimation objectReference: {fileID: 0} - - target: {fileID: 4803746489132991462, guid: c8f4b60877f9d354baf440225fa74419, - type: 3} - propertyPath: m_SortingLayer - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c8f4b60877f9d354baf440225fa74419, type: 3} ---- !u!4 &3558886827158185516 stripped -Transform: +--- !u!224 &3558886827158185516 stripped +RectTransform: m_CorrespondingSourceObject: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} m_PrefabInstance: {fileID: 3608242020191063646} diff --git a/Assets/Prefab/PipeCell5.prefab b/Assets/Prefab/PipeCell5.prefab index b9fe4ce8..959c7075 100644 --- a/Assets/Prefab/PipeCell5.prefab +++ b/Assets/Prefab/PipeCell5.prefab @@ -192,7 +192,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 136, y: 135} + m_SizeDelta: {x: 180, y: 180} m_Pivot: {x: 0, y: 1} --- !u!222 &1790415148045804930 CanvasRenderer: @@ -296,7 +296,7 @@ MonoBehaviour: correctRotateDelta: 2 redundant: 0 _rotationValue: 0 - cellKind: 5 + cellKind: 0 --- !u!114 &1790415148045804973 MonoBehaviour: m_ObjectHideFlags: 0 @@ -412,10 +412,10 @@ RectTransform: - {fileID: 6816683185678960960} m_Father: {fileID: 1790415148045804959} m_LocalEulerAnglesHint: {x: 0, y: 0, z: -90} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -77.5, y: 4} - m_SizeDelta: {x: 100, y: 100} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7342205599614165165 CanvasRenderer: @@ -512,10 +512,10 @@ RectTransform: - {fileID: 9180058696611931389} m_Father: {fileID: 1790415148045804956} m_LocalEulerAnglesHint: {x: 0, y: 0, z: -90} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -77.4, y: 5.2} - m_SizeDelta: {x: 100, y: 100} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4878161869919723237 CanvasRenderer: @@ -612,10 +612,10 @@ RectTransform: - {fileID: 1643442384742056375} m_Father: {fileID: 1790415148045804959} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -1.8, y: -74.8} - m_SizeDelta: {x: 100, y: 100} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1058117273454891525 CanvasRenderer: @@ -712,10 +712,10 @@ RectTransform: - {fileID: 2843696356753295874} m_Father: {fileID: 1790415148045804956} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -2.4, y: -78.4} - m_SizeDelta: {x: 100, y: 100} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3704318737115900224 CanvasRenderer: @@ -788,28 +788,33 @@ PrefabInstance: m_Modifications: - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} - propertyPath: m_LocalScale.x - value: 15 + propertyPath: m_AnchorMax.x + value: 0.49444434 objectReference: {fileID: 0} - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} - propertyPath: m_LocalScale.y - value: 15 + propertyPath: m_AnchorMax.y + value: 0 objectReference: {fileID: 0} - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} - propertyPath: m_LocalScale.z - value: 15 + propertyPath: m_AnchorMin.x + value: 0.49444434 + objectReference: {fileID: 0} + - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 objectReference: {fileID: 0} - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} propertyPath: m_LocalPosition.x - value: -1.2 + value: 0 objectReference: {fileID: 0} - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} propertyPath: m_LocalPosition.y - value: 20.3 + value: 0 objectReference: {fileID: 0} - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} @@ -836,6 +841,16 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 1 objectReference: {fileID: 0} + - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -4.199997 + objectReference: {fileID: 0} + - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -13.300003 + objectReference: {fileID: 0} - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -856,18 +871,13 @@ PrefabInstance: propertyPath: m_Name value: WaterSpriteAnimation objectReference: {fileID: 0} - - target: {fileID: 4803746489132991462, guid: c8f4b60877f9d354baf440225fa74419, - type: 3} - propertyPath: m_SortingLayer - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c8f4b60877f9d354baf440225fa74419, type: 3} ---- !u!4 &1643442384742056375 stripped -Transform: +--- !u!224 &1643442384742056375 stripped +RectTransform: m_CorrespondingSourceObject: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} m_PrefabInstance: {fileID: 1566715638669109701} @@ -882,28 +892,33 @@ PrefabInstance: m_Modifications: - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} - propertyPath: m_LocalScale.x - value: 15 + propertyPath: m_AnchorMax.x + value: 0.46111107 + objectReference: {fileID: 0} + - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.01666667 objectReference: {fileID: 0} - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} - propertyPath: m_LocalScale.y - value: 15 + propertyPath: m_AnchorMin.x + value: 0.46111107 objectReference: {fileID: 0} - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} - propertyPath: m_LocalScale.z - value: 15 + propertyPath: m_AnchorMin.y + value: 0.01666667 objectReference: {fileID: 0} - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} propertyPath: m_LocalPosition.x - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} propertyPath: m_LocalPosition.y - value: 26.6 + value: 0 objectReference: {fileID: 0} - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} @@ -930,6 +945,16 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 1 objectReference: {fileID: 0} + - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0.3000002 + objectReference: {fileID: 0} + - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -14.800003 + objectReference: {fileID: 0} - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -955,8 +980,8 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c8f4b60877f9d354baf440225fa74419, type: 3} ---- !u!4 &2843696356753295874 stripped -Transform: +--- !u!224 &2843696356753295874 stripped +RectTransform: m_CorrespondingSourceObject: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} m_PrefabInstance: {fileID: 2595884777973129840} @@ -971,18 +996,23 @@ PrefabInstance: m_Modifications: - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} - propertyPath: m_LocalScale.x - value: 15 + propertyPath: m_AnchorMax.x + value: 0.47777778 objectReference: {fileID: 0} - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} - propertyPath: m_LocalScale.y - value: 15 + propertyPath: m_AnchorMax.y + value: 0 objectReference: {fileID: 0} - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} - propertyPath: m_LocalScale.z - value: 15 + propertyPath: m_AnchorMin.x + value: 0.47777778 + objectReference: {fileID: 0} + - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 objectReference: {fileID: 0} - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} @@ -992,7 +1022,7 @@ PrefabInstance: - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} propertyPath: m_LocalPosition.y - value: 23.3 + value: 0 objectReference: {fileID: 0} - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} @@ -1019,6 +1049,16 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 1 objectReference: {fileID: 0} + - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -2.6999998 + objectReference: {fileID: 0} + - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -17 + objectReference: {fileID: 0} - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -1044,8 +1084,8 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c8f4b60877f9d354baf440225fa74419, type: 3} ---- !u!4 &6816683185678960960 stripped -Transform: +--- !u!224 &6816683185678960960 stripped +RectTransform: m_CorrespondingSourceObject: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} m_PrefabInstance: {fileID: 6766940512528179506} @@ -1060,28 +1100,33 @@ PrefabInstance: m_Modifications: - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} - propertyPath: m_LocalScale.x - value: 15 + propertyPath: m_AnchorMax.x + value: 0.48888883 objectReference: {fileID: 0} - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} - propertyPath: m_LocalScale.y - value: 15 + propertyPath: m_AnchorMax.y + value: 0.0055555557 objectReference: {fileID: 0} - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} - propertyPath: m_LocalScale.z - value: 15 + propertyPath: m_AnchorMin.x + value: 0.48888883 + objectReference: {fileID: 0} + - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.0055555557 objectReference: {fileID: 0} - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} propertyPath: m_LocalPosition.x - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} propertyPath: m_LocalPosition.y - value: 21 + value: 0 objectReference: {fileID: 0} - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} @@ -1108,6 +1153,16 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 1 objectReference: {fileID: 0} + - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -2.5 + objectReference: {fileID: 0} + - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -18 + objectReference: {fileID: 0} - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -1133,8 +1188,8 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c8f4b60877f9d354baf440225fa74419, type: 3} ---- !u!4 &9180058696611931389 stripped -Transform: +--- !u!224 &9180058696611931389 stripped +RectTransform: m_CorrespondingSourceObject: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} m_PrefabInstance: {fileID: 8941517770265119887} diff --git a/Assets/Prefab/PipeCell6.prefab b/Assets/Prefab/PipeCell6.prefab index b4f18615..1ae1e21d 100644 --- a/Assets/Prefab/PipeCell6.prefab +++ b/Assets/Prefab/PipeCell6.prefab @@ -229,7 +229,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 136, y: 135} + m_SizeDelta: {x: 180, y: 180} m_Pivot: {x: 0, y: 1} --- !u!222 &1790415148045804928 CanvasRenderer: @@ -333,7 +333,7 @@ MonoBehaviour: correctRotateDelta: 1 redundant: 0 _rotationValue: 0 - cellKind: 4 + cellKind: 0 --- !u!114 &1790415148045804979 MonoBehaviour: m_ObjectHideFlags: 0 @@ -412,10 +412,10 @@ RectTransform: - {fileID: 3336851666362592216} m_Father: {fileID: 1790415148045804949} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -1.3, y: -73.9} - m_SizeDelta: {x: 100, y: 100} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9121278933166801780 CanvasRenderer: @@ -512,10 +512,10 @@ RectTransform: - {fileID: 9113540435629849827} m_Father: {fileID: 1790415148045804949} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 2.6, y: 82.6} - m_SizeDelta: {x: 100, y: 100} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7384000626433871122 CanvasRenderer: @@ -612,10 +612,10 @@ RectTransform: - {fileID: 1919167880079986563} m_Father: {fileID: 1790415148045804958} m_LocalEulerAnglesHint: {x: 0, y: 0, z: -180} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 2.2, y: 76.9} - m_SizeDelta: {x: 100, y: 100} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4564843139025117299 CanvasRenderer: @@ -712,10 +712,10 @@ RectTransform: - {fileID: 6477772458342305249} m_Father: {fileID: 1790415148045804958} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -1.5, y: -79.8} - m_SizeDelta: {x: 100, y: 100} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2591712778839444142 CanvasRenderer: @@ -788,18 +788,23 @@ PrefabInstance: m_Modifications: - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} - propertyPath: m_LocalScale.x - value: 15 + propertyPath: m_AnchorMax.x + value: 0.48888886 objectReference: {fileID: 0} - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} - propertyPath: m_LocalScale.y - value: 15 + propertyPath: m_AnchorMax.y + value: 0 objectReference: {fileID: 0} - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} - propertyPath: m_LocalScale.z - value: 15 + propertyPath: m_AnchorMin.x + value: 0.48888886 + objectReference: {fileID: 0} + - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 objectReference: {fileID: 0} - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} @@ -809,7 +814,7 @@ PrefabInstance: - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} propertyPath: m_LocalPosition.y - value: 22.4 + value: 0 objectReference: {fileID: 0} - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} @@ -836,6 +841,16 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 1 objectReference: {fileID: 0} + - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -2.5 + objectReference: {fileID: 0} + - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -18.199997 + objectReference: {fileID: 0} - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -856,18 +871,13 @@ PrefabInstance: propertyPath: m_Name value: WaterSpriteAnimation objectReference: {fileID: 0} - - target: {fileID: 4803746489132991462, guid: c8f4b60877f9d354baf440225fa74419, - type: 3} - propertyPath: m_SortingLayer - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c8f4b60877f9d354baf440225fa74419, type: 3} ---- !u!4 &1919167880079986563 stripped -Transform: +--- !u!224 &1919167880079986563 stripped +RectTransform: m_CorrespondingSourceObject: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} m_PrefabInstance: {fileID: 1860823041076176881} @@ -882,18 +892,23 @@ PrefabInstance: m_Modifications: - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} - propertyPath: m_LocalScale.x - value: 15 + propertyPath: m_AnchorMax.x + value: 0.48333332 objectReference: {fileID: 0} - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} - propertyPath: m_LocalScale.y - value: 15 + propertyPath: m_AnchorMax.y + value: 0 objectReference: {fileID: 0} - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} - propertyPath: m_LocalScale.z - value: 15 + propertyPath: m_AnchorMin.x + value: 0.48333332 + objectReference: {fileID: 0} + - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 objectReference: {fileID: 0} - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} @@ -903,7 +918,7 @@ PrefabInstance: - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} propertyPath: m_LocalPosition.y - value: 17.6 + value: 0 objectReference: {fileID: 0} - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} @@ -930,6 +945,16 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 1 objectReference: {fileID: 0} + - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -0.6000004 + objectReference: {fileID: 0} + - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -19.199997 + objectReference: {fileID: 0} - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -955,8 +980,8 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c8f4b60877f9d354baf440225fa74419, type: 3} ---- !u!4 &3336851666362592216 stripped -Transform: +--- !u!224 &3336851666362592216 stripped +RectTransform: m_CorrespondingSourceObject: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} m_PrefabInstance: {fileID: 3260141448779170730} @@ -971,18 +996,23 @@ PrefabInstance: m_Modifications: - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} - propertyPath: m_LocalScale.x - value: 15 + propertyPath: m_AnchorMax.x + value: 0.4888889 + objectReference: {fileID: 0} + - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 objectReference: {fileID: 0} - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} - propertyPath: m_LocalScale.y - value: 15 + propertyPath: m_AnchorMin.x + value: 0.4888889 objectReference: {fileID: 0} - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} - propertyPath: m_LocalScale.z - value: 15 + propertyPath: m_AnchorMin.y + value: 0 objectReference: {fileID: 0} - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} @@ -992,7 +1022,7 @@ PrefabInstance: - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} propertyPath: m_LocalPosition.y - value: 25 + value: 0 objectReference: {fileID: 0} - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} @@ -1019,6 +1049,16 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 1 objectReference: {fileID: 0} + - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -1.5999999 + objectReference: {fileID: 0} + - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -15.599998 + objectReference: {fileID: 0} - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -1044,8 +1084,8 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c8f4b60877f9d354baf440225fa74419, type: 3} ---- !u!4 &6477772458342305249 stripped -Transform: +--- !u!224 &6477772458342305249 stripped +RectTransform: m_CorrespondingSourceObject: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} m_PrefabInstance: {fileID: 6527143078883075475} @@ -1060,18 +1100,23 @@ PrefabInstance: m_Modifications: - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} - propertyPath: m_LocalScale.x - value: 15 + propertyPath: m_AnchorMax.x + value: 0.51111114 + objectReference: {fileID: 0} + - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.0055552865 objectReference: {fileID: 0} - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} - propertyPath: m_LocalScale.y - value: 15 + propertyPath: m_AnchorMin.x + value: 0.51111114 objectReference: {fileID: 0} - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} - propertyPath: m_LocalScale.z - value: 15 + propertyPath: m_AnchorMin.y + value: 0.0055552865 objectReference: {fileID: 0} - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} @@ -1081,7 +1126,7 @@ PrefabInstance: - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} propertyPath: m_LocalPosition.y - value: 24.1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} @@ -1108,6 +1153,16 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 1 objectReference: {fileID: 0} + - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -2 + objectReference: {fileID: 0} + - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -20.800003 + objectReference: {fileID: 0} - target: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -1133,8 +1188,8 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c8f4b60877f9d354baf440225fa74419, type: 3} ---- !u!4 &9113540435629849827 stripped -Transform: +--- !u!224 &9113540435629849827 stripped +RectTransform: m_CorrespondingSourceObject: {fileID: 247902173754878066, guid: c8f4b60877f9d354baf440225fa74419, type: 3} m_PrefabInstance: {fileID: 9009861220615115921} diff --git a/Assets/Prefab/PipeCell7.prefab b/Assets/Prefab/PipeCell7.prefab index 4d7a6a42..16e12dc0 100644 --- a/Assets/Prefab/PipeCell7.prefab +++ b/Assets/Prefab/PipeCell7.prefab @@ -317,7 +317,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 136, y: 135} + m_SizeDelta: {x: 180, y: 180} m_Pivot: {x: 0, y: 1} --- !u!222 &1790415148045804927 CanvasRenderer: @@ -404,7 +404,7 @@ MonoBehaviour: correctRotateDelta: 4 redundant: 0 _rotationValue: 0 - cellKind: 6 + cellKind: 0 --- !u!114 &1790415148045804991 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Cell.cs b/Assets/Scripts/Cell.cs index 9f3bdd43..5a69d196 100644 --- a/Assets/Scripts/Cell.cs +++ b/Assets/Scripts/Cell.cs @@ -1,932 +1,933 @@ -/* -http://www.cgsoso.com/forum-211-1.html - -CG搜搜 Unity3d 每日Unity3d插件免费更新 更有VIP资源! - -CGSOSO 主打游戏开发,影视设计等CG资源素材。 - -插件如若商用,请务必官网购买! - -daily assets update for try. - -U should buy the asset from home store if u use it in your project! -*/ - -using System.Collections.Generic; -using UnityEngine; -using UnityEngine.UI; - -public class Cell : MonoBehaviour -{ - public Vector2Int pos; - - public PipeColor defaultColor; - - public int rightRotationValue; - - [Header("PipeDetail")] - public RectTransform pipeParent; - - public CellType pipeCellType; - - public List pipes; - - public List pipeSprites; - - public int correctRotateDelta = 4; - - [HideInInspector] - public bool redundant; - - private bool _isHint; - - public int _rotationValue; - private object pipe; - public CellKind cellKind; - - - - public bool IsHint - { - get - { - return _isHint; - } - set - { - if (value) - { - RotationValue = rightRotationValue; - ApplyRotationOnImage(0.05f); - GetComponent().color = ColorManager.intance.hintCellBGColor; - } - else - { - GetComponent().color = ColorManager.intance.normalCellBGColor; - } - _isHint = value; - } - } - - public int RotationValue - { - get - { - return _rotationValue; - } - set - { - if (!IsHint) - { - int num = (value < 4) ? value : 0; - num = (_rotationValue = ((num >= 0) ? num : 3)); - pipes.ForEach(delegate (Pipe obj) - { - obj.SetPipeRotation(_rotationValue); - SetCellFlowSide(cellKind); - }); - } - } - } - - public Cell RightCell - { - get - { - Vector2Int v = pos + Vector2Int.right; - if (!IsValidIndex(v)) - { - return null; - } - return GetCellFromVector(v); - } - } - - public Cell LeftCell - { - get - { - Vector2Int v = pos + Vector2Int.left; - if (!IsValidIndex(v)) - { - return null; - } - return GetCellFromVector(v); - } - } - - public Cell TopCell - { - get - { - Vector2Int v = pos + Vector2Int.down; - if (!IsValidIndex(v)) - { - return null; - } - return GetCellFromVector(v); - } - } - - public Cell BottomCell - { - get - { - Vector2Int v = pos + Vector2Int.up; - if (!IsValidIndex(v)) - { - return null; - } - return GetCellFromVector(v); - } - } - - public void SetLevelData(LevelCellData lcd) - { - defaultColor = lcd.DefaultColor; - if (pipeCellType != 0) - { - GetComponent