Merge branch 'master' of http://192.168.123.2:3000/ck/XiuXianGame

# Conflicts:
#	Assets/Resources/Shader/Shader Graphs_ShengShiShader.mat   resolved by origin/master(远端) version

Assets/Art/VFX/Materials/UIMat/ui_ob_yindao_glow_add.mat

@@ -57,7 +57,7 @@ Material:
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
-    - _Alpha: 0.8575237
+    - _Alpha: 0.8902296
     - _AlphaCutoff: 0.5
     - _ColorMask: 15
     - _EnableExternalAlpha: 0

Assets/Art/VFX/Materials/UIMat/ui_ob_yindao_quan.mat

@@ -57,7 +57,7 @@ Material:
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
-    - _Alpha: 0.7350793
+    - _Alpha: 0.5876296
     - _AlphaCutoff: 0.5
     - _ColorMask: 0
     - _EnableExternalAlpha: 0

Assets/Res/Config/HeroPowerUpConfig.json

@@ -969,7 +969,8 @@
       ],
       "LeijieDamages": [
         3431,
-        5147
+        5147,
+        2
       ],
       "HPFactor": 15.0624866,
       "ATKFactor": 1.80870819,
@@ -1954,7 +1955,8 @@
       ],
       "LeijieDamages": [
         14300,
-        21450
+        21450,
+        3
       ],
       "HPFactor": 52.6819839,
       "ATKFactor": 4.907138,
@@ -2939,7 +2941,8 @@
       ],
       "LeijieDamages": [
         64589,
-        96883
+        96883,
+        4
       ],
       "HPFactor": 174.988464,
       "ATKFactor": 13.3133717,
@@ -3924,7 +3927,8 @@
       ],
       "LeijieDamages": [
         257663,
-        386494
+        386494,
+        5
       ],
       "HPFactor": 561.732544,
       "ATKFactor": 36.1200066,
@@ -4909,7 +4913,8 @@
       ],
       "LeijieDamages": [
         897059,
-        1345589
+        1345589,
+        6
       ],
       "HPFactor": 1759.992,
       "ATKFactor": 97.99583,
@@ -5894,7 +5899,8 @@
       ],
       "LeijieDamages": [
         3024062,
-        4536093
+        4536093,
+        7
       ],
       "HPFactor": 5415.187,
       "ATKFactor": 265.8688,
@@ -6879,7 +6885,8 @@
       ],
       "LeijieDamages": [
         10349560,
-        15524340
+        15524340,
+        8
       ],
       "HPFactor": 16428.6953,
       "ATKFactor": 721.3186,
@@ -7864,7 +7871,8 @@
       ],
       "LeijieDamages": [
         34630848,
-        51946272
+        51946272,
+        9
       ],
       "HPFactor": 49284.54,
       "ATKFactor": 1956.9823,
@@ -8849,7 +8857,8 @@
       ],
       "LeijieDamages": [
         105941258,
-        158911886
+        158911886,
+        10
       ],
       "HPFactor": 146497.234,
       "ATKFactor": 5309.415,
@@ -9831,7 +9840,8 @@
       ],
       "LeijieDamages": [
         327737400,
-        491606100
+        491606100,
+        11
       ],
       "HPFactor": 432143.219,
       "ATKFactor": 14404.7734,

Assets/Res/Config/ItemConfig.json

@@ -9,6 +9,9 @@
       "quality": 2,
       "stack": 0,
       "isSell": false,
+      "SkiptoID": [
+        5
+      ],
       "rewardsNum": 0,
       "isVisible": 1,
       "isUse": false,
@@ -34,6 +37,10 @@
       "quality": 4,
       "stack": 0,
       "isSell": false,
+      "SkiptoID": [
+        5,
+        4
+      ],
       "rewardsNum": 0,
       "isVisible": 1,
       "isUse": false,
@@ -198,7 +205,7 @@
       "stack_1": 0,
       "associateID": 9,
       "associateVlaue": [
-        1002,
+        1004,
         6
       ],
       "sort": 0,
