1431 Commits

Author SHA1 Message Date
chenxi
844c587d71 Merge branch 'dev_shenhe' into dev 2023-06-13 15:04:53 +08:00
chenxi
0e62320f31 审核模式不显示金猪 2023-06-13 15:04:47 +08:00
chenxi
c65113785d 更新配置 2023-06-13 14:37:42 +08:00
chenxi
58c539a789 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-06-13 11:59:38 +08:00
chenxi
823dac78f8 金猪倒计时 2023-06-13 11:59:35 +08:00
xiekaidong
1319417de0 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-06-13 11:11:09 +08:00
xiekaidong
ad7212ff13 新的肉鸽机制-改变effect概率 2023-06-13 11:11:06 +08:00
chenxi
95fd46ed94 Merge branch 'dev_shenhe' into dev 2023-06-13 10:43:59 +08:00
chenxi
00ec7c553d 账号绑定的apple处理 2023-06-13 10:41:19 +08:00
chenxi
0d916a96e8 Merge branch 'dev_shenhe' into dev 2023-06-12 18:25:37 +08:00
chenxi
8891f004ff 审核模式 2023-06-12 18:25:14 +08:00
xiekaidong
71b4b2b4e0 战斗任务参数修改 2023-06-12 16:30:04 +08:00
xiekaidong
99694fc1d8 整合一下战斗任务参数 2023-06-12 16:25:11 +08:00
xiekaidong
39dacd3cdc 攻击距离可配置 2023-06-12 10:36:58 +08:00
xiekaidong
47ee292697 更改近身攻击距离 2023-06-12 10:09:42 +08:00
xiekaidong
225fa8ad1f 每日挑战不显示每日buff信息 2023-06-12 09:46:51 +08:00
xiekaidong
f848e7b5bc Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-06-09 17:34:10 +08:00
xiekaidong
66db212dd4 更新配置 2023-06-09 17:34:07 +08:00
chenxi
cd0f34f5ee 商店页签红点 2023-06-09 15:45:43 +08:00
chenxi
1d163ad8eb 商店 2023-06-09 15:41:54 +08:00
chenxi
4d898cee05 商店页签红点 2023-06-09 15:33:45 +08:00
chenxi
60e6251493 商店页签红点 2023-06-09 15:30:36 +08:00
chenxi
608eb91087 英雄tips 2023-06-08 21:34:28 +08:00
chenxi
822b6baa75 商店热卖标签红点 2023-06-08 20:51:09 +08:00
chenxi
c1c5e8415e 金猪满了后下一次进主城要弹出来 2023-06-08 20:20:42 +08:00
chenxi
bda768c79f bug 2023-06-08 18:05:55 +08:00
chenxi
c17ece443b 启动界面位置错误 2023-06-08 17:29:49 +08:00
chenxi
10e96bb030 Merge branch 'dev_20230608_hotupdate' 2023-06-08 17:08:30 +08:00
xiekaidong
cc8bace10b 上报修复 2023-06-08 17:07:04 +08:00
chenxi
5b37d50df4 多语言 2023-06-08 17:01:17 +08:00
xiekaidong
86e6e62fe9 bug修复 2023-06-08 16:41:07 +08:00
xiekaidong
75bcd50e85 支付奖励上报修复 2023-06-08 12:06:03 +08:00
chenxi
ba2903a60f Merge branch 'dev_20230607_hotupdate' into dev 2023-06-07 20:57:35 +08:00
chenxi
4fd27dab0e 账号相关 2023-06-07 19:44:10 +08:00
chenxi
304ed48943 账号相关 2023-06-07 19:32:22 +08:00
chenxi
74a9205f30 账号绑定的bug 2023-06-07 19:13:20 +08:00
xiekaidong
fddb727eb4 删除冗余代码 2023-06-07 19:03:32 +08:00
xiekaidong
cb8006c377 显示修复 2023-06-07 17:47:29 +08:00
xiekaidong
c46b80a567 新增上报 2023-06-07 17:33:54 +08:00
xiekaidong
22ca62a023 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-06-07 17:25:17 +08:00
xiekaidong
c800a0cc31 日志上报 2023-06-07 17:25:08 +08:00
chenxi
26ea46d608 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-06-07 16:49:16 +08:00
chenxi
2257dfc25d 挂机界面1分钟拉一次 2023-06-07 16:49:09 +08:00
xiekaidong
0b1b9f262e 新增一些上报信息 2023-06-07 15:27:11 +08:00
xiekaidong
502c73bae8 主界面关卡宝箱领取显示bug修复 2023-06-07 10:30:37 +08:00
chenxi
695e9f1e7d Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-06-06 21:11:42 +08:00
chenxi
3edeb6c50c 隐私政策,退回登录界面还是连不上的问题 2023-06-06 21:11:38 +08:00
xiekaidong
7aa6dad65d 登陆界面复制账号 2023-06-06 21:05:12 +08:00
xiekaidong
1c89ec147b 显示bug修复 2023-06-06 20:37:32 +08:00
chenxi
1461bc9d7f 调长一点 2023-06-06 18:40:49 +08:00