jiaoyangna
|
63780c4c7a
|
宝物共鸣修改
|
2021-07-29 11:13:34 +08:00 |
zhangqiang
|
2a31ef09ce
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-29 11:11:43 +08:00 |
zhangqiang
|
1969dd31ab
|
Revert "【跨服切磋】"
This reverts commit cc8974c016 .
|
2021-07-29 11:11:16 +08:00 |
jiaoyangna
|
040cd78dc4
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-29 10:24:21 +08:00 |
jiaoyangna
|
12c8efa516
|
装备红点提交
|
2021-07-29 10:23:52 +08:00 |
ZhangBiao
|
e1ae3e3bf3
|
【副本界面】按下区域大小调整
|
2021-07-29 10:09:02 +08:00 |
jiaoyangna
|
78c982e740
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-28 18:39:16 +08:00 |
jiaoyangna
|
bac3e3dfa9
|
动画提交
|
2021-07-28 18:39:05 +08:00 |
zhangqiang
|
cc8974c016
|
【跨服切磋】
|
2021-07-28 18:38:06 +08:00 |
jiaoyangna
|
f4cc4d7df6
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-28 17:46:11 +08:00 |
jiaoyangna
|
7ee1ef9910
|
Merge branch 'china/dev-c' into china/dev
# Conflicts:
# Assets/ManagedResources/Atlas/DyAct_Activity5.meta
# Assets/ManagedResources/EffectResUI/ChengHao_new.meta
# Assets/ManagedResources/EffectResUI/ChengHao_new/Animation.meta
# Assets/ManagedResources/EffectResUI/ZhenQiBaoGe/Texture.meta
# Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua
|
2021-07-28 17:45:59 +08:00 |
gaoxin
|
e552db5499
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-28 17:43:04 +08:00 |
gaoxin
|
ef78e0ae21
|
【跨服聊天】添加跨服聊天频道
|
2021-07-28 17:42:58 +08:00 |
jiaoyangna
|
957513db52
|
添加一些log
|
2021-07-28 17:41:48 +08:00 |
jiaoyangna
|
0d16b1511a
|
资源删除工具修改提交
|
2021-07-28 17:26:13 +08:00 |
jiaoyangna
|
b98fd71d35
|
删除资源工具提交
|
2021-07-28 17:00:14 +08:00 |
jiaoyangna
|
55c839dcd0
|
Revert "Revert "红点修改提交""
This reverts commit d53776b558 .
|
2021-07-28 16:59:07 +08:00 |
jiaoyangna
|
8c01285354
|
Revert "Revert "强化和精炼界面修改""
This reverts commit 4c9871767f .
|
2021-07-28 16:59:00 +08:00 |
jiaoyangna
|
7ac8f03cd3
|
Revert "Revert "宝物培养修改提交""
This reverts commit 4590076eb9 .
|
2021-07-28 16:58:52 +08:00 |
jiaoyangna
|
ab7c586a90
|
Revert "Revert "装备界面改动""
This reverts commit 9a1d361c63 .
|
2021-07-28 16:58:44 +08:00 |
jiaoyangna
|
93a9473184
|
红点修改提交
|
2021-07-28 16:52:41 +08:00 |
ZhangBiao
|
33edb62796
|
【锻器阁】增加魂印合成引导
|
2021-07-28 16:45:29 +08:00 |
wangzhenxing
|
68e3a32140
|
[bug]====称号层级修改
|
2021-07-28 16:41:37 +08:00 |
wangzhenxing
|
ef714577e8
|
[bug]========称号显示修改
|
2021-07-28 16:10:58 +08:00 |
zhangqiang
|
9a2d9c70a7
|
【新功能】罗浮争锋排行榜增加跨服切磋功能
|
2021-07-28 15:48:35 +08:00 |
jiaoyangna
|
ad850da05f
|
宝物共鸣修改
|
2021-07-28 15:40:50 +08:00 |
gaoxin
|
d7009c9950
|
【热更配置】添加动游和灵动商务服热更配置
|
2021-07-28 15:32:08 +08:00 |
ZhangBiao
|
263cb18d03
|
【车迟斗法】玩法内等待次数刷新,红点不显示,退出重进显示正常 修复
|
2021-07-28 15:16:10 +08:00 |
jiaoyangna
|
4805b041e8
|
宝物使用跳转错误修改
|
2021-07-28 15:07:57 +08:00 |
ZhangBiao
|
87e8496df0
|
【适配】优化神将升星提示在长屏手机的适配效果
|
2021-07-28 14:49:21 +08:00 |
jiaoyangna
|
ab9e5f8e64
|
红点修改提交
|
2021-07-28 14:00:17 +08:00 |
jiaoyangna
|
eea24f126e
|
红点添加
|
2021-07-28 13:49:04 +08:00 |
ZhangBiao
|
2c0c23553c
|
【逍遥游】恭喜获得中道具有跳转按钮,跳转后再返回显示空的恭喜获得
|
2021-07-28 12:06:58 +08:00 |
jiaoyangna
|
1123d9dc2d
|
宝物修改提交
|
2021-07-28 11:52:47 +08:00 |
ZhangBiao
|
48330717a7
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-28 11:20:36 +08:00 |
ZhangBiao
|
ffd0685d97
|
【任务跳转】未解锁灵兽山,灵兽招募任务前往提示活动未开启,应提示功能未解锁
【红点】车迟斗法的红点仍绑在副本入口处,而非公会按钮
|
2021-07-28 11:20:27 +08:00 |
liujiaqi
|
dab4dc03fb
|
【资源】误删资源回滚
|
2021-07-28 11:10:14 +08:00 |
jiaoyangna
|
b0c50a4571
|
id1017799
(cherry picked from commit 35a048adc9 )
|
2021-07-28 11:07:16 +08:00 |
jiaoyangna
|
35a048adc9
|
id1017799
|
2021-07-28 11:06:33 +08:00 |
zhangqiang
|
0204573ad9
|
【玩家信息】跨服排行榜里,查看玩家信息,战力显示超框问题
|
2021-07-28 10:52:49 +08:00 |
jiaoyangna
|
527295f30c
|
宝物优化
|
2021-07-28 10:51:39 +08:00 |
zhangqiang
|
e54a17decb
|
【魂印穿戴】点击魂印不穿戴,魂印在列表中消失
|
2021-07-28 10:51:35 +08:00 |
ZhangBiao
|
c8d35b5458
|
【星魂福袋】点击使用数量加号,提示英雄达上限 修复
|
2021-07-28 09:58:41 +08:00 |
jiaoyangna
|
88df4dbde8
|
为装备的宝物点击报错修改提交
|
2021-07-28 09:48:08 +08:00 |
jiaoyangna
|
d1845618d1
|
宝物可强化时,TIPS上的【强化】按钮未显示红点,精炼功能有相同问题
|
2021-07-27 18:53:36 +08:00 |
jiaoyangna
|
94c92a7f22
|
拥有可替换/战斗力较高的宝物时,应在宝物图标右上角,及下方的魂宝/灵宝按钮上显示红点,不应当在魂宝/灵宝装备格子上显示红点
|
2021-07-27 18:34:37 +08:00 |
jiaoyangna
|
b75d869c8a
|
【资源优化】整理废弃的冗余资源,减少包体大小
|
2021-07-27 17:13:18 +08:00 |
jiaoyangna
|
9a4c92baa1
|
Revert "【ID1009762】"
This reverts commit c99394b54e .
|
2021-07-27 17:04:12 +08:00 |
jiaoyangna
|
5fc9cc77a2
|
Revert "【ID1009762】"
This reverts commit 99d668ae30 .
|
2021-07-27 17:03:52 +08:00 |
jiaoyangna
|
99d668ae30
|
【ID1009762】
【资源优化】整理废弃的冗余资源,减少包体大小
|
2021-07-27 16:19:11 +08:00 |