@@ -227,7 +234,7 @@
       "stack_1": 0,
       "associateID": 9,
       "associateVlaue": [
-        1002,
+        1004,
         30
       ],
       "sort": 0,
@@ -256,7 +263,7 @@
       "stack_1": 0,
       "associateID": 9,
       "associateVlaue": [
-        1002,
+        1004,
         98
       ],
       "sort": 0,
@@ -285,7 +292,7 @@
       "stack_1": 0,
       "associateID": 9,
       "associateVlaue": [
-        1002,
+        1004,
         198
       ],
       "sort": 0,
@@ -314,7 +321,7 @@
       "stack_1": 0,
       "associateID": 9,
       "associateVlaue": [
-        1002,
+        1004,
         328
       ],
       "sort": 0,
@@ -343,7 +350,7 @@
       "stack_1": 0,
       "associateID": 9,
       "associateVlaue": [
-        1002,
+        1004,
         648
       ],
       "sort": 0,

Assets/Res/Config/LanguageChineseConfig.json

@@ -646,15 +646,15 @@
     },
     {
       "ID": 162,
-      "txt": "金幣，可用於開寶箱"
+      "txt": "游历仙界最基础的货币。"
     },
     {
       "ID": 163,
-      "txt": "鑽石，後續開放（敬請期待）"
+      "txt": "妖物魂魄凝结而成的丹药，一般作为较为稀有的货币。"
     },
     {
       "ID": 164,
-      "txt": "經驗，用於英雄升級"
+      "txt": "英雄提升等级所必需的资源。"
     },
     {
       "ID": 165,
@@ -674,15 +674,15 @@
     },
     {
       "ID": 169,
-      "txt": "金幣"
+      "txt": "灵石"
     },
     {
       "ID": 170,
-      "txt": "鑽石"
+      "txt": "妖丹"
     },
     {
       "ID": 171,
-      "txt": "英雄經驗"
+      "txt": "修为"
     },
     {
       "ID": 172,
@@ -994,7 +994,7 @@
     },
     {
       "ID": 249,
-      "txt": "最稀有的货币"
+      "txt": "仙界最为珍贵的货币。"
     },
     {
       "ID": 250,
@@ -2790,7 +2790,7 @@
     },
     {
       "ID": 698,
-      "txt": "玄黄道 "
+      "txt": "玄黄道"
     },
     {
       "ID": 699,
@@ -2802,7 +2802,7 @@
     },
     {
       "ID": 701,
-      "txt": "每次使用功法时在当前位置留下一道属性印记，下一个放上来的功法如果和以前功法相生则功法效果提升{0}%，每次使用功法时都会治疗对应相生属性的{1}伤势。（均衡性功法搭配，转盘改变，变为金、水、木、火、土）\n"
+      "txt": "每次使用功法时在当前位置留下一道属性印记，下一个放上来的功法如果和以前功法相生则功法效果提升{0}%，每次使用功法时都会治疗对应相生属性的{1}伤势。（均衡性功法搭配，转盘改变，变为金、水、木、火、土）"
     },
     {
       "ID": 702,
@@ -2898,11 +2898,11 @@
     },
     {
       "ID": 725,
-      "txt": "功法灵气"
+      "txt": "灵气"
     },
     {
       "ID": 726,
-      "txt": "[临]灵气的描述"
+      "txt": "功法升级所必需的资源。"
     },
     {
       "ID": 727,
@@ -5598,11 +5598,11 @@
     },
     {
       "ID": 1400,
-      "txt": "法宝灵韵"
+      "txt": "玄晶"
     },
     {
       "ID": 1401,
-      "txt": "用于提升法宝的等级"
+      "txt": "法宝升级所必需的资源。"
     },
     {
       "ID": 1402,
@@ -13342,111 +13342,111 @@
     },
     {
       "ID": 4076,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4077,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4078,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4079,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4080,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4081,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4082,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4083,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4084,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4085,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4086,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4087,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4088,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4089,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4090,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4091,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4092,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4093,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4094,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4095,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4096,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4097,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4098,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4099,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4100,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4101,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4102,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4103,
@@ -13494,7 +13494,7 @@
     },
     {
       "ID": 4114,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4115,
@@ -13558,11 +13558,11 @@
     },
     {
       "ID": 4130,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4131,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4132,
@@ -13806,7 +13806,7 @@
     },
     {
       "ID": 4192,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4193,
@@ -38198,7 +38198,7 @@
     },
     {
       "ID": 10290,
-      "txt": "心情+{0} "
+      "txt": "心情+{0}"
     },
     {
       "ID": 10291,

Assets/Res/Config/ShopItemConfig.json

@@ -1869,6 +1869,29 @@
       "itemId": [
         1002
       ],
+      "itemCount": [
+        100
+      ],
+      "costItemId": 1004,
+      "price": 10,
+      "oldPrice": 1,
+      "buyCount": -1,
+      "maxBuyCount": -1,
+      "shopItemGroup": 7,
+      "continueTime": -1,
+      "shopName": 0,
+      "shopDesc": 0,
+      "shopShowTemplate": 3,
+      "shopShowTemplateParm": [
+        "icon_Gem_Star_Blue"
+      ]
+    },
+    {
+      "ID": 702,
+      "giftID": "",
+      "itemId": [
+        1002
+      ],
       "itemCount": [
         10
       ],

Assets/Res/Config/SkiptoConfig.json

@@ -5,7 +5,7 @@
       "SkipType": 1,
       "SkipID": 1,
       "SkipTxt": 10107,
-      "UnlockType": 1,
+      "UnlockType": 0,
       "UnlockPara2": 0
     },
     {
@@ -28,6 +28,9 @@
       "ID": 4,
       "SkipType": 4,
       "SkipID": 4,
+      "SkipArguments": [
+        7
+      ],
       "SkipTxt": 10110,
       "UnlockType": 0,
       "UnlockPara2": 0
@@ -39,6 +42,14 @@
       "SkipTxt": 10111,
       "UnlockType": 0,
       "UnlockPara2": 0
+    },
+    {
+      "ID": 6,
+      "SkipType": 6,
+      "SkipID": 4,
+      "SkipTxt": 0,
+      "UnlockType": 0,
+      "UnlockPara2": 0
     }
   ]
 }

