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 |
|
chenxi
|
5ab6aac2b6
|
代码重命名
|
2023-05-29 10:54:10 +08:00 |
|
CloudJ
|
c106607a65
|
成长礼包逻辑
|
2023-05-26 19:57:13 +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 |
|
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
|
da120dc0a0
|
部分ui逻辑
|
2023-05-26 15:43:01 +08:00 |
|
xiekaidong
|
5c1307ad0d
|
一些数据和更新配置
|
2023-05-26 15:43:01 +08:00 |
|
xiekaidong
|
7fa2c93ad5
|
每日战斗战斗部分
|
2023-05-26 15:42:35 +08:00 |
|
Fang
|
9830ac3cbd
|
每日挑战
|
2023-05-26 15:42:35 +08:00 |
|
chenxi
|
8eccf012ba
|
七天乐
|
2023-05-26 15:38:55 +08:00 |
|
chenxi
|
e552761eea
|
七天乐
|
2023-05-26 11:39:23 +08:00 |
|
chenxi
|
189faa4701
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
# Conflicts:
# lua/app/config/buff_daily_challenge.lua.meta
# lua/app/config/chapter_board_daily_challenge.lua.meta
# lua/app/config/chapter_daily_challenge.lua.meta
# lua/app/config/monster_daily_challenge.lua.meta
# lua/app/config/strings/cn/buff_daily_challenge.lua.meta
# lua/app/config/strings/cn/task_daily_challenge.lua.meta
# lua/app/config/strings/de/buff_daily_challenge.lua.meta
# lua/app/config/strings/de/task_daily_challenge.lua.meta
# lua/app/config/strings/en/buff_daily_challenge.lua.meta
# lua/app/config/strings/en/task_daily_challenge.lua.meta
# lua/app/config/strings/fr/buff_daily_challenge.lua.meta
# lua/app/config/strings/fr/task_daily_challenge.lua.meta
# lua/app/config/strings/id/buff_daily_challenge.lua.meta
# lua/app/config/strings/id/task_daily_challenge.lua.meta
# lua/app/config/strings/ja/buff_daily_challenge.lua.meta
# lua/app/config/strings/ja/task_daily_challenge.lua.meta
# lua/app/config/strings/ko/buff_daily_challenge.lua.meta
# lua/app/config/strings/ko/task_daily_challenge.lua.meta
# lua/app/config/strings/pt/buff_daily_challenge.lua.meta
# lua/app/config/strings/pt/task_daily_challenge.lua.meta
# lua/app/config/strings/ru/buff_daily_challenge.lua.meta
# lua/app/config/strings/ru/task_daily_challenge.lua.meta
# lua/app/config/strings/th/buff_daily_challenge.lua.meta
# lua/app/config/strings/th/task_daily_challenge.lua.meta
# lua/app/config/strings/vi/buff_daily_challenge.lua.meta
# lua/app/config/strings/vi/task_daily_challenge.lua.meta
# lua/app/config/strings/zh/buff_daily_challenge.lua.meta
# lua/app/config/strings/zh/task_daily_challenge.lua.meta
# lua/app/config/task_daily_challenge.lua.meta
|
2023-05-25 17:06:46 +08:00 |
|
chenxi
|
56a4f329c3
|
紧急
|
2023-05-25 17:05:55 +08:00 |
|
CloudJ
|
cc674c3204
|
更新配置表与pb 修复一些问题
|
2023-05-25 15:26:57 +08:00 |
|
CloudJ
|
423b4a8f78
|
助力与金币礼包
|
2023-05-25 12:00:57 +08:00 |
|
CloudJ
|
602cd716df
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
# Conflicts:
# lua/app/common/pay_manager.lua
|
2023-05-25 10:18:31 +08:00 |
|
chenxi
|
4212a80a4a
|
等级基金
|
2023-05-24 21:05:52 +08:00 |
|
chenxi
|
e421a044c2
|
删除不用的
|
2023-05-24 19:32:16 +08:00 |
|
chenxi
|
143c5282e0
|
merge
|
2023-05-24 19:20:05 +08:00 |
|
chenxi
|
fdc400fd8d
|
基金
|
2023-05-24 19:19:34 +08:00 |
|
CloudJ
|
5888ee766f
|
助力礼包
|
2023-05-24 17:26:52 +08:00 |
|
CloudJ
|
eb531423dd
|
章节礼包与新手礼包
|
2023-05-24 16:00:43 +08:00 |
|
CloudJ
|
ca51dddab2
|
章节礼包
|
2023-05-24 11:33:54 +08:00 |
|
CloudJ
|
21f1a9cd89
|
抽奖逻辑
|
2023-05-24 10:44:11 +08:00 |
|
xiekaidong
|
bff772a1de
|
技能刷新接入联网
|
2023-05-24 10:01:36 +08:00 |
|
CloudJ
|
ada108ac82
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-05-23 18:37:12 +08:00 |
|
CloudJ
|
1fb818d12b
|
提交一波
|
2023-05-23 18:37:09 +08:00 |
|
chenxi
|
c95e0cb014
|
merge
|
2023-05-23 17:04:04 +08:00 |
|
chenxi
|
ee23cd83ad
|
金猪和邮件
|
2023-05-23 17:02:14 +08:00 |
|
CloudJ
|
38a9faffb6
|
提交一波
|
2023-05-23 16:37:01 +08:00 |
|
CloudJ
|
f5cfef0bbc
|
移除测试
|
2023-05-23 14:20:00 +08:00 |
|
CloudJ
|
74e2ecbb76
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
# Conflicts:
# lua/app/common/bi_report.lua
|
2023-05-23 14:17:44 +08:00 |
|
CloudJ
|
13d53c5166
|
提一波
|
2023-05-23 14:17:29 +08:00 |
|
chenxi
|
78e03328ce
|
邮件
|
2023-05-22 21:23:07 +08:00 |
|
CloudJ
|
46a2c52ca4
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
# Conflicts:
# lua/app/common/bi_report.lua
|
2023-05-22 17:50:24 +08:00 |
|
CloudJ
|
066b5cdef9
|
cache
|
2023-05-22 17:50:02 +08:00 |
|
CloudJ
|
58de179979
|
每日特惠
|
2023-05-22 17:27:12 +08:00 |
|
xiekaidong
|
3f747de9aa
|
boss的buff自动提示
|
2023-05-22 17:23:36 +08:00 |
|
chenxi
|
e97c1cd4e9
|
玩家升级界面
|
2023-05-22 16:22:26 +08:00 |
|