1

Assets/MyGame/aa/Game/FLZY/BOSS/GSL/4022_Timeline Variant.prefab

@@ -5732,6 +5732,11 @@ PrefabInstance:
       propertyPath: m_Layer
       value: 10
       objectReference: {fileID: 0}
+    - target: {fileID: 6697986194447116423, guid: 6d1f14f0c958e7d4ab5d5e9dd5f2270a,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 6727806731254963401, guid: 6d1f14f0c958e7d4ab5d5e9dd5f2270a,
         type: 3}
       propertyPath: m_Layer

Assets/MyGame/aa/Game/FLZY/BOSS/JBP/176.prefab

@@ -2183,6 +2183,8 @@ MonoBehaviour:
   needLockEvent: 0
   createVideoClip: {fileID: 0}
   rotationPY: 60
+  useMirrorCompensate: 0
+  useRouteFlipX: 0
   baseMmove: 0
   isRotate: 0
   isNot1: 0

Assets/MyGame/aa/Game/FLZY/TSY/ShanDian/27.prefab

@@ -334,7 +334,7 @@ MonoBehaviour:
   isRotate: 1
   isNot1: 0
   ischild0: 1
-  depthOffset: 0
+  depthOffset: 350
   is2DFish: 0
   sortOrder2D: 0
   keepAliveTime: 1

Assets/MyGame/aa/Game/HHWK/Fish/Fish_2008 Variant.prefab

@@ -584,16 +584,20 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   beilv: 0
   guid: 
+  lastMoveLineId: 
   monsterData:
     die_Score: 0
     isDie: 0
     fishTypeConfig:
       fishNumber: 
       fishName: 
+      fishBrief: 
       fishType: 0
       fishScore: 0
       killWeight: 0
       pathList: 
+      fishImage: 
+      fishMultipleDesc: 
     moveLine:
       bezierCurveData:
         name: 
@@ -602,6 +606,8 @@ MonoBehaviour:
         end: {x: 0, y: 0}
       moveTime: 0
       moveSpeed: 0
+      cachedCamera: {fileID: 0}
+      cachedUirootRect: {fileID: 0}
   skeleton: {fileID: 0}
   isSpine: 1
   fishTypeID: 13013
@@ -619,9 +625,17 @@ MonoBehaviour:
   yzID: 
   colliderList: []
   lockPoint: {fileID: 5122533014505160175}
-  bingDongEffect: {fileID: 0}
+  bingDongEffect:
+  - {fileID: 0}
+  needLockEvent: 0
+  createVideoClip: {fileID: 0}
   rotationPY: 60
+  useMirrorCompensate: 1
+  useRouteFlipX: 1
+  baseMmove: 0
   isRotate: 1
   isNot1: 0
   ischild0: 1
   depthOffset: 810
+  is2DFish: 0
+  sortOrder2D: 0

Assets/MyGame/aa/Game/HHWK/Fish/Fish_2009 Variant.prefab

@@ -623,16 +623,20 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   beilv: 0
   guid: 
+  lastMoveLineId: 
   monsterData:
     die_Score: 0
     isDie: 0
     fishTypeConfig:
       fishNumber: 
       fishName: 
+      fishBrief: 
       fishType: 0
       fishScore: 0
       killWeight: 0
       pathList: 
+      fishImage: 
+      fishMultipleDesc: 
     moveLine:
       bezierCurveData:
         name: 
@@ -641,6 +645,8 @@ MonoBehaviour:
         end: {x: 0, y: 0}
       moveTime: 0
       moveSpeed: 0
+      cachedCamera: {fileID: 0}
+      cachedUirootRect: {fileID: 0}
   skeleton: {fileID: 0}
   isSpine: 1
   fishTypeID: 13014
@@ -658,12 +664,20 @@ MonoBehaviour:
   yzID: 
   colliderList: []
   lockPoint: {fileID: 5601320423330744558}
-  bingDongEffect: {fileID: 0}
+  bingDongEffect:
+  - {fileID: 0}
+  needLockEvent: 0
+  createVideoClip: {fileID: 0}
   rotationPY: 60
+  useMirrorCompensate: 1
+  useRouteFlipX: 1
+  baseMmove: 0
   isRotate: 1
   isNot1: 0
   ischild0: 1
   depthOffset: 820
+  is2DFish: 0
+  sortOrder2D: 0
 --- !u!4 &7456109067163209629 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: 4642988549198181, guid: 773962850d4405447bb584bc3734b93b,

Assets/MyGame/aa/Game/HHWK/Fish/Fish_2011 Variant.prefab

@@ -663,6 +663,8 @@ MonoBehaviour:
         end: {x: 0, y: 0}
       moveTime: 0
       moveSpeed: 0
+      cachedCamera: {fileID: 0}
+      cachedUirootRect: {fileID: 0}
   skeleton: {fileID: 0}
   isSpine: 1
   fishTypeID: 13016
@@ -680,11 +682,17 @@ MonoBehaviour:
   yzID: 
   colliderList: []
   lockPoint: {fileID: 2550720441526352770}
-  bingDongEffect: {fileID: 0}
+  bingDongEffect:
+  - {fileID: 0}
+  needLockEvent: 0
   createVideoClip: {fileID: 0}
   rotationPY: 60
+  useMirrorCompensate: 1
+  useRouteFlipX: 1
   baseMmove: 0
   isRotate: 1
   isNot1: 0
   ischild0: 1
   depthOffset: 840
+  is2DFish: 0
+  sortOrder2D: 0

Assets/MyGame/aa/Game/HHWK/Fish/Fish_2012 Variant.prefab

@@ -692,6 +692,7 @@ MonoBehaviour:
   createVideoClip: {fileID: 0}
   rotationPY: 80
   useMirrorCompensate: 1
+  useRouteFlipX: 1
   baseMmove: 0
   isRotate: 1
   isNot1: 0

Assets/MyGame/aa/Game/HHWK/Fish/Fish_2013 Variant.prefab

@@ -341,16 +341,20 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   beilv: 0
   guid: 
+  lastMoveLineId: 
   monsterData:
     die_Score: 0
     isDie: 0
     fishTypeConfig:
       fishNumber: 
       fishName: 
+      fishBrief: 
       fishType: 0
       fishScore: 0
       killWeight: 0
       pathList: 
+      fishImage: 
+      fishMultipleDesc: 
     moveLine:
       bezierCurveData:
         name: 
@@ -359,6 +363,8 @@ MonoBehaviour:
         end: {x: 0, y: 0}
       moveTime: 0
       moveSpeed: 0
+      cachedCamera: {fileID: 0}
+      cachedUirootRect: {fileID: 0}
   skeleton: {fileID: 0}
   isSpine: 1
   fishTypeID: 13018
@@ -376,12 +382,20 @@ MonoBehaviour:
   yzID: 
   colliderList: []
   lockPoint: {fileID: 6536531906417029953}
-  bingDongEffect: {fileID: 0}
+  bingDongEffect:
+  - {fileID: 0}
+  needLockEvent: 0
+  createVideoClip: {fileID: 0}
   rotationPY: 60
+  useMirrorCompensate: 1
+  useRouteFlipX: 1
+  baseMmove: 0
   isRotate: 1
   isNot1: 0
   ischild0: 1
   depthOffset: 860
+  is2DFish: 0
+  sortOrder2D: 0
 --- !u!1001 &6537198470344860617
 PrefabInstance:
   m_ObjectHideFlags: 0

Assets/MyGame/aa/Game/HHWK/Fish/Fish_2014 Variant.prefab

@@ -373,16 +373,20 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   beilv: 0
   guid: 
+  lastMoveLineId: 
   monsterData:
     die_Score: 0
     isDie: 0
     fishTypeConfig:
       fishNumber: 
       fishName: 
+      fishBrief: 
       fishType: 0
       fishScore: 0
       killWeight: 0
       pathList: 
+      fishImage: 
+      fishMultipleDesc: 
     moveLine:
       bezierCurveData:
         name: 
@@ -391,6 +395,8 @@ MonoBehaviour:
         end: {x: 0, y: 0}
       moveTime: 0
       moveSpeed: 0
+      cachedCamera: {fileID: 0}
+      cachedUirootRect: {fileID: 0}
   skeleton: {fileID: 0}
   isSpine: 1
   fishTypeID: 13024
@@ -408,12 +414,20 @@ MonoBehaviour:
   yzID: 
   colliderList: []
   lockPoint: {fileID: 6976749960772518159}
-  bingDongEffect: {fileID: 0}
+  bingDongEffect:
+  - {fileID: 0}
+  needLockEvent: 0
+  createVideoClip: {fileID: 0}
   rotationPY: 60
+  useMirrorCompensate: 1
+  useRouteFlipX: 1
+  baseMmove: 0
   isRotate: 1
   isNot1: 0
   ischild0: 1
   depthOffset: 870
+  is2DFish: 0
+  sortOrder2D: 0
 --- !u!1001 &6972630653134549612
 PrefabInstance:
   m_ObjectHideFlags: 0

Assets/MyGame/aa/Game/HHWK/Fish/Fish_3002 Variant.prefab

@@ -877,6 +877,8 @@ MonoBehaviour:
         end: {x: 0, y: 0}
       moveTime: 0
       moveSpeed: 0
