Fang
|
5d9e8d33de
|
容错处理
|
2023-06-05 10:59:10 +08:00 |
|
Fang
|
827c282c62
|
首次进入每日挑战未显示任务弹窗fix
|
2023-06-05 10:41:20 +08:00 |
|
Fang
|
a8f727c014
|
每日挑战首次解锁显示fix
|
2023-06-05 10:41:20 +08:00 |
|
xiekaidong
|
eb2872b7ee
|
修改bug，优化战斗流程逻辑
|
2023-06-03 19:11:19 +08:00 |
|
xiekaidong
|
63b03dba2a
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-06-02 19:01:36 +08:00 |
|
Fang
|
b6936a2c4a
|
功能解锁飞行动画
|
2023-06-02 18:35:36 +08:00 |
|
chenxi
|
2f2a993c12
|
打完第二章后七天乐没有开启的bug
|
2023-06-02 18:20:15 +08:00 |
|
xiekaidong
|
5a9558184b
|
火箭动画
|
2023-06-02 17:58:18 +08:00 |
|
xiekaidong
|
eb1354f807
|
先更新一下格子
|
2023-06-02 16:54:16 +08:00 |
|
xiekaidong
|
09e4b06ccd
|
显示优化
|
2023-06-01 22:10:01 +08:00 |
|
xiekaidong
|
9429f79a1e
|
bug修复
|
2023-06-01 16:35:23 +08:00 |
|
chenxi
|
f90220463d
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-06-01 10:23:34 +08:00 |
|
chenxi
|
3f792038be
|
修复金猪bug和删掉不用的同步接口
|
2023-06-01 10:23:31 +08:00 |
|
CloudJ
|
9f6e66df43
|
fix 宝箱道具数量问题
|
2023-06-01 10:23:28 +08:00 |
|
chenxi
|
35a6bc5fa7
|
账号绑定
|
2023-05-31 22:23:04 +08:00 |
|
xiekaidong
|
694ef22777
|
格子支持一下spine
|
2023-05-31 20:11:00 +08:00 |
|
Fang
|
7ff0afed6c
|
主界面按钮切换动画替换
|
2023-05-31 17:56:01 +08:00 |
|
CloudJ
|
44a7937320
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-05-31 15:41:44 +08:00 |
|
CloudJ
|
298a0aaa1b
|
修复一些商城的bug
|
2023-05-31 15:41:42 +08:00 |
|
Fang
|
2b92ed0909
|
main界面模块切换逻辑重构
|
2023-05-31 14:40:08 +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 |
|
Fang
|
17b5f1129c
|
每日挑战界面调整、扣除次数修复
|
2023-05-31 10:24:51 +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
|
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
|
284f7ce3c7
|
设置界面里的邮箱加一个开启限制
|
2023-05-30 18:17:51 +08:00 |
|
chenxi
|
88aa6a6cf3
|
碎片tips显示错误
|
2023-05-30 15:58:00 +08:00 |
|
chenxi
|
1c4589843c
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-05-30 15:33:04 +08:00 |
|
chenxi
|
5d7771fd87
|
解锁新功能弹窗
|
2023-05-30 15:32:58 +08:00 |
|
xiekaidong
|
71daac9cb7
|
表现优化
|
2023-05-30 15:06:33 +08:00 |
|
xiekaidong
|
334f7e870b
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-05-30 14:15:45 +08:00 |
|
xiekaidong
|
122c0da462
|
buff描述
|
2023-05-30 14:15:42 +08:00 |
|
chenxi
|
5a3aeceae8
|
英雄解锁
|
2023-05-30 12:16:40 +08:00 |
|
chenxi
|
b253e3946e
|
容错
|
2023-05-30 11:52:34 +08:00 |
|
陈希
|
bbc196035c
|
Merge branch 'fang/daily_challenge' into 'dev'
每日挑战
See merge request b6-client/b6-lua!1
|
2023-05-30 03:38:33 +00:00 |
|
CloudJ
|
47ad46fba9
|
审核模式调整
|
2023-05-30 11:34:38 +08:00 |
|
CloudJ
|
d15e52a41d
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-05-30 10:38:10 +08:00 |
|
CloudJ
|
b64ea50f65
|
审核模式增加mall_treasure表
|
2023-05-30 10:38:07 +08:00 |
|
Fang
|
9b3a00e809
|
Merge remote-tracking branch 'origin/dev' into fang/daily_challenge
# Conflicts:
# lua/app/config/localization/localization_global_const.lua
# lua/app/config/skill.lua
# lua/app/config/strings/cn/buff.lua
# lua/app/config/strings/cn/global.lua
# lua/app/config/strings/de/buff.lua
# lua/app/config/strings/en/buff.lua
# lua/app/config/strings/fr/buff.lua
# lua/app/config/strings/id/buff.lua
# lua/app/config/strings/ja/buff.lua
# lua/app/config/strings/ko/buff.lua
# lua/app/config/strings/pt/buff.lua
# lua/app/config/strings/ru/buff.lua
# lua/app/config/strings/th/buff.lua
# lua/app/config/strings/vi/buff.lua
# lua/app/config/strings/zh/buff.lua
|
2023-05-30 10:35:05 +08:00 |
|
chenxi
|
bcfd27d6f0
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-05-30 10:17:34 +08:00 |
|
chenxi
|
837f54acda
|
英雄解锁
|
2023-05-30 10:17:31 +08:00 |
|
CloudJ
|
1d21fd5ff5
|
红点
|
2023-05-30 10:13:53 +08:00 |
|
CloudJ
|
08e95f0ff3
|
商城红点去掉toast
|
2023-05-30 09:43:29 +08:00 |
|
xiekaidong
|
fe6994625c
|
bug修复
|
2023-05-29 20:56:46 +08:00 |
|
xiekaidong
|
c50f92bbc0
|
bug修复
|
2023-05-29 20:21:05 +08:00 |
|
Fang
|
3880dfd3d2
|
Merge remote-tracking branch 'origin/dev' into fang/daily_challenge
# Conflicts:
# lua/app/common/module_manager.lua
# lua/app/config/buff_daily_challenge.lua
# lua/app/config/chapter.lua
# lua/app/config/hero.lua
# lua/app/config/localization/localization_global_const.lua
# lua/app/config/skill.lua
# lua/app/config/strings/cn/buff.lua
# lua/app/config/strings/cn/global.lua
|
2023-05-29 18:24:33 +08:00 |
|
Fang
|
74f242b214
|
每日挑战开启状态变化fix
|
2023-05-29 18:22:17 +08:00 |
|