Browse Source

修改3D闸门UI,闸门模型顺序调整(记得重新打AB包)

Void_F 10 months ago
parent
commit
b4df441743

+ 38 - 38
Assets/Art/Prefab/Buildings/BuYuan_ShiNei_Model/ZhaMen.prefab

@@ -12,7 +12,7 @@ GameObject:
   - component: {fileID: 2087591714989980155}
   - component: {fileID: 5400624696927697926}
   m_Layer: 0
-  m_Name: ZhaMen04
+  m_Name: ZhaMen12
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -25,13 +25,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 553648927097478807}
-  m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 56.113594, y: 0.097243346, z: -0.0162677}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 56.113594, y: 0.097243786, z: -0.016267776}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 6737401307673640640}
-  m_RootOrder: 3
+  m_RootOrder: 11
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!33 &2087591714989980155
 MeshFilter:
@@ -95,7 +95,7 @@ GameObject:
   - component: {fileID: 184362148343643027}
   - component: {fileID: 8856528802640890235}
   m_Layer: 0
-  m_Name: ZhaMen03
+  m_Name: ZhaMen13
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -114,7 +114,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 6737401307673640640}
-  m_RootOrder: 2
+  m_RootOrder: 12
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!33 &184362148343643027
 MeshFilter:
@@ -261,7 +261,7 @@ GameObject:
   - component: {fileID: 3918106288653234356}
   - component: {fileID: 720073426779366853}
   m_Layer: 0
-  m_Name: ZhaMen10
+  m_Name: ZhaMen06
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -280,7 +280,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 6737401307673640640}
-  m_RootOrder: 9
+  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!33 &3918106288653234356
 MeshFilter:
@@ -344,7 +344,7 @@ GameObject:
   - component: {fileID: 7781394588533548630}
   - component: {fileID: 5396325314483685741}
   m_Layer: 0
-  m_Name: ZhaMen13
+  m_Name: ZhaMen03
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -363,7 +363,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 6737401307673640640}
-  m_RootOrder: 12
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!33 &7781394588533548630
 MeshFilter:
@@ -427,7 +427,7 @@ GameObject:
   - component: {fileID: 8296009579853137777}
   - component: {fileID: 4202171917512980449}
   m_Layer: 0
-  m_Name: ZhaMen09
+  m_Name: ZhaMen07
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -446,7 +446,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 6737401307673640640}
-  m_RootOrder: 8
+  m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!33 &8296009579853137777
 MeshFilter:
@@ -510,7 +510,7 @@ GameObject:
   - component: {fileID: 1900121550387824226}
   - component: {fileID: 4672555907924097272}
   m_Layer: 0
-  m_Name: ZhaMen11
+  m_Name: ZhaMen05
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -529,7 +529,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 6737401307673640640}
-  m_RootOrder: 10
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!33 &1900121550387824226
 MeshFilter:
@@ -593,7 +593,7 @@ GameObject:
   - component: {fileID: 968577083829266744}
   - component: {fileID: 1120445799645405832}
   m_Layer: 0
-  m_Name: ZhaMen06
+  m_Name: ZhaMen10
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -612,7 +612,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 6737401307673640640}
-  m_RootOrder: 5
+  m_RootOrder: 9
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!33 &968577083829266744
 MeshFilter:
@@ -676,7 +676,7 @@ GameObject:
   - component: {fileID: 7745351820026145127}
   - component: {fileID: 5173772500369954007}
   m_Layer: 0
-  m_Name: ZhaMen12
+  m_Name: ZhaMen04
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -695,7 +695,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 6737401307673640640}
-  m_RootOrder: 11
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!33 &7745351820026145127
 MeshFilter:
@@ -759,7 +759,7 @@ GameObject:
   - component: {fileID: 6006456717128628796}
   - component: {fileID: 772430370569171820}
   m_Layer: 0
-  m_Name: ZhaMen02
+  m_Name: ZhaMen14
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -778,7 +778,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 6737401307673640640}
-  m_RootOrder: 1
+  m_RootOrder: 13
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!33 &6006456717128628796
 MeshFilter:
@@ -859,19 +859,19 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 2719903077355102565}
-  - {fileID: 2099732464622248592}
-  - {fileID: 1636418134062106467}
-  - {fileID: 4489872167607947759}
-  - {fileID: 2135780969531077664}
-  - {fileID: 8650693078817094857}
-  - {fileID: 6113681957087249081}
-  - {fileID: 6640484005547653506}
-  - {fileID: 1213004998587637078}
-  - {fileID: 7623170527537524181}
-  - {fileID: 8977980743092852239}
-  - {fileID: 6369450267189754071}
-  - {fileID: 4476097048029716301}
   - {fileID: 8699017895377133663}
+  - {fileID: 4476097048029716301}
+  - {fileID: 6369450267189754071}
+  - {fileID: 8977980743092852239}
+  - {fileID: 7623170527537524181}
+  - {fileID: 1213004998587637078}
+  - {fileID: 6640484005547653506}
+  - {fileID: 6113681957087249081}
+  - {fileID: 8650693078817094857}
+  - {fileID: 2135780969531077664}
+  - {fileID: 4489872167607947759}
+  - {fileID: 1636418134062106467}
+  - {fileID: 2099732464622248592}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -887,7 +887,7 @@ GameObject:
   - component: {fileID: 8010905108330338457}
   - component: {fileID: 5353515932617195106}
   m_Layer: 0
-  m_Name: ZhaMen07
+  m_Name: ZhaMen09
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -906,7 +906,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 6737401307673640640}
-  m_RootOrder: 6
+  m_RootOrder: 8
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!33 &8010905108330338457
 MeshFilter:
@@ -1053,7 +1053,7 @@ GameObject:
   - component: {fileID: 1606415467604426048}
   - component: {fileID: 719369669897370369}
   m_Layer: 0
