diff --git a/Assets/lua/app/config/fx.lua.bytes.meta b/Assets/lua/app/config/fx.lua.bytes.meta
index ee83af676..0e5d3f2ae 100644
--- a/Assets/lua/app/config/fx.lua.bytes.meta
+++ b/Assets/lua/app/config/fx.lua.bytes.meta
@@ -1,5 +1,9 @@
 fileFormatVersion: 2
+<<<<<<< HEAD
+guid: 826b7842174cd7e48b9b620c1beadf47
+=======
 guid: a8d4e0ed16d081b4aa60e5d2cfa120b3
+>>>>>>> 4e744fa0e1914c5d5be1aa0f56da5137a83aec04
 TextScriptImporter:
   externalObjects: {}
   userData: 
diff --git a/Assets/lua/app/server/data/server_tutorial_data.lua.bytes.meta b/Assets/lua/app/server/data/server_tutorial_data.lua.bytes.meta
index 77a623fc2..15e60b60d 100644
--- a/Assets/lua/app/server/data/server_tutorial_data.lua.bytes.meta
+++ b/Assets/lua/app/server/data/server_tutorial_data.lua.bytes.meta
@@ -1,5 +1,9 @@
 fileFormatVersion: 2
+<<<<<<< HEAD
+guid: a8f882241e504c041ae086b7de6bb54d
+=======
 guid: 7e71616201ef35f4192e28731443afcb
+>>>>>>> 4e744fa0e1914c5d5be1aa0f56da5137a83aec04
 TextScriptImporter:
   externalObjects: {}
   userData: 
diff --git a/Assets/lua/app/server/manager/server_tutorial_manager.lua.bytes.meta b/Assets/lua/app/server/manager/server_tutorial_manager.lua.bytes.meta
index b04078bff..12e4e06f9 100644
--- a/Assets/lua/app/server/manager/server_tutorial_manager.lua.bytes.meta
+++ b/Assets/lua/app/server/manager/server_tutorial_manager.lua.bytes.meta
@@ -1,5 +1,9 @@
 fileFormatVersion: 2
+<<<<<<< HEAD
+guid: 63a1838dbfe97e74f925979737eec95e
+=======
 guid: 5410269c993414148bab89f39c16135a
+>>>>>>> 4e744fa0e1914c5d5be1aa0f56da5137a83aec04
 TextScriptImporter:
   externalObjects: {}
   userData: 
diff --git a/Assets/prefabs/ui/battle/battle_ui.prefab b/Assets/prefabs/ui/battle/battle_ui.prefab
index dd20d7038..b12e518d3 100644
--- a/Assets/prefabs/ui/battle/battle_ui.prefab
+++ b/Assets/prefabs/ui/battle/battle_ui.prefab
@@ -388,16 +388,16 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 463079035279260010}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
-  m_Father: {fileID: 4165930251451731960}
+  m_Father: {fileID: 5339333885219356068}
   m_RootOrder: 0
   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: 960, y: 900}
+  m_AnchoredPosition: {x: 960, y: 850}
   m_SizeDelta: {x: 3840, y: 1800}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2297117606088499637
@@ -882,7 +882,7 @@ RectTransform:
   - {fileID: 4106454344608963245}
   - {fileID: 1603915954017502330}
   m_Father: {fileID: 4165930251451731960}
-  m_RootOrder: 5
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
@@ -1292,7 +1292,7 @@ RectTransform:
   - {fileID: 7945390112548214915}
   - {fileID: 5938755434983395188}
   m_Father: {fileID: 4165930251451731960}
-  m_RootOrder: 6
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -2850,12 +2850,12 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
-  m_Father: {fileID: 4165930251451731960}
+  m_Father: {fileID: 5339333885219356068}
   m_RootOrder: 1
   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: 950}
+  m_AnchoredPosition: {x: 0, y: 900}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &2816638622637494834
@@ -5327,12 +5327,12 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
-  m_Father: {fileID: 4165930251451731960}
+  m_Father: {fileID: 5339333885219356068}
   m_RootOrder: 3
   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: 950}
