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 |
|
chenxi
|
0c775e8215
|
卡牌tips
|
2023-05-17 19:05:29 +08:00 |
|
xiekaidong
|
ad0ab2b8ba
|
宝箱
|
2023-05-17 18:17:09 +08:00 |
|
chenxi
|
e45900ee6f
|
删除不用的代码
|
2023-04-27 20:06:36 +08:00 |
|
xiekaidong
|
eeb0af1262
|
战斗引导
|
2023-04-21 16:10:28 +08:00 |
|
xiekaidong
|
d1c95c8979
|
战斗暂停、技能选择、战斗结算、通用奖励获取等界面的处理
|
2023-04-14 15:18:14 +08:00 |
|
chenxi
|
2698e4044b
|
整理一下
|
2023-04-07 15:22:56 +08:00 |
|
xiekaidong
|
e30ad1dbd0
|
整理代码
|
2023-04-03 10:59:13 +08:00 |
|