-  m_Name: ZhaMen14
+  m_Name: ZhaMen02
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -1072,7 +1072,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 6737401307673640640}
-  m_RootOrder: 13
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!33 &1606415467604426048
 MeshFilter:
@@ -1136,7 +1136,7 @@ GameObject:
   - component: {fileID: 3364611338885123606}
   - component: {fileID: 3046733914956099108}
   m_Layer: 0
-  m_Name: ZhaMen05
+  m_Name: ZhaMen11
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -1155,7 +1155,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 6737401307673640640}
-  m_RootOrder: 4
+  m_RootOrder: 10
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!33 &3364611338885123606
 MeshFilter:

+ 77 - 77
Assets/Art/Prefab/Buildings/TaoKou_ShiNei_Model/ZhaMen.prefab

@@ -12,7 +12,7 @@ GameObject:
   - component: {fileID: 2588497003752815734}
   - component: {fileID: 3168539750231285669}
   m_Layer: 0
-  m_Name: ZhaMen37
+  m_Name: ZhaMen38
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -31,7 +31,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 7330928930957230616}
-  m_RootOrder: 36
+  m_RootOrder: 37
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!33 &2588497003752815734
 MeshFilter:
@@ -95,7 +95,7 @@ GameObject:
   - component: {fileID: 3804084209338192535}
   - component: {fileID: 1309298056447062223}
   m_Layer: 0
-  m_Name: ZhaMen22
+  m_Name: ZhaMen23
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -114,7 +114,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 7330928930957230616}
-  m_RootOrder: 21
+  m_RootOrder: 22
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!33 &3804084209338192535
 MeshFilter:
@@ -178,7 +178,7 @@ GameObject:
   - component: {fileID: 4316356152690968168}
   - component: {fileID: 911783752060890518}
   m_Layer: 0
-  m_Name: ZhaMen40
+  m_Name: ZhaMen41
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -197,7 +197,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 7330928930957230616}
-  m_RootOrder: 39
+  m_RootOrder: 40
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!33 &4316356152690968168
 MeshFilter:
@@ -344,7 +344,7 @@ GameObject:
   - component: {fileID: 3939208017011052685}
   - component: {fileID: 6998642027458436325}
   m_Layer: 0
-  m_Name: ZhaMen41
+  m_Name: ZhaMen42
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -363,7 +363,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 7330928930957230616}
-  m_RootOrder: 40
+  m_RootOrder: 41
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!33 &3939208017011052685
 MeshFilter:
@@ -427,7 +427,7 @@ GameObject:
   - component: {fileID: 1036768166406179948}
   - component: {fileID: 3585579135425403165}
   m_Layer: 0
-  m_Name: ZhaMen10
+  m_Name: ZhaMen11
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -446,7 +446,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 7330928930957230616}
-  m_RootOrder: 9
+  m_RootOrder: 10
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!33 &1036768166406179948
 MeshFilter:
@@ -510,7 +510,7 @@ GameObject:
   - component: {fileID: 1731726640841807211}
   - component: {fileID: 1029299449178813867}
   m_Layer: 0
-  m_Name: ZhaMen17
+  m_Name: ZhaMen18
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -529,7 +529,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 7330928930957230616}
-  m_RootOrder: 16
+  m_RootOrder: 17
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!33 &1731726640841807211
 MeshFilter:
@@ -593,7 +593,7 @@ GameObject:
   - component: {fileID: 3293488558391348634}
   - component: {fileID: 5947856854235565781}
   m_Layer: 0
-  m_Name: ZhaMen36
+  m_Name: ZhaMen37
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -612,7 +612,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 7330928930957230616}
-  m_RootOrder: 35
+  m_RootOrder: 36
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!33 &3293488558391348634
 MeshFilter:
@@ -676,7 +676,7 @@ GameObject:
   - component: {fileID: 1032684501007158564}
   - component: {fileID: 8465582476018232653}
   m_Layer: 0
-  m_Name: ZhaMen24
+  m_Name: ZhaMen25
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -695,7 +695,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 7330928930957230616}
-  m_RootOrder: 23
+  m_RootOrder: 24
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!33 &1032684501007158564
 MeshFilter:
@@ -759,7 +759,7 @@ GameObject:
   - component: {fileID: 6812585951027679196}
   - component: {fileID: 515261364662641348}
   m_Layer: 0
-  m_Name: ZhaMen18
+  m_Name: ZhaMen19
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -778,7 +778,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 7330928930957230616}
-  m_RootOrder: 17
+  m_RootOrder: 18
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!33 &6812585951027679196
 MeshFilter:
@@ -842,7 +842,7 @@ GameObject:
   - component: {fileID: 1862951252877356395}
   - component: {fileID: 6733703532312642524}
   m_Layer: 0
-  m_Name: ZhaMen29
+  m_Name: ZhaMen30
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -861,7 +861,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 7330928930957230616}
-  m_RootOrder: 28
+  m_RootOrder: 29
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!33 &1862951252877356395
 MeshFilter:
@@ -925,7 +925,7 @@ GameObject:
   - component: {fileID: 1558557855700800970}
   - component: {fileID: 5943469726994166936}
   m_Layer: 0
-  m_Name: ZhaMen35
+  m_Name: ZhaMen36
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -944,7 +944,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 7330928930957230616}
-  m_RootOrder: 34
+  m_RootOrder: 35
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!33 &1558557855700800970
 MeshFilter:
@@ -1008,7 +1008,7 @@ GameObject:
   - component: {fileID: 4736416445012373718}
   - component: {fileID: 1587804373413580006}
   m_Layer: 0
-  m_Name: ZhaMen39
+  m_Name: ZhaMen40
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -1027,7 +1027,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 7330928930957230616}
-  m_RootOrder: 38
+  m_RootOrder: 39
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!33 &4736416445012373718
 MeshFilter:
