xiekaidong 15cc2bd437 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev ...

# Conflicts:
#	lua/app/config/chapter_board.lua
#	lua/app/config/mail.lua.meta
#	lua/app/config/strings/cn/mail.lua.meta
#	lua/app/config/strings/de/mail.lua.meta
#	lua/app/config/strings/en/mail.lua.meta
#	lua/app/config/strings/fr/mail.lua.meta
#	lua/app/config/strings/ja/mail.lua.meta
#	lua/app/config/strings/ko/mail.lua.meta
#	lua/app/config/strings/zh/mail.lua.meta

2023-05-17 19:19:35 +08:00

..

activity

任务

2023-05-11 18:20:10 +08:00

bag

战令

2023-05-16 18:17:05 +08:00

battle

宝箱

2023-05-17 18:17:09 +08:00

bounty

任务

2023-05-17 17:26:35 +08:00

chapter

宝箱

2023-05-17 19:19:24 +08:00

formation

联网

2023-05-08 14:39:11 +08:00

game_setting

.

2023-04-22 00:46:52 +08:00

hero

卡牌tips

2023-05-17 19:05:29 +08:00

player

战令

2023-05-15 21:32:13 +08:00

task

任务

2023-05-17 17:26:35 +08:00

tutorial

联网

2023-05-08 09:47:58 +08:00

activity.meta

整理代码

2023-04-03 10:59:13 +08:00

bag.meta

整理代码

2023-04-03 10:59:13 +08:00

base_data.lua

整理一下

2023-04-07 15:22:56 +08:00

base_data.lua.meta

整理代码

2023-04-03 10:59:13 +08:00

battle.meta

整理代码

2023-04-03 10:59:13 +08:00

bounty.meta

主城

2023-05-05 22:03:42 +08:00

chapter.meta

整理代码

2023-04-03 10:59:13 +08:00

formation.meta

战斗

2023-04-11 18:23:25 +08:00

game_setting.meta

整理代码

2023-04-03 10:59:13 +08:00

hero.meta

整理代码

2023-04-03 10:59:13 +08:00

player.meta

整理代码

2023-04-03 10:59:13 +08:00

task.meta

任务

2023-05-09 15:24:20 +08:00

tutorial.meta

整理代码

2023-04-03 10:59:13 +08:00