314 Commits

Author SHA1 Message Date
xiekaidong
7f7707094d 竞技场战斗 2023-06-29 14:24:29 +08:00
CloudJ
b1f01a9ded 增加泰语/西班牙 2023-06-29 14:22:08 +08:00
Fang
10f3747396 处理新号报错 2023-06-29 10:03:42 +08:00
xiekaidong
c259b2ed58 Merge branch 'arena' of http://git.juzugame.com/b6-client/b6-lua into arena
# Conflicts:
#	lua/app/module/battle/battle_const.lua
2023-06-28 21:25:19 +08:00
xiekaidong
d4d92cf97d pvp战斗和整合pve战斗 2023-06-28 21:24:15 +08:00
Fang
a522015156 逻辑补充 2023-06-28 18:36:53 +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
xiekaidong
f17eeb8e68 Merge branch 'arena' of http://git.juzugame.com/b6-client/b6-lua into arena 2023-06-26 15:28:43 +08:00
xiekaidong
a623c25f6f pvp战斗概念引入 2023-06-26 15:28:40 +08:00
CloudJ
fdc773df09 竞技场战令 2023-06-26 11:26:28 +08:00
chenxi
4c80f6ee3d 白名单和审核模式 2023-06-21 11:35:44 +08:00
xiekaidong
f39665d6ce 修复 2023-06-20 22:08:55 +08:00
chenxi
9f8fff2cae 先屏蔽泰语 2023-06-20 15:44:31 +08:00
chenxi
ae544d1f3d 审核服上报 2023-06-20 14:52:35 +08:00
chenxi
93f580f1bf 资源白名单 2023-06-20 14:42:34 +08:00
chenxi
eb3ec49d37 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-06-20 10:05:58 +08:00
chenxi
b57c80254b 西班牙语 2023-06-20 10:05:55 +08:00
xiekaidong
557475e3c4 参数 2023-06-19 17:46:06 +08:00
xiekaidong
33ba5c7ef1 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-06-19 17:28:08 +08:00
xiekaidong
e573463879 增加网络通信失败的上报 2023-06-19 17:28:05 +08:00
Fang
45e6b4d856 跨天关闭副本关卡选择界面 2023-06-19 15:58:51 +08:00
chenxi
3c9a656192 获取firebasetoken 2023-06-19 11:18:15 +08:00
Fang
f3924368ce 头像昵称功能 2023-06-19 10:57:39 +08:00
chenxi
0988c47259 adjust事件 2023-06-19 09:56:07 +08:00
chenxi
13edfce314 界面调整 2023-06-16 17:32:01 +08:00
xiekaidong
aae6480bf7 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-06-16 16:59:57 +08:00
xiekaidong
35a4f25366 邮件容错 2023-06-16 16:59:54 +08:00
chenxi
fb671ca1af 维护公告 2023-06-16 15:11:37 +08:00
chenxi
212abb61d5 谷歌订单 2023-06-16 10:26:16 +08:00
chenxi
83c02d3d4e 上报 2023-06-15 20:59:48 +08:00
chenxi
f810b8105e 支付参数 2023-06-15 20:28:25 +08:00
chenxi
30cbf7d8cc ios支付 2023-06-15 19:54:46 +08:00
chenxi
6d97c5f9bf 未完成订单 2023-06-15 19:16:39 +08:00
xiekaidong
c11428b80b bug修复 2023-06-15 17:52:22 +08:00
xiekaidong
3723335174 每日挑战任务完成情况上报 2023-06-15 17:30:08 +08:00
xiekaidong
e8b6534d3b 副本开启引导触发 2023-06-15 15:32:27 +08:00
chenxi
355c8753d9 ios 支付参数 2023-06-15 11:03:56 +08:00
chenxi
af1c4f72a7 支付调整 2023-06-15 10:11:08 +08:00
chenxi
9666158491 adjust上报 2023-06-14 21:43:02 +08:00
chenxi
119a6eaa27 支付 2023-06-14 18:57:09 +08:00
chenxi
fb18182d6a ios 支付 2023-06-14 18:43:04 +08:00
chenxi
27676042fb ios 支付调整 2023-06-14 17:36:22 +08:00
xiekaidong
35053faa9b Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-06-14 16:00:20 +08:00
xiekaidong
17ad018a43 日志上报 2023-06-14 16:00:17 +08:00
chenxi
d3bb4c3698 Merge branch 'dev_ios' into dev 2023-06-14 15:40:47 +08:00
chenxi
34332c6af9 merge cdkey 2023-06-14 15:04:56 +08:00
chenxi
5934e03198 cdkey 2023-06-14 15:04:26 +08:00