@@ -1174,7 +1174,7 @@ GameObject:
   - component: {fileID: 1703660377915380052}
   - component: {fileID: 1471938228921849324}
   m_Layer: 0
-  m_Name: ZhaMen27
+  m_Name: ZhaMen28
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -1193,7 +1193,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 7330928930957230616}
-  m_RootOrder: 26
+  m_RootOrder: 27
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!33 &1703660377915380052
 MeshFilter:
@@ -1257,7 +1257,7 @@ GameObject:
   - component: {fileID: 6659226043683055980}
   - component: {fileID: 6927890508089434128}
   m_Layer: 0
-  m_Name: ZhaMen15
+  m_Name: ZhaMen16
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -1276,7 +1276,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 7330928930957230616}
-  m_RootOrder: 14
+  m_RootOrder: 15
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!33 &6659226043683055980
 MeshFilter:
@@ -1340,7 +1340,7 @@ GameObject:
   - component: {fileID: 3929191087350651745}
   - component: {fileID: 3356904001714974477}
   m_Layer: 0
-  m_Name: ZhaMen34
+  m_Name: ZhaMen35
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -1359,7 +1359,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 7330928930957230616}
-  m_RootOrder: 33
+  m_RootOrder: 34
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!33 &3929191087350651745
 MeshFilter:
@@ -1423,7 +1423,7 @@ GameObject:
   - component: {fileID: 1231665790509755617}
   - component: {fileID: 2395543937364652626}
   m_Layer: 0
-  m_Name: ZhaMen33
+  m_Name: ZhaMen34
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -1442,7 +1442,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 7330928930957230616}
-  m_RootOrder: 32
+  m_RootOrder: 33
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!33 &1231665790509755617
 MeshFilter:
@@ -1506,7 +1506,7 @@ GameObject:
   - component: {fileID: 8143770438339538742}
   - component: {fileID: 7571657620008919946}
   m_Layer: 0
-  m_Name: ZhaMen21
+  m_Name: ZhaMen22
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -1525,7 +1525,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 7330928930957230616}
-  m_RootOrder: 20
+  m_RootOrder: 21
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!33 &8143770438339538742
 MeshFilter:
@@ -1589,7 +1589,7 @@ GameObject:
   - component: {fileID: 8408540496844579548}
   - component: {fileID: 6600279211294360333}
   m_Layer: 0
-  m_Name: ZhaMen32
+  m_Name: ZhaMen33
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -1608,7 +1608,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 7330928930957230616}
-  m_RootOrder: 31
+  m_RootOrder: 32
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!33 &8408540496844579548
 MeshFilter:
@@ -1755,7 +1755,7 @@ GameObject:
   - component: {fileID: 707826636919374572}
   - component: {fileID: 8888804881303485789}
   m_Layer: 0
-  m_Name: ZhaMen43
+  m_Name: ZhaMen44
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -1774,7 +1774,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 7330928930957230616}
-  m_RootOrder: 42
+  m_RootOrder: 43
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!33 &707826636919374572
 MeshFilter:
@@ -1921,7 +1921,7 @@ GameObject:
   - component: {fileID: 3348318114909880728}
   - component: {fileID: 3586845703447021529}
   m_Layer: 0
-  m_Name: ZhaMen14
+  m_Name: ZhaMen15
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -1940,7 +1940,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 7330928930957230616}
-  m_RootOrder: 13
+  m_RootOrder: 14
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!33 &3348318114909880728
 MeshFilter:
@@ -2004,7 +2004,7 @@ GameObject:
   - component: {fileID: 7163304128814439153}
   - component: {fileID: 4461452180754929426}
   m_Layer: 0
-  m_Name: ZhaMen19
+  m_Name: ZhaMen20
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -2023,7 +2023,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 7330928930957230616}
-  m_RootOrder: 18
+  m_RootOrder: 19
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!33 &7163304128814439153
 MeshFilter:
@@ -2087,7 +2087,7 @@ GameObject:
   - component: {fileID: 4290918784489785425}
   - component: {fileID: 2457047231344742903}
   m_Layer: 0
-  m_Name: ZhaMen16
+  m_Name: ZhaMen17
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -2106,7 +2106,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 7330928930957230616}
-  m_RootOrder: 15
+  m_RootOrder: 16
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!33 &4290918784489785425
 MeshFilter:
@@ -2170,7 +2170,7 @@ GameObject:
   - component: {fileID: 6436967512764576344}
   - component: {fileID: 8793646237236606577}
   m_Layer: 0
-  m_Name: ZhaMen23
+  m_Name: ZhaMen24
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -2189,7 +2189,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 7330928930957230616}
-  m_RootOrder: 22
+  m_RootOrder: 23
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!33 &6436967512764576344
 MeshFilter:
@@ -2253,7 +2253,7 @@ GameObject:
   - component: {fileID: 1362145856368692996}
   - component: {fileID: 2529090396704120536}
   m_Layer: 0
-  m_Name: ZhaMen26
+  m_Name: ZhaMen27
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -2272,7 +2272,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 7330928930957230616}
-  m_RootOrder: 25
+  m_RootOrder: 26
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!33 &1362145856368692996
 MeshFilter:
@@ -2336,7 +2336,7 @@ GameObject:
   - component: {fileID: 4078016318170188708}
   - component: {fileID: 9099927863678377596}
   m_Layer: 0
-  m_Name: ZhaMen20
+  m_Name: ZhaMen21
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -2355,7 +2355,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 7330928930957230616}
-  m_RootOrder: 19
+  m_RootOrder: 20
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!33 &4078016318170188708
 MeshFilter:
@@ -2419,7 +2419,7 @@ GameObject:
   - component: {fileID: 6273738641580811329}
   - component: {fileID: 8248129064137523898}
   m_Layer: 0