+  m_AnchoredPosition: {x: 0, y: 900}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &5608342323733900253
@@ -8166,6 +8166,45 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &7901088395067873330
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5339333885219356068}
+  m_Layer: 0
+  m_Name: battle_root
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5339333885219356068
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7901088395067873330}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 5198724544769838051}
+  - {fileID: 766509631108997893}
+  - {fileID: 5146938743224756479}
+  - {fileID: 8767600639872220622}
+  m_Father: {fileID: 4165930251451731960}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &8039529484345768939
 GameObject:
   m_ObjectHideFlags: 0
@@ -8292,7 +8331,7 @@ RectTransform:
   - {fileID: 4292633816534545540}
   - {fileID: 6497301874867098174}
   m_Father: {fileID: 4165930251451731960}
-  m_RootOrder: 4
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
@@ -8409,12 +8448,12 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
-  m_Father: {fileID: 4165930251451731960}
+  m_Father: {fileID: 5339333885219356068}
   m_RootOrder: 2
   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: 950}
+  m_AnchoredPosition: {x: 0, y: 900}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &8482142981540581360
@@ -8972,10 +9011,7 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
-  - {fileID: 5198724544769838051}
-  - {fileID: 766509631108997893}
-  - {fileID: 5146938743224756479}
-  - {fileID: 8767600639872220622}
+  - {fileID: 5339333885219356068}
   - {fileID: 8367488913663849825}
   - {fileID: 1493758059695593667}
   - {fileID: 2868547218605158834}
@@ -9044,8 +9080,8 @@ MonoBehaviour:
     hashName: 2544486462
     objectType: 0
     gameObject: {fileID: 606870700976508775}
-  - name: battle_ui.close_btn
-    hashName: 3753184482
+  - name: battle_ui.top_node.close_btn
+    hashName: 4060698662
     objectType: 0
     gameObject: {fileID: 3919187627067218253}
   - name: battle_ui.bg_2.skill_node.skill_node_cell_1
@@ -9068,12 +9104,12 @@ MonoBehaviour:
     hashName: 3413014284
     objectType: 1
     gameObject: {fileID: 2632601909374628188}
-  - name: battle_ui.battle_node
-    hashName: 2083252022
+  - name: battle_ui.battle_root.battle_node
+    hashName: 2280180049
     objectType: 0
     gameObject: {fileID: 2716961016822480841}
-  - name: battle_ui.bg_2.board_mask
-    hashName: 2544443688
+  - name: battle_ui.bg_2.board_node.grid_node.board_mask
+    hashName: 3597945032
     objectType: 0
     gameObject: {fileID: 7688802235252301942}
   - name: battle_ui.bg_2.board_cache_node
@@ -9084,8 +9120,8 @@ MonoBehaviour:
     hashName: 1224637066
     objectType: 0
     gameObject: {fileID: 8512114194521404538}
-  - name: battle_ui.battle_number_node
-    hashName: 96138628
+  - name: battle_ui.battle_root.battle_number_node
+    hashName: 1289457417
     objectType: 0
     gameObject: {fileID: 8481230358941673083}
   - name: battle_ui.bg_2.skill_node
@@ -9140,28 +9176,28 @@ MonoBehaviour:
     hashName: 3842705844
     objectType: 0
     gameObject: {fileID: 8984854456205409131}
-  - name: battle_ui.bg_2.board_node.ani_node.grid_cell_1
-    hashName: 4261114228
+  - name: battle_ui.bg_2.ani_node.grid_cell_1
+    hashName: 1458131591
     objectType: 1
     gameObject: {fileID: 4532191219610058284}
-  - name: battle_ui.bg_2.board_node.ani_node.grid_cell_2
-    hashName: 4261114229
+  - name: battle_ui.bg_2.ani_node.grid_cell_2
+    hashName: 1458131592
     objectType: 1
     gameObject: {fileID: 8568562378450594759}
-  - name: battle_ui.bg_2.board_node.ani_node.grid_cell_3
-    hashName: 4261114230
+  - name: battle_ui.bg_2.ani_node.grid_cell_3
+    hashName: 1458131593
     objectType: 1
     gameObject: {fileID: 7746559084762877130}
-  - name: battle_ui.bg_2.board_node.ani_node.grid_cell_4
-    hashName: 4261114231
+  - name: battle_ui.bg_2.ani_node.grid_cell_4
+    hashName: 1458131594
     objectType: 1
     gameObject: {fileID: 8240790560213506744}