+      cachedCamera: {fileID: 0}
+      cachedUirootRect: {fileID: 0}
   skeleton: {fileID: 0}
   isSpine: 1
   fishTypeID: 13020
@@ -894,12 +896,17 @@ MonoBehaviour:
   yzID: 
   colliderList: []
   lockPoint: {fileID: 8092196371060847562}
-  bingDongEffect: {fileID: 0}
+  bingDongEffect:
+  - {fileID: 0}
   needLockEvent: 0
   createVideoClip: {fileID: 0}
   rotationPY: 60
+  useMirrorCompensate: 1
+  useRouteFlipX: 1
   baseMmove: 0
   isRotate: 1
   isNot1: 0
   ischild0: 1
   depthOffset: 890
+  is2DFish: 0
+  sortOrder2D: 0

Assets/MyGame/aa/Game/HHWK/Fish/fish_1017 Variant.prefab

@@ -158,16 +158,20 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   beilv: 0
   guid: 
+  lastMoveLineId: 
   monsterData:
     die_Score: 0
     isDie: 0
     fishTypeConfig:
       fishNumber: 
       fishName: 
+      fishBrief: 
       fishType: 0
       fishScore: 0
       killWeight: 0
       pathList: 
+      fishImage: 
+      fishMultipleDesc: 
     moveLine:
       bezierCurveData:
         name: 
@@ -176,6 +180,8 @@ MonoBehaviour:
         end: {x: 0, y: 0}
       moveTime: 0
       moveSpeed: 0
+      cachedCamera: {fileID: 0}
+      cachedUirootRect: {fileID: 0}
   skeleton: {fileID: 0}
   isSpine: 1
   fishTypeID: 13001
@@ -193,12 +199,20 @@ MonoBehaviour:
   yzID: 
   colliderList: []
   lockPoint: {fileID: 1497276017444126853}
-  bingDongEffect: {fileID: 0}
+  bingDongEffect:
+  - {fileID: 0}
+  needLockEvent: 0
+  createVideoClip: {fileID: 0}
   rotationPY: -90
+  useMirrorCompensate: 1
+  useRouteFlipX: 1
+  baseMmove: 0
   isRotate: 1
   isNot1: 1
   ischild0: 1
   depthOffset: 1000
+  is2DFish: 0
+  sortOrder2D: 0
 --- !u!4 &3932267669272526887 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: 4703437598541787, guid: 1461200f483c12642a09ef755696d8c4,

Assets/MyGame/aa/Game/HHWK/Fish/fish_1018 Variant.prefab

@@ -158,16 +158,30 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   beilv: 0
   guid: 
+  lastMoveLineId: 
   monsterData:
     die_Score: 0
     isDie: 0
     fishTypeConfig:
       fishNumber: 
       fishName: 
+      fishBrief: 
       fishType: 0
       fishScore: 0
       killWeight: 0
       pathList: 
+      fishImage: 
+      fishMultipleDesc: 
+    moveLine:
+      bezierCurveData:
+        name: 
+        start: {x: 0, y: 0}
+        controlPoints: []
+        end: {x: 0, y: 0}
+      moveTime: 0
+      moveSpeed: 0
+      cachedCamera: {fileID: 0}
+      cachedUirootRect: {fileID: 0}
   skeleton: {fileID: 0}
   isSpine: 1
   fishTypeID: 13002
@@ -185,12 +199,20 @@ MonoBehaviour:
   yzID: 
   colliderList: []
   lockPoint: {fileID: 6613943160179652640}
-  bingDongEffect: {fileID: 0}
+  bingDongEffect:
+  - {fileID: 0}
+  needLockEvent: 0
+  createVideoClip: {fileID: 0}
   rotationPY: -90
+  useMirrorCompensate: 1
+  useRouteFlipX: 1
+  baseMmove: 0
   isRotate: 1
   isNot1: 1
   ischild0: 1
   depthOffset: 1000
+  is2DFish: 0
+  sortOrder2D: 0
 --- !u!4 &4798522997234469819 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: 4703437598541787, guid: 6f9ba87c0c298204597a3786e912d4f3,

Assets/MyGame/aa/Game/HHWK/Fish/fish_1019 Variant.prefab

@@ -164,16 +164,30 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   beilv: 0
   guid: 
+  lastMoveLineId: 
   monsterData:
     die_Score: 0
     isDie: 0
     fishTypeConfig:
       fishNumber: 
       fishName: 
+      fishBrief: 
       fishType: 0
       fishScore: 0
       killWeight: 0
       pathList: 
+      fishImage: 
+      fishMultipleDesc: 
+    moveLine:
+      bezierCurveData:
+        name: 
+        start: {x: 0, y: 0}
+        controlPoints: []
+        end: {x: 0, y: 0}
+      moveTime: 0
+      moveSpeed: 0
+      cachedCamera: {fileID: 0}
+      cachedUirootRect: {fileID: 0}
   skeleton: {fileID: 0}
   isSpine: 1
   fishTypeID: 13003
@@ -191,12 +205,20 @@ MonoBehaviour:
   yzID: 
   colliderList: []
   lockPoint: {fileID: 843371976736088860}
-  bingDongEffect: {fileID: 0}
+  bingDongEffect:
+  - {fileID: 0}
+  needLockEvent: 0
+  createVideoClip: {fileID: 0}
   rotationPY: -90
+  useMirrorCompensate: 1
+  useRouteFlipX: 1
+  baseMmove: 0
   isRotate: 1
   isNot1: 1
   ischild0: 1
   depthOffset: 1000
+  is2DFish: 0
+  sortOrder2D: 0
 --- !u!1001 &6761791426332002869
 PrefabInstance:
   m_ObjectHideFlags: 0

Assets/MyGame/aa/Game/HHWK/Fish/fish_1020 Variant.prefab

@@ -318,16 +318,30 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   beilv: 0
   guid: 
+  lastMoveLineId: 
   monsterData:
     die_Score: 0
     isDie: 0
     fishTypeConfig:
       fishNumber: 
       fishName: 
+      fishBrief: 
       fishType: 0
       fishScore: 0
       killWeight: 0
       pathList: 
+      fishImage: 
+      fishMultipleDesc: 
+    moveLine:
+      bezierCurveData:
+        name: 
+        start: {x: 0, y: 0}
+        controlPoints: []
+        end: {x: 0, y: 0}
+      moveTime: 0
+      moveSpeed: 0
+      cachedCamera: {fileID: 0}
+      cachedUirootRect: {fileID: 0}
   skeleton: {fileID: 0}
   isSpine: 1
   fishTypeID: 13004
@@ -345,12 +359,20 @@ MonoBehaviour:
   yzID: 
   colliderList: []
   lockPoint: {fileID: 65027620505796751}
-  bingDongEffect: {fileID: 0}
+  bingDongEffect:
+  - {fileID: 0}
+  needLockEvent: 0
+  createVideoClip: {fileID: 0}
   rotationPY: -90
+  useMirrorCompensate: 1
+  useRouteFlipX: 1
+  baseMmove: 0
   isRotate: 1
   isNot1: 1
   ischild0: 1
   depthOffset: 1000
+  is2DFish: 0
+  sortOrder2D: 0
 --- !u!4 &7024093533638435985 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: 4703437598541787, guid: d0d8725bed789824bb1b0462fde12f45,

Assets/MyGame/aa/Game/HHWK/Fish/fish_1021 Variant.prefab

@@ -158,16 +158,30 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   beilv: 0
   guid: 
+  lastMoveLineId: 
   monsterData:
     die_Score: 0
     isDie: 0
     fishTypeConfig:
       fishNumber: 
       fishName: 
+      fishBrief: 
       fishType: 0
       fishScore: 0
       killWeight: 0
       pathList: 
+      fishImage: 
+      fishMultipleDesc: 
+    moveLine:
+      bezierCurveData:
+        name: 
+        start: {x: 0, y: 0}
+        controlPoints: []
+        end: {x: 0, y: 0}
+      moveTime: 0
+      moveSpeed: 0
+      cachedCamera: {fileID: 0}
+      cachedUirootRect: {fileID: 0}
   skeleton: {fileID: 0}
   isSpine: 1
   fishTypeID: 13005
@@ -185,12 +199,20 @@ MonoBehaviour:
   yzID: 
   colliderList: []
   lockPoint: {fileID: 1621051044293585920}
-  bingDongEffect: {fileID: 0}
+  bingDongEffect:
+  - {fileID: 0}
+  needLockEvent: 0
+  createVideoClip: {fileID: 0}
   rotationPY: -90
+  useMirrorCompensate: 1
+  useRouteFlipX: 1
+  baseMmove: 0
   isRotate: 1
   isNot1: 1
   ischild0: 1
   depthOffset: 1000
+  is2DFish: 0
+  sortOrder2D: 0
 --- !u!4 &4331926983231046282 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: 4703437598541787, guid: 51618a9fa649dc84bbbb0f2b2ae34548,

Assets/MyGame/aa/Game/HHWK/Fish/fish_1022 Variant.prefab

@@ -53,7 +53,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 1709254077376921, guid: ee1e72c133ca6124485715190eaa1e3a, type: 3}
       propertyPath: m_IsActive
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 1709254077376921, guid: ee1e72c133ca6124485715190eaa1e3a, type: 3}
       propertyPath: m_TagString
@@ -164,16 +164,30 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   beilv: 0
   guid: 