-  m_Name: ZhaMen07
+  m_Name: ZhaMen08
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -2438,7 +2438,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 7330928930957230616}
-  m_RootOrder: 6
+  m_RootOrder: 7
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!33 &6273738641580811329
 MeshFilter:
@@ -2502,7 +2502,7 @@ GameObject:
   - component: {fileID: 5685106486096734397}
   - component: {fileID: 5471277325663462082}
   m_Layer: 0
-  m_Name: ZhaMen08
+  m_Name: ZhaMen09
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -2521,7 +2521,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 7330928930957230616}
-  m_RootOrder: 7
+  m_RootOrder: 8
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!33 &5685106486096734397
 MeshFilter:
@@ -2585,7 +2585,7 @@ GameObject:
   - component: {fileID: 5999282607704102335}
   - component: {fileID: 9218957927019767823}
   m_Layer: 0
-  m_Name: ZhaMen12
+  m_Name: ZhaMen13
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -2604,7 +2604,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 7330928930957230616}
-  m_RootOrder: 11
+  m_RootOrder: 12
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!33 &5999282607704102335
 MeshFilter:
@@ -2751,7 +2751,7 @@ GameObject:
   - component: {fileID: 4173362143762057587}
   - component: {fileID: 4527705429143879125}
   m_Layer: 0
-  m_Name: ZhaMen44
+  m_Name: ZhaMen07
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -2770,7 +2770,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 7330928930957230616}
-  m_RootOrder: 43
+  m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!33 &4173362143762057587
 MeshFilter:
@@ -2834,7 +2834,7 @@ GameObject:
   - component: {fileID: 3215767232642075852}
   - component: {fileID: 3397065716210215439}
   m_Layer: 0
-  m_Name: ZhaMen25
+  m_Name: ZhaMen26
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -2853,7 +2853,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 7330928930957230616}
-  m_RootOrder: 24
+  m_RootOrder: 25
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!33 &3215767232642075852
 MeshFilter:
@@ -2940,6 +2940,7 @@ Transform:
   - {fileID: 464861679887052087}
   - {fileID: 2711007234040842488}
   - {fileID: 4625707312854990865}
+  - {fileID: 7113585525882204916}
   - {fileID: 7846562029284507233}
   - {fileID: 7213362302171481434}
   - {fileID: 2948109876135616910}
@@ -2977,7 +2978,6 @@ Transform:
   - {fileID: 8161052959659513919}
   - {fileID: 249654739170388633}
   - {fileID: 5835991616543909091}
-  - {fileID: 7113585525882204916}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -3097,7 +3097,7 @@ GameObject:
   - component: {fileID: 1490367610563889863}
   - component: {fileID: 7351758944569027403}
   m_Layer: 0
-  m_Name: ZhaMen38
+  m_Name: ZhaMen39
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -3116,7 +3116,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 7330928930957230616}
-  m_RootOrder: 37
+  m_RootOrder: 38
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!33 &1490367610563889863
 MeshFilter:
@@ -3180,7 +3180,7 @@ GameObject:
   - component: {fileID: 9093215234720744141}
   - component: {fileID: 3194051648285320913}
   m_Layer: 0
-  m_Name: ZhaMen42
+  m_Name: ZhaMen43
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -3199,7 +3199,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 7330928930957230616}
-  m_RootOrder: 41
+  m_RootOrder: 42
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!33 &9093215234720744141
 MeshFilter:
@@ -3263,7 +3263,7 @@ GameObject:
   - component: {fileID: 5412736368748460969}
   - component: {fileID: 174975004202437433}
   m_Layer: 0
-  m_Name: ZhaMen09
+  m_Name: ZhaMen10
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -3282,7 +3282,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 7330928930957230616}
-  m_RootOrder: 8
+  m_RootOrder: 9
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!33 &5412736368748460969
 MeshFilter:
@@ -3346,7 +3346,7 @@ GameObject:
   - component: {fileID: 2477588602618051258}
   - component: {fileID: 8711368062525457440}
   m_Layer: 0
-  m_Name: ZhaMen11
+  m_Name: ZhaMen12
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -3365,7 +3365,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 7330928930957230616}
-  m_RootOrder: 10
+  m_RootOrder: 11
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!33 &2477588602618051258
 MeshFilter:
@@ -3429,7 +3429,7 @@ GameObject:
   - component: {fileID: 4891315703998715797}
   - component: {fileID: 8858089548549056466}
   m_Layer: 0
-  m_Name: ZhaMen31
+  m_Name: ZhaMen32
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -3448,7 +3448,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 7330928930957230616}
-  m_RootOrder: 30
+  m_RootOrder: 31
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!33 &4891315703998715797
 MeshFilter:
@@ -3512,7 +3512,7 @@ GameObject:
   - component: {fileID: 4614551800124097295}
   - component: {fileID: 4532791279274834530}
   m_Layer: 0
-  m_Name: ZhaMen28
+  m_Name: ZhaMen29
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -3531,7 +3531,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 7330928930957230616}
-  m_RootOrder: 27
+  m_RootOrder: 28
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!33 &4614551800124097295
 MeshFilter:
@@ -3595,7 +3595,7 @@ GameObject:
   - component: {fileID: 6035297287188830862}
   - component: {fileID: 8277377000323888565}
   m_Layer: 0
-  m_Name: ZhaMen13
+  m_Name: ZhaMen14
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -3614,7 +3614,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 7330928930957230616}
-  m_RootOrder: 12
+  m_RootOrder: 13
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!33 &6035297287188830862
 MeshFilter:
@@ -3678,7 +3678,7 @@ GameObject:
   - component: {fileID: 5462670588934123774}
   - component: {fileID: 1378090743625348412}
   m_Layer: 0
-  m_Name: ZhaMen30
+  m_Name: ZhaMen31
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -3697,7 +3697,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 7330928930957230616}
-  m_RootOrder: 29
+  m_RootOrder: 30
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!33 &5462670588934123774
 MeshFilter:

+ 9 - 4
Assets/ModelAniTool.cs

@@ -19,7 +19,7 @@ public class ModelAniTool : MonoBehaviour
     
     public float speed=2.0f;
 
-    private GameObject[] targetObjs;
+    public GameObject[] targetObjs;
 
     public AniType aniType;
 
@@ -46,8 +46,12 @@ public class ModelAniTool : MonoBehaviour
         ActionInstance._Instance.ModelAni_Off += Ani_Off;
     }
 
-    public void Ani_On(float[] v3s)
+    public void Ani_On(AniType type,float[] v3s)
     {
+        if (type != aniType)
+        {
+            return;
+        }
         if (v3s == null)
         {
             v3s = new float[targetObjs.Length];
@@ -64,7 +68,8 @@ public class ModelAniTool : MonoBehaviour
                 {
                     int tempIndex = i;
                     targetObjs[i].transform.localPosition = oriV3[tempIndex];
-                    targetObjs[i].transform.DOLocalMoveY(8*openValues[tempIndex], speed);
+                    targetObjs[i].transform.DOLocalMoveZ(8*openValues[tempIndex], speed);
+                    Debug.Log($"{targetObjs[i].name}:{openValues[tempIndex]}");
                 }
                 break;
             case AniType.taoKou:
@@ -87,7 +92,7 @@ public class ModelAniTool : MonoBehaviour
                 {
                     int tempIndex = i;
                     targetObjs[i].transform.localPosition = oriV3[tempIndex] + new Vector3(0, 0, 8);
-                    targetObjs[i].transform.DOLocalMoveY(0, speed);
+                    targetObjs[i].transform.DOLocalMoveZ(0, speed);
                 }
                 break;
             case AniType.taoKou:

+ 2 - 2
Assets/Prefabs/UI/3D/GCZL.prefab

@@ -341,7 +341,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &7236755091719880464
 RectTransform:
   m_ObjectHideFlags: 0
@@ -832,7 +832,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &8481814305050007921
 RectTransform:
   m_ObjectHideFlags: 0

+ 256 - 25
Assets/Prefabs/UI/SWFZ/ZMJK.prefab

@@ -458,12 +458,12 @@ RectTransform:
   m_Children:
   - {fileID: 4024445922542991802}
   - {fileID: 2820657295753270039}
-  m_Father: {fileID: 8853781256864456230}
+  m_Father: {fileID: 6374276066563140182}
   m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 106, y: -208}
+  m_AnchoredPosition: {x: 106, y: -214}
   m_SizeDelta: {x: 172, y: 64}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8392595051247197919
@@ -3630,12 +3630,12 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 8853781256864456230}
+  m_Father: {fileID: 6374276066563140182}
   m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -15, y: -15}
+  m_AnchoredPosition: {x: -15, y: -21}
   m_SizeDelta: {x: 20, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6524910699952850643
@@ -3912,12 +3912,12 @@ RectTransform:
   m_Children:
   - {fileID: 4771681860162712450}
   - {fileID: 5638878429765519930}
-  m_Father: {fileID: 8853781256864456230}
+  m_Father: {fileID: 6374276066563140182}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 106, y: -134}
+  m_AnchoredPosition: {x: 106, y: -140}
   m_SizeDelta: {x: 172, y: 64}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5710733351205372321
@@ -6463,12 +6463,12 @@ RectTransform:
   m_Children:
   - {fileID: 6244737564282157820}
   - {fileID: 2315313621839284835}
-  m_Father: {fileID: 8853781256864456230}
+  m_Father: {fileID: 6374276066563140182}
   m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 294, y: -208}
+  m_AnchoredPosition: {x: 294, y: -214}
   m_SizeDelta: {x: 172, y: 64}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &168517911436517855
@@ -8739,6 +8739,82 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &2987941616224786961
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5392938928620238107}
+  - component: {fileID: 8954337169631449213}
+  - component: {fileID: 4926731129212831334}
+  m_Layer: 5
+  m_Name: Image (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5392938928620238107
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2987941616224786961}
+  m_LocalRotation: {x: 0, y: 0, z: -0.38268343, w: 0.92387956}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 8853781256864456230}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: -45}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 55.7, y: 56}
+  m_SizeDelta: {x: 4, y: 142.98}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8954337169631449213
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2987941616224786961}
+  m_CullTransparentMesh: 1
+--- !u!114 &4926731129212831334
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2987941616224786961}
+  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: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  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!1 &2992155751568623533
 GameObject:
   m_ObjectHideFlags: 0
@@ -8893,6 +8969,89 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &3027197402902407407
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6374276066563140182}
+  - component: {fileID: 6585389013858613049}
+  - component: {fileID: 4115528295288951234}
+  m_Layer: 5
+  m_Name: bg
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6374276066563140182
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3027197402902407407}
+  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_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 4492879154336153449}
+  - {fileID: 4515071229004848575}
+  - {fileID: 8272408814850990978}
+  - {fileID: 8509063599123288539}
+  - {fileID: 4576088174781819349}
+  - {fileID: 4159492196613629441}
+  - {fileID: 7795459548279204250}
+  m_Father: {fileID: 8853781256864456230}
+  m_RootOrder: 2
+  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: 406.4, y: 44}
+  m_SizeDelta: {x: 400, y: 600}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6585389013858613049
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3027197402902407407}
+  m_CullTransparentMesh: 1
+--- !u!114 &4115528295288951234
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3027197402902407407}
+  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: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 2e07baada5bc940458d45b408039f686, type: 3}
+  m_Type: 0
+  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!1 &3078741135405642596
 GameObject:
   m_ObjectHideFlags: 0
@@ -12352,12 +12511,12 @@ RectTransform:
   m_Children:
   - {fileID: 4934170336394333831}
   - {fileID: 7541132771724086506}
