Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev

Assets/lua/app/module/battle/component/battle_unit_comp.lua.bytes.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 63d5af9cfb4e96d4bbe5584088ff98c7
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/lua/app/module/battle/skill/battle_board_skill_handle.lua.bytes.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 8a56b058347cc3145974d3fc93f3ef08
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/lua/app/server/data/server_hero_data.lua.bytes.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 1b653dbe158c74546ae9a3d47c1b9efb
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/lua/app/ui/common/cell/hero_cell.lua.bytes

@@ -0,0 +1,2 @@
+bf_encrypt_luai)1X+H-ø8GH:uua0
+3D9xI4k5MR0qYxsGX9\b1_V]!Uf\G"
S%9xI4k5MR0pra8reB98Iu+5MÔ°1qM¸òd(9xI>+µÌt0qpO8òe@9xI0mV!3Cu`p+z%Xo<3C2TaLK/FF%S0qqh8seD9xJ4k5IR0qpi:seD9^I´k5MR0qqi8reD9yI4k1MR0pqi8w!UI4k5LR0qqi8rmD9xH4k5LR0qpi8rdD9xM4k5NR0qwi8rcD9xH4k5DU*]	@9xI<k5MS0qqlg7+

Assets/lua/app/ui/common/cell/hero_cell.lua.bytes.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 005cfe9ab2712564984e5c30b05d5edd
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/lua/app/ui/hero/cell/hero_list_cell.lua.bytes.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 4f64a504f6b87854d9afd4b21891f052
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/lua/app/userdata/bag/equip_data.lua.bytes.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: fd2e3c0d99ad3d74ebedcefb880d7790
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: lua/app/userdata/bag/equip_data.lua.bytes.ab
-  assetBundleVariant: 

Assets/lua/app/userdata/bag/equip_entity.lua.bytes.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 627669ae8a0357749ba7a5db02f1f676
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: lua/app/userdata/bag/equip_entity.lua.bytes.ab
-  assetBundleVariant: 

Assets/lua/app/userdata/battle/skill/battle_borad_skill_entity.lua.bytes.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 4761c4a32c7f9a7479d002bc25fac317
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/lua/app/userdata/battle/team/battle_team_entity.lua.bytes.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 003e412e02af74943871ac1f7137b934
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/lua/app/userdata/battle/team/battle_unit_entity.lua.bytes.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 741cd2aa5188ec846a00d2e4c2312f64
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/prefabs/ui/battle/battle_ui.prefab

@@ -110,7 +110,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 720, y: 847}
+  m_SizeDelta: {x: 1280, y: 847}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &2297117606088499637
 CanvasRenderer:
@@ -172,13 +172,13 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 517010416691627781}
-  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:
   - {fileID: 6203926605139831875}
   m_Father: {fileID: 8367488913663849825}
-  m_RootOrder: 1
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -252,7 +252,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 8367488913663849825}
-  m_RootOrder: 0
+  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}
@@ -373,13 +373,13 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1999216343829329659}
-  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:
   - {fileID: 41649985259200298}
   m_Father: {fileID: 8367488913663849825}
-  m_RootOrder: 5
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -688,13 +688,13 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4881709928577835956}
-  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:
   - {fileID: 7751019883391958389}
   m_Father: {fileID: 8367488913663849825}
-  m_RootOrder: 2
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -764,13 +764,13 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5164116559243941087}
-  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:
   - {fileID: 7571609030389506671}
   m_Father: {fileID: 8367488913663849825}
-  m_RootOrder: 4
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -919,19 +919,19 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
-  - {fileID: 8218123047022309772}
   - {fileID: 7439903636326335380}
   - {fileID: 2480449020035650648}
   - {fileID: 9042858699163794537}
   - {fileID: 654892824183363579}
   - {fileID: 4434589560579663982}
+  - {fileID: 8218123047022309772}
   m_Father: {fileID: 4165930251451731960}
   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: 387}
-  m_SizeDelta: {x: 720, y: 774}
+  m_SizeDelta: {x: 1280, y: 774}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4090866635735359956
 CanvasRenderer:
@@ -1133,13 +1133,13 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 9186964964330120711}
-  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:
   - {fileID: 1043811153682106217}
   m_Father: {fileID: 8367488913663849825}
-  m_RootOrder: 3
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}