+  lastMoveLineId: 
   monsterData:
     die_Score: 0
     isDie: 0
     fishTypeConfig:
       fishNumber: 
       fishName: 
+      fishBrief: 
       fishType: 0
       fishScore: 0
       killWeight: 0
       pathList: 
+      fishImage: 
+      fishMultipleDesc: 
+    moveLine:
+      bezierCurveData:
+        name: 
+        start: {x: 0, y: 0}
+        controlPoints: []
+        end: {x: 0, y: 0}
+      moveTime: 0
+      moveSpeed: 0
+      cachedCamera: {fileID: 0}
+      cachedUirootRect: {fileID: 0}
   skeleton: {fileID: 0}
   isSpine: 1
   fishTypeID: 13006
@@ -191,12 +205,20 @@ MonoBehaviour:
   yzID: 
   colliderList: []
   lockPoint: {fileID: 4063311169368434864}
-  bingDongEffect: {fileID: 0}
+  bingDongEffect:
-  rotationPY: -90
+  - {fileID: 0}
+  needLockEvent: 0
+  createVideoClip: {fileID: 0}
+  rotationPY: 90
+  useMirrorCompensate: 1
+  useRouteFlipX: 1
+  baseMmove: 0
   isRotate: 1
   isNot1: 1
   ischild0: 1
   depthOffset: 1000
+  is2DFish: 0
+  sortOrder2D: 0
 --- !u!1001 &5582305301452974272
 PrefabInstance:
   m_ObjectHideFlags: 0

Assets/MyGame/aa/Game/HHWK/Fish/fish_1023 Variant.prefab

@@ -324,16 +324,30 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   beilv: 0
   guid: 
+  lastMoveLineId: 
   monsterData:
     die_Score: 0
     isDie: 0
     fishTypeConfig:
       fishNumber: 
       fishName: 
+      fishBrief: 
       fishType: 0
       fishScore: 0
       killWeight: 0
       pathList: 
+      fishImage: 
+      fishMultipleDesc: 
+    moveLine:
+      bezierCurveData:
+        name: 
+        start: {x: 0, y: 0}
+        controlPoints: []
+        end: {x: 0, y: 0}
+      moveTime: 0
+      moveSpeed: 0
+      cachedCamera: {fileID: 0}
+      cachedUirootRect: {fileID: 0}
   skeleton: {fileID: 0}
   isSpine: 1
   fishTypeID: 13007
@@ -351,9 +365,17 @@ MonoBehaviour:
   yzID: 
   colliderList: []
   lockPoint: {fileID: 4698499819094165687}
-  bingDongEffect: {fileID: 0}
+  bingDongEffect:
+  - {fileID: 0}
+  needLockEvent: 0
+  createVideoClip: {fileID: 0}
   rotationPY: -90
+  useMirrorCompensate: 1
+  useRouteFlipX: 1
+  baseMmove: 0
   isRotate: 1
   isNot1: 1
   ischild0: 1
   depthOffset: 1000
+  is2DFish: 0
+  sortOrder2D: 0

Assets/MyGame/aa/Game/HHWK/Fish/fish_1024 Variant.prefab

@@ -158,16 +158,20 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   beilv: 0
   guid: 
+  lastMoveLineId: 
   monsterData:
     die_Score: 0
     isDie: 0
     fishTypeConfig:
       fishNumber: 
       fishName: 
+      fishBrief: 
       fishType: 0
       fishScore: 0
       killWeight: 0
       pathList: 
+      fishImage: 
+      fishMultipleDesc: 
     moveLine:
       bezierCurveData:
         name: 
@@ -176,6 +180,8 @@ MonoBehaviour:
         end: {x: 0, y: 0}
       moveTime: 0
       moveSpeed: 0
+      cachedCamera: {fileID: 0}
+      cachedUirootRect: {fileID: 0}
   skeleton: {fileID: 0}
   isSpine: 1
   fishTypeID: 13008
@@ -193,12 +199,20 @@ MonoBehaviour:
   yzID: 
   colliderList: []
   lockPoint: {fileID: 4929093940051466871}
-  bingDongEffect: {fileID: 0}
+  bingDongEffect:
+  - {fileID: 0}
+  needLockEvent: 0
+  createVideoClip: {fileID: 0}
   rotationPY: -90
+  useMirrorCompensate: 1
+  useRouteFlipX: 1
+  baseMmove: 0
   isRotate: 1
   isNot1: 1
   ischild0: 1
   depthOffset: 1000
+  is2DFish: 0
+  sortOrder2D: 0
 --- !u!4 &7201521853190922041 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: 4703437598541787, guid: 8aca3c1d421ff8e4c87619bd4511a615,

Assets/MyGame/aa/Game/HHWK/Fish/fish_1025 Variant.prefab

@@ -164,16 +164,20 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   beilv: 0
   guid: 
+  lastMoveLineId: 
   monsterData:
     die_Score: 0
     isDie: 0
     fishTypeConfig:
       fishNumber: 
       fishName: 
+      fishBrief: 
       fishType: 0
       fishScore: 0
       killWeight: 0
       pathList: 
+      fishImage: 
+      fishMultipleDesc: 
     moveLine:
       bezierCurveData:
         name: 
@@ -182,6 +186,8 @@ MonoBehaviour:
         end: {x: 0, y: 0}
       moveTime: 0
       moveSpeed: 0
+      cachedCamera: {fileID: 0}
+      cachedUirootRect: {fileID: 0}
   skeleton: {fileID: 0}
   isSpine: 1
   fishTypeID: 13009
@@ -199,12 +205,20 @@ MonoBehaviour:
   yzID: 
   colliderList: []
   lockPoint: {fileID: 1513225839292478598}
-  bingDongEffect: {fileID: 0}
+  bingDongEffect:
+  - {fileID: 0}
+  needLockEvent: 0
+  createVideoClip: {fileID: 0}
   rotationPY: -90
+  useMirrorCompensate: 1
+  useRouteFlipX: 1
+  baseMmove: 0
   isRotate: 1
   isNot1: 1
   ischild0: 1
   depthOffset: 1000
+  is2DFish: 0
+  sortOrder2D: 0
 --- !u!1001 &6202979445234625319
 PrefabInstance:
   m_ObjectHideFlags: 0

Assets/MyGame/aa/Game/HHWK/Fish/fish_1026 Variant.prefab

@@ -236,16 +236,20 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   beilv: 0
   guid: 
+  lastMoveLineId: 
   monsterData:
     die_Score: 0
     isDie: 0
     fishTypeConfig:
       fishNumber: 
       fishName: 
+      fishBrief: 
       fishType: 0
       fishScore: 0
       killWeight: 0
       pathList: 
+      fishImage: 
+      fishMultipleDesc: 
     moveLine:
       bezierCurveData:
         name: 
@@ -254,6 +258,8 @@ MonoBehaviour:
         end: {x: 0, y: 0}
       moveTime: 0
       moveSpeed: 0
+      cachedCamera: {fileID: 0}
+      cachedUirootRect: {fileID: 0}
   skeleton: {fileID: 0}
   isSpine: 1
   fishTypeID: 13010
@@ -271,12 +277,20 @@ MonoBehaviour:
   yzID: 
   colliderList: []
   lockPoint: {fileID: 8119681082241791630}
-  bingDongEffect: {fileID: 0}
+  bingDongEffect:
+  - {fileID: 0}
+  needLockEvent: 0
+  createVideoClip: {fileID: 0}
   rotationPY: 30
+  useMirrorCompensate: 1
+  useRouteFlipX: 1
+  baseMmove: 0
   isRotate: 1
   isNot1: 0
   ischild0: 1
   depthOffset: 1000
+  is2DFish: 0
+  sortOrder2D: 0
 --- !u!1001 &2585595305865003636
 PrefabInstance:
   m_ObjectHideFlags: 0

Assets/MyGame/aa/Game/HHWK/Fish/fish_1027 Variant.prefab

@@ -158,16 +158,20 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   beilv: 0
   guid: 
+  lastMoveLineId: 
   monsterData:
     die_Score: 0
     isDie: 0
     fishTypeConfig:
       fishNumber: 
       fishName: 
+      fishBrief: 
       fishType: 0
       fishScore: 0
       killWeight: 0
       pathList: 
+      fishImage: 
+      fishMultipleDesc: 
     moveLine:
       bezierCurveData:
         name: 
@@ -176,6 +180,8 @@ MonoBehaviour:
         end: {x: 0, y: 0}
       moveTime: 0
       moveSpeed: 0
+      cachedCamera: {fileID: 0}
+      cachedUirootRect: {fileID: 0}
   skeleton: {fileID: 0}
   isSpine: 1
   fishTypeID: 13011
@@ -193,12 +199,20 @@ MonoBehaviour:
   yzID: 
   colliderList: []
   lockPoint: {fileID: 8770686222094608858}
-  bingDongEffect: {fileID: 0}
+  bingDongEffect:
+  - {fileID: 0}
+  needLockEvent: 0
+  createVideoClip: {fileID: 0}
   rotationPY: -90
+  useMirrorCompensate: 1
+  useRouteFlipX: 1
+  baseMmove: 0
   isRotate: 1
   isNot1: 1
   ischild0: 1
   depthOffset: 1000
+  is2DFish: 0
+  sortOrder2D: 0
 --- !u!4 &3527731164989796449 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: 4703437598541787, guid: 10dcab870ce73d24abf17f9ea84712ad,

