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-06-16 17:43:14 +08:00
2023-09-19 14:45:51 +08:00
2023-09-18 14:51:32 +08:00
2023-09-18 17:06:17 +08:00
2023-09-19 15:03:53 +08:00
2023-06-19 17:36:26 +08:00
2023-09-19 11:24:01 +08:00
2023-09-19 09:27:16 +08:00
2023-04-03 11:04:31 +08:00
2023-06-14 19:11:34 +08:00
2023-08-18 20:13:47 +08:00
2023-08-14 20:44:28 +08:00
2023-08-14 20:39:48 +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
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