Commit Graph

8269 Commits (aec7bb684373151d3a9f177b4785599ba0ec5781)
 

Author SHA1 Message Date
ZhangBiao 49d4336f38 【限时召唤优化】调整适配,使部分屏幕内隐藏的召唤次数上限显示出来 2021-07-29 15:03:39 +08:00
jiaoyangna 856f03b494 【ID1017815】
【魂印分解】一键选择,优先选择了品质高的魂印
2021-07-29 15:01:58 +08:00
jiaoyangna 1cff130e45 【ID1017827】
【心魔试炼】dev分支心魔试炼界面底部白边
2021-07-29 14:38:13 +08:00
jiaoyangna 548e43b486 共鸣中去掉一键装备红点 2021-07-29 14:33:52 +08:00
jiaoyangna 2f47e10caf 重置提交 2021-07-29 14:20:51 +08:00
jiaoyangna 9a87435469 【ID1017808】
【天书秘卷】适配错误,文字超出显示区域
2021-07-29 14:16:07 +08:00
jiaoyangna 8ad1911755 文字大小调整 2021-07-29 13:55:50 +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
jiaoyangna f50caf3ff5 清理空文件夹 2021-07-29 11:28:30 +08:00
jiaoyangna 43c4c159ed Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-29 11:27:42 +08:00
jiaoyangna dd076dfb6a 立绘删除 2021-07-29 11:25:36 +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 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