Assets/MyGame/aa/Game/HHWK/Fish/fish_1028 Variant.prefab

@@ -158,16 +158,20 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   beilv: 0
   guid: 
+  lastMoveLineId: 
   monsterData:
     die_Score: 0
     isDie: 0
     fishTypeConfig:
       fishNumber: 
       fishName: 
+      fishBrief: 
       fishType: 0
       fishScore: 0
       killWeight: 0
       pathList: 
+      fishImage: 
+      fishMultipleDesc: 
     moveLine:
       bezierCurveData:
         name: 
@@ -176,6 +180,8 @@ MonoBehaviour:
         end: {x: 0, y: 0}
       moveTime: 0
       moveSpeed: 0
+      cachedCamera: {fileID: 0}
+      cachedUirootRect: {fileID: 0}
   skeleton: {fileID: 0}
   isSpine: 1
   fishTypeID: 13012
@@ -193,12 +199,20 @@ MonoBehaviour:
   yzID: 
   colliderList: []
   lockPoint: {fileID: 6143660667663271190}
-  bingDongEffect: {fileID: 0}
+  bingDongEffect:
+  - {fileID: 0}
+  needLockEvent: 0
+  createVideoClip: {fileID: 0}
   rotationPY: -90
+  useMirrorCompensate: 1
+  useRouteFlipX: 1
+  baseMmove: 0
   isRotate: 1
   isNot1: 1
   ischild0: 1
   depthOffset: 1000
+  is2DFish: 0
+  sortOrder2D: 0
 --- !u!4 &3079608771229918319 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: 4703437598541787, guid: d441aa2f2c0f8524e9a494199140b726,

Assets/MyGame/aa/Game/HHWK/Fish/fish_2010 Variant.prefab

@@ -319,6 +319,8 @@ MonoBehaviour:
         end: {x: 0, y: 0}
       moveTime: 0
       moveSpeed: 0
+      cachedCamera: {fileID: 0}
+      cachedUirootRect: {fileID: 0}
   skeleton: {fileID: 0}
   isSpine: 1
   fishTypeID: 0
@@ -336,14 +338,20 @@ MonoBehaviour:
   yzID: 
   colliderList: []
   lockPoint: {fileID: 8487291494278195416}
-  bingDongEffect: {fileID: 0}
+  bingDongEffect:
+  - {fileID: 0}
+  needLockEvent: 0
   createVideoClip: {fileID: 0}
   rotationPY: 60
+  useMirrorCompensate: 1
+  useRouteFlipX: 1
   baseMmove: 0
   isRotate: 1
   isNot1: 0
   ischild0: 1
   depthOffset: 830
+  is2DFish: 0
+  sortOrder2D: 0
 --- !u!4 &4073602345332461237 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: 4472185465350827, guid: c61d7b09b58215148aaffc1b82f11bf4,

Assets/MyGame/aa/Game/HHWK/Fish/fish_3001 Variant.prefab

@@ -453,16 +453,20 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   beilv: 0
   guid: 
+  lastMoveLineId: 
   monsterData:
     die_Score: 0
     isDie: 0
     fishTypeConfig:
       fishNumber: 
       fishName: 
+      fishBrief: 
       fishType: 0
       fishScore: 0
       killWeight: 0
       pathList: 
+      fishImage: 
+      fishMultipleDesc: 
     moveLine:
       bezierCurveData:
         name: 
@@ -471,6 +475,8 @@ MonoBehaviour:
         end: {x: 0, y: 0}
       moveTime: 0
       moveSpeed: 0
+      cachedCamera: {fileID: 0}
+      cachedUirootRect: {fileID: 0}
   skeleton: {fileID: 0}
   isSpine: 1
   fishTypeID: 13019
@@ -488,12 +494,20 @@ MonoBehaviour:
   yzID: 
   colliderList: []
   lockPoint: {fileID: 1329100429413357316}
-  bingDongEffect: {fileID: 0}
+  bingDongEffect:
+  - {fileID: 0}
+  needLockEvent: 0
+  createVideoClip: {fileID: 0}
   rotationPY: 60
+  useMirrorCompensate: 1
+  useRouteFlipX: 1
+  baseMmove: 0
   isRotate: 1
   isNot1: 0
   ischild0: 1
   depthOffset: 880
+  is2DFish: 0
+  sortOrder2D: 0
 --- !u!1001 &8244822918661465325
 PrefabInstance:
   m_ObjectHideFlags: 0

Assets/MyGame/aa/Game/HHWK/Fish/fish_3003 Variant.prefab

@@ -701,6 +701,8 @@ MonoBehaviour:
         end: {x: 0, y: 0}
       moveTime: 0
       moveSpeed: 0
+      cachedCamera: {fileID: 0}
+      cachedUirootRect: {fileID: 0}
   skeleton: {fileID: 0}
   isSpine: 1
   fishTypeID: 13021
@@ -718,15 +720,20 @@ MonoBehaviour:
   yzID: 
   colliderList: []
   lockPoint: {fileID: 7099483109033587896}
-  bingDongEffect: {fileID: 0}
+  bingDongEffect:
+  - {fileID: 0}
   needLockEvent: 0
   createVideoClip: {fileID: 0}
   rotationPY: 60
+  useMirrorCompensate: 1
+  useRouteFlipX: 1
   baseMmove: 0
   isRotate: 1
   isNot1: 0
   ischild0: 1
   depthOffset: 900
+  is2DFish: 0
+  sortOrder2D: 0
 --- !u!4 &7952344689971121780 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: 4918264173551851, guid: a87bdbcfa12d35644b5c34825a6e6591,

Assets/MyGame/aa/Game/HHWK/Fish/fish_3004 Variant.prefab

@@ -1052,6 +1052,8 @@ MonoBehaviour:
         end: {x: 0, y: 0}
       moveTime: 0
       moveSpeed: 0
+      cachedCamera: {fileID: 0}
+      cachedUirootRect: {fileID: 0}
   skeleton: {fileID: 0}
   isSpine: 1
   fishTypeID: 13022
@@ -1069,15 +1071,20 @@ MonoBehaviour:
   yzID: 
   colliderList: []
   lockPoint: {fileID: 7626289246856194830}
-  bingDongEffect: {fileID: 0}
+  bingDongEffect:
+  - {fileID: 0}
   needLockEvent: 0
   createVideoClip: {fileID: 0}
   rotationPY: 60
+  useMirrorCompensate: 1
+  useRouteFlipX: 1
   baseMmove: 0
   isRotate: 1
   isNot1: 0
   ischild0: 1
   depthOffset: 910
+  is2DFish: 0
+  sortOrder2D: 0
 --- !u!4 &8103313998890164229 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: 4900271049623953, guid: e4de03f3bbdf4d643b88a0ed7bd4df63,

Assets/MyGame/aa/Game/HHWK/Fish/fish_3005 Variant.prefab

@@ -433,6 +433,8 @@ MonoBehaviour:
         end: {x: 0, y: 0}
       moveTime: 0
       moveSpeed: 0
+      cachedCamera: {fileID: 0}
+      cachedUirootRect: {fileID: 0}
   skeleton: {fileID: 0}
   isSpine: 1
   fishTypeID: 13023
@@ -450,15 +452,20 @@ MonoBehaviour:
   yzID: 
   colliderList: []
   lockPoint: {fileID: 6415108411962225159}
-  bingDongEffect: {fileID: 0}
+  bingDongEffect:
+  - {fileID: 0}
   needLockEvent: 0
   createVideoClip: {fileID: 0}
   rotationPY: 30
+  useMirrorCompensate: 1
+  useRouteFlipX: 1
   baseMmove: 0
   isRotate: 1
   isNot1: 0
   ischild0: 1
   depthOffset: 920
+  is2DFish: 0
+  sortOrder2D: 0
 --- !u!4 &3085370228904392803 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: 4967328832014496, guid: dfd6e1dcb49f5c9459f3a2abeb4c6135,

Assets/MyGame/aa/Game/HHWK/MonsterTSY/SDY/GameObject.prefab

@@ -92,7 +92,7 @@ MonoBehaviour:
   minBJCount: 10
   maxBJCount: 15
   laserPrefab: {fileID: 0}
-  laserLengthCorrect: 1
+  laserLengthCorrect: 20
   lightningMaterial: {fileID: 2100000, guid: a023113e8eb8bf245b8ba10c3e9788d1, type: 2}
   lightningColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
   lightningWidth: 0.08

Assets/MyGame/aa/Game/XJMH/Boss/XingJiXunHang/XingJiXunHangEvent.cs

@@ -1395,6 +1395,11 @@ public class XingJiXunHangEvent : BJRedPacketEvent
     /// <summary>
     /// 播放满屏暴击文字（IronFist/GammaStorm 用）。
     /// 自己看 TextCrit_Self，他人看 TextCrit_Other。
+    ///
+    /// ⭐ 文字内容：预制体里写死的是占位 '123'，必须由代码写入「爆奖小鱼死亡累加的面板分」
+    ///   （<see cref="_bossPanelScore"/>，与奖励框上滚动的分同一个值，封顶 maxScore）。
+    /// ⭐ 层级：克隆体根上挂着嵌套 Canvas，美术里是无效层ID + order 5，
+    ///   会被 FullScreen 框（Default, order 12）压在下面 → 这里显式改成 Default + 更高 order。
     /// </summary>
     private void PlayTextCrit()
     {
@@ -1405,20 +1410,59 @@ public class XingJiXunHangEvent : BJRedPacketEvent
             return;
         }
 
