chenxi
|
51a60e0f1e
|
模块解锁
|
2023-05-31 20:53:57 +08:00 |
|
Fang
|
7ff0afed6c
|
主界面按钮切换动画替换
|
2023-05-31 17:56:01 +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 |
|
chenxi
|
3121b7b59a
|
功能开启
|
2023-05-30 19:01:04 +08:00 |
|
chenxi
|
9feb05f0e6
|
解锁动画
|
2023-05-30 18:49:18 +08:00 |
|
chenxi
|
54eaa39e85
|
解锁动画
|
2023-05-30 18:47:16 +08:00 |
|
chenxi
|
284f7ce3c7
|
设置界面里的邮箱加一个开启限制
|
2023-05-30 18:17:51 +08:00 |
|
chenxi
|
5d7771fd87
|
解锁新功能弹窗
|
2023-05-30 15:32:58 +08:00 |
|
chenxi
|
a4ace76f2f
|
主城战令名字
|
2023-05-30 14:30:02 +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 |
|
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 |
|
CloudJ
|
058c2aec8a
|
商城红点
|
2023-05-29 18:06:40 +08:00 |
|
CloudJ
|
23fca8d7bf
|
更新首充界面
|
2023-05-29 17:15:54 +08:00 |
|
CloudJ
|
2f15a426bc
|
更新配置表
|
2023-05-29 16:25:50 +08:00 |
|
CloudJ
|
81fe73352d
|
商城开启条件
|
2023-05-29 15:38:13 +08:00 |
|
CloudJ
|
f8a4bf7935
|
多语言
|
2023-05-29 14:05:32 +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 |
|
chenxi
|
5ab6aac2b6
|
代码重命名
|
2023-05-29 10:54:10 +08:00 |
|
CloudJ
|
d53e491175
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-05-26 19:57:16 +08:00 |
|
CloudJ
|
c106607a65
|
成长礼包逻辑
|
2023-05-26 19:57:13 +08:00 |
|
chenxi
|
dc96cf269e
|
调整侧标栏按钮位置
|
2023-05-26 19:25:41 +08:00 |
|
Fang
|
0288f2a300
|
boss界面模型比例适配
|
2023-05-26 18:39:07 +08:00 |
|
Fang
|
b57318f3a6
|
Merge remote-tracking branch 'origin/dev' into fang/daily_challenge
|
2023-05-26 18:26:21 +08:00 |
|
Fang
|
858de8d1eb
|
每日挑战任务奖励
|
2023-05-26 18:00:46 +08:00 |
|
chenxi
|
3262bb7633
|
七天乐红点
|
2023-05-26 17:01:16 +08:00 |
|
CloudJ
|
ec6ce43f70
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
# Conflicts:
# lua/app/common/bi_report.lua
|
2023-05-26 15:44:50 +08:00 |
|
CloudJ
|
01922a4c0d
|
成长礼包
|
2023-05-26 15:44:35 +08:00 |
|
Fang
|
d473cbc537
|
提示逻辑补全
|
2023-05-26 15:43:01 +08:00 |
|
Fang
|
9d212aaf26
|
部分ui逻辑
|
2023-05-26 15:43:01 +08:00 |
|
xiekaidong
|
5c1307ad0d
|
一些数据和更新配置
|
2023-05-26 15:43:01 +08:00 |
|
Fang
|
9830ac3cbd
|
每日挑战
|
2023-05-26 15:42:35 +08:00 |
|
chenxi
|
8eccf012ba
|
七天乐
|
2023-05-26 15:38:55 +08:00 |
|
chenxi
|
0b6607d714
|
七天乐
|
2023-05-26 14:51:24 +08:00 |
|
chenxi
|
e552761eea
|
七天乐
|
2023-05-26 11:39:23 +08:00 |
|
CloudJ
|
8158609a45
|
修复一个拼写报错
|
2023-05-25 18:47:18 +08:00 |
|
CloudJ
|
6cbf391728
|
礼包逻辑调整
|
2023-05-25 18:18:08 +08:00 |
|
CloudJ
|
4d6bdbed51
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-05-25 17:31:00 +08:00 |
|
CloudJ
|
4fa2d67de2
|
礼包
|
2023-05-25 17:30:57 +08:00 |
|