167 Commits

Author SHA1 Message Date
Fang
8c1082793e 圆月活动 2023-09-15 19:22:15 +08:00
xiekaidong
d4c7cf71b0 优化一下断线续关,并增加上报 2023-09-12 19:43:58 +08:00
Fang
f1f1daafa2 符文功能 2023-09-12 10:35:46 +08:00
xiekaidong
10253fbafb 符文副本 2023-09-11 20:01:55 +08:00
xiekaidong
a817d25305 符文副本 2023-09-08 18:53:46 +08:00
xiekaidong
c0a3356cfd 符文副本主界面 2023-09-07 19:14:39 +08:00
xiekaidong
b7997bb181 Merge branch 'master' into dev_20230919 2023-09-06 10:20:56 +08:00
xiekaidong
4e5021741d Merge branch 'dev_20230905' into boss_rush
# Conflicts:
#	lua/app/common/bi_report.lua
#	lua/app/common/data_manager.lua
#	lua/app/common/local_data.lua
#	lua/app/common/module_manager.lua
#	lua/app/config/act_fourteen_bounty.lua.meta
#	lua/app/config/act_fourteen_exchange.lua.meta
#	lua/app/config/act_fourteen_quest.lua
#	lua/app/config/act_fourteen_quest.lua.meta
#	lua/app/config/activity_boss_rush_chapter.lua.meta
#	lua/app/config/activity_boss_rush_exchange.lua.meta
#	lua/app/config/activity_boss_rush_rank.lua.meta
#	lua/app/config/activity_exchange.lua.meta
#	lua/app/config/avatar_frame.lua
#	lua/app/config/chapter_board_bossrush.lua.meta
#	lua/app/config/monster_activity.lua.meta
#	lua/app/config/strings/cn/act_fourteen_quest.lua.meta
#	lua/app/config/strings/cn/global.lua
#	lua/app/config/strings/cn/task_type.lua.meta
#	lua/app/config/strings/de/act_fourteen_quest.lua.meta
#	lua/app/config/strings/de/task_type.lua.meta
#	lua/app/config/strings/en/act_fourteen_quest.lua.meta
#	lua/app/config/strings/en/task_type.lua.meta
#	lua/app/config/strings/es/act_fourteen_quest.lua.meta
#	lua/app/config/strings/es/task_type.lua.meta
#	lua/app/config/strings/fr/act_fourteen_quest.lua.meta
#	lua/app/config/strings/fr/task_type.lua.meta
#	lua/app/config/strings/id/act_fourteen_quest.lua.meta
#	lua/app/config/strings/id/task_type.lua.meta
#	lua/app/config/strings/ja/act_fourteen_quest.lua.meta
#	lua/app/config/strings/ja/task_type.lua.meta
#	lua/app/config/strings/ko/act_fourteen_quest.lua.meta
#	lua/app/config/strings/ko/task_type.lua.meta
#	lua/app/config/strings/pt/act_fourteen_quest.lua.meta
#	lua/app/config/strings/pt/task_type.lua.meta
#	lua/app/config/strings/ru/act_fourteen_quest.lua.meta
#	lua/app/config/strings/th/act_fourteen_quest.lua.meta
#	lua/app/config/strings/th/task_type.lua.meta
#	lua/app/config/strings/vi/act_fourteen_quest.lua.meta
#	lua/app/config/strings/vi/task_type.lua.meta
#	lua/app/config/strings/zh/act_fourteen_quest.lua.meta
#	lua/app/config/strings/zh/task_type.lua.meta
#	lua/app/proto/proto_msg_type.lua
2023-09-01 21:18:54 +08:00
Fang
89eeac3f2d 新手14天乐 2023-09-01 15:35:19 +08:00
xiekaidong
049d7508ea bossrush 2023-08-31 20:18:14 +08:00
xiekaidong
211d7cc71e boss_rush 2023-08-30 19:11:38 +08:00
xiekaidong
3e562738a0 Merge branch 'master' into dev_20230919 2023-08-29 19:41:23 +08:00
Fang
f15917914c 竞技场段位奖励 2023-08-23 14:40:52 +08:00
chenxi
3230b99fb3 上报参数 2023-08-18 20:13:29 +08:00
xiekaidong
c880279be1 英雄基金 2023-08-18 18:08:48 +08:00
xiekaidong
5b119201cf 界面和协议 2023-08-17 18:16:06 +08:00
Fang
ff930c7264 夏日活动上报修改 2023-08-15 20:40:24 +08:00
Fang
f0767abd9f 夏日活动上报 2023-08-15 20:31:24 +08:00
xiekaidong
4a4b25e11c 竞技场弹出礼包界面 2023-08-14 14:52:38 +08:00
Fang
e0db8bcfda 夏日活动 2023-08-11 11:52:12 +08:00
xiekaidong
5eff2c3633 上报和容错 2023-08-10 18:41:24 +08:00
xiekaidong
18d447de17 名称修改 2023-08-10 11:56:45 +08:00
xiekaidong
ad56074c71 新增上报 2023-08-07 18:15:19 +08:00
xiekaidong
f0ec99f24a 字段修改 2023-08-07 15:50:46 +08:00
xiekaidong
7aa2b95686 宝箱日志上报 2023-08-07 15:33:06 +08:00
xiekaidong
f74226c056 增加上报属性 2023-08-07 10:35:11 +08:00
xiekaidong
f3e4284916 修改一下上报信息 2023-08-04 11:28:51 +08:00
xiekaidong
a47f18db07 日志上报 2023-08-03 14:20:16 +08:00
Fang
2933776048 支线基金 2023-07-24 11:54:09 +08:00
xiekaidong
100e125c19 Merge branch 'dev_20230725' into dungeon
# Conflicts:
#	lua/app/common/bi_report.lua
#	lua/app/common/module_manager.lua
#	lua/app/config/localization/localization_global_const.lua
#	lua/app/config/strings/cn/global.lua
2023-07-20 19:45:54 +08:00
xiekaidong
8b4933f4f0 支线副本 2023-07-20 17:41:42 +08:00
Fang
28bf5ab6ad 装备系统 2023-07-20 10:15:42 +08:00
xiekaidong
c2dc577fc6 Merge branch 'dev_20230725' into dungeon 2023-07-19 20:18:27 +08:00
xiekaidong
2ffd6e88ba 装备副本 2023-07-19 20:16:17 +08:00
chenxi
a2e2370d29 上报逻辑调整 2023-07-19 15:36:40 +08:00
chenxi
c643750a33 广告价值回传 2023-07-19 11:29:43 +08:00
chenxi
e20311211e 广告价值回传上报 2023-07-19 09:49:49 +08:00
chenxi
be2e185a77 Merge branch 'master' into dev_20230725 2023-07-19 09:48:56 +08:00
xiekaidong
c3e62e4bc2 修改一下命名 2023-07-18 17:04:09 +08:00
xiekaidong
fe73554226 上报 2023-07-18 16:36:26 +08:00
xiekaidong
a2ca40f00c 优化一下性能 2023-07-18 15:35:49 +08:00
xiekaidong
ed400f1b75 处理一下跨等级上报 2023-07-18 15:28:22 +08:00
xiekaidong
6f85752093 firebase、af、fb日志上报 2023-07-18 15:06:30 +08:00
Fang
b2dba1de2e 英雄图鉴 2023-07-14 17:07:03 +08:00
chenxi
6848735fd9 merge master 2023-07-14 17:06:39 +08:00
xiekaidong
2b0d5b7596 网络模块优化和bug提交 2023-07-13 11:03:41 +08:00
xiekaidong
3c76dfe2ef 网络优化和bug修复 2023-07-13 10:35:01 +08:00
xiekaidong
0157ca5d27 一些日志上报混乱修复 2023-07-11 11:02:14 +08:00
xiekaidong
552e604167 修改上报参数,bug修复 2023-07-11 10:20:37 +08:00
xiekaidong
0beaf804a9 用户属性主线阵容上报信息错误修复,竞技场消耗上报增加段位id,竞技场结算上报增加胜负 2023-07-10 17:46:11 +08:00