puxuan c06f88f8dc Merge branch 'dev_hero' into dev_equip ...

# Conflicts:
#	Assets/lua/app/config/localization/localization_global_const.lua.bytes
#	Assets/lua/app/config/skill.lua.bytes
#	Assets/lua/app/config/strings/cn/global.lua.bytes
#	Assets/lua/app/global/global_const.lua.bytes
#	Assets/lua/app/proto/proto_msg_type.lua.bytes
#	Assets/lua/app/ui/hero/hero_detail_ui.lua.bytes
#	Assets/prefabs/ui/hero/hero_detail_ui.prefab
#	Assets/proto/protocol.bytes

2025-09-16 16:12:56 +08:00

..

app

Merge branch 'dev_hero' into dev_equip

2025-09-16 16:12:56 +08:00

app.meta

整理项目

2023-04-03 11:04:31 +08:00

main.lua.bytes

倒计时优化

2023-09-04 17:25:39 +08:00

main.lua.bytes.meta

整理项目

2023-04-03 11:04:31 +08:00