Assets/Res/UI/Canvas/Canvas.prefab

@@ -435,7 +435,7 @@ MonoBehaviour:
     m_Bits: 0
   m_VolumeTrigger: {fileID: 0}
   m_VolumeFrameworkUpdateModeOption: 2
-  m_RenderPostProcessing: 0
+  m_RenderPostProcessing: 1
   m_Antialiasing: 0
   m_AntialiasingQuality: 2
   m_StopNaN: 0

Assets/Resources/Shader/Shader Graphs_ShengShiShader.mat

@@ -66,5 +66,5 @@ Material:
     m_Colors:
     - _mainColor: {r: 0.21314356, g: 1.4060051, b: 2.1517377, a: 0}
     - _off: {r: 0.01, g: 0.01, b: 0, a: 0}
-    - _pos: {r: -10.84, g: -5.3999996, b: -30, a: 0}
+    - _pos: {r: 0, g: -5, b: -30, a: 0}
   m_BuildTextureStacks: []

Assets/Scenes/testCombat.scene

@@ -890,6 +890,76 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 442218246}
   m_CullTransparentMesh: 1
+--- !u!1001 &471604613
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 2035678242}
+    m_Modifications:
+    - target: {fileID: 3683907582521372588, guid: c19d229d8a45ed0458c1fea6112d29b7, type: 3}
+      propertyPath: m_Name
+      value: Mountain010 (1)
+      objectReference: {fileID: 0}
+    - target: {fileID: 8909352204525286337, guid: c19d229d8a45ed0458c1fea6112d29b7, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8909352204525286337, guid: c19d229d8a45ed0458c1fea6112d29b7, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8909352204525286337, guid: c19d229d8a45ed0458c1fea6112d29b7, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8909352204525286337, guid: c19d229d8a45ed0458c1fea6112d29b7, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8909352204525286337, guid: c19d229d8a45ed0458c1fea6112d29b7, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -8.51
+      objectReference: {fileID: 0}
+    - target: {fileID: 8909352204525286337, guid: c19d229d8a45ed0458c1fea6112d29b7, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8909352204525286337, guid: c19d229d8a45ed0458c1fea6112d29b7, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8909352204525286337, guid: c19d229d8a45ed0458c1fea6112d29b7, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8909352204525286337, guid: c19d229d8a45ed0458c1fea6112d29b7, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8909352204525286337, guid: c19d229d8a45ed0458c1fea6112d29b7, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8909352204525286337, guid: c19d229d8a45ed0458c1fea6112d29b7, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8909352204525286337, guid: c19d229d8a45ed0458c1fea6112d29b7, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: -20.114
+      objectReference: {fileID: 0}
+    - target: {fileID: 8909352204525286337, guid: c19d229d8a45ed0458c1fea6112d29b7, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents:
+    - {fileID: 8479685889786791212, guid: c19d229d8a45ed0458c1fea6112d29b7, type: 3}
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: c19d229d8a45ed0458c1fea6112d29b7, type: 3}
 --- !u!1001 &515822005
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -1314,6 +1384,11 @@ RectTransform:
   m_CorrespondingSourceObject: {fileID: 7091770935250694576, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
   m_PrefabInstance: {fileID: 515822005}
   m_PrefabAsset: {fileID: 0}
+--- !u!4 &1123038626 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 8909352204525286337, guid: c19d229d8a45ed0458c1fea6112d29b7, type: 3}
+  m_PrefabInstance: {fileID: 471604613}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &1312762638
 GameObject:
   m_ObjectHideFlags: 0
@@ -1480,11 +1555,83 @@ MonoBehaviour:
   m_OnValueChanged:
     m_PersistentCalls:
       m_Calls: []
+--- !u!1001 &1814571273
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 3683907582521372588, guid: c19d229d8a45ed0458c1fea6112d29b7, type: 3}
+      propertyPath: m_Name
+      value: Mountain010
+      objectReference: {fileID: 0}
+    - target: {fileID: 3683907582521372588, guid: c19d229d8a45ed0458c1fea6112d29b7, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8909352204525286337, guid: c19d229d8a45ed0458c1fea6112d29b7, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -37.3
+      objectReference: {fileID: 0}
+    - target: {fileID: 8909352204525286337, guid: c19d229d8a45ed0458c1fea6112d29b7, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -0.1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8909352204525286337, guid: c19d229d8a45ed0458c1fea6112d29b7, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 31.9
+      objectReference: {fileID: 0}
+    - target: {fileID: 8909352204525286337, guid: c19d229d8a45ed0458c1fea6112d29b7, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.9846344
+      objectReference: {fileID: 0}
+    - target: {fileID: 8909352204525286337, guid: c19d229d8a45ed0458c1fea6112d29b7, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8909352204525286337, guid: c19d229d8a45ed0458c1fea6112d29b7, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0.17462842
+      objectReference: {fileID: 0}
+    - target: {fileID: 8909352204525286337, guid: c19d229d8a45ed0458c1fea6112d29b7, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8909352204525286337, guid: c19d229d8a45ed0458c1fea6112d29b7, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8909352204525286337, guid: c19d229d8a45ed0458c1fea6112d29b7, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: -20.114
+      objectReference: {fileID: 0}
+    - target: {fileID: 8909352204525286337, guid: c19d229d8a45ed0458c1fea6112d29b7, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents:
+    - {fileID: 8479685889786791212, guid: c19d229d8a45ed0458c1fea6112d29b7, type: 3}
+    - {fileID: 3660374313649103400, guid: c19d229d8a45ed0458c1fea6112d29b7, type: 3}
+    - {fileID: 2068246416621670301, guid: c19d229d8a45ed0458c1fea6112d29b7, type: 3}
+    m_RemovedGameObjects: []
+    m_AddedGameObjects:
+    - targetCorrespondingSourceObject: {fileID: 8909352204525286337, guid: c19d229d8a45ed0458c1fea6112d29b7, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 1123038626}
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: c19d229d8a45ed0458c1fea6112d29b7, type: 3}
 --- !u!224 &1895189377 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 8311278189826985699, guid: b37c08dad0bf98f42b569bf67e351455, type: 3}
   m_PrefabInstance: {fileID: 965542112758883088}
   m_PrefabAsset: {fileID: 0}
+--- !u!4 &2035678242 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 8909352204525286337, guid: c19d229d8a45ed0458c1fea6112d29b7, type: 3}
+  m_PrefabInstance: {fileID: 1814571273}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &965542112758883088
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -1699,3 +1846,4 @@ SceneRoots:
   - {fileID: 293130736}
   - {fileID: 6588466611375917160}
   - {fileID: 515822005}
+  - {fileID: 1814571273}

Assets/Scripts/GameData/ExcelConfig/HeroPowerUpConfig.cs

@@ -145,7 +145,7 @@ namespace Excel2Json
 		
 
 		/// <summary>
-		///雷劫伤害 要填下限和上限
+		///雷劫伤害 要填下限、上限、表现上几根雷
 		/// </summary>
 #if !COMBAT_SERVER
 		public int[] LeijieDamages;

Assets/Scripts/GameLogic/Combat/CombatState/CombatMiniSceneSwitchState.cs

@@ -0,0 +1,98 @@
+using Excel2Json;
+using Fort23.Core;
+using Fort23.UTool;
+using GameLogic.Combat.CombatTool;
+using GameLogic.Combat.Hero;
+using UnityEngine;
+using Utility.UITool;
+
+namespace GameLogic.Combat.CombatState
+{
+    public class CombatMiniSceneSwitchState: CombatStateBasic
+    {
+        private Vector3 dir;
+        private Vector3 moveTargetDir;
+
+        private float currTime;
+        private int state;
+        private Vector3 startPos;
+        private Vector3 startEulerAngles;
+        private float speed=0.5f;
+        private float feiXingCurTime;
+
+        public CombatMiniSceneSwitchState(CombatController combatController) : base(combatController)
+        {
+        }
+
+        protected override void ProEnter()
+        {
+            // CombatController.CombatCameraControllder.isStop = true;
+            CombatController.IsFightState = false;
+            CombatController.GameTimeLineParticleFactory.RecycleAllFxAiLogicBasic();
+            CombatHeroEntity playerHeroEntity =CombatController.currActiveCombat.playerHeroEntity;
+            // if (playerHeroEntity != null)
+            // {
+            //     playerHeroEntity.PlayAnim(CombatHeroStateType.idle, true, 0, false, 1);
+            //     CombatController.MagicWeaponCombatSence.CloseSecene();
+            // }
+
+            startPos = playerHeroEntity.GameObject.transform.position;
+            startEulerAngles = playerHeroEntity.GameObject.transform.rotation.eulerAngles;
+            InitScenes();
+            // CombatHeroEntity playerHeroEntity = CombatController.currActiveCombat.playerHeroEntity;
+            // Vector3 target = playerHeroEntity.GameObject.transform.TransformPoint(new Vector3(2, 2, 1));
+            // moveTargetDir = (target - playerHeroEntity.GameObject.transform.forward).normalized;
+            // dir = playerHeroEntity.GameObject.transform.forward;
+            // currTime = 0;
+            state = 0;
+            // feiXingCurTime = 0;
+        }
+
+        protected override void ProUpdate(float t)
+        {
+            CombatHeroEntity playerHeroEntity = CombatController.currActiveCombat.playerHeroEntity;
+            if (playerHeroEntity == null||state==2)
+            {
+                return;
+            }
+
+          
+
+        
+            
+
+            float add = 0.1f;
+            Vector3 pos = playerHeroEntity.dotPos;
+            Vector3 dir =  CombatController.currActiveCombat.CombatSenceController.moveDir;
+            float fx = 1;
+            
+            pos += dir.normalized * CombatController.currActiveCombat.CombatHeroController.moveSpeed * t;
+
+            playerHeroEntity.combatHeroGameObject.SetPosition(pos);
+            playerHeroEntity.GameObject.transform.rotation = Quaternion.LookRotation(dir * fx);
+
+
+            CombatController.CombatHeroController.Update(t);
+            CombatController.CombatCameraControllder.Update(t);
+            CombatController.GameTimeLineParticleFactory.CombatUpdate(t);
+        }
+
+        private async void InitScenes()
+        {
+            CombatController.currActiveCombat.CombatSenceController.Flight(3, -90, 10);
+            await TimerComponent.Instance.WaitAsync(2000);
+            EventManager.Instance.Dispatch(CustomEventType.ShowLoadingUI, null);
+            await TimerComponent.Instance.WaitAsync(2000);
+            state = 2;
+            CombatHeroEntity playerHeroEntity =CombatController.currActiveCombat.playerHeroEntity;
+            playerHeroEntity.GameObject.transform.position = startPos;
+            playerHeroEntity.GameObject.transform.rotation = Quaternion.Euler(startEulerAngles);
+            SmallPlacesConfig smallPlacesConfig =
+                ConfigComponent.Instance.Get<SmallPlacesConfig>(PlayerManager.Instance.CurrentsmallPlaces.id);
+            await CombatController.CombatSenceController.InitScenes(smallPlacesConfig.scencName);
+            EventManager.Instance.Dispatch(CustomEventType.CloseLoadingUI, null);
+            CombatController.CombatCameraControllder.isStop = false;
+            CombatController.ChangeState(CombatController.fight);
+        }
+    }
+}

Assets/Scripts/GameLogic/Combat/CombatState/CombatMiniSceneSwitchState.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 7fdda6bc01594f26b006967ae0204df7
+timeCreated: 1758770917

Assets/Scripts/GameLogic/Combat/CombatTool/CombatController.cs

@@ -29,7 +29,7 @@ namespace GameLogic.Combat.CombatTool
         public static string update = "update";
         public static string fight = "fight";
         public static string sceneSwitch = "sceneSwitch";
-
+        public static string miniSceneSwitch = "miniSceneSwitch";
         public static CombatController currActiveCombat;
         public CombatHeroController CombatHeroController;
         public CombatCameraControllder CombatCameraControllder;
@@ -88,6 +88,7 @@ namespace GameLogic.Combat.CombatTool
                 stateControl.AddState("fight", new CombatFightState(this));
                 stateControl.AddState("combatfinish", new CombatFinishState(this));
                 stateControl.AddState(sceneSwitch, new CombatSceneSwitchState(this));
+                stateControl.AddState(miniSceneSwitch, new CombatFinishState(this));
 
              
                 if (CombatSenceController == null)

Assets/Scripts/GameLogic/Combat/CombatTool/SceneTool/SceneCJ2MonoConfig.cs

@@ -161,15 +161,18 @@ namespace GameLogic.Combat.CombatTool.SceneTool
 
         protected override void ProDispose()
         {
-            foreach (var VARIABLE in _downAllGameObjectPools.Values)
+            for (_downAllGameObjectPools.Begin(); _downAllGameObjectPools.Next();)
             {
                 GObjectPool.Instance.Recycle(_downAllGameObjectPools.Value);
             }
 
+   
             _downAllGameObjectPools.Clear();
-            foreach (var VARIABLE in _allGameObjectPools.Values)
+            for (_allGameObjectPools.Begin(); _allGameObjectPools.Next();)
+            {
                 GObjectPool.Instance.Recycle(_allGameObjectPools.Value);
-            _allGameObjectPools.Clear();
+            }
+
         }
     }
 }

Assets/Scripts/GameLogic/Combat/CombatTool/SceneTool/SceneMonoConfig.cs

@@ -97,10 +97,11 @@ namespace GameLogic.Combat.CombatTool.SceneTool
 
         protected override void ProDispose()
         {
-            foreach (var VARIABLE in _allGameObjectPools.Values)
+            for (_allGameObjectPools.Begin(); _allGameObjectPools.Next();)
             {
-                GObjectPool.Instance.Recycle(VARIABLE);
+                GObjectPool.Instance.Recycle(_allGameObjectPools.Value);
             }
+            
             _allGameObjectPools.Clear();
         }
     }