1321 Commits

Author SHA1 Message Date
xiekaidong
89b35ce6aa 战斗相关bug修复 2023-05-31 14:23:48 +08:00
Fang
325d906a3c 每日挑战跨天请求时机优化 2023-05-31 11:59:50 +08:00
CloudJ
14b1f256c9 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-05-31 11:37:51 +08:00
CloudJ
87a178c50d 商城跨天重置逻辑调整 2023-05-31 11:37:48 +08:00
xiekaidong
19f2695c22 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-05-31 11:10:33 +08:00
xiekaidong
d4a1b5be93 描述修改 2023-05-31 11:10:29 +08:00
Fang
17b5f1129c 每日挑战界面调整、扣除次数修复 2023-05-31 10:24:51 +08:00
CloudJ
a9b115e2de Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-05-31 10:12:15 +08:00
CloudJ
521bcf9c1a 宝箱钥匙展示规则调整 2023-05-31 10:12:13 +08:00
chenxi
32857bc983 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-05-31 10:12:09 +08:00
chenxi
ce822360d2 七天乐界面调整 2023-05-31 10:11:45 +08:00
xiekaidong
02832f21f3 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-05-31 09:49:37 +08:00
xiekaidong
6eee1909ad 网络接口 2023-05-31 09:49:29 +08:00
CloudJ
ff2fc67a42 礼包样式调整 2023-05-31 09:45:52 +08:00
CloudJ
eac7ce3f76 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-05-31 09:45:43 +08:00
xiekaidong
abc9c6af93 更新配置 2023-05-31 09:34:19 +08:00
chenxi
6736d2634e tips数量显示错误 2023-05-30 22:40:13 +08:00
chenxi
e86e750a1b 更新配置 2023-05-30 22:23:19 +08:00
chenxi
8aee4b4ed9 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-05-30 22:22:49 +08:00
chenxi
ad9f510a1e 七天乐 2023-05-30 22:22:46 +08:00
xiekaidong
c3c2e63ed6 层级调整 2023-05-30 22:04:32 +08:00
xiekaidong
981c440e5d 更新配置 2023-05-30 21:30:14 +08:00
CloudJ
0b6af4320d Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
# Conflicts:
#	lua/app/common/module_manager.lua
2023-05-30 19:35:22 +08:00
CloudJ
3baef020b0 替换首充界面 2023-05-30 19:34:37 +08:00
chenxi
afc0b58e39 七天乐天数没解锁的表现 2023-05-30 19:14:14 +08:00
chenxi
3121b7b59a 功能开启 2023-05-30 19:01:04 +08:00
chenxi
9feb05f0e6 解锁动画 2023-05-30 18:49:18 +08:00
chenxi
44085f6c23 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-05-30 18:47:19 +08:00
chenxi
54eaa39e85 解锁动画 2023-05-30 18:47:16 +08:00
xiekaidong
063df7972b 显示优化 2023-05-30 18:40:48 +08:00
xiekaidong
ba51eee559 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-05-30 18:32:49 +08:00
xiekaidong
5213236c5c boss出场动画 2023-05-30 18:32:46 +08:00
chenxi
3d47f56f9c Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-05-30 18:17:57 +08:00
chenxi
284f7ce3c7 设置界面里的邮箱加一个开启限制 2023-05-30 18:17:51 +08:00
xiekaidong
676ea6bfe8 显示bug修复 2023-05-30 18:12:39 +08:00
xiekaidong
1abca26819 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-05-30 17:50:32 +08:00
chenxi
40fef6069a 七天乐打开界面的时候自动去最新的天数 2023-05-30 17:45:09 +08:00
xiekaidong
8110054b34 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-05-30 17:42:35 +08:00
xiekaidong
b7614062f0 boss入场动画 2023-05-30 17:42:02 +08:00
chenxi
43733762a0 更新配置 2023-05-30 17:24:02 +08:00
chenxi
313e17425d 基金 2023-05-30 17:23:35 +08:00
chenxi
4b7a41f638 基金显示模型 2023-05-30 17:22:42 +08:00
chenxi
ee13ca7ae9 战令点击滑动 2023-05-30 16:25:45 +08:00
chenxi
2b496c8c19 七天乐tips 2023-05-30 16:07:45 +08:00
chenxi
2ba96c7b3f Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-05-30 15:58:06 +08:00
chenxi
88aa6a6cf3 碎片tips显示错误 2023-05-30 15:58:00 +08:00
xiekaidong
b6fc8538a2 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-05-30 15:56:32 +08:00
xiekaidong
fdbafd1dfe 增加一个战斗内使用的gm命令 2023-05-30 15:56:29 +08:00
chenxi
fe8d9aede1 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-05-30 15:50:21 +08:00
chenxi
9feb782b67 界面文本 2023-05-30 15:50:18 +08:00