-  m_Father: {fileID: 8853781256864456230}
+  m_Father: {fileID: 6374276066563140182}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 294, y: -134}
+  m_AnchoredPosition: {x: 294, y: -140}
   m_SizeDelta: {x: 172, y: 64}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6387525493470696701
@@ -15997,20 +16156,16 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 4492879154336153449}
-  - {fileID: 4515071229004848575}
-  - {fileID: 8272408814850990978}
-  - {fileID: 8509063599123288539}
-  - {fileID: 4576088174781819349}
-  - {fileID: 4159492196613629441}
-  - {fileID: 7795459548279204250}
+  - {fileID: 5392938928620238107}
+  - {fileID: 1393834271580688366}
+  - {fileID: 6374276066563140182}
   m_Father: {fileID: 4461453780397662635}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 1525, y: -524}
-  m_SizeDelta: {x: 400, y: 588}
+  m_AnchoredPosition: {x: 1074, y: -524}
+  m_SizeDelta: {x: 18, y: 19}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8819686433551012977
 CanvasRenderer:
@@ -16040,7 +16195,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 2e07baada5bc940458d45b408039f686, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 4125e041895e70d41a1f539ec889bfd7, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -18304,12 +18459,12 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 8853781256864456230}
+  m_Father: {fileID: 6374276066563140182}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 114, y: -21}
+  m_AnchoredPosition: {x: 114, y: -27}
   m_SizeDelta: {x: 108, y: 24}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7415341264967988894
@@ -18663,7 +18818,7 @@ MonoBehaviour:
   m_HandleRect: {fileID: 7625981591886958950}
   m_Direction: 2
   m_Value: 0
-  m_Size: 0.81333333
+  m_Size: 1
   m_NumberOfSteps: 0
   m_OnValueChanged:
     m_PersistentCalls:
@@ -20477,6 +20632,82 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &8299914638928862325
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1393834271580688366}
+  - component: {fileID: 1383678792769646176}
+  - component: {fileID: 4763180849157995116}
+  m_Layer: 5
+  m_Name: Image (2)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1393834271580688366
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8299914638928862325}
+  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_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 8853781256864456230}
+  m_RootOrder: 1
+  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: 156.4, y: 106}
+  m_SizeDelta: {x: 100, y: 4}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1383678792769646176
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8299914638928862325}
+  m_CullTransparentMesh: 1
+--- !u!114 &4763180849157995116
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8299914638928862325}
+  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: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  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!1 &8307386289464083548
 GameObject:
   m_ObjectHideFlags: 0
@@ -20586,12 +20817,12 @@ RectTransform:
   - {fileID: 1883910266815122658}
   - {fileID: 7649492946615949557}
   - {fileID: 5921665105891909031}
-  m_Father: {fileID: 8853781256864456230}
+  m_Father: {fileID: 6374276066563140182}
   m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 200, y: -292}
+  m_AnchoredPosition: {x: 200, y: -298}
   m_SizeDelta: {x: 360, y: 32}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &556773731049330890

File diff suppressed because it is too large
+ 2 - 99
Assets/Scene 1.unity


+ 1 - 1
Assets/Scripts/ActionInstance.cs

@@ -9,7 +9,7 @@ public class ActionInstance : MonoBehaviour
 
     public Action<string> obsFmUpdata;
 
-    public Action<float[]> ModelAni_On;
+    public Action<AniType,float[]> ModelAni_On;
     public Action ModelAni_Off;
 
     public Action<bool> SetCheckPathActive;

+ 40 - 40
Assets/Scripts/UI/UIView/3D/GCZLLayer.cs

@@ -39,8 +39,8 @@ public class GCZLLayer : MonoBehaviour
 
     private LayerUnitData currentData;
 
-    private Button OpenAniButton;
-    private Button CloseAniButton;
+    //private Button OpenAniButton;
+    //private Button CloseAniButton;
 
     private Button detail_modelButton;
     private Button detail_designButton;
