Commit Graph

8639 Commits (d3ee7eda1d31572d566acb12104be85a0de87003)
 

Author SHA1 Message Date
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
ZhangBiao 5bba13ccc0 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-24 17:46:03 +08:00
ZhangBiao 9a7ef2f0a2 【轩辕宝境】从任意一个宝境里返回轩辕宝境主界面,顶部资源条消失 2021-07-24 17:45:48 +08:00
jiaoyangna 1e70bdb2ca 活动修改提交 2021-07-24 17:38:48 +08:00
ZhangBiao ccc208b2c4 【万象商会】界面关闭 2021-07-24 17:02:30 +08:00
ZhangBiao c045a944ee Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-24 16:30:34 +08:00
ZhangBiao b910dcfc6f 【主题活动商店】增加商店类型 2021-07-24 16:30:19 +08:00
jiaoyangna 9d78af51e0 强化和精炼界面修改 2021-07-24 16:22:16 +08:00
jiaoyangna 24363d5c03 【ID1009862】
15日登录送白泽活动加入预告功能
2021-07-24 15:46:00 +08:00
jiaoyangna 6c59983568 工会查看信息报错修改 2021-07-24 15:18:38 +08:00
ZhangBiao 7bc3a3d460 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-23 19:23:05 +08:00
ZhangBiao c3a5e5b7de 【主题活动】bannerSetNative 2021-07-23 19:22:56 +08:00
jiaoyangna fd7d51168d Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-23 19:12:46 +08:00
jiaoyangna bcd0651029 宝物培养修改提交 2021-07-23 19:12:42 +08:00
ZhangBiao 38bbb808b4 【主题活动】商店 2021-07-23 19:05:53 +08:00
wangzhenxing ff6639ebfb 【称号】=====称号属性显示修改 2021-07-23 18:34:07 +08:00
ZhangBiao d571e3126d bat鎵瑰鐞嗚嚜鍔ㄦ帹閫?2021/07/23,18:33:47 2021-07-23 18:33:47 +08:00
ZhangBiao 05f4718241 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-23 18:26:35 +08:00