Commit Graph

5321 Commits (aece2194b54e1ac4f43d507c76ff3ec9accb17e6)

Author SHA1 Message Date
gaoxin aece2194b5 【跨服聊天】添加服务器名显示 2021-07-30 13:47:03 +08:00
zhangqiang 78ec831ca1 【跨服详情】修改提交 2021-07-30 11:59:39 +08:00
zhangqiang 23d4f9548f Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-30 10:21:45 +08:00
zhangqiang edbfbc9afc 【主城优化】跨服战入口变更位置 2021-07-30 10:20:35 +08:00
jiaoyangna 8c0060a835 四元阵动画播两遍修改 2021-07-30 10:00:26 +08:00
gaoxin f5584b0fbe 【巅峰赛】添加未开放状态兼容处理 2021-07-29 20:00:02 +08:00
jiaoyangna f73a554f35 宝物震动修改 2021-07-29 18:57:30 +08:00
jiaoyangna 7af6aa20da 宝物引导提交 2021-07-29 18:53:00 +08:00
jiaoyangna 97c5e11f5c Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-29 18:36:45 +08:00
jiaoyangna 0480506f53 【ID1009852】
四元阵界面优化,修改新手指引的抽卡位置
2021-07-29 18:36:30 +08:00
wangzhenxing 31c19def0a Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-29 17:34:55 +08:00
wangzhenxing d8801cae6c [称号]=============添加罗浮争锋称号 获得 及 到时 后消息推送 2021-07-29 17:34:40 +08:00
ZhangBiao 3cdce73c69 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-29 17:12:31 +08:00
ZhangBiao bc46019646 【战令优化】无尽副本任务数量冗余修改 2021-07-29 17:12:21 +08:00
zhangqiang 8b56e352ba 【跨服排行榜】 2021-07-29 17:11:10 +08:00
zhangqiang c11d9849fd Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
# Conflicts:
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
2021-07-29 16:38:35 +08:00
zhangqiang 9c28f232f6 【跨服排行榜】 2021-07-29 16:35:58 +08:00
jiaoyangna 283f9d209a 魂印圈圈错误修改 2021-07-29 16:35:20 +08:00
jiaoyangna 6f24638e3e Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-29 16:10:43 +08:00
jiaoyangna 52e9f406aa 十绝阵当我的排名为0 时报错 2021-07-29 16:10:39 +08:00
wangzhenxing 2cafeecb80 [战斗]==============死亡技能不受眩晕,沉默影响 2021-07-29 15:44:23 +08:00
jiaoyangna 706ee26390 魂印分解界面特效被切修改 2021-07-29 15:31:09 +08:00
jiaoyangna 01632378f6 魂印分解界面修改 2021-07-29 15:21:44 +08:00
jiaoyangna 856f03b494 【ID1017815】
【魂印分解】一键选择,优先选择了品质高的魂印
2021-07-29 15:01:58 +08:00
jiaoyangna 548e43b486 共鸣中去掉一键装备红点 2021-07-29 14:33:52 +08:00
jiaoyangna 2f47e10caf 重置提交 2021-07-29 14:20:51 +08:00
jiaoyangna 44965dd1c2 跨服十绝阵提交 2021-07-29 12:09:03 +08:00
jiaoyangna 50963966fa Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-29 11:53:16 +08:00
jiaoyangna beacff1d20 共鸣中的宝物去掉红点 2021-07-29 11:53:11 +08:00
gaoxin a61602eae4 【角色信息】删除服务器名称只在JUMPSERVER类型下显示的限制 2021-07-29 11:50:59 +08:00
gaoxin 1b3e5c196b 【跨服聊天】完善跨服聊天角色信息显示 2021-07-29 11:46:59 +08:00
gaoxin 381d537a4e 【登录】除流畅,拥挤和爆满外的其他状态全部不可进入游戏 2021-07-29 11:44:35 +08:00
jiaoyangna f935fb163b 层级修改提交 2021-07-29 11:34:53 +08:00
jiaoyangna 522754669f 删除log 2021-07-29 11:31:30 +08:00
ZhangBiao 59c823e080 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-29 11:19:03 +08:00
ZhangBiao 68466c0fff 【副本界面】按钮调整 2021-07-29 11:18:53 +08:00
jiaoyangna cfdc6b0abc Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-29 11:13:44 +08:00
jiaoyangna 63780c4c7a 宝物共鸣修改 2021-07-29 11:13:34 +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
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 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