165 Commits

Author SHA1 Message Date
Fang
b8155b97de 成长礼包触发方式修改 2023-07-06 18:17:37 +08:00
xiekaidong
0445086500 竞技场日志上报 2023-07-06 18:08:53 +08:00
Fang
9a7b8d316d 竞技场bi上报 2023-07-06 11:59:28 +08:00
Fang
6099fe08fb fix 2023-07-04 18:29:05 +08:00
xiekaidong
ce97be9b65 Merge branch 'dev' into arena
# Conflicts:
#	lua/app/config/localization/localization_global_const.lua
#	lua/app/config/strings/cn/global.lua
#	lua/app/module/battle/controller/battle_controller.lua
#	lua/app/ui/main_city/main_city_ui.lua
2023-07-04 15:36:04 +08:00
xiekaidong
c976166cc9 竞技场弹窗礼包 2023-07-03 19:57:39 +08:00
xiekaidong
f228e84585 评价弹窗 2023-07-03 15:55:05 +08:00
Fang
52a1631ad4 逻辑完善 2023-06-29 16:09:54 +08:00
xiekaidong
7f7707094d 竞技场战斗 2023-06-29 14:24:29 +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
CloudJ
fdc773df09 竞技场战令 2023-06-26 11:26:28 +08:00
chenxi
4c80f6ee3d 白名单和审核模式 2023-06-21 11:35:44 +08:00
chenxi
ae544d1f3d 审核服上报 2023-06-20 14:52:35 +08:00
xiekaidong
557475e3c4 参数 2023-06-19 17:46:06 +08:00
xiekaidong
e573463879 增加网络通信失败的上报 2023-06-19 17:28:05 +08:00
Fang
f3924368ce 头像昵称功能 2023-06-19 10:57:39 +08:00
chenxi
0988c47259 adjust事件 2023-06-19 09:56:07 +08:00
chenxi
83c02d3d4e 上报 2023-06-15 20:59:48 +08:00
xiekaidong
c11428b80b bug修复 2023-06-15 17:52:22 +08:00
xiekaidong
3723335174 每日挑战任务完成情况上报 2023-06-15 17:30:08 +08:00
chenxi
9666158491 adjust上报 2023-06-14 21:43:02 +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
Fang
e4dad61f52 活动副本 2023-06-12 15:39:52 +08:00
xiekaidong
c46b80a567 新增上报 2023-06-07 17:33:54 +08:00
xiekaidong
c800a0cc31 日志上报 2023-06-07 17:25:08 +08:00
xiekaidong
0b1b9f262e 新增一些上报信息 2023-06-07 15:27:11 +08:00
chenxi
b621d37dbe Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-06-06 18:22:55 +08:00
chenxi
3ccfaec8d0 战令 2023-06-06 18:22:48 +08:00
xiekaidong
ce947c0a34 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-06-06 18:21:27 +08:00
xiekaidong
fac1e2c2d5 更新一下字段 2023-06-06 18:20:42 +08:00
chenxi
01054b8e3b merge bireport 2023-06-06 18:14:34 +08:00
chenxi
ec3ae95cc4 上报相关 2023-06-06 18:14:07 +08:00
xiekaidong
6cb971d493 战斗bi日志上报 2023-06-06 18:06:38 +08:00
xiekaidong
e69b7a14e5 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
# Conflicts:
#	lua/app/common/bi_report.lua
2023-06-06 17:59:30 +08:00
xiekaidong
8bdd4ae3d3 英雄操作bi上报 2023-06-06 17:58:58 +08:00
CloudJ
0d2144756d 调整上报参数 2023-06-06 17:51:18 +08:00
chenxi
0a7c349470 merge 2023-06-06 17:14:17 +08:00
chenxi
e59e40435d 上报玩家升级 2023-06-06 17:13:44 +08:00
CloudJ
f84f0a103a Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-06-06 17:11:18 +08:00
CloudJ
f95926cfde 增加一部分上报 2023-06-06 17:11:16 +08:00
chenxi
e6435c68ff 公共事件增加上报体力 2023-06-06 16:43:12 +08:00
chenxi
be043ef0d1 支付上报 2023-06-06 15:50:33 +08:00
xiekaidong
eb1281f999 bi注释 2023-06-06 09:44:02 +08:00