+        GameObject critObj;
         if (isSelf)
         {
             // ⭐ 满屏暴击文字是 UI → 放 UI 中心，加入统一销毁列表
-            SpawnUiEffect(critPrefab);
+            critObj = SpawnUiEffect(critPrefab);
             Debug.Log("[XingJiXunHang] 播放满屏暴击（自己，UI中心）");
         }
         else
         {
             Vector3 critPos = GetSeatPosition() + Vector3.up * 2f;
-            var critObj = SpawnWorldEffect(critPrefab, critPos);
+            critObj = SpawnWorldEffect(critPrefab, critPos);
             if (critObj != null)
                 critObj.transform.localScale = Vector3.one * 0.6f;
             Debug.Log($"[XingJiXunHang] 播放满屏暴击（他人） pos={critPos}");
         }
+
+        if (critObj == null)
+        {
+            Debug.LogWarning("[XingJiXunHang] 暴击文字生成失败，跳过分数写入");
+            return;
+        }
+
+        // ⭐ 写入分数：爆奖过程中小鱼死亡累加的面板分（_bossPanelScore）
+        //    该 TMP 的 spriteAsset 已配好「数字→图片」映射，直接赋数字即可
+        var critTmp = critObj.GetComponentInChildren<TMPro.TextMeshProUGUI>(true);
+        if (critTmp != null)
+        {
+            critTmp.text = _bossPanelScore.ToString();
+            Debug.Log($"[XingJiXunHang] 暴击文字分数 = {_bossPanelScore}（上限{maxScore}）");
+            if (_bossPanelScore <= 0)
+                Debug.LogWarning("[XingJiXunHang] 暴击文字分数为 0：本次没有小鱼死亡累加（面板分仍为 0）");
+        }
+        else
+        {
+            Debug.LogWarning($"[XingJiXunHang] 暴击文字 {critObj.name} 上没找到 TMP，分数未写入");
+        }
+
+        // ⭐ 修层级：嵌套 Canvas → Default(0) + 高于 FullScreen(order 12)，
+        //    否则暴击文字会被全屏特效框挡住（美术里的 -559336389 在本项目 TagManager 里不存在）
+        var critCanvas = critObj.GetComponent<Canvas>();
+        if (critCanvas == null)
+            critCanvas = critObj.GetComponentInChildren<Canvas>(true);
+        if (critCanvas != null)
+        {
+            critCanvas.overrideSorting = true;
+            critCanvas.sortingLayerID = 0;    // Default（本项目只有 Default 一个排序层）
+            critCanvas.sortingOrder = 15;     // 高于 FullScreen 的 12
+            Debug.Log($"[XingJiXunHang] 暴击文字 Canvas 层级修正: Default / order={critCanvas.sortingOrder}");
+        }
+        else
+        {
+            Debug.LogWarning($"[XingJiXunHang] 暴击文字 {critObj.name} 上没找到 Canvas，层级未修正");
+        }
     }
 
     // ==================== 伽马风暴暴击框 ====================

Assets/MyGame/aa/UI/Game/GameMainPanel_FishBase.cs

@@ -118,6 +118,18 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
     /// <summary>是否正在退出倒计时（期间屏蔽帧同步和爆奖特效）</summary>
     private bool _isLeavingCountdown = false;
     private Coroutine _leaveCountdownCoroutine;
+
+    [Header("无操作自动退出")]
+    [Tooltip("无操作总时长（秒），走完自动退出回大厅（<=0 关闭该功能）")]
+    public float idleExitTotalSeconds = 70f;
+    [Tooltip("最后多少秒才显示倒计时面板（autoExitGamePanel）并逐秒倒数，之前全程无提示")]
+    public float idleExitPanelShowSeconds = 10f;
+    /// <summary>无操作计时是否生效（资源加载完成后才开始计时，OnHide/离房时失效）</summary>
+    private bool _idleExitArmed = false;
+    /// <summary>最近一次玩家操作的时间（Time.realtimeSinceStartup，含切后台时间）</summary>
+    private float _lastOperationTime = 0f;
+    /// <summary>警告文本当前显示的剩余秒数（-1=未显示；避免每帧刷新 TMP 文本）</summary>
+    private int _idleWarnShownSeconds = -1;
     [Header("游戏场景")]
     public string sceneName;
     public GameTypeEnum gameType;
@@ -181,6 +193,8 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
     public Toggle toggle_Lock;
     public Toggle toggle_Three;
     public Toggle toggle_Shuang;
+
+
     // ⭐ 双倍开火：toggle_Shuang 开启后计时 shuangDuration 秒自动关闭(DaoJiShi 驱动)，
     //   child0 的 Image(Filled 360°) 做环形倒计时显示（GetShuangFillImage 懒获取）
     float shuangDuration = 15f;
@@ -189,14 +203,15 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
     public Toggle toggle_BaoZou;
     public TextMeshProUGUI tmp_BaoZouCount;
     public Image img_BaoZou;
-    float frenzyDuration = 5f; // 疯狂状态持续时间
+    [Header("狂暴/冰封持续时间(秒,可在面板手动设置)")]
+    public float frenzyDuration = 15f; // 疯狂状态持续时间
     public float currFrenzyTime = 0f;
     public Toggle toggle_BingFeng;
     public TextMeshProUGUI tmp_BingFengCount;
     public Image img_BingFeng;
     public GameObject bingFengEffect;         // 冰封特效预制体（首次Instantiate，之后激活/隐藏）
     private GameObject _bingFengInstance;     // 克隆出来的实例
-    float bingFengDuration = 15f; // 冰封状态持续时间(服务端 FishFrozen 延长 15 秒,客户端写死 15s 倒计时)
+    public float bingFengDuration = 15f; // 冰封状态持续时间(服务端 FishFrozen 延长 15 秒,可在面板调整)
     public float currBingFengTime = 0f;
     private Dictionary<Component, object> _frozenAnimSpeeds = new Dictionary<Component, object>();
 
@@ -243,7 +258,10 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
     public GameObject bulletParent;
     float changeTurretTime = 0f;
     bool isChangingTurret = false;
-
+    [Header("超时自动退出倒计时")]
+    public GameObject autoExitGamePanel;  //倒计时面板
+    public TextMeshProUGUI tmp_ExitDaoJiShi;  //里面显示的是这个 n秒后自动关闭
+    public Button btn_CloseAutoExitGamePanel;  //退出游戏按钮
     // XJMH 长按炮台扇形切换
     [Header("XJMH 炮台长按切换")]
     [Tooltip("长按炮台触发扇形切换的阈值(秒)")]
@@ -279,6 +297,9 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
     protected override void OnShow(object args = null)
     {
         base.OnShow(args);
+        // ⭐ 无操作自动退出：加载期间不计时，LoadResources 完成后重新开始计；确保倒计时面板初始隐藏
+        _idleExitArmed = false;
+        HideIdleExitWarning();
         LoadResources();
         RefreshGGKCount();
         //UIManager.Instance.ShowBoard("太好看了");
@@ -352,7 +373,11 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
                 currSitData.lockFX.transform.GetChild(0).gameObject.SetActive(false);
                 currSitData.lockFX.transform.GetChild(1).gameObject.SetActive(true);
                 if (mySitAnim != null && currSitData.turretParent != null)
+                {
                     mySitAnim.transform.position = currSitData.turretParent.position;
+                    // ⭐ 进入游戏圆圈：6 秒后自动消失（点击屏幕立即消失的逻辑在 HandleInput）
+                    StartCoroutine(HideMySitAnimAfter(6f));
+                }
             }
             else
             {
@@ -478,6 +503,10 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
         UnhookOpenPTLongPress();
         UnhookAutoAttackOff();
 
+        // ⭐ 无操作自动退出：面板隐藏即停止计时
+        _idleExitArmed = false;
+        HideIdleExitWarning();
+
         UnLoadResources();
         // 场景可能未加载或已卸载，做保护避免重复卸载报错
         var scene = SceneManager.GetSceneByName(sceneName);
@@ -604,6 +633,10 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
         if (btn_ChangeRoom != null)
             btn_ChangeRoom.onClick.AddListener(StartChangeRoom);
 
+        // ⭐ 无操作自动退出：关闭倒计时面板并重新计时（未拖引用时为null，做保护）
+        if (btn_CloseAutoExitGamePanel != null)
+            btn_CloseAutoExitGamePanel.onClick.AddListener(OnCloseAutoExitPanel);
+
         // ⭐ 左侧道具按钮：开启/关闭 obj_PropPanel（一级列表由 PropConfigData 配置构建，
         //   点击一级道具在 tmp_PropTwoPanel 展开二级子道具）
         if (btn_Prop != null)
@@ -726,6 +759,124 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
         if (btn_QueRen != null) btn_QueRen.interactable = true;
     }
 