@@ -86,10 +86,10 @@ public class GCZLLayer : MonoBehaviour
         Info_DetailButton.onClick.AddListener(() =>
         {
             DetailTitleText.text = currentData.name;
-            OpenAniButton.gameObject.SetActive(currentData.namePri.Equals("BuYuan") ||
-                                               currentData.namePri.Equals("TaoKou"));
-            CloseAniButton.gameObject.SetActive(currentData.namePri.Equals("BuYuan") ||
-                                                currentData.namePri.Equals("TaoKou"));
+            // OpenAniButton.gameObject.SetActive(currentData.namePri.Equals("BuYuan") ||
+            //                                    currentData.namePri.Equals("TaoKou"));
+            // CloseAniButton.gameObject.SetActive(currentData.namePri.Equals("BuYuan") ||
+            //                                     currentData.namePri.Equals("TaoKou"));
             ModelCameraCtrl._Instance.SetCameraActive(true);
             ResetDetailPanel();
             DetailPanel.SetActive(true);
@@ -154,30 +154,30 @@ public class GCZLLayer : MonoBehaviour
         downloadPdfButton = DetailPanel.transform.Find("DownButton").GetComponent<Button>();
         downloadPdfButton.onClick.AddListener(DownLoadPDF);
         
-        OpenAniButton = DetailPanel.transform.Find("OpenAniButton").GetComponent<Button>();
-        OpenAniButton.onClick.AddListener(() =>
-        {
-            float[] openValues=new float[1];
-            if (currentData.namePri.Equals("BuYuan"))
-            {
-                openValues=new float[GlobalData.buYuanSensorData.data.Count];
-                for (int i = 0; i < openValues.Length; i++)
-                {
-                    openValues[i] = GlobalData.buYuanSensorData.data[i].opening_degree*0.01f;
-                }
-            }
-            if (currentData.namePri.Equals("TaoKou"))
-            {
-                openValues=new float[GlobalData.taoKouSensorData.data.Count];
-                for (int i = 0; i < openValues.Length; i++)
-                {
-                    openValues[i] = GlobalData.taoKouSensorData.data[i].opening_degree*0.01f;
-                }
-            }
-            ActionInstance._Instance.ModelAni_On?.Invoke(openValues);
-        });
-        CloseAniButton = DetailPanel.transform.Find("CloseAniButton").GetComponent<Button>();
-        CloseAniButton.onClick.AddListener(() => { ActionInstance._Instance.ModelAni_Off?.Invoke(); });
+        // OpenAniButton = DetailPanel.transform.Find("OpenAniButton").GetComponent<Button>();
+        // OpenAniButton.onClick.AddListener(() =>
+        // {
+        //     float[] openValues=new float[1];
+        //     if (currentData.namePri.Equals("BuYuan"))
+        //     {
+        //         openValues=new float[GlobalData.buYuanSensorData.data.Count];
+        //         for (int i = 0; i < openValues.Length; i++)
+        //         {
+        //             openValues[i] = GlobalData.buYuanSensorData.data[i].opening_degree*0.01f;
+        //         }
+        //     }
+        //     if (currentData.namePri.Equals("TaoKou"))
+        //     {
+        //         openValues=new float[GlobalData.taoKouSensorData.data.Count];
+        //         for (int i = 0; i < openValues.Length; i++)
+        //         {
+        //             openValues[i] = GlobalData.taoKouSensorData.data[i].opening_degree*0.01f;
+        //         }
+        //     }
+        //     ActionInstance._Instance.ModelAni_On?.Invoke(openValues);
+        // });
+        // CloseAniButton = DetailPanel.transform.Find("CloseAniButton").GetComponent<Button>();
+        // CloseAniButton.onClick.AddListener(() => { ActionInstance._Instance.ModelAni_Off?.Invoke(); });
 
         InfoPanel.SetActive(false);
         DetailPanel.SetActive(false);
@@ -358,10 +358,10 @@ public class GCZLLayer : MonoBehaviour
                 nextPhotoButton.gameObject.SetActive(false);
                 
                 
-                OpenAniButton.gameObject.SetActive(currentData.namePri.Equals("BuYuan") ||
-                                                   currentData.namePri.Equals("TaoKou"));
-                CloseAniButton.gameObject.SetActive(currentData.namePri.Equals("BuYuan") ||
-                                                    currentData.namePri.Equals("TaoKou"));
+                // OpenAniButton.gameObject.SetActive(currentData.namePri.Equals("BuYuan") ||
+                //                                    currentData.namePri.Equals("TaoKou"));
+                // CloseAniButton.gameObject.SetActive(currentData.namePri.Equals("BuYuan") ||
+                //                                     currentData.namePri.Equals("TaoKou"));
                 downloadPdfButton.gameObject.SetActive(false);
                 break;
             case 1:
@@ -373,8 +373,8 @@ public class GCZLLayer : MonoBehaviour
                 lastPhotoButton.gameObject.SetActive(true);
                 nextPhotoButton.gameObject.SetActive(true);
              
-                OpenAniButton.gameObject.SetActive(false);
-                CloseAniButton.gameObject.SetActive(false);
+                // OpenAniButton.gameObject.SetActive(false);
+                // CloseAniButton.gameObject.SetActive(false);
                 ChangePDF(0);
                 break;
             case 2:
@@ -386,8 +386,8 @@ public class GCZLLayer : MonoBehaviour
                 lastPhotoButton.gameObject.SetActive(true);
                 nextPhotoButton.gameObject.SetActive(true);
 
-                OpenAniButton.gameObject.SetActive(false);
-                CloseAniButton.gameObject.SetActive(false);
+                // OpenAniButton.gameObject.SetActive(false);
+                // CloseAniButton.gameObject.SetActive(false);
                 downloadPdfButton.gameObject.SetActive(false);
                 ChangePhoto(0);
                 break;
@@ -400,8 +400,8 @@ public class GCZLLayer : MonoBehaviour
                 lastPhotoButton.gameObject.SetActive(false);
                 nextPhotoButton.gameObject.SetActive(false);
                
-                OpenAniButton.gameObject.SetActive(false);
-                CloseAniButton.gameObject.SetActive(false);
+                // OpenAniButton.gameObject.SetActive(false);
+                // CloseAniButton.gameObject.SetActive(false);
                 downloadPdfButton.gameObject.SetActive(false);
                 break;
         }

+ 44 - 5
Assets/Scripts/UI/UIView/3D/ZMJKLayer.cs

@@ -29,17 +29,25 @@ public class ZMJKLayer : MonoBehaviour
 
     public List<ZhaZhanItem> currentZMDataList = new List<ZhaZhanItem>();
 
+
+    public GameObject targetObj;
+    public bool showGongPanel = false;
+    private Camera _camera;
+
     private void Awake()
     {
         closeButton.onClick.AddListener(() =>
         {
-            gongChengPanel.SetActive(false);   
+            gongChengPanel.SetActive(false);
+            showGongPanel = false;
         });
-        gongChengPanel.SetActive(false);   
+        gongChengPanel.SetActive(false);
+        showGongPanel = false;
     }
 
     private void OnEnable()
     {
+        _camera = CameraManager.instance.mainCamera;
         StaticLod.instance.OnFoucusStatic(0);
     }
 
@@ -56,17 +64,22 @@ public class ZMJKLayer : MonoBehaviour
         {
             return GlobalData.floorGateData.success;
         });
