jiaoyangna
|
ab7c586a90
|
Revert "Revert "装备界面改动""
This reverts commit 9a1d361c63 .
|
2021-07-28 16:58:44 +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 |
gaoxin
|
d7009c9950
|
【热更配置】添加动游和灵动商务服热更配置
|
2021-07-28 15:32:08 +08:00 |
ZhangBiao
|
263cb18d03
|
【车迟斗法】玩法内等待次数刷新,红点不显示,退出重进显示正常 修复
|
2021-07-28 15:16:10 +08:00 |
ZhangBiao
|
87e8496df0
|
【适配】优化神将升星提示在长屏手机的适配效果
|
2021-07-28 14:49:21 +08:00 |
ZhangBiao
|
2c0c23553c
|
【逍遥游】恭喜获得中道具有跳转按钮,跳转后再返回显示空的恭喜获得
|
2021-07-28 12:06:58 +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 |
jiaoyangna
|
b0c50a4571
|
id1017799
(cherry picked from commit 35a048adc9 )
|
2021-07-28 11:07:16 +08:00 |
zhangqiang
|
0204573ad9
|
【玩家信息】跨服排行榜里,查看玩家信息,战力显示超框问题
|
2021-07-28 10:52:49 +08:00 |
zhangqiang
|
e54a17decb
|
【魂印穿戴】点击魂印不穿戴,魂印在列表中消失
|
2021-07-28 10:51:35 +08:00 |
ZhangBiao
|
c8d35b5458
|
【星魂福袋】点击使用数量加号,提示英雄达上限 修复
|
2021-07-28 09:58:41 +08:00 |
zhangqiang
|
042644bdcb
|
【资源】冲突处理
|
2021-07-27 13:53:37 +08:00 |
liujiaqi
|
82677ad40c
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-26 12:02:32 +08:00 |
zhangqiang
|
b54f3ca07a
|
【跨服天梯】主界面
|
2021-07-27 11:34:46 +08:00 |
zhangqiang
|
71f7e8a469
|
Merge branch 'china/dev' into china/jumpserver
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
|
2021-07-27 11:26:30 +08:00 |
gaoxin
|
34b7a00d47
|
【特效】重名资源处理
|
2021-07-27 10:19:33 +08:00 |
gaoxin
|
3e11938166
|
【meta】
|
2021-07-27 10:06:56 +08:00 |
ZhangBiao
|
509f34e19b
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-26 19:00:55 +08:00 |
ZhangBiao
|
74c713c65b
|
【主题活动】加强限时商市,珍奇宝阁入口按钮的辨识度
|
2021-07-26 19:00:41 +08:00 |
ZhangBiao
|
8e5664f85c
|
bat鎵瑰鐞嗚嚜鍔ㄦ帹閫?2021/07/26,17:54:54
|
2021-07-26 17:54:55 +08:00 |
jiaoyangna
|
efc0f62cc5
|
【ID1017708】
【无尽副本】购买秘宝后等待下一期秘宝刷新,上一期购买秘宝获得的积分不清,导致下期秘宝无法正常领取奖励
(cherry picked from commit 76fad397de )
|
2021-07-26 16:06:21 +08:00 |
jiaoyangna
|
825c38fc0d
|
红点修改提交
(cherry picked from commit c546710d1f )
|
2021-07-26 15:19:57 +08:00 |
ZhangBiao
|
07de90eb45
|
【提交】
|
2021-07-26 15:07:49 +08:00 |
ZhangBiao
|
da34a5834b
|
【主题活动】时间显示调整
|
2021-07-26 14:36:58 +08:00 |
ZhangBiao
|
1ba38242ad
|
【主题活动】提交
|
2021-07-26 12:29:13 +08:00 |
liujiaqi
|
6ae640d65a
|
bat鎵瑰鐞嗚嚜鍔ㄦ帹閫?2021/07/26,12:00:55
|
2021-07-26 12:01:02 +08:00 |
JieLing
|
d2090cb930
|
【跨服】修复角色信息英雄详细信息报错
|
2021-07-26 11:10:11 +08:00 |
ZhangBiao
|
11543e53a0
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-26 11:09:20 +08:00 |
ZhangBiao
|
beea770b78
|
【竞技场】适配调整
|
2021-07-26 11:09:07 +08:00 |
zhangqiang
|
e01694fa28
|
【跨服天梯】战斗记录协议修改
|
2021-07-26 11:03:45 +08:00 |
jiaoyangna
|
9a1d361c63
|
Revert "装备界面改动"
This reverts commit c131d41d58 .
|
2021-07-26 10:03:10 +08:00 |
jiaoyangna
|
4590076eb9
|
Revert "宝物培养修改提交"
This reverts commit bcd0651029 .
|
2021-07-26 10:00:59 +08:00 |
jiaoyangna
|
4c9871767f
|
Revert "强化和精炼界面修改"
This reverts commit 9d78af51e0 .
|
2021-07-26 10:00:49 +08:00 |
jiaoyangna
|
d53776b558
|
Revert "红点修改提交"
This reverts commit 734efe7b52 .
|
2021-07-26 10:00:07 +08:00 |
jiaoyangna
|
c93f98dabc
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-26 09:55:42 +08:00 |
ZhangBiao
|
1634345c1e
|
【清除log】
|
2021-07-26 09:48:18 +08:00 |
jiaoyangna
|
b49166afe1
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-24 19:39:25 +08:00 |
jiaoyangna
|
734efe7b52
|
红点修改提交
|
2021-07-24 19:36:34 +08:00 |
ZhangBiao
|
7111f53936
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-24 19:34:13 +08:00 |
ZhangBiao
|
7e9fad28b7
|
【万象商会】提交
|
2021-07-24 19:33:56 +08:00 |
jiaoyangna
|
06dfb74d33
|
活动修改提交
|
2021-07-24 19:33:54 +08:00 |
jiaoyangna
|
7a9100dfec
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-24 19:08:06 +08:00 |
jiaoyangna
|
e5d387c37d
|
主题活动任务修改提交
|
2021-07-24 19:07:56 +08:00 |
ZhangBiao
|
4c73ac0976
|
【万象商会】刷新
|
2021-07-24 18:59:42 +08:00 |
jiaoyangna
|
7b9a5e535c
|
红点检测修改提交
|
2021-07-24 18:16:05 +08:00 |
jiaoyangna
|
8d76903f10
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-24 18:13:45 +08:00 |