46 Commits

Author SHA1 Message Date
xiekaidong
854ce2b986 通用扫荡弹窗 2023-07-19 10:39:22 +08:00
xiekaidong
2610718eb2 副本入口 2023-07-18 17:01:27 +08:00
Fang
b2dba1de2e 英雄图鉴 2023-07-14 17:07:03 +08:00
Fang
e580b332a9 添加头像、头像框道具解锁逻辑 2023-07-07 11:04:22 +08:00
Fang
abe661f228 空名称处理 2023-07-03 14:16:03 +08:00
Fang
10f3747396 处理新号报错 2023-06-29 10:03:42 +08:00
CloudJ
519dc9822e Merge branch 'arena' of git.juzugame.com:b6-client/b6-lua into arena
# Conflicts:
#	lua/app/common/module_manager.lua
2023-06-28 09:38:58 +08:00
Fang
cd09e79bca 竞技场 2023-06-27 18:27:11 +08:00
CloudJ
b88c471ce0 Merge branch 'dev' into arena
# Conflicts:
#	lua/app/common/bi_report.lua
2023-06-27 17:25:42 +08:00
CloudJ
b59a8d20d6 入门礼包 2023-06-27 17:24:32 +08:00
CloudJ
fdc773df09 竞技场战令 2023-06-26 11:26:28 +08:00
Fang
bf1e7b7885 活动副本 2023-06-09 18:46:22 +08:00
chenxi
fe3c8849b8 删除账号 2023-05-31 17:53:41 +08:00
Fang
325d906a3c 每日挑战跨天请求时机优化 2023-05-31 11:59:50 +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
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
c106607a65 成长礼包逻辑 2023-05-26 19:57:13 +08:00
xiekaidong
5c1307ad0d 一些数据和更新配置 2023-05-26 15:43:01 +08:00
Fang
9830ac3cbd 每日挑战 2023-05-26 15:42:35 +08:00
chenxi
e552761eea 七天乐 2023-05-26 11:39:23 +08:00
chenxi
fdc400fd8d 基金 2023-05-24 19:19:34 +08:00
CloudJ
38a9faffb6 提交一波 2023-05-23 16:37:01 +08:00
CloudJ
13d53c5166 提一波 2023-05-23 14:17:29 +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
58de179979 每日特惠 2023-05-22 17:27:12 +08:00
chenxi
e97c1cd4e9 玩家升级界面 2023-05-22 16:22:26 +08:00
chenxi
0ab51fcc07 购买体力和邮箱 2023-05-19 18:32:23 +08:00
chenxi
84be3f721b 挂机 2023-05-17 22:27:58 +08:00
chenxi
f7cd1c6094 战令 2023-05-16 18:17:05 +08:00
chenxi
aa18b68b20 宝箱界面 2023-05-15 09:36:48 +08:00
chenxi
dfc705fbe8 商城 2023-05-12 21:07:05 +08:00
chenxi
6369eab7f6 战令 2023-05-12 15:32:53 +08:00
chenxi
482e1a2127 任务 2023-05-11 18:20:10 +08:00
chenxi
df3a225ebd 任务 2023-05-09 17:41:27 +08:00
chenxi
8e590c242b 任务 2023-05-09 15:24:20 +08:00
chenxi
4b6ee24312 购买体力 2023-05-09 14:52:36 +08:00
chenxi
50a2ff4b9f 金猪 2023-05-05 14:59:02 +08:00
chenxi
be01873d54 金猪 2023-05-05 11:57:41 +08:00
chenxi
47cd13f4ad 一些系统代码 2023-05-05 10:32:50 +08:00
xiekaidong
3b909a2a81 一些界面修改和接入关卡结算 2023-04-14 22:19:22 +08:00
xiekaidong
d1b80d3527 英雄养成 2023-04-13 21:13:43 +08:00
chenxi
4b621b0e07 上阵 2023-04-11 20:05:03 +08:00
xiekaidong
ccdd6a778b 棋盘 2023-04-06 10:38:04 +08:00
xiekaidong
e30ad1dbd0 整理代码 2023-04-03 10:59:13 +08:00