xiekaidong
|
3148733679
|
更新配置，上传资源
|
2023-07-21 17:17:51 +08:00 |
|
xiekaidong
|
f204a47316
|
试玩弹窗优化
|
2023-07-21 16:24:04 +08:00 |
|
xiekaidong
|
ee6d36fa48
|
界面调整
|
2023-07-21 16:16:36 +08:00 |
|
xiekaidong
|
ff21cd5b2b
|
界面调整
|
2023-07-21 16:15:25 +08:00 |
|
xiekaidong
|
dbbfbf4842
|
优化技能的释放位置逻辑
|
2023-07-21 15:36:05 +08:00 |
|
xiekaidong
|
5d433841b5
|
bug修复
|
2023-07-21 15:15:21 +08:00 |
|
xiekaidong
|
efb91a7fcf
|
bug修复
|
2023-07-21 15:06:59 +08:00 |
|
xiekaidong
|
ac3388b96b
|
新增buff和叠加方式优化
|
2023-07-21 14:40:11 +08:00 |
|
xiekaidong
|
bab7c281ca
|
更新配置，英雄排序问题
|
2023-07-21 11:47:19 +08:00 |
|
xiekaidong
|
dbc99ccb79
|
优化
|
2023-07-21 11:41:37 +08:00 |
|
xiekaidong
|
3ace684951
|
更新配置
|
2023-07-21 11:38:46 +08:00 |
|
xiekaidong
|
909df16ca7
|
Merge branch 'dev_20230725' of http://git.juzugame.com/b6-client/b6-lua into dev_20230725
|
2023-07-21 11:37:33 +08:00 |
|
xiekaidong
|
026166478e
|
buff机制修改
|
2023-07-21 11:37:29 +08:00 |
|
Fang
|
10ea4ca114
|
通行证赛季更新
|
2023-07-21 11:18:55 +08:00 |
|
xiekaidong
|
e85f2ba4f2
|
bug修复
|
2023-07-21 10:00:13 +08:00 |
|
xiekaidong
|
52dd2b1336
|
Merge branch 'dev_20230725' of http://git.juzugame.com/b6-client/b6-lua into dev_20230725
|
2023-07-21 09:55:50 +08:00 |
|
xiekaidong
|
d96adead75
|
修改评价弹窗关卡
|
2023-07-21 09:55:47 +08:00 |
|
陈希
|
017e190e21
|
Merge branch 'fang/材料获取' into 'dev_20230725'
装备升级材料获取
See merge request b6-client/b6-lua!7
|
2023-07-21 01:52:07 +00:00 |
|
Fang
|
bafb8673ec
|
装备升级材料获取
|
2023-07-21 09:50:45 +08:00 |
|
xiekaidong
|
4ea04aadc5
|
Merge branch 'dev_20230725' of http://git.juzugame.com/b6-client/b6-lua into dev_20230725
|
2023-07-21 09:49:51 +08:00 |
|
xiekaidong
|
adaacec90f
|
优化
|
2023-07-21 09:49:41 +08:00 |
|
陈希
|
6eddc93a88
|
Merge branch 'fang/礼包' into 'dev_20230725'
装备礼包
See merge request b6-client/b6-lua!8
|
2023-07-21 01:48:55 +00:00 |
|
Fang
|
61b302305e
|
装备礼包
|
2023-07-21 09:35:21 +08:00 |
|
xiekaidong
|
a798a468c7
|
结算界面异常处理
|
2023-07-20 22:04:26 +08:00 |
|
xiekaidong
|
a4a1574ace
|
支线副本
|
2023-07-20 21:56:24 +08:00 |
|
xiekaidong
|
d68d2257fe
|
Merge branch 'dev_20230725' into dungeon
|
2023-07-20 21:47:21 +08:00 |
|
xiekaidong
|
cd41579159
|
支线副本
|
2023-07-20 21:46:49 +08:00 |
|
Fang
|
015de6fc70
|
英雄升级显示、战斗报错fix
|
2023-07-20 21:23:02 +08:00 |
|
xiekaidong
|
ef1b59db67
|
支线副本战斗中的任务
|
2023-07-20 20:41:17 +08:00 |
|
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 |
|
陈希
|
afd06bd270
|
Merge branch 'fang/equip' into 'dev_20230725'
装备系统
See merge request b6-client/b6-lua!6
|
2023-07-20 11:38:46 +00: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 |
|
xiekaidong
|
2772c26e81
|
改名异常修复
v1.0.8_android
v1.1.8_ios
|
2023-07-20 15:10:58 +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 |
|