xiekaidong
|
441a42c087
|
显示调整
|
2023-07-24 22:00:59 +08:00 |
|
xiekaidong
|
d8c8591e40
|
Merge branch 'dev_20230725' of http://git.juzugame.com/b6-client/b6-lua into dev_20230725
|
2023-07-24 21:47:52 +08:00 |
|
xiekaidong
|
e4647b17dc
|
优化
|
2023-07-24 21:47:45 +08:00 |
|
Fang
|
0d04b99d3e
|
显示fix
|
2023-07-24 21:39:18 +08:00 |
|
Fang
|
9ea10ea0c7
|
防具升级显示的增加绿色数值不计算加成百分比、扫荡界面奖励动画
|
2023-07-24 21:07:05 +08:00 |
|
Fang
|
2d655fbb4f
|
切换英雄按钮显示fix
|
2023-07-24 20:01:27 +08:00 |
|
xiekaidong
|
e59b7f1ccb
|
Merge branch 'dev_20230725' of http://git.juzugame.com/b6-client/b6-lua into dev_20230725
|
2023-07-24 18:47:54 +08:00 |
|
xiekaidong
|
c6d10d8825
|
调整一下逻辑
|
2023-07-24 18:47:46 +08:00 |
|
Fang
|
d10b9049f7
|
装备属性加成计算fix
|
2023-07-24 18:37:43 +08:00 |
|
xiekaidong
|
0e2bb42a25
|
一些报错修复
|
2023-07-24 18:32:41 +08:00 |
|
xiekaidong
|
1ecd45294f
|
Merge branch 'dev_20230725' of http://git.juzugame.com/b6-client/b6-lua into dev_20230725
|
2023-07-24 17:10:46 +08:00 |
|
xiekaidong
|
37482eb2ca
|
副本引导
|
2023-07-24 17:10:39 +08:00 |
|
Fang
|
f99f54b8f8
|
装备礼包弹出规则fix
|
2023-07-24 17:07:05 +08:00 |
|
Fang
|
0a0fc7c127
|
商城特惠加装备banner
|
2023-07-24 17:07:05 +08:00 |
|
xiekaidong
|
65c580fb87
|
Merge branch 'dev_20230725' of http://git.juzugame.com/b6-client/b6-lua into dev_20230725
|
2023-07-24 17:04:44 +08:00 |
|
xiekaidong
|
6bc0ce7738
|
添加一些容错
|
2023-07-24 17:04:40 +08:00 |
|
Fang
|
fd863d414c
|
道具获取扫荡文案修改
|
2023-07-24 15:57:58 +08:00 |
|
Fang
|
8ad4b580e0
|
礼包资源上传、bug_fix
|
2023-07-24 15:13:21 +08:00 |
|
Fang
|
fddf41fca5
|
bug fix
|
2023-07-24 14:34:52 +08:00 |
|
xiekaidong
|
e42990673e
|
Merge branch 'dev_20230725' of http://git.juzugame.com/b6-client/b6-lua into dev_20230725
|
2023-07-24 14:08:49 +08:00 |
|
xiekaidong
|
a963053416
|
字段修改
|
2023-07-24 14:08:39 +08:00 |
|
Fang
|
2933776048
|
支线基金
|
2023-07-24 11:54:09 +08:00 |
|
xiekaidong
|
13851fb403
|
显示修改
|
2023-07-24 11:40:19 +08:00 |
|
xiekaidong
|
1ca93be7f6
|
修改描述
|
2023-07-24 11:22:32 +08:00 |
|
xiekaidong
|
dc84eb073d
|
新增道具宝箱显示
|
2023-07-24 11:18:21 +08:00 |
|
xiekaidong
|
d7ed50ab8c
|
处理界面显示
|
2023-07-24 10:36:25 +08:00 |
|
xiekaidong
|
b1df62d3a4
|
英雄属性bug修复，查看其他玩家信息时带入装备信息
|
2023-07-22 18:15:46 +08:00 |
|
Fang
|
eac7f683c6
|
材料获取显示修复
|
2023-07-21 18:04:13 +08:00 |
|
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
|
5d433841b5
|
bug修复
|
2023-07-21 15:15:21 +08:00 |
|
xiekaidong
|
bab7c281ca
|
更新配置，英雄排序问题
|
2023-07-21 11:47:19 +08:00 |
|
xiekaidong
|
dbc99ccb79
|
优化
|
2023-07-21 11:41:37 +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 |
|
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 |
|
Fang
|
61b302305e
|
装备礼包
|
2023-07-21 09:35:21 +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 |
|
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 |
|