Commit Graph

8356 Commits (50cbd0ea50f606ccdd34772c2c44ec666d0c1dbf)
 

Author SHA1 Message Date
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
jiaoyangna c99394b54e 【ID1009762】
【资源优化】整理废弃的冗余资源,减少包体大小
2021-07-27 15:24:11 +08:00
jiaoyangna d4126bb634 宝物培养修改 2021-07-27 14:39:48 +08:00
zhangqiang 042644bdcb 【资源】冲突处理 2021-07-27 13:53:37 +08:00
jiaoyangna 7225723b34 引导修改提交 2021-07-27 10:25:42 +08:00
gaoxin d4e78afcab 【packID】数数打点新增字段 2021-07-27 10:04:22 +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 917662ff20 宝物培养红点提交 2021-07-26 17:16:29 +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
jiaoyangna c546710d1f 红点修改提交 2021-07-26 15:18:49 +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 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
liujiaqi 6ae640d65a bat鎵瑰鐞嗚嚜鍔ㄦ帹閫?2021/07/26,12:00:55 2021-07-26 12:01:02 +08:00
jiaoyangna 76fad397de 【ID1017708】
【无尽副本】购买秘宝后等待下一期秘宝刷新,上一期购买秘宝获得的积分不清,导致下期秘宝无法正常领取奖励
2021-07-26 11:23:26 +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
jiaoyangna 8226901eb8 任务修改提交 2021-07-24 18:13:40 +08:00