Fang
|
95aa50bb42
|
英雄升级报错fix
|
2023-07-20 20:28:04 +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 |
|
Fang
|
7d7519b6cf
|
review
|
2023-07-20 19:34:09 +08:00 |
|
xiekaidong
|
8b4933f4f0
|
支线副本
|
2023-07-20 17:41:42 +08:00 |
|
Fang
|
16ac56ec20
|
导表
|
2023-07-20 16:24:02 +08:00 |
|
Fang
|
cc7feea039
|
review
|
2023-07-20 16:20:11 +08:00 |
|
Fang
|
28bf5ab6ad
|
装备系统
|
2023-07-20 10:15:42 +08:00 |
|
xiekaidong
|
8dddb194f8
|
更新配置
|
2023-07-19 20:23:46 +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
|
27ef576c8f
|
副本入口
|
2023-07-18 21:00:12 +08:00 |
|
xiekaidong
|
c3e62e4bc2
|
修改一下命名
|
2023-07-18 17:04:09 +08:00 |
|
xiekaidong
|
2610718eb2
|
副本入口
|
2023-07-18 17:01:27 +08:00 |
|
xiekaidong
|
0cfce182b3
|
更新配置
|
2023-07-18 16:45:46 +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
|
7a6d84c902
|
满级英雄收集点数显示fix
|
2023-07-18 14:30:21 +08:00 |
|
xiekaidong
|
3ed70b6c87
|
Merge branch 'master' into dev_20230725
|
2023-07-18 09:33:07 +08:00 |
|
xiekaidong
|
8ea47bc34f
|
战斗引导问题
|
2023-07-17 18:35:17 +08:00 |
|
xiekaidong
|
5db24d5a74
|
更新配置
|
2023-07-17 18:05:26 +08:00 |
|
xiekaidong
|
9642247f4e
|
更新日语多语言
|
2023-07-17 17:40:06 +08:00 |
|
xiekaidong
|
2c379e55a1
|
功能开启异常飘字修复，引导异常修复
|
2023-07-17 17:32:55 +08:00 |
|
xiekaidong
|
de04cbc6ff
|
更新配置和优化
|
2023-07-17 17:21:00 +08:00 |
|
xiekaidong
|
5691ea1f0b
|
Merge branch 'dev_20230725' of http://git.juzugame.com/b6-client/b6-lua into dev_20230725
|
2023-07-17 15:52:07 +08:00 |
|
xiekaidong
|
e2d08a7ffa
|
战报阵容
|
2023-07-17 15:52:04 +08:00 |
|
Fang
|
fc98c944af
|
新号报错处理
|
2023-07-17 15:18:18 +08:00 |
|
xiekaidong
|
85f016086d
|
层数buff完善
|
2023-07-17 14:46:02 +08:00 |
|
xiekaidong
|
ac9d7dd776
|
Merge branch 'dev_20230725' of http://git.juzugame.com/b6-client/b6-lua into dev_20230725
|
2023-07-17 14:28:58 +08:00 |
|
xiekaidong
|
de16d711ec
|
层数护盾
|
2023-07-17 14:28:55 +08:00 |
|
陈希
|
ee64fb61d9
|
Merge branch 'fang/collect' into 'dev_20230725'
英雄图鉴
See merge request b6-client/b6-lua!5
|
2023-07-17 03:19:35 +00:00 |
|
Fang
|
3025a7e58a
|
review
|
2023-07-17 11:16:51 +08:00 |
|
xiekaidong
|
6249f3bd3e
|
引导bug修复
|
2023-07-17 10:34:10 +08:00 |
|
Fang
|
e2ef9ea208
|
红点
|
2023-07-14 17:35:55 +08:00 |
|
Fang
|
b2dba1de2e
|
英雄图鉴
|
2023-07-14 17:07:03 +08:00 |
|
chenxi
|
6848735fd9
|
merge master
|
2023-07-14 17:06:39 +08:00 |
|
Fang
|
5e985f7743
|
英雄信息界面金币改变刷新fix
|
2023-07-14 16:12:19 +08:00 |
|
Fang
|
fe2f7de08b
|
礼包入口spine
|
2023-07-14 15:26:38 +08:00 |
|
xiekaidong
|
b1dd325b05
|
伤害公式
|
2023-07-13 18:18:22 +08:00 |
|
xiekaidong
|
a69305960b
|
更新配置
|
2023-07-13 18:03:33 +08:00 |
|
xiekaidong
|
29bcf831a3
|
Merge branch 'battle' into dev_20230725
|
2023-07-13 18:03:03 +08:00 |
|