xiekaidong
16da88351d
Merge branch 'dev_20230919' of http://git.juzugame.com/b6-client/b6-unity into dev_20230919
# 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/config/strings/cn/item.lua.bytes
# Assets/lua/app/config/strings/en/equip.lua.bytes
# Assets/lua/app/config/strings/ja/global.lua.bytes
# Assets/lua/app/config/strings/vi/task_type.lua.bytes
# Assets/lua/app/config/strings/zh/task_type.lua.bytes
# Assets/lua/app/ui/hero/runes_info_comp.lua.bytes
2023-09-19 15:03:53 +08:00
..
2023-09-04 17:25:39 +08:00
2023-09-19 15:03:21 +08:00
2023-09-19 15:03:53 +08:00
2023-07-07 15:48:54 +08:00
2023-09-16 20:26:20 +08:00
2023-06-20 20:20:23 +08:00
2023-09-19 15:03:21 +08:00
2023-08-29 11:02:11 +08:00
2023-09-18 10:38:18 +08:00
2023-04-03 11:04:31 +08:00
2023-04-07 15:27:09 +08:00
2023-09-19 15:03:02 +08:00
2023-09-19 15:03:02 +08:00
2023-04-03 11:04:31 +08:00
2023-04-03 11:04:31 +08:00
2023-04-03 11:04:31 +08:00
2023-04-03 11:04:31 +08:00
2023-09-04 17:25:39 +08:00
2023-04-03 11:04:31 +08:00
2023-04-03 11:04:31 +08:00
2023-04-03 11:04:31 +08:00
2023-04-03 11:04:31 +08:00
2023-04-03 11:04:31 +08:00
2023-04-03 11:04:31 +08:00
2023-04-03 11:04:31 +08:00
2023-04-03 11:04:31 +08:00
2023-04-03 11:04:31 +08:00
2023-04-03 11:04:31 +08:00