+    #region 无操作自动退出（60秒静默 → 最后10秒倒计时面板 → 70秒自动回大厅）
+
+    /// <summary>
+    /// ⭐ 每帧记录玩家操作（触摸/鼠标/键盘，含 UI 点击），超时自动走离房流程回大厅。
+    ///   机器人/其他玩家的同步数据不算操作；退出确认面板开着时超时同样生效。
+    ///   只在资源加载完成后计时（加载慢不会被踢）；离房流程进行中不重复触发。
+    ///   流程：前 idleExitTotalSeconds - idleExitPanelShowSeconds（默认60秒）全程无提示
+    ///   → 最后 idleExitPanelShowSeconds（默认10秒）才弹出倒计时面板（autoExitGamePanel）
+    ///   逐秒倒数 → 走满 idleExitTotalSeconds（默认70秒）自动退出回大厅；
+    ///   期间任意操作或点 btn_CloseAutoExitGamePanel → 关闭面板并重新计时。
+    /// </summary>
+    private void UpdateIdleAutoExit()
+    {
+        if (idleExitTotalSeconds <= 0f || idleExitPanelShowSeconds <= 0f)
+        {
+            HideIdleExitWarning();
+            return;
+        }
+
+        // 任何触摸/鼠标/键盘输入（含点在 UI 上）都算一次操作
+        if (IsAnyOperationThisFrame())
+        {
+            _lastOperationTime = Time.realtimeSinceStartup;
+            // 有操作 → 立即隐藏倒计时面板
+            HideIdleExitWarning();
+        }
+
+        // 计时未生效（加载中/已隐藏）或已在离房流程中 → 跳过
+        if (!_idleExitArmed || _leaveRoomResponseTcs != null) return;
+
+        float idleElapsed = Time.realtimeSinceStartup - _lastOperationTime;
+        // 面板弹出时刻：总时长 - 面板显示时长（70 - 10 = 60 秒）
+        float panelShowAt = idleExitTotalSeconds - idleExitPanelShowSeconds;
+
+        if (idleElapsed >= idleExitTotalSeconds)
+        {
+            HideIdleExitWarning();
+            Debug.Log($"[IdleExit] 连续 {idleExitTotalSeconds} 秒无操作，自动退出游戏回大厅");
+            // 退出确认面板还开着 → 先关掉，再走离房流程
+            if (_isLeavingCountdown) CancelLeaveCountdown();
+            RequestLeaveRoom();
+            return;
+        }
+
+        // 只有最后 idleExitPanelShowSeconds 秒才显示面板；之前保持隐藏
+        if (idleElapsed >= panelShowAt)
+            ShowIdleExitWarning(Mathf.CeilToInt(idleExitTotalSeconds - idleElapsed));
+        else
+            HideIdleExitWarning();
+    }
+
+    /// <summary>显示/刷新无操作退出倒计时面板（仅在剩余秒数变化时刷新文本，避免每帧 GC）</summary>
+    private void ShowIdleExitWarning(int remainingSeconds)
+    {
+        // 弹出倒计时面板（未拖面板引用时退化为只显示文本）
+        if (autoExitGamePanel != null)
+        {
+            if (!autoExitGamePanel.activeSelf)
+                autoExitGamePanel.SetActive(true);
+        }
+        else if (tmp_ExitDaoJiShi != null && !tmp_ExitDaoJiShi.gameObject.activeSelf)
+        {
+            tmp_ExitDaoJiShi.gameObject.SetActive(true);
+        }
+
+        if (tmp_ExitDaoJiShi != null && _idleWarnShownSeconds != remainingSeconds)
+        {
+            _idleWarnShownSeconds = remainingSeconds;
+            tmp_ExitDaoJiShi.text =
+                $"（{remainingSeconds}秒后自动退出）";
+        }
+    }
+
+    /// <summary>隐藏无操作退出倒计时面板（有操作/关闭按钮/开始离房/面板隐藏时调用）</summary>
+    private void HideIdleExitWarning()
+    {
+        if (autoExitGamePanel != null)
+        {
+            if (autoExitGamePanel.activeSelf)
+            {
+                autoExitGamePanel.SetActive(false);
+                _idleWarnShownSeconds = -1;
+            }
+            return;
+        }
+        if (tmp_ExitDaoJiShi != null && tmp_ExitDaoJiShi.gameObject.activeSelf)
+        {
+            tmp_ExitDaoJiShi.gameObject.SetActive(false);
+            _idleWarnShownSeconds = -1;
+        }
+    }
+
+    /// <summary>btn_CloseAutoExitGamePanel：关闭倒计时面板并从头重新计时</summary>
+    private void OnCloseAutoExitPanel()
+    {
+        HideIdleExitWarning();
+        _lastOperationTime = Time.realtimeSinceStartup;
+    }
+
+    /// <summary>本帧是否有玩家输入：触摸/鼠标按下、按住、松开 或 任意按键</summary>
+    private bool IsAnyOperationThisFrame()
+    {
+        var input = GetInput();
+        if (input.isPressed || input.wasPressedThisFrame || input.wasReleasedThisFrame)
+            return true;
+        var keyboard = Keyboard.current;
+        return keyboard != null && keyboard.anyKey.isPressed;
+    }
+
+    /// <summary>开始无操作计时（LoadResources 完成后调用，计时从当前时刻重新起算）</summary>
+    private void ArmIdleAutoExit()
+    {
+        _lastOperationTime = Time.realtimeSinceStartup;
+        _idleExitArmed = true;
+    }
+
+    #endregion
+
     public virtual void OnDestroy()
     {
         EventCenter.Instance.RemoveEventListener<SyncGameData>(ConstEventString.SyncGameData_Rotate, SyncGameData_Rotate);
@@ -873,8 +1024,7 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
 
     protected virtual void Update()
     {
-
+        UpdateIdleAutoExit();
-
 
         HandleAutoRotate();
         HandleInput();
@@ -991,6 +1141,9 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
             ClearChangeRoomBar();
         else if (JinDuTiao != null)
             JinDuTiao.Hide();
+
+        // ⭐ 无操作自动退出：加载完成，从现在开始计无操作时间
+        ArmIdleAutoExit();
     }
 
     public async void UnLoadResources()
@@ -2074,6 +2227,14 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
     }
 
 
+    /// <summary>进入游戏圆圈 mySitAnim：延时自动消失（6 秒没点屏幕也消失；点击屏幕立即消失在 HandleInput）</summary>
+    private IEnumerator HideMySitAnimAfter(float delay)
+    {
+        yield return new WaitForSeconds(delay);
+        if (mySitAnim != null && mySitAnim.gameObject.activeSelf)
+            mySitAnim.gameObject.SetActive(false);
+    }
+
     private void HandleInput()
     {
         // ⭐ 退出倒计时期间屏蔽本地玩家手动输入(旋转/开火/锁定),其他玩家和机器人不受影响
@@ -3123,7 +3284,7 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
                 MonsterContral m = kv.Value;
                 if (m == null || !m.gameObject.activeInHierarchy) continue;
                 if (selected.Contains(m.guid)) continue; // 跳过已选中的
-                // ⭐ 路径进度过滤:刚出生(< 0.2)或即将离场(> 0.8)的鱼不作为目标
+                // ⭐ 路径进度过滤:刚出生(< 0.1)或即将离场(> 0.9)的鱼不作为目标
                 if (!IsFishPathLockable(m)) continue;
                 // ⭐ 可锁定过滤:出场效果期间/needLockEvent 鱼未就绪 → 跳过换下一条
                 if (!IsMonsterLockable(m)) continue;
@@ -3444,20 +3605,23 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
         // ⭐ 用世界坐标(Z=0平面),和 bot AI 一致,否则距离计算会异常(出现 3.4E+38 之类)
         Vector3 origin = currSitData.turretWorldPos;
 
-        // ⭐ 规则:特殊Boss / Boss鱼 / 特殊鱼 为高价值组(按优先级 + 距离最近),
+        // ⭐ 规则:严格按优先级分层,高价值到低价值:
-        //   黄金鱼 / 普通鱼 为普通组(随机选一只)
+        //   特殊Boss(5) > Boss鱼(4) > 特殊鱼(3) > 黄金鱼(2) > 普通鱼(1)
-        //   高价值组有目标时只从高价值组选;高价值组无目标时从普通组随机
+        //   - 特殊Boss/Boss鱼/特殊鱼:同层取距离最近
+        //   - 黄金鱼/普通鱼:各自独立分层,同层随机选一只
+        //   高层有目标时绝不选低层
         MonsterContral best = null;
         int bestPri = -1;
         float bestSqr = float.MaxValue;
 
-        var normalList = new List<MonsterContral>();
+        var goldList = new List<MonsterContral>();   // 黄金鱼(2) 单独一层
+        var smallList = new List<MonsterContral>();  // 普通鱼(1) 单独一层
 
         foreach (var kv in CreateFishManager.Instance.fishDatas_hashCodekey)
         {
             MonsterContral m = kv.Value;
             if (m == null || !m.gameObject.activeInHierarchy) continue;
-            // ⭐ 路径进度过滤:刚出生(< 0.2)或即将离场(> 0.8)的鱼不作为自动锁定目标
+            // ⭐ 路径进度过滤:刚出生(< 0.1)或即将离场(> 0.9)的鱼不作为自动锁定目标
             if (!IsFishPathLockable(m)) continue;
             // ⭐ 可锁定过滤:出场效果期间/needLockEvent 鱼未就绪 → 跳过换下一条
             if (!IsMonsterLockable(m)) continue;
@@ -3475,19 +3639,27 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
                     best = m;
                 }
             }
