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 |
|
xiekaidong
|
2023930d62
|
宝箱
|
2023-05-17 19:19:24 +08:00 |
|
chenxi
|
0c775e8215
|
卡牌tips
|
2023-05-17 19:05:29 +08:00 |
|
chenxi
|
32051d90c6
|
战令
|
2023-05-15 21:32:13 +08:00 |
|
xiekaidong
|
18c83cfa0c
|
联网
|
2023-05-08 11:02:42 +08:00 |
|
chenxi
|
d65f0021e1
|
icon frame
|
2023-04-21 23:31:49 +08:00 |
|
chenxi
|
666e36416e
|
tips
|
2023-04-20 18:22:39 +08:00 |
|
chenxi
|
f73980c7de
|
奖励显示碎片
|
2023-04-20 17:40:25 +08:00 |
|
xiekaidong
|
3b909a2a81
|
一些界面修改和接入关卡结算
|
2023-04-14 22:19:22 +08:00 |
|
xiekaidong
|
d1c95c8979
|
战斗暂停、技能选择、战斗结算、通用奖励获取等界面的处理
|
2023-04-14 15:18:14 +08:00 |
|
xiekaidong
|
f268d99606
|
reward显示
|
2023-04-12 21:46:16 +08:00 |
|
chenxi
|
2698e4044b
|
整理一下
|
2023-04-07 15:22:56 +08:00 |
|
xiekaidong
|
e30ad1dbd0
|
整理代码
|
2023-04-03 10:59:13 +08:00 |
|