From 10b5f44b36f3dd0d3bdc2fcc06aa13caaa611760 Mon Sep 17 00:00:00 2001
From: liuzhiwei <liuzhiwei@qq.com>
Date: Wed, 11 Nov 2020 16:56:04 +0800
Subject: [PATCH] Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master
---
Assets/Scenes/Levels/Battle/Endless.unity | 496 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 491 insertions(+), 5 deletions(-)
diff --git a/Assets/Scenes/Levels/Battle/Endless.unity b/Assets/Scenes/Levels/Battle/Endless.unity
index abbbbc3..e95015b 100644
--- a/Assets/Scenes/Levels/Battle/Endless.unity
+++ b/Assets/Scenes/Levels/Battle/Endless.unity
@@ -1237,7 +1237,8 @@
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 20.6, y: 0.98, z: 7.24}
m_LocalScale: {x: 0.79999995, y: 1, z: 3.3}
- m_Children: []
+ m_Children:
+ - {fileID: 1047835204}
m_Father: {fileID: 304173789}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1254,6 +1255,7 @@
m_Name:
m_EditorClassIdentifier:
waveLineId: 4
+ myPS: {fileID: 0}
--- !u!65 &167919694
BoxCollider:
m_ObjectHideFlags: 0
@@ -2784,7 +2786,8 @@
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -20.46, y: 0.9, z: 7.24}
m_LocalScale: {x: 0.79999995, y: 1, z: 3.3}
- m_Children: []
+ m_Children:
+ - {fileID: 585504009}
m_Father: {fileID: 304173789}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -2801,6 +2804,7 @@
m_Name:
m_EditorClassIdentifier:
waveLineId: 0
+ myPS: {fileID: 0}
--- !u!65 &495435996
BoxCollider:
m_ObjectHideFlags: 0
@@ -3625,6 +3629,86 @@
m_Father: {fileID: 1435697235}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1001 &585504008
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 495435994}
+ m_Modifications:
+ - target: {fileID: 6294722403196809820, guid: 3b5552a18f3f1d342a697c60f35c66b5,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6294722403196809820, guid: 3b5552a18f3f1d342a697c60f35c66b5,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6294722403196809820, guid: 3b5552a18f3f1d342a697c60f35c66b5,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: -2.19
+ objectReference: {fileID: 0}
+ - target: {fileID: 6294722403196809820, guid: 3b5552a18f3f1d342a697c60f35c66b5,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6294722403196809820, guid: 3b5552a18f3f1d342a697c60f35c66b5,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6294722403196809820, guid: 3b5552a18f3f1d342a697c60f35c66b5,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6294722403196809820, guid: 3b5552a18f3f1d342a697c60f35c66b5,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 6294722403196809820, guid: 3b5552a18f3f1d342a697c60f35c66b5,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6294722403196809820, guid: 3b5552a18f3f1d342a697c60f35c66b5,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6294722403196809820, guid: 3b5552a18f3f1d342a697c60f35c66b5,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6294722403196809820, guid: 3b5552a18f3f1d342a697c60f35c66b5,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6294722403196809820, guid: 3b5552a18f3f1d342a697c60f35c66b5,
+ type: 3}
+ propertyPath: m_LocalScale.z
+ value: 0.3030303
+ objectReference: {fileID: 0}
+ - target: {fileID: 6294722403196809823, guid: 3b5552a18f3f1d342a697c60f35c66b5,
+ type: 3}
+ propertyPath: m_Name
+ value: Effect_GongJiLuJing
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 3b5552a18f3f1d342a697c60f35c66b5, type: 3}
+--- !u!4 &585504009 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 6294722403196809820, guid: 3b5552a18f3f1d342a697c60f35c66b5,
+ type: 3}
+ m_PrefabInstance: {fileID: 585504008}
+ m_PrefabAsset: {fileID: 0}
--- !u!1 &587345874
GameObject:
m_ObjectHideFlags: 0
@@ -3790,7 +3874,8 @@
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 10.42, y: 0.98, z: 7.24}
m_LocalScale: {x: 0.79999995, y: 1, z: 3.3}
- m_Children: []
+ m_Children:
+ - {fileID: 741868831}
m_Father: {fileID: 304173789}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -3807,6 +3892,7 @@
m_Name:
m_EditorClassIdentifier:
waveLineId: 3
+ myPS: {fileID: 0}
--- !u!65 &618377765
BoxCollider:
m_ObjectHideFlags: 0
@@ -4460,6 +4546,86 @@
offset: 0
size: 0
path:
+--- !u!1001 &741868830
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 618377763}
+ m_Modifications:
+ - target: {fileID: 6294722403196809820, guid: 3b5552a18f3f1d342a697c60f35c66b5,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6294722403196809820, guid: 3b5552a18f3f1d342a697c60f35c66b5,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6294722403196809820, guid: 3b5552a18f3f1d342a697c60f35c66b5,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: -2.19
+ objectReference: {fileID: 0}
+ - target: {fileID: 6294722403196809820, guid: 3b5552a18f3f1d342a697c60f35c66b5,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6294722403196809820, guid: 3b5552a18f3f1d342a697c60f35c66b5,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6294722403196809820, guid: 3b5552a18f3f1d342a697c60f35c66b5,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6294722403196809820, guid: 3b5552a18f3f1d342a697c60f35c66b5,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 6294722403196809820, guid: 3b5552a18f3f1d342a697c60f35c66b5,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6294722403196809820, guid: 3b5552a18f3f1d342a697c60f35c66b5,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6294722403196809820, guid: 3b5552a18f3f1d342a697c60f35c66b5,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6294722403196809820, guid: 3b5552a18f3f1d342a697c60f35c66b5,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6294722403196809820, guid: 3b5552a18f3f1d342a697c60f35c66b5,
+ type: 3}
+ propertyPath: m_LocalScale.z
+ value: 0.3030303
+ objectReference: {fileID: 0}
+ - target: {fileID: 6294722403196809823, guid: 3b5552a18f3f1d342a697c60f35c66b5,
+ type: 3}
+ propertyPath: m_Name
+ value: Effect_GongJiLuJing
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 3b5552a18f3f1d342a697c60f35c66b5, type: 3}
+--- !u!4 &741868831 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 6294722403196809820, guid: 3b5552a18f3f1d342a697c60f35c66b5,
+ type: 3}
+ m_PrefabInstance: {fileID: 741868830}
+ m_PrefabAsset: {fileID: 0}
--- !u!1 &748467610
GameObject:
m_ObjectHideFlags: 0
@@ -5159,6 +5325,7 @@
- {fileID: 306286610}
- {fileID: 1730636813}
- {fileID: 1172214030}
+ - {fileID: 1980697784}
m_Father: {fileID: 0}
m_RootOrder: 11
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -6417,6 +6584,86 @@
m_Father: {fileID: 1466089839}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1001 &1047835203
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 167919692}
+ m_Modifications:
+ - target: {fileID: 6294722403196809820, guid: 3b5552a18f3f1d342a697c60f35c66b5,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6294722403196809820, guid: 3b5552a18f3f1d342a697c60f35c66b5,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6294722403196809820, guid: 3b5552a18f3f1d342a697c60f35c66b5,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: -2.19
+ objectReference: {fileID: 0}
+ - target: {fileID: 6294722403196809820, guid: 3b5552a18f3f1d342a697c60f35c66b5,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6294722403196809820, guid: 3b5552a18f3f1d342a697c60f35c66b5,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6294722403196809820, guid: 3b5552a18f3f1d342a697c60f35c66b5,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6294722403196809820, guid: 3b5552a18f3f1d342a697c60f35c66b5,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 6294722403196809820, guid: 3b5552a18f3f1d342a697c60f35c66b5,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6294722403196809820, guid: 3b5552a18f3f1d342a697c60f35c66b5,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6294722403196809820, guid: 3b5552a18f3f1d342a697c60f35c66b5,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6294722403196809820, guid: 3b5552a18f3f1d342a697c60f35c66b5,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6294722403196809820, guid: 3b5552a18f3f1d342a697c60f35c66b5,
+ type: 3}
+ propertyPath: m_LocalScale.z
+ value: 0.3030303
+ objectReference: {fileID: 0}
+ - target: {fileID: 6294722403196809823, guid: 3b5552a18f3f1d342a697c60f35c66b5,
+ type: 3}
+ propertyPath: m_Name
+ value: Effect_GongJiLuJing
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 3b5552a18f3f1d342a697c60f35c66b5, type: 3}
+--- !u!4 &1047835204 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 6294722403196809820, guid: 3b5552a18f3f1d342a697c60f35c66b5,
+ type: 3}
+ m_PrefabInstance: {fileID: 1047835203}
+ m_PrefabAsset: {fileID: 0}
--- !u!1 &1050046941
GameObject:
m_ObjectHideFlags: 0
@@ -7620,7 +7867,8 @@
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -10.08, y: 0.98, z: 7.24}
m_LocalScale: {x: 0.79999995, y: 1, z: 3.3}
- m_Children: []
+ m_Children:
+ - {fileID: 1397278834}
m_Father: {fileID: 304173789}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -7637,6 +7885,7 @@
m_Name:
m_EditorClassIdentifier:
waveLineId: 1
+ myPS: {fileID: 0}
--- !u!65 &1172845529
BoxCollider:
m_ObjectHideFlags: 0
@@ -9297,6 +9546,86 @@
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1396658961}
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!1001 &1397278833
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 1172845527}
+ m_Modifications:
+ - target: {fileID: 6294722403196809820, guid: 3b5552a18f3f1d342a697c60f35c66b5,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6294722403196809820, guid: 3b5552a18f3f1d342a697c60f35c66b5,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6294722403196809820, guid: 3b5552a18f3f1d342a697c60f35c66b5,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: -2.19
+ objectReference: {fileID: 0}
+ - target: {fileID: 6294722403196809820, guid: 3b5552a18f3f1d342a697c60f35c66b5,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6294722403196809820, guid: 3b5552a18f3f1d342a697c60f35c66b5,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6294722403196809820, guid: 3b5552a18f3f1d342a697c60f35c66b5,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6294722403196809820, guid: 3b5552a18f3f1d342a697c60f35c66b5,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 6294722403196809820, guid: 3b5552a18f3f1d342a697c60f35c66b5,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6294722403196809820, guid: 3b5552a18f3f1d342a697c60f35c66b5,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6294722403196809820, guid: 3b5552a18f3f1d342a697c60f35c66b5,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6294722403196809820, guid: 3b5552a18f3f1d342a697c60f35c66b5,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6294722403196809820, guid: 3b5552a18f3f1d342a697c60f35c66b5,
+ type: 3}
+ propertyPath: m_LocalScale.z
+ value: 0.3030303
+ objectReference: {fileID: 0}
+ - target: {fileID: 6294722403196809823, guid: 3b5552a18f3f1d342a697c60f35c66b5,
+ type: 3}
+ propertyPath: m_Name
+ value: Effect_GongJiLuJing
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 3b5552a18f3f1d342a697c60f35c66b5, type: 3}
+--- !u!4 &1397278834 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 6294722403196809820, guid: 3b5552a18f3f1d342a697c60f35c66b5,
+ type: 3}
+ m_PrefabInstance: {fileID: 1397278833}
+ m_PrefabAsset: {fileID: 0}
--- !u!1 &1435697234
GameObject:
m_ObjectHideFlags: 0
@@ -10425,6 +10754,86 @@
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 0
+--- !u!1001 &1584088619
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 1977355535}
+ m_Modifications:
+ - target: {fileID: 6294722403196809820, guid: 3b5552a18f3f1d342a697c60f35c66b5,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6294722403196809820, guid: 3b5552a18f3f1d342a697c60f35c66b5,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6294722403196809820, guid: 3b5552a18f3f1d342a697c60f35c66b5,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: -2.19
+ objectReference: {fileID: 0}
+ - target: {fileID: 6294722403196809820, guid: 3b5552a18f3f1d342a697c60f35c66b5,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6294722403196809820, guid: 3b5552a18f3f1d342a697c60f35c66b5,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6294722403196809820, guid: 3b5552a18f3f1d342a697c60f35c66b5,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6294722403196809820, guid: 3b5552a18f3f1d342a697c60f35c66b5,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 6294722403196809820, guid: 3b5552a18f3f1d342a697c60f35c66b5,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6294722403196809820, guid: 3b5552a18f3f1d342a697c60f35c66b5,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6294722403196809820, guid: 3b5552a18f3f1d342a697c60f35c66b5,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6294722403196809820, guid: 3b5552a18f3f1d342a697c60f35c66b5,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6294722403196809820, guid: 3b5552a18f3f1d342a697c60f35c66b5,
+ type: 3}
+ propertyPath: m_LocalScale.z
+ value: 0.3030303
+ objectReference: {fileID: 0}
+ - target: {fileID: 6294722403196809823, guid: 3b5552a18f3f1d342a697c60f35c66b5,
+ type: 3}
+ propertyPath: m_Name
+ value: Effect_GongJiLuJing
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 3b5552a18f3f1d342a697c60f35c66b5, type: 3}
+--- !u!4 &1584088620 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 6294722403196809820, guid: 3b5552a18f3f1d342a697c60f35c66b5,
+ type: 3}
+ m_PrefabInstance: {fileID: 1584088619}
+ m_PrefabAsset: {fileID: 0}
--- !u!1 &1618971293
GameObject:
m_ObjectHideFlags: 0
@@ -13828,7 +14237,8 @@
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0.08, y: 0.98, z: 7.24}
m_LocalScale: {x: 0.79999995, y: 1, z: 3.3}
- m_Children: []
+ m_Children:
+ - {fileID: 1584088620}
m_Father: {fileID: 304173789}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -13845,6 +14255,7 @@
m_Name:
m_EditorClassIdentifier:
waveLineId: 2
+ myPS: {fileID: 0}
--- !u!65 &1977355537
BoxCollider:
m_ObjectHideFlags: 0
@@ -13907,6 +14318,81 @@
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1977355534}
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!1 &1980697783
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1980697784}
+ - component: {fileID: 1980697786}
+ - component: {fileID: 1980697785}
+ m_Layer: 5
+ m_Name: Image_DarkGround
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1980697784
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1980697783}
+ 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: 849284131}
+ m_RootOrder: 4
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ 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!114 &1980697785
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1980697783}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 0
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_Sprite: {fileID: 21300000, guid: fa0112e55d0dc614d8242f21f0da35be, type: 3}
+ m_Type: 1
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
+ m_PixelsPerUnitMultiplier: 1
+--- !u!222 &1980697786
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1980697783}
+ m_CullTransparentMesh: 0
--- !u!1 &1990433418
GameObject:
m_ObjectHideFlags: 0
--
Gitblit v1.9.1