CloudJ
|
99fedebb96
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-05-22 16:14:47 +08:00 |
|
xiekaidong
|
14dfdecddc
|
Merge branch 'battle' into dev
# Conflicts:
# lua/app/config/strings/cn/global.lua
|
2023-05-22 15:59:54 +08:00 |
|
xiekaidong
|
528ac6a89b
|
技能tips
|
2023-05-22 15:59:17 +08:00 |
|
chenxi
|
4acb1271f2
|
空邮件的表现
|
2023-05-22 12:00:39 +08:00 |
|
chenxi
|
f18e16103c
|
邮箱
|
2023-05-22 11:36:26 +08:00 |
|
chenxi
|
15692a0127
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-05-22 11:22:01 +08:00 |
|
chenxi
|
a47b2bdf2c
|
先屏蔽金猪
|
2023-05-22 11:21:55 +08:00 |
|
xiekaidong
|
8d131457f6
|
美术表现
|
2023-05-22 10:57:38 +08:00 |
|
xiekaidong
|
2959b8db73
|
弹窗
|
2023-05-22 10:24:45 +08:00 |
|
CloudJ
|
d1d0c736cb
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-05-22 09:59:08 +08:00 |
|
chenxi
|
7552e3a946
|
sidebar
|
2023-05-19 23:10:28 +08:00 |
|
chenxi
|
deeeedbfaa
|
金猪
|
2023-05-19 23:02:02 +08:00 |
|
chenxi
|
a1cfb3d3c3
|
邮箱
|
2023-05-19 21:55:40 +08:00 |
|
chenxi
|
d739908228
|
任务红点
|
2023-05-19 21:23:06 +08:00 |
|
chenxi
|
55c6ba1263
|
邮箱界面
|
2023-05-19 20:14:37 +08:00 |
|
CloudJ
|
52bd3a3167
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
# Conflicts:
# lua/app/global/global_const.lua
|
2023-05-19 20:03:48 +08:00 |
|
CloudJ
|
f04108a58d
|
tmp
|
2023-05-19 20:03:28 +08:00 |
|
chenxi
|
0ab51fcc07
|
购买体力和邮箱
|
2023-05-19 18:32:23 +08:00 |
|
chenxi
|
e6acef616d
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-05-19 16:51:27 +08:00 |
|
chenxi
|
9d398707e0
|
任务宝箱tips
|
2023-05-19 16:51:24 +08:00 |
|
xiekaidong
|
1f3fa74d39
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-05-19 16:47:41 +08:00 |
|
xiekaidong
|
d2dadaf448
|
增加一个容错
|
2023-05-19 16:47:38 +08:00 |
|
chenxi
|
a78be93bc1
|
宝箱tips
|
2023-05-19 16:36:59 +08:00 |
|
chenxi
|
680992e0b6
|
挂机表现
|
2023-05-19 15:10:44 +08:00 |
|
chenxi
|
e55fdab3dd
|
快速挂机界面
|
2023-05-19 14:56:50 +08:00 |
|
chenxi
|
49002c4407
|
挂机表现
|
2023-05-19 14:49:27 +08:00 |
|
chenxi
|
b6da2f4bd6
|
挂机
|
2023-05-18 22:09:43 +08:00 |
|
chenxi
|
a783d2120c
|
挂机
|
2023-05-18 20:24:04 +08:00 |
|
chenxi
|
3cb5152538
|
挂机
|
2023-05-18 15:39:44 +08:00 |
|
chenxi
|
0289de2d9a
|
merge
|
2023-05-17 22:28:26 +08:00 |
|
chenxi
|
84be3f721b
|
挂机
|
2023-05-17 22:27:58 +08:00 |
|
xiekaidong
|
d7bee9480c
|
宝箱显示
|
2023-05-17 20:17:56 +08:00 |
|
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
|
3059cf0689
|
描述
|
2023-05-17 19:17:12 +08:00 |
|
chenxi
|
0c775e8215
|
卡牌tips
|
2023-05-17 19:05:29 +08:00 |
|
xiekaidong
|
ad0ab2b8ba
|
宝箱
|
2023-05-17 18:17:09 +08:00 |
|
chenxi
|
b5541f30b6
|
任务
|
2023-05-17 17:26:35 +08:00 |
|
chenxi
|
8c2d9c26bb
|
多语言
|
2023-05-17 16:26:33 +08:00 |
|
chenxi
|
74c514f7fe
|
战令购买提示
|
2023-05-17 15:00:29 +08:00 |
|
chenxi
|
6e33313f69
|
购买战令界面
|
2023-05-17 14:40:54 +08:00 |
|
chenxi
|
e07eb6a961
|
战令定位
|
2023-05-17 11:14:07 +08:00 |
|
chenxi
|
4a162302ff
|
主城战令显示
|
2023-05-16 22:39:23 +08:00 |
|
chenxi
|
2430f90295
|
适配
|
2023-05-16 22:04:17 +08:00 |
|
chenxi
|
88030484d8
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-05-16 22:02:45 +08:00 |
|
chenxi
|
f4724ca434
|
战令重复奖励
|
2023-05-16 22:02:42 +08:00 |
|
xiekaidong
|
22d9bb9b3d
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-05-16 21:22:55 +08:00 |
|
xiekaidong
|
97e5506ab2
|
神灯障碍物
|
2023-05-16 21:22:52 +08:00 |
|
xiekaidong
|
91cd324e44
|
神灯
|
2023-05-16 20:39:21 +08:00 |
|
chenxi
|
2b64929a70
|
弹窗调整
|
2023-05-16 19:41:14 +08:00 |
|