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
|
2f24834d5e
|
更新配置
|
2023-05-19 21:57:36 +08:00 |
|
chenxi
|
b1671c98cd
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-05-19 21:55:43 +08:00 |
|
chenxi
|
a1cfb3d3c3
|
邮箱
|
2023-05-19 21:55:40 +08:00 |
|
xiekaidong
|
fd2c150b19
|
bug修复
|
2023-05-19 21:44:36 +08:00 |
|
xiekaidong
|
d348d13fcc
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-05-19 21:37:59 +08:00 |
|
xiekaidong
|
d4d1249f09
|
bug修复
|
2023-05-19 21:37:56 +08:00 |
|
chenxi
|
06da81fc58
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-05-19 21:23:09 +08:00 |
|
chenxi
|
d739908228
|
任务红点
|
2023-05-19 21:23:06 +08:00 |
|
xiekaidong
|
d2eff9d230
|
随机位置
|
2023-05-19 20:59:18 +08:00 |
|
xiekaidong
|
16c0078704
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-05-19 20:55:44 +08:00 |
|
xiekaidong
|
4708ed1ae2
|
随机
|
2023-05-19 20:55:41 +08:00 |
|
chenxi
|
8ab3c40bef
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-05-19 20:45:33 +08:00 |
|
chenxi
|
9096635687
|
邮件推送
|
2023-05-19 20:45:30 +08:00 |
|
xiekaidong
|
9067a7ffa1
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-05-19 20:44:41 +08:00 |
|
xiekaidong
|
5309687502
|
果冻
|
2023-05-19 20:44:38 +08:00 |
|
chenxi
|
e85131f041
|
任务
|
2023-05-19 20:43:35 +08:00 |
|
chenxi
|
adca98cb90
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-05-19 20:14:40 +08:00 |
|
chenxi
|
55c6ba1263
|
邮箱界面
|
2023-05-19 20:14:37 +08:00 |
|
xiekaidong
|
1fcf0137e3
|
死局问题修改
|
2023-05-19 20:09:32 +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 |
|
xiekaidong
|
1718c96004
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-05-19 20:00:12 +08:00 |
|
xiekaidong
|
d51624b93b
|
容错
|
2023-05-19 20:00:06 +08:00 |
|
chenxi
|
0ab51fcc07
|
购买体力和邮箱
|
2023-05-19 18:32:23 +08:00 |
|
xiekaidong
|
b8d7fa533d
|
战斗内部计数相关任务
|
2023-05-19 18:18:33 +08:00 |
|
xiekaidong
|
58d366ba9d
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-05-19 18:00:05 +08:00 |
|
xiekaidong
|
f6d5546d2b
|
战斗任务数据
|
2023-05-19 18:00:03 +08:00 |
|
chenxi
|
502f35bf2e
|
体力不足得时候弹出来购买体力界面
|
2023-05-19 17:08:19 +08:00 |
|
chenxi
|
af59a3f9a2
|
体力不足的时候弹出来购买体力
|
2023-05-19 17:05:28 +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
|
23de1b57e0
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-05-19 16:37:04 +08:00 |
|
chenxi
|
a78be93bc1
|
宝箱tips
|
2023-05-19 16:36:59 +08:00 |
|
xiekaidong
|
d1fe14d396
|
删除打印
|
2023-05-19 16:31:26 +08:00 |
|
xiekaidong
|
43dc8332f8
|
更新配置
|
2023-05-19 16:29:02 +08:00 |
|
xiekaidong
|
c98c11142b
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-05-19 16:28:01 +08:00 |
|
xiekaidong
|
ff56360efa
|
技能机制
|
2023-05-19 16:27:54 +08:00 |
|
xiekaidong
|
8316e48633
|
随机技能机制
|
2023-05-19 15:15:02 +08:00 |
|
chenxi
|
680992e0b6
|
挂机表现
|
2023-05-19 15:10:44 +08:00 |
|
chenxi
|
e55fdab3dd
|
快速挂机界面
|
2023-05-19 14:56:50 +08:00 |
|
chenxi
|
96957ccda4
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-05-19 14:49:30 +08:00 |
|