+        float[] byV3 = new float[GlobalData.floorGateData.BuYuan.FloodGates.Length];
         for (int i = 0; i < GlobalData.floorGateData.BuYuan.FloodGates.Length; i++)
         {
             int tempIndex = i;
             ZhaZhanItem tempItem = Instantiate(ZhaZhanItemOri, itemContent).GetComponent<ZhaZhanItem>();
             tempItem.SetData(GlobalData.floorGateData.BuYuan.FloodGates[tempIndex], $"补元闸门-{tempIndex + 1}");
+            byV3[tempIndex] = GlobalData.floorGateData.BuYuan.FloodGates[tempIndex].CurrentOpening * 0.01f;
+            Debug.Log($"补元闸门-{tempIndex + 1}:{byV3[tempIndex]}");
             tempItem.gameObject.GetComponent<Button>().onClick.AddListener(() =>
             {
                 StaticLod.instance.OnFoucusStatic($"BY_ZM_{tempIndex+1:00}");
+                targetObj = StaticLod.instance.GetStaticObj($"BY_ZM_{tempIndex + 1:00}");
                 gongChengPanel.SetActive(true);
+                showGongPanel = true;
                 zhaZhanMingCheng.text = tempItem._name;
-                zhaMenKaiDu.text = $"{GlobalData.floorGateData.BuYuan.FloodGates[tempIndex].CurrentOpening*100.0f:0.00}<size=14><color=#A5BFE2>%</color></size>";
+                zhaMenKaiDu.text = $"{GlobalData.floorGateData.BuYuan.FloodGates[tempIndex].CurrentOpening:0.00}<size=14><color=#A5BFE2>%</color></size>";
                 guoZhaLiuLiang.text = $"{GlobalData.floorGateData.BuYuan.FloodGates[tempIndex].CurrentFlow}<size=14><color=#A5BFE2>m\u00b3/s</color></size>";
                 //zhaQianShuiWei.text = $"{GlobalData.floorGateData.BuYuan.FloodGates[tempIndex]} <size=14><color=#A5BFE2>m</color></size>";
                 //zhaHouShuiWei.text = $"{GlobalData.floorGateData.BuYuan.FloodGates[tempIndex]} <size=14><color=#A5BFE2>m</color></size>";
@@ -74,22 +87,29 @@ public class ZMJKLayer : MonoBehaviour
             });
             currentZMDataList.Add(tempItem);
         }
+        ActionInstance._Instance.ModelAni_On?.Invoke(AniType.buYuan,byV3);
+        
+        float[] tkV3 = new float[GlobalData.floorGateData.TaoKou.FloodGates.Length];
         for (int i = 0; i < GlobalData.floorGateData.TaoKou.FloodGates.Length; i++)
         {
             int tempIndex = i;
             ZhaZhanItem tempItem = Instantiate(ZhaZhanItemOri, itemContent).GetComponent<ZhaZhanItem>();
             tempItem.SetData(GlobalData.floorGateData.TaoKou.FloodGates[tempIndex], $"套口闸门-{tempIndex + 1}");
+            tkV3[tempIndex] = GlobalData.floorGateData.TaoKou.FloodGates[tempIndex].CurrentOpening * 0.01f;
             tempItem.gameObject.GetComponent<Button>().onClick.AddListener(() =>
             {
                 StaticLod.instance.OnFoucusStatic($"TK_ZM_{tempIndex+1:00}");
+                targetObj = StaticLod.instance.GetStaticObj($"TK_ZM_{tempIndex+1:00}");
                 gongChengPanel.SetActive(true);
+                showGongPanel = true;
                 zhaZhanMingCheng.text = tempItem._name;
-                zhaMenKaiDu.text = $"{GlobalData.floorGateData.TaoKou.FloodGates[tempIndex].CurrentOpening*100.0f:0.00}<size=14><color=#A5BFE2>%</color></size>";
+                zhaMenKaiDu.text = $"{GlobalData.floorGateData.TaoKou.FloodGates[tempIndex].CurrentOpening:0.00}<size=14><color=#A5BFE2>%</color></size>";
                 guoZhaLiuLiang.text = $"{GlobalData.floorGateData.TaoKou.FloodGates[tempIndex].CurrentFlow}<size=14><color=#A5BFE2>m\u00b3/s</color></size>";
 
             });
             currentZMDataList.Add(tempItem);
         }
+        ActionInstance._Instance.ModelAni_On?.Invoke(AniType.taoKou,tkV3);
         int totalCount = GlobalData.floorGateData.BuYuanTotalGates + GlobalData.floorGateData.TaoKouTotalGates;
         zhaZhanCount.text = $"闸门列表 (<color=#FFFFFF>{totalCount}</color>)";
     }
@@ -114,6 +134,25 @@ public class ZMJKLayer : MonoBehaviour
     // Update is called once per frame
     void Update()
     {
-        
+        if (showGongPanel)
+        {
+            if (targetObj != null)
+            {
+                if (IsObjectInCameraView(targetObj.transform, _camera))
+                {
+                    gongChengPanel.transform.position=_camera.WorldToScreenPoint(targetObj.transform.position);
+                }
+            }
+        }
+    }
+    
+    bool IsObjectInCameraView(Transform objectTransform, Camera camera)
+    {
+        Vector3 objectScreenPosition = camera.WorldToScreenPoint(objectTransform.position);
+        return objectScreenPosition.z > 0 &&
+               objectScreenPosition.x > 0 &&
+               objectScreenPosition.x < Screen.width &&
+               objectScreenPosition.y > 0 &&
+               objectScreenPosition.y < Screen.height;
     }
 }

+ 1 - 1
Assets/Scripts/UI/UIView/XHDD/XHDDLayer.cs

@@ -472,7 +472,7 @@ public class XHDDLayer : YZTRootLayer
                     return;
                 }
                 StaticLod.instance.OnFoucusStatic("Bird4");
-                ActionInstance._Instance.ModelAni_On?.Invoke(null);
+                //ActionInstance._Instance.ModelAni_On?.Invoke(null);
                 await new WaitUntil(() =>
                 {
                     return currentTime > 5.2;

Some files were not shown because too many files changed in this diff