chenxi
|
e6435c68ff
|
公共事件增加上报体力
|
2023-06-06 16:43:12 +08:00 |
|
chenxi
|
be043ef0d1
|
支付上报
|
2023-06-06 15:50:33 +08:00 |
|
chenxi
|
f63a2bf876
|
音效
|
2023-06-06 11:29:34 +08:00 |
|
xiekaidong
|
6efff3f554
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-06-06 11:08:57 +08:00 |
|
xiekaidong
|
b8f08c59a3
|
资源上传
|
2023-06-06 11:08:52 +08:00 |
|
CloudJ
|
17984d56ae
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
# Conflicts:
# lua/app/common/audio_manager.lua
|
2023-06-06 11:08:52 +08:00 |
|
CloudJ
|
9a5d42c753
|
音效
|
2023-06-06 11:08:37 +08:00 |
|
chenxi
|
04f9000eed
|
白名单
|
2023-06-06 11:07:07 +08:00 |
|
xiekaidong
|
c218e5a359
|
音效
|
2023-06-06 10:59:34 +08:00 |
|
xiekaidong
|
2dbf06a3b0
|
boss预警音效
|
2023-06-06 10:38:43 +08:00 |
|
xiekaidong
|
eb1281f999
|
bi注释
|
2023-06-06 09:44:02 +08:00 |
|
chenxi
|
b0b6b7cee1
|
还原语言相关设置
|
2023-06-05 22:01:49 +08:00 |
|
chenxi
|
976dfc2653
|
上报参数
|
2023-06-05 21:29:54 +08:00 |
|
chenxi
|
0c8613fd6c
|
bi
|
2023-06-05 21:04:38 +08:00 |
|
chenxi
|
74f91dabae
|
上报
|
2023-06-05 19:07:40 +08:00 |
|
chenxi
|
16975e700e
|
充值后没有绑定则提示绑定
|
2023-06-05 18:32:51 +08:00 |
|
xiekaidong
|
5d5ba37a4b
|
支付成功时没绑定账号，提示绑定账号
|
2023-06-05 18:02:12 +08:00 |
|
xiekaidong
|
7acd32c46c
|
更改奖励上报
|
2023-06-05 15:35:05 +08:00 |
|
Fang
|
827c282c62
|
首次进入每日挑战未显示任务弹窗fix
|
2023-06-05 10:41:20 +08:00 |
|
chenxi
|
a225025d02
|
支付code
|
2023-06-04 22:12:28 +08:00 |
|
chenxi
|
2f2a993c12
|
打完第二章后七天乐没有开启的bug
|
2023-06-02 18:20:15 +08:00 |
|
chenxi
|
09fb4c1fb7
|
登录的一个参数
|
2023-06-02 11:20:22 +08:00 |
|
chenxi
|
bab3e8218e
|
登录
|
2023-06-01 18:15:32 +08:00 |
|
chenxi
|
80619b8e94
|
支付相关
|
2023-06-01 18:09:30 +08:00 |
|
chenxi
|
2b4dc82363
|
账号相关
|
2023-05-31 22:38:15 +08:00 |
|
chenxi
|
35a6bc5fa7
|
账号绑定
|
2023-05-31 22:23:04 +08:00 |
|
chenxi
|
c996e1414e
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-05-31 17:53:44 +08:00 |
|
chenxi
|
fe3c8849b8
|
删除账号
|
2023-05-31 17:53:41 +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
|
325d906a3c
|
每日挑战跨天请求时机优化
|
2023-05-31 11:59:50 +08:00 |
|
Fang
|
17b5f1129c
|
每日挑战界面调整、扣除次数修复
|
2023-05-31 10:24:51 +08:00 |
|
chenxi
|
ce822360d2
|
七天乐界面调整
|
2023-05-31 10:11:45 +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 |
|
陈希
|
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
|
b64ea50f65
|
审核模式增加mall_treasure表
|
2023-05-30 10:38:07 +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 |
|
CloudJ
|
23fca8d7bf
|
更新首充界面
|
2023-05-29 17:15:54 +08:00 |
|
CloudJ
|
2f15a426bc
|
更新配置表
|
2023-05-29 16:25:50 +08:00 |
|
CloudJ
|
832701111b
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-05-29 15:10:06 +08:00 |
|
chenxi
|
5493c1b0eb
|
白名单
|
2023-05-29 14:34:31 +08:00 |
|
CloudJ
|
8cc59343b7
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-05-29 14:05:35 +08:00 |
|
chenxi
|
85cdf222c6
|
修复任务没开启前会显示任务完成得toast
|
2023-05-29 12:05:26 +08:00 |
|
CloudJ
|
8ed5c657b1
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
# Conflicts:
# lua/app/module/maincity/maincity_const.lua
|
2023-05-29 11:04:25 +08:00 |
|
CloudJ
|
792830c90e
|
首充礼包
|
2023-05-29 11:03:43 +08:00 |
|