-            // 普通组:黄金鱼(2) / 普通鱼(1) → 先收集,后面随机
+            // ⭐ 黄金鱼(2) / 普通鱼(1) 分开收集,不再混在一个列表里
+            else if (pri == 2)
+            {
+                goldList.Add(m);
+            }
             else
             {
-                normalList.Add(m);
+                smallList.Add(m);
             }
         }
 
-        // 高价值组有目标 → 直接返回最高价值(同价值最近)的目标
+        // ① 特殊Boss/Boss鱼/特殊鱼 有目标 → 返回最高价值(同价值最近)的目标
         if (best != null) return best;
 
-        // 高价值组无目标 → 从普通组随机选一只
+        // ② 没有特殊鱼及以上 → 黄金鱼层随机选一只
-        if (normalList.Count > 0)
+        if (goldList.Count > 0)
-            return normalList[Random.Range(0, normalList.Count)];
+            return goldList[Random.Range(0, goldList.Count)];
+
+        // ③ 没有黄金鱼 → 普通鱼层随机选一只
+        if (smallList.Count > 0)
+            return smallList[Random.Range(0, smallList.Count)];
 
         return null;
     }
@@ -4489,7 +4661,7 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
         {
             var m = kv.Value;
             if (m == null || !m.gameObject.activeInHierarchy) continue;
-            // ⭐ 路径进度过滤:刚出生(< 0.2)或即将离场(> 0.8)的 Boss 不作为目标
+            // ⭐ 路径进度过滤:刚出生(< 0.1)或即将离场(> 0.9)的 Boss 不作为目标
             if (!IsFishPathLockable(m)) continue;
 
             int ft = (int)m.fishenum;
@@ -4820,7 +4992,7 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
         {
             var m = kv.Value;
             if (m == null || !m.gameObject.activeInHierarchy) continue;
-            // ⭐ 路径进度过滤:刚出生(< 0.2)或即将离场(> 0.8)的鱼不作为目标
+            // ⭐ 路径进度过滤:刚出生(< 0.1)或即将离场(> 0.9)的鱼不作为目标
             if (!IsFishPathLockable(m)) continue;
 
             Vector3 fishPos = m.transform.position;
@@ -4867,7 +5039,7 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
             var m = kv.Value;
             if (m == null || !m.gameObject.activeInHierarchy) continue;
             if (m == exclude) continue;
-            // ⭐ 路径进度过滤:刚出生(< 0.2)或即将离场(> 0.8)的鱼不作为目标
+            // ⭐ 路径进度过滤:刚出生(< 0.1)或即将离场(> 0.9)的鱼不作为目标
             if (!IsFishPathLockable(m)) continue;
 
             Vector3 fishPos = m.transform.position;

Assets/MyGame/aa/UI/Game/Skill.prefab

@@ -103,8 +103,8 @@ RectTransform:
   m_GameObject: {fileID: 236891699104540088}
   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_LocalScale: {x: 0.8, y: 0.8, z: 0.8}
-  m_ConstrainProportionsScale: 0
+  m_ConstrainProportionsScale: 1
   m_Children:
   - {fileID: 7835773788371249517}
   - {fileID: 3278342634232470330}
@@ -485,8 +485,8 @@ RectTransform:
   m_GameObject: {fileID: 633761538334472770}
   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_LocalScale: {x: 0.8, y: 0.8, z: 0.8}
-  m_ConstrainProportionsScale: 0
+  m_ConstrainProportionsScale: 1
   m_Children:
   - {fileID: 2642676799649327388}
   - {fileID: 5142449319288461331}
@@ -1465,8 +1465,8 @@ RectTransform:
   m_GameObject: {fileID: 2630252367303179408}
   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_LocalScale: {x: 0.8, y: 0.8, z: 0.8}
-  m_ConstrainProportionsScale: 0
+  m_ConstrainProportionsScale: 1
   m_Children:
   - {fileID: 5338333950028160419}
   m_Father: {fileID: 992911195842070766}
@@ -2761,7 +2761,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: -8.9}
   m_SizeDelta: {x: 371.3, y: 90.2755}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!114 &7282809205694097740
@@ -2781,8 +2781,8 @@ MonoBehaviour:
     m_Right: 0
     m_Top: 0
     m_Bottom: 0
-  m_ChildAlignment: 0
+  m_ChildAlignment: 4
-  m_Spacing: 0
+  m_Spacing: -16.22
   m_ChildForceExpandWidth: 0
   m_ChildForceExpandHeight: 1
   m_ChildControlWidth: 0
@@ -2950,8 +2950,8 @@ RectTransform:
   m_GameObject: {fileID: 6013575717776043754}
   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_LocalScale: {x: 0.8, y: 0.8, z: 0.8}
-  m_ConstrainProportionsScale: 0
+  m_ConstrainProportionsScale: 1
   m_Children:
   - {fileID: 3477348704099036915}
   - {fileID: 2154829562891718650}
@@ -3349,8 +3349,8 @@ RectTransform:
   m_GameObject: {fileID: 7078537490689401426}
   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_LocalScale: {x: 0.8, y: 0.8, z: 0.8}
-  m_ConstrainProportionsScale: 0
+  m_ConstrainProportionsScale: 1
   m_Children:
   - {fileID: 7704570457894514173}
   - {fileID: 823219710641931391}
@@ -3753,8 +3753,8 @@ RectTransform:
   m_GameObject: {fileID: 7273522503763847789}
   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_LocalScale: {x: 0.8, y: 0.8, z: 0.8}
-  m_ConstrainProportionsScale: 0
+  m_ConstrainProportionsScale: 1
   m_Children:
   - {fileID: 8819816701581450929}
   - {fileID: 3177524625614227146}

Assets/MyGame/aa/UI/Game/右上.prefab

@@ -318,6 +318,16 @@ PrefabInstance:
       propertyPath: m_SortingLayer
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 3397302884702173062, guid: 509192cd5f627cf409a54e9be694a24d,
+        type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3397302884702173062, guid: 509192cd5f627cf409a54e9be694a24d,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 3494573310348252002, guid: 509192cd5f627cf409a54e9be694a24d,
         type: 3}
       propertyPath: m_SortingLayer
@@ -496,7 +506,7 @@ PrefabInstance:
     - target: {fileID: 4843941669050715073, guid: 509192cd5f627cf409a54e9be694a24d,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 128
+      value: 147.6
       objectReference: {fileID: 0}
     - target: {fileID: 4874233463245360906, guid: 509192cd5f627cf409a54e9be694a24d,
         type: 3}
@@ -798,6 +808,16 @@ PrefabInstance:
       propertyPath: m_SortingLayer
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 7782089659438206966, guid: 509192cd5f627cf409a54e9be694a24d,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7782089659438206966, guid: 509192cd5f627cf409a54e9be694a24d,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 7782089659438206966, guid: 509192cd5f627cf409a54e9be694a24d,
         type: 3}
       propertyPath: m_LocalScale.y
@@ -806,7 +826,7 @@ PrefabInstance:
     - target: {fileID: 7782089659438206966, guid: 509192cd5f627cf409a54e9be694a24d,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -73.5
+      value: -8.5
       objectReference: {fileID: 0}
     - target: {fileID: 7782089659438206966, guid: 509192cd5f627cf409a54e9be694a24d,
         type: 3}

Assets/MyGame/aa/UI/Game/右下.prefab

@@ -48,6 +48,16 @@ PrefabInstance:
       propertyPath: m_SortingLayer
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 397833008454374056, guid: c9c177e60fd350e49844955f7e8a5874,
+        type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 397833008454374056, guid: c9c177e60fd350e49844955f7e8a5874,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 450003735944806845, guid: c9c177e60fd350e49844955f7e8a5874,
         type: 3}
       propertyPath: m_SortingLayer

Assets/MyGame/aa/UI/Game/左上.prefab

@@ -53,6 +53,16 @@ PrefabInstance:
       propertyPath: m_SortingLayer
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 397833008454374056, guid: c9c177e60fd350e49844955f7e8a5874,
+        type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 397833008454374056, guid: c9c177e60fd350e49844955f7e8a5874,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 450003735944806845, guid: c9c177e60fd350e49844955f7e8a5874,
         type: 3}
       propertyPath: m_SortingLayer
@@ -83,6 +93,11 @@ PrefabInstance:
       propertyPath: m_LocalScale.y
       value: -1
       objectReference: {fileID: 0}
+    - target: {fileID: 973905160343307270, guid: c9c177e60fd350e49844955f7e8a5874,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -3.8000093
+      objectReference: {fileID: 0}
     - target: {fileID: 1138529054820578357, guid: c9c177e60fd350e49844955f7e8a5874,
         type: 3}
       propertyPath: m_SortingLayer
@@ -448,6 +463,16 @@ PrefabInstance:
       propertyPath: m_SortingLayer
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 4710570228793354968, guid: c9c177e60fd350e49844955f7e8a5874,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4710570228793354968, guid: c9c177e60fd350e49844955f7e8a5874,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 4710570228793354968, guid: c9c177e60fd350e49844955f7e8a5874,
         type: 3}
       propertyPath: m_LocalScale.x
