Merge branch 'dev_hero_2' into dev_hero

2025-10-30 20:14:51 +08:00 · 2025-10-30 20:14:51 +08:00 · 4718cc678c
commit 4718cc678c
parent ea9e7bed20 90cfba07ec
17 changed files with 14 additions and 0 deletions
--- a/Assets/lua/app/common/data_manager.lua.bytes
+++ b/Assets/lua/app/common/data_manager.lua.bytes
--- a/Assets/lua/app/global/global_func.lua.bytes
+++ b/Assets/lua/app/global/global_func.lua.bytes
--- a/Assets/lua/app/module/equip/equip_manager.lua.bytes
+++ b/Assets/lua/app/module/equip/equip_manager.lua.bytes
--- a/Assets/lua/app/ui/common/cell/large_hero_cell.lua.bytes
+++ b/Assets/lua/app/ui/common/cell/large_hero_cell.lua.bytes
--- a/Assets/lua/app/ui/hero/equip_info_comp.lua.bytes
+++ b/Assets/lua/app/ui/hero/equip_info_comp.lua.bytes
--- a/Assets/lua/app/ui/hero/hero_comp.lua.bytes
+++ b/Assets/lua/app/ui/hero/hero_comp.lua.bytes
--- a/Assets/lua/app/ui/hero/hero_detail_ui.lua.bytes
+++ b/Assets/lua/app/ui/hero/hero_detail_ui.lua.bytes
--- a/Assets/lua/app/ui/hero/hero_info_comp.lua.bytes
+++ b/Assets/lua/app/ui/hero/hero_info_comp.lua.bytes
--- a/Assets/lua/app/ui/hero/star_info_comp.lua.bytes
+++ b/Assets/lua/app/ui/hero/star_info_comp.lua.bytes
--- a/Assets/lua/app/userdata/equip/equip_data.lua.bytes
+++ b/Assets/lua/app/userdata/equip/equip_data.lua.bytes
--- a/Assets/lua/app/userdata/equip/equip_data_other.lua.bytes
+++ b/Assets/lua/app/userdata/equip/equip_data_other.lua.bytes
--- a/Assets/lua/app/userdata/equip/equip_data_other.lua.bytes.meta
+++ b/Assets/lua/app/userdata/equip/equip_data_other.lua.bytes.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 2a78a3ae652464dc1bf8309b41701954
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/lua/app/userdata/equip/equip_entity_other.lua.bytes
+++ b/Assets/lua/app/userdata/equip/equip_entity_other.lua.bytes
--- a/Assets/lua/app/userdata/equip/equip_entity_other.lua.bytes.meta
+++ b/Assets/lua/app/userdata/equip/equip_entity_other.lua.bytes.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 2172235bbfd664da98a39abe221770da
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/lua/app/userdata/formation/formation_data.lua.bytes
+++ b/Assets/lua/app/userdata/formation/formation_data.lua.bytes
--- a/Assets/lua/app/userdata/hero/hero_data_other.lua.bytes
+++ b/Assets/lua/app/userdata/hero/hero_data_other.lua.bytes
--- a/Assets/lua/app/userdata/hero/hero_entity_other.lua.bytes
+++ b/Assets/lua/app/userdata/hero/hero_entity_other.lua.bytes