-  - name: battle_ui.bg_2.board_node.ani_node.grid_cell_5
-    hashName: 4261114232
+  - name: battle_ui.bg_2.ani_node.grid_cell_5
+    hashName: 1458131595
     objectType: 1
     gameObject: {fileID: 6456457455187257617}
-  - name: battle_ui.bg
-    hashName: 2542042008
+  - name: battle_ui.battle_root.bg
+    hashName: 3444227869
     objectType: 0
     gameObject: {fileID: 463079035279260010}
   - name: battle_ui.top_node.buff_l.buff_1
@@ -9280,8 +9316,8 @@ MonoBehaviour:
     hashName: 4215141983
     objectType: 1
     gameObject: {fileID: 5822956687597775327}
-  - name: battle_ui.batttle_fx_node
-    hashName: 659684139
+  - name: battle_ui.battle_root.batttle_fx_node
+    hashName: 1732925382
     objectType: 0
     gameObject: {fileID: 5506336141550111868}
   - name: battle_ui.tutorial_node
@@ -9292,6 +9328,10 @@ MonoBehaviour:
     hashName: 235219870
     objectType: 0
     gameObject: {fileID: 575712910726956570}
+  - name: battle_ui.battle_root
+    hashName: 2083371542
+    objectType: 0
+    gameObject: {fileID: 7901088395067873330}
 --- !u!114 &305814484176852896
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -9340,7 +9380,7 @@ RectTransform:
   m_Children:
   - {fileID: 3421699519209019831}
   m_Father: {fileID: 4165930251451731960}
-  m_RootOrder: 7
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -9568,7 +9608,7 @@ RectTransform:
   - {fileID: 3542903639894422700}
   - {fileID: 2367957692945644157}
   m_Father: {fileID: 4165930251451731960}
-  m_RootOrder: 8
+  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -9716,16 +9756,16 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: fab1c2506f4927947a34769a9d072496, type: 3}
---- !u!224 &4823950210164062713 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 4664058343642732121, guid: fab1c2506f4927947a34769a9d072496, type: 3}
-  m_PrefabInstance: {fileID: 164396171060211616}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &4532191219610058284 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 4372325173911228812, guid: fab1c2506f4927947a34769a9d072496, type: 3}
   m_PrefabInstance: {fileID: 164396171060211616}
   m_PrefabAsset: {fileID: 0}
+--- !u!224 &4823950210164062713 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 4664058343642732121, guid: fab1c2506f4927947a34769a9d072496, type: 3}
+  m_PrefabInstance: {fileID: 164396171060211616}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &5351464385034910283
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -9867,16 +9907,16 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: fab1c2506f4927947a34769a9d072496, type: 3}
---- !u!1 &8568562378450594759 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 4372325173911228812, guid: fab1c2506f4927947a34769a9d072496, type: 3}
-  m_PrefabInstance: {fileID: 5351464385034910283}
-  m_PrefabAsset: {fileID: 0}
 --- !u!224 &792115507450702866 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 4664058343642732121, guid: fab1c2506f4927947a34769a9d072496, type: 3}
   m_PrefabInstance: {fileID: 5351464385034910283}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &8568562378450594759 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 4372325173911228812, guid: fab1c2506f4927947a34769a9d072496, type: 3}
+  m_PrefabInstance: {fileID: 5351464385034910283}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &5688246229370211124
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -10320,13 +10360,13 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: fab1c2506f4927947a34769a9d072496, type: 3}
---- !u!224 &2706240165845954244 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 4664058343642732121, guid: fab1c2506f4927947a34769a9d072496, type: 3}
-  m_PrefabInstance: {fileID: 7292576075314493597}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &6456457455187257617 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 4372325173911228812, guid: fab1c2506f4927947a34769a9d072496, type: 3}
   m_PrefabInstance: {fileID: 7292576075314493597}
   m_PrefabAsset: {fileID: 0}
+--- !u!224 &2706240165845954244 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 4664058343642732121, guid: fab1c2506f4927947a34769a9d072496, type: 3}
+  m_PrefabInstance: {fileID: 7292576075314493597}
+  m_PrefabAsset: {fileID: 0}