@@ -466,12 +491,12 @@ PrefabInstance:
     - target: {fileID: 4710570228793354968, guid: c9c177e60fd350e49844955f7e8a5874,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 44.4
+      value: 34.7
       objectReference: {fileID: 0}
     - target: {fileID: 4710570228793354968, guid: c9c177e60fd350e49844955f7e8a5874,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -73.1
+      value: -9.3
       objectReference: {fileID: 0}
     - target: {fileID: 4710570228793354968, guid: c9c177e60fd350e49844955f7e8a5874,
         type: 3}
@@ -831,7 +856,7 @@ PrefabInstance:
     - target: {fileID: 7609364501153394415, guid: c9c177e60fd350e49844955f7e8a5874,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 126.7
+      value: 152.1
       objectReference: {fileID: 0}
     - target: {fileID: 7702690943730251830, guid: c9c177e60fd350e49844955f7e8a5874,
         type: 3}
@@ -858,6 +883,11 @@ PrefabInstance:
       propertyPath: m_LocalScale.y
       value: -1.25
       objectReference: {fileID: 0}
+    - target: {fileID: 7835193491978159751, guid: c9c177e60fd350e49844955f7e8a5874,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -3.8
+      objectReference: {fileID: 0}
     - target: {fileID: 8015305268238102307, guid: c9c177e60fd350e49844955f7e8a5874,
         type: 3}
       propertyPath: m_SortingLayer

Assets/MyGame/aa/UI/Game/左下.prefab

@@ -32,9 +32,9 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 7609364501153394415}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: -123.49982, y: -39.500076}
+  m_AnchoredPosition: {x: 60.500183, y: 27.499924}
   m_SizeDelta: {x: 103, y: 35}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &939075357221539841
@@ -185,7 +185,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
-  m_AnchoredPosition: {x: 131.37505, y: -3.3250427}
+  m_AnchoredPosition: {x: 131.37505, y: -4.424999}
   m_SizeDelta: {x: 60, y: 12}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &2701583448577859658
@@ -540,9 +540,9 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 7609364501153394415}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: -124.99997, y: -42.5}
+  m_AnchoredPosition: {x: 59.00003, y: 24.5}
   m_SizeDelta: {x: 64, y: 21}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7068578546255737722
@@ -1182,9 +1182,9 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 7609364501153394415}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: -123.49982, y: -38.500076}
+  m_AnchoredPosition: {x: 60.500183, y: 28.499924}
   m_SizeDelta: {x: 103, y: 33}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5518507213745826613
@@ -1424,9 +1424,9 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 7609364501153394415}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: -131.49997, y: -42.5}
+  m_AnchoredPosition: {x: 52.50003, y: 24.5}
   m_SizeDelta: {x: 51, y: 21}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1086207817666691744
@@ -1501,7 +1501,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 44.770996, y: -28.020882}
+  m_AnchoredPosition: {x: 44.770996, y: -24.3}
   m_SizeDelta: {x: -161.23, y: -90.8334}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7940740183345757366
@@ -1618,7 +1618,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &2094753452532434597
 RectTransform:
   m_ObjectHideFlags: 0
@@ -1633,9 +1633,9 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 7609364501153394415}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: -126.49997, y: -38.500076}
+  m_AnchoredPosition: {x: 57.50003, y: 28.499924}
   m_SizeDelta: {x: 97, y: 33}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3478998171396289274
@@ -2328,9 +2328,9 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 7609364501153394415}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: -131.49997, y: -42.5}
+  m_AnchoredPosition: {x: 52.50003, y: 24.5}
   m_SizeDelta: {x: 51, y: 21}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1439673781816471195
@@ -2813,9 +2813,9 @@ RectTransform:
   - {fileID: 2501852592714539457}
   m_Father: {fileID: 7609364501153394415}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMin: {x: 0.5, y: 1}
-  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 34.5, y: 77.49994}
+  m_AnchoredPosition: {x: 34.5, y: 10.499939}
   m_SizeDelta: {x: 279, y: 37}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7598986287992324467
@@ -2888,9 +2888,9 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 7609364501153394415}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: -130.99982, y: -42.5}
+  m_AnchoredPosition: {x: 53.000183, y: 24.5}
   m_SizeDelta: {x: 52, y: 21}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4430190150721293563
@@ -3154,9 +3154,9 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 7609364501153394415}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: -123.00012, y: -39.000076}
+  m_AnchoredPosition: {x: 60.999878, y: 27.999924}
   m_SizeDelta: {x: 104, y: 34}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6359790639086632546
@@ -3229,9 +3229,9 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 7609364501153394415}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: -131.49997, y: -42.5}
+  m_AnchoredPosition: {x: 52.50003, y: 24.5}
   m_SizeDelta: {x: 51, y: 21}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7553169601699106405
@@ -3304,9 +3304,9 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 7609364501153394415}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: -131.49997, y: -42.5}
+  m_AnchoredPosition: {x: 52.50003, y: 24.5}
   m_SizeDelta: {x: 49, y: 21}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3062482307563368506
@@ -3381,7 +3381,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
-  m_AnchoredPosition: {x: 216.8, y: -2.7000427}
+  m_AnchoredPosition: {x: 216.8, y: -2.3}
   m_SizeDelta: {x: 87, y: 13}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2271467992873135901
@@ -3440,13 +3440,13 @@ MonoBehaviour:
   m_faceColor:
     serializedVersion: 2
     rgba: 4294967295
-  m_fontSize: 16
+  m_fontSize: 20
-  m_fontSizeBase: 16
+  m_fontSizeBase: 20
   m_fontWeight: 400
   m_enableAutoSizing: 0
   m_fontSizeMin: 18
   m_fontSizeMax: 72
-  m_fontStyle: 1
+  m_fontStyle: 0
   m_HorizontalAlignment: 1
   m_VerticalAlignment: 512
   m_textAlignment: 65535
@@ -3514,9 +3514,9 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 7609364501153394415}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: -123.49982, y: -38.500076}
+  m_AnchoredPosition: {x: 60.500183, y: 28.499924}
   m_SizeDelta: {x: 103, y: 33}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6995607045978658789
@@ -3755,9 +3755,9 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 7609364501153394415}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: -131.49997, y: -42.5}
+  m_AnchoredPosition: {x: 52.50003, y: 24.5}
   m_SizeDelta: {x: 51, y: 21}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1724657610333687412
@@ -3986,9 +3986,9 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 7609364501153394415}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: -131.49997, y: -42.5}
+  m_AnchoredPosition: {x: 52.50003, y: 24.5}
   m_SizeDelta: {x: 51, y: 21}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &256452233577848298
@@ -4270,9 +4270,9 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 7609364501153394415}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: -131.49997, y: -42.5}
+  m_AnchoredPosition: {x: 52.50003, y: 24.5}
   m_SizeDelta: {x: 51, y: 21}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &694978334991620813
@@ -4345,9 +4345,9 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 7609364501153394415}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: -131.49997, y: -42.5}
+  m_AnchoredPosition: {x: 52.50003, y: 24.5}
   m_SizeDelta: {x: 51, y: 21}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1825487224143377863
@@ -4495,9 +4495,9 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 7609364501153394415}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: -130.99982, y: -42.5}
+  m_AnchoredPosition: {x: 53.000183, y: 24.5}
   m_SizeDelta: {x: 52, y: 21}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3597029131539317174
@@ -4858,7 +4858,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
-  m_AnchoredPosition: {x: -245.7, y: 30.7}
+  m_AnchoredPosition: {x: -245.7, y: 26.3}
   m_SizeDelta: {x: 35, y: 35}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8591802468268028330
@@ -5055,14 +5055,14 @@ RectTransform:
   m_GameObject: {fileID: 7712621374721581439}
   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_LocalScale: {x: 0.7967, y: 0.7967, z: 0.7967}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 7609364501153394415}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: -130.99982, y: 15}
+  m_AnchoredPosition: {x: 53.000183, y: 69.6}
   m_SizeDelta: {x: 88, y: 88}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6645034468252132292
@@ -5330,7 +5330,7 @@ RectTransform:
   m_GameObject: {fileID: 7917363225261056705}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0.8, y: 0.8, z: 0.8}
+  m_LocalScale: {x: 0.7, y: 0.72928804, z: 0.72928804}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 4710570228793354968}
@@ -5359,8 +5359,8 @@ RectTransform:
   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: -214.40002, y: -136}
+  m_AnchoredPosition: {x: -214.40002, y: -151.766}
-  m_SizeDelta: {x: 368, y: 134}
+  m_SizeDelta: {x: 368, y: 113.2365}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8378108290391890554
 CanvasRenderer:
@@ -5811,14 +5811,14 @@ RectTransform:
   m_GameObject: {fileID: 8715748350172511410}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1.25, y: 1.25, z: 1.25}
+  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
+  m_ConstrainProportionsScale: 1
   m_Children: []
   m_Father: {fileID: 4710570228793354968}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
-  m_AnchoredPosition: {x: 67.5, y: -1.9819}
+  m_AnchoredPosition: {x: 69.9, y: -2.3000078}
   m_SizeDelta: {x: 38, y: 13.149}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4580168597633069950
@@ -5877,8 +5877,8 @@ MonoBehaviour:
   m_faceColor:
     serializedVersion: 2
     rgba: 4294967295
-  m_fontSize: 16.25
+  m_fontSize: 20
-  m_fontSizeBase: 16.25
+  m_fontSizeBase: 20
   m_fontWeight: 400
   m_enableAutoSizing: 0
   m_fontSizeMin: 18