From eafda00b2799204f913a11c835bd9ca7c64dd1e7 Mon Sep 17 00:00:00 2001
From: chenxin <chenxin6991@163.com>
Date: Sat, 28 Nov 2020 17:02:28 +0800
Subject: [PATCH] GM Panel修改
---
Assets/Scenes/Levels/Battle/Endless2D.unity | 221 ++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 153 insertions(+), 68 deletions(-)
diff --git a/Assets/Scenes/Levels/Battle/Endless2D.unity b/Assets/Scenes/Levels/Battle/Endless2D.unity
index aab4161..810641d 100644
--- a/Assets/Scenes/Levels/Battle/Endless2D.unity
+++ b/Assets/Scenes/Levels/Battle/Endless2D.unity
@@ -1237,6 +1237,18 @@
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 167919691}
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!114 &188161146 stripped
+MonoBehaviour:
+ m_CorrespondingSourceObject: {fileID: 8706660362263686852, guid: 956e8afbc5c59e6429b9cc31c627d660,
+ type: 3}
+ m_PrefabInstance: {fileID: 3349256845298627641}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 0}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 2fafe2cfe61f6974895a912c3755e8f1, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
--- !u!1 &191237708
GameObject:
m_ObjectHideFlags: 0
@@ -4021,7 +4033,7 @@
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 849284131}
- m_RootOrder: 4
+ m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
@@ -4277,11 +4289,11 @@
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0, y: 0, z: 0}
m_Children:
- - {fileID: 1511101862}
- - {fileID: 1176213066}
- {fileID: 1693998523}
- {fileID: 1777094488}
- {fileID: 799533491}
+ - {fileID: 1511101862}
+ - {fileID: 1176213066}
- {fileID: 213376311}
m_Father: {fileID: 1340671931}
m_RootOrder: 2
@@ -7062,6 +7074,18 @@
type: 3}
m_PrefabInstance: {fileID: 877647585}
m_PrefabAsset: {fileID: 0}
+--- !u!114 &1430828456 stripped
+MonoBehaviour:
+ m_CorrespondingSourceObject: {fileID: 2060028181757369343, guid: 956e8afbc5c59e6429b9cc31c627d660,
+ type: 3}
+ m_PrefabInstance: {fileID: 3349256845298627641}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 0}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 2fafe2cfe61f6974895a912c3755e8f1, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
--- !u!1 &1435697234
GameObject:
m_ObjectHideFlags: 0
@@ -8378,7 +8402,7 @@
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 849284131}
- m_RootOrder: 2
+ m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
@@ -8944,7 +8968,7 @@
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 849284131}
- m_RootOrder: 3
+ m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
@@ -9219,6 +9243,18 @@
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1813750110}
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!114 &1832175059 stripped
+MonoBehaviour:
+ m_CorrespondingSourceObject: {fileID: 5006600019238887402, guid: 956e8afbc5c59e6429b9cc31c627d660,
+ type: 3}
+ m_PrefabInstance: {fileID: 3349256845298627641}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 0}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 2fafe2cfe61f6974895a912c3755e8f1, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
--- !u!1 &1861603046
GameObject:
m_ObjectHideFlags: 0
@@ -10858,6 +10894,21 @@
propertyPath: RandomText
value:
objectReference: {fileID: 551527859}
+ - target: {fileID: 1671498435182872928, guid: dcbcc0c51f9291c498c66e05663360e2,
+ type: 3}
+ propertyPath: WoodToggleGroup
+ value:
+ objectReference: {fileID: 188161146}
+ - target: {fileID: 1671498435182872928, guid: dcbcc0c51f9291c498c66e05663360e2,
+ type: 3}
+ propertyPath: FireToggleGroup
+ value:
+ objectReference: {fileID: 1430828456}
+ - target: {fileID: 1671498435182872928, guid: dcbcc0c51f9291c498c66e05663360e2,
+ type: 3}
+ propertyPath: WaterToggleGroup
+ value:
+ objectReference: {fileID: 1832175059}
- target: {fileID: 1671498435182872929, guid: dcbcc0c51f9291c498c66e05663360e2,
type: 3}
propertyPath: m_LocalPosition.x
@@ -10896,7 +10947,7 @@
- target: {fileID: 1671498435182872929, guid: dcbcc0c51f9291c498c66e05663360e2,
type: 3}
propertyPath: m_RootOrder
- value: 1
+ value: 4
objectReference: {fileID: 0}
- target: {fileID: 1671498435182872929, guid: dcbcc0c51f9291c498c66e05663360e2,
type: 3}
@@ -10971,7 +11022,7 @@
- target: {fileID: 1671498435182872930, guid: dcbcc0c51f9291c498c66e05663360e2,
type: 3}
propertyPath: m_IsActive
- value: 0
+ value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: dcbcc0c51f9291c498c66e05663360e2, type: 3}
@@ -10982,21 +11033,55 @@
m_Modification:
m_TransformParent: {fileID: 849284131}
m_Modifications:
+ - target: {fileID: 580281434, guid: 956e8afbc5c59e6429b9cc31c627d660, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
+ value:
+ objectReference: {fileID: 1176213067}
+ - target: {fileID: 253118173309355446, guid: 956e8afbc5c59e6429b9cc31c627d660,
+ type: 3}
+ propertyPath: onValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_Target
+ value:
+ objectReference: {fileID: 1176213067}
+ - target: {fileID: 1019857694183088589, guid: 956e8afbc5c59e6429b9cc31c627d660,
+ type: 3}
+ propertyPath: onValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_Target
+ value:
+ objectReference: {fileID: 1176213067}
+ - target: {fileID: 1300267123527524047, guid: 956e8afbc5c59e6429b9cc31c627d660,
+ type: 3}
+ propertyPath: onValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_Target
+ value:
+ objectReference: {fileID: 1176213067}
+ - target: {fileID: 1749341164731477527, guid: 956e8afbc5c59e6429b9cc31c627d660,
+ type: 3}
+ propertyPath: onValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_Target
+ value:
+ objectReference: {fileID: 1176213067}
+ - target: {fileID: 1836725507681989285, guid: 956e8afbc5c59e6429b9cc31c627d660,
+ type: 3}
+ propertyPath: onValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_Target
+ value:
+ objectReference: {fileID: 1176213067}
+ - target: {fileID: 1890679990068197469, guid: 956e8afbc5c59e6429b9cc31c627d660,
+ type: 3}
+ propertyPath: onValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_Target
+ value:
+ objectReference: {fileID: 1176213067}
+ - target: {fileID: 2267357075442126035, guid: 956e8afbc5c59e6429b9cc31c627d660,
+ type: 3}
+ propertyPath: onValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_Target
+ value:
+ objectReference: {fileID: 1176213067}
+ - target: {fileID: 2345193589857388592, guid: 956e8afbc5c59e6429b9cc31c627d660,
+ type: 3}
+ propertyPath: onValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_Target
+ value:
+ objectReference: {fileID: 1176213067}
- target: {fileID: 3349256845150633716, guid: 956e8afbc5c59e6429b9cc31c627d660,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 1176213067}
- - target: {fileID: 3349256845150633717, guid: 956e8afbc5c59e6429b9cc31c627d660,
- type: 3}
- propertyPath: m_AnchoredPosition.x
- value: 330
- objectReference: {fileID: 0}
- - target: {fileID: 3349256845150633717, guid: 956e8afbc5c59e6429b9cc31c627d660,
- type: 3}
- propertyPath: m_AnchoredPosition.y
- value: -156
- objectReference: {fileID: 0}
- target: {fileID: 3349256845281063795, guid: 956e8afbc5c59e6429b9cc31c627d660,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
@@ -11007,25 +11092,10 @@
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 1176213067}
- - target: {fileID: 3349256846154412987, guid: 956e8afbc5c59e6429b9cc31c627d660,
- type: 3}
- propertyPath: m_AnchoredPosition.x
- value: 330
- objectReference: {fileID: 0}
- - target: {fileID: 3349256846154412987, guid: 956e8afbc5c59e6429b9cc31c627d660,
- type: 3}
- propertyPath: m_AnchoredPosition.y
- value: -25
- objectReference: {fileID: 0}
- target: {fileID: 3349256846538989978, guid: 956e8afbc5c59e6429b9cc31c627d660,
type: 3}
propertyPath: m_Name
value: GMPanel
- objectReference: {fileID: 0}
- - target: {fileID: 3349256846538989978, guid: 956e8afbc5c59e6429b9cc31c627d660,
- type: 3}
- propertyPath: m_IsActive
- value: 0
objectReference: {fileID: 0}
- target: {fileID: 3349256846538989983, guid: 956e8afbc5c59e6429b9cc31c627d660,
type: 3}
@@ -11065,7 +11135,7 @@
- target: {fileID: 3349256846538989983, guid: 956e8afbc5c59e6429b9cc31c627d660,
type: 3}
propertyPath: m_RootOrder
- value: 0
+ value: 3
objectReference: {fileID: 0}
- target: {fileID: 3349256846538989983, guid: 956e8afbc5c59e6429b9cc31c627d660,
type: 3}
@@ -11137,21 +11207,6 @@
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 1176213067}
- - target: {fileID: 3349256846721294077, guid: 956e8afbc5c59e6429b9cc31c627d660,
- type: 3}
- propertyPath: m_AnchoredPosition.x
- value: -330
- objectReference: {fileID: 0}
- - target: {fileID: 3349256846721294077, guid: 956e8afbc5c59e6429b9cc31c627d660,
- type: 3}
- propertyPath: m_AnchoredPosition.y
- value: -25
- objectReference: {fileID: 0}
- - target: {fileID: 3349256847075511824, guid: 956e8afbc5c59e6429b9cc31c627d660,
- type: 3}
- propertyPath: m_AnchoredPosition.y
- value: -25
- objectReference: {fileID: 0}
- target: {fileID: 3349256847075511827, guid: 956e8afbc5c59e6429b9cc31c627d660,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
@@ -11162,30 +11217,60 @@
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 1176213067}
- - target: {fileID: 3349256847133983161, guid: 956e8afbc5c59e6429b9cc31c627d660,
- type: 3}
- propertyPath: m_AnchoredPosition.y
- value: -156
- objectReference: {fileID: 0}
- - target: {fileID: 3349256847133983161, guid: 956e8afbc5c59e6429b9cc31c627d660,
- type: 3}
- propertyPath: m_AnchoredPosition.x
- value: -330
- objectReference: {fileID: 0}
- - target: {fileID: 3349256847153310370, guid: 956e8afbc5c59e6429b9cc31c627d660,
- type: 3}
- propertyPath: m_AnchoredPosition.y
- value: -156
- objectReference: {fileID: 0}
- - target: {fileID: 3349256847153310370, guid: 956e8afbc5c59e6429b9cc31c627d660,
- type: 3}
- propertyPath: m_AnchoredPosition.x
- value: 0
- objectReference: {fileID: 0}
- target: {fileID: 3349256847153310373, guid: 956e8afbc5c59e6429b9cc31c627d660,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 1176213067}
+ - target: {fileID: 4044681877253777814, guid: 956e8afbc5c59e6429b9cc31c627d660,
+ type: 3}
+ propertyPath: onValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_Target
+ value:
+ objectReference: {fileID: 1176213067}
+ - target: {fileID: 4289594054294636412, guid: 956e8afbc5c59e6429b9cc31c627d660,
+ type: 3}
+ propertyPath: onValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_Target
+ value:
+ objectReference: {fileID: 1176213067}
+ - target: {fileID: 4416282546202965636, guid: 956e8afbc5c59e6429b9cc31c627d660,
+ type: 3}
+ propertyPath: onValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_Target
+ value:
+ objectReference: {fileID: 1176213067}
+ - target: {fileID: 4488881254114326629, guid: 956e8afbc5c59e6429b9cc31c627d660,
+ type: 3}
+ propertyPath: onValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_Target
+ value:
+ objectReference: {fileID: 1176213067}
+ - target: {fileID: 5683648220907820883, guid: 956e8afbc5c59e6429b9cc31c627d660,
+ type: 3}
+ propertyPath: onValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_Target
+ value:
+ objectReference: {fileID: 1176213067}
+ - target: {fileID: 5974431036818947538, guid: 956e8afbc5c59e6429b9cc31c627d660,
+ type: 3}
+ propertyPath: onValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_Target
+ value:
+ objectReference: {fileID: 1176213067}
+ - target: {fileID: 6923322012616660611, guid: 956e8afbc5c59e6429b9cc31c627d660,
+ type: 3}
+ propertyPath: onValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_Target
+ value:
+ objectReference: {fileID: 1176213067}
+ - target: {fileID: 7822809742738407517, guid: 956e8afbc5c59e6429b9cc31c627d660,
+ type: 3}
+ propertyPath: onValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_Target
+ value:
+ objectReference: {fileID: 1176213067}
+ - target: {fileID: 9116109220945698194, guid: 956e8afbc5c59e6429b9cc31c627d660,
+ type: 3}
+ propertyPath: onValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_Target
+ value:
+ objectReference: {fileID: 1176213067}
+ - target: {fileID: 9150022674153898468, guid: 956e8afbc5c59e6429b9cc31c627d660,
+ type: 3}
+ propertyPath: onValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_Target
+ value:
+ objectReference: {fileID: 1176213067}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 956e8afbc5c59e6429b9cc31c627d660, type: 3}
--
Gitblit v1.9.1