324 Commits

Author SHA1 Message Date
Fang
9a3850c145 添加英雄升级标签红点,标签红点更新fix 2023-07-26 16:14:24 +08:00
Fang
11624308ea 动效、fix 2023-07-25 22:33:51 +08:00
Fang
a5d2749ede 支线基金看完广告直接领奖 2023-07-25 19:59:31 +08:00
Fang
6753303909 界面跳转未关闭fix 2023-07-25 15:44:10 +08:00
Fang
2933776048 支线基金 2023-07-24 11:54:09 +08:00
Fang
61b302305e 装备礼包 2023-07-21 09:35:21 +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
b8751b9229 支线副本 2023-07-20 19:44:41 +08:00
xiekaidong
8b4933f4f0 支线副本 2023-07-20 17:41:42 +08:00
Fang
cc7feea039 review 2023-07-20 16:20:11 +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
xiekaidong
000bc5e926 武器副本的一些界面 2023-07-19 16:52:28 +08:00
chenxi
a2e2370d29 上报逻辑调整 2023-07-19 15:36:40 +08:00
chenxi
dad792f0af 初始化AF广告回传sdk 2023-07-19 14:59:25 +08:00
chenxi
c643750a33 广告价值回传 2023-07-19 11:29:43 +08:00
xiekaidong
854ce2b986 通用扫荡弹窗 2023-07-19 10:39:22 +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
2610718eb2 副本入口 2023-07-18 17:01:27 +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
xiekaidong
de04cbc6ff 更新配置和优化 2023-07-17 17:21:00 +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
c0c0c8f93e 优化章节礼包弹出逻辑 2023-07-13 16:52:38 +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
f527141d7b Merge branch 'master' into dev_20230712 2023-07-12 09:48:18 +08:00
xiekaidong
61a23d81c9 Merge branch 'master' into dev_20230712 2023-07-11 11:05:47 +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
xiekaidong
a334622cbb bug修复 2023-07-10 16:44:29 +08:00
xiekaidong
460a60a34f 木兰试玩 2023-07-10 12:00:32 +08:00
Fang
e580b332a9 添加头像、头像框道具解锁逻辑 2023-07-07 11:04:22 +08:00
xiekaidong
8bea91e63e 加一行代码 2023-07-06 21:49:35 +08:00
xiekaidong
8ecb19d48c Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-07-06 18:24:59 +08:00
xiekaidong
9ff9550fb5 日志上报 2023-07-06 18:24:53 +08:00
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
68f80b45d3 竞技场ad宝箱功能补全 2023-07-05 15:02:59 +08:00
Fang
6099fe08fb fix 2023-07-04 18:29:05 +08:00
xiekaidong
8569147e4c 更新协议 2023-07-04 18:14:09 +08:00
xiekaidong
47d5b00318 取消连线 2023-07-04 18:05:17 +08:00