Commit Graph

10290 Commits (b8c763cbcedcce1c0a2780b383ac7ecf180c3b0e)
 

Author SHA1 Message Date
jiaoyangna 4941110a7b 神魂提交 2021-11-03 18:38:13 +08:00
jiaoyangna b11e859557 神魂提交 2021-11-03 18:16:26 +08:00
jiaoyangna 6f0d51ddb2 神魂提交 2021-11-03 18:11:08 +08:00
gaoxin 29df41d399 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-03 17:44:08 +08:00
gaoxin 5b3073f0eb 【周卡】修复0点刷新不及时问题 2021-11-03 17:44:02 +08:00
ZhangBiao 38544fd273 【逍遥游】触发仙缘界面中,事件图标显示不对 2021-11-03 17:12:20 +08:00
ZhangBiao fc6d13a4d7 【鸿蒙碑】升级鸿蒙碑不弹出战斗力变化提示,且升级后总战斗力数值错误,重新登录后战斗力会提升 2021-11-03 17:06:45 +08:00
jiaoyangna 358f9e13ba 底修改提交 2021-11-03 16:26:07 +08:00
gaoxin 24c550cee5 Merge branch '0活动开发聚集地/周卡' into china/dev
# Conflicts:
#	Assets/ManagedResources/Spine/zq_niu/zq_niu.png.meta
2021-11-03 16:09:31 +08:00
gaoxin 820b45cfa0 【宝物】修复神树和四灵变化后,没有重新计算宝物评分的问题 2021-11-03 15:16:48 +08:00
jiaoyangna 4eed456628 神魂图标修改 2021-11-03 13:25:08 +08:00
jiaoyangna 604b1d6819 神魂提交 2021-11-03 11:18:37 +08:00
jiaoyangna 0468c865db 神魂提交 2021-11-03 10:32:55 +08:00
jiaoyangna 125e37fe6d 神魂提交 2021-11-03 10:13:44 +08:00
wangzhenxing 6092ce28c0 【战斗】=========处理战斗伤害记录不显示敌方主角 2021-11-02 20:19:36 +08:00
ZhangBiao 68f92b5bd0 【山河社稷图】提交 2021-11-02 18:56:45 +08:00
wangzhenxing 46fe5a1b8d 【战斗】======战斗结果显示主角伤害治疗修改 2021-11-02 18:00:31 +08:00
ZhangBiao 251a91b7fc Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-02 17:45:28 +08:00
ZhangBiao 8a7ce09aa9 【山河社稷图】提交 2021-11-02 17:45:18 +08:00
gaoxin 15f2a8e424 【ID1010610】【魂印合成优化】选中材料后,切换合成目标不清除材料 2021-11-02 17:36:05 +08:00
ZhangBiao 8f2398c932 【山河社稷图优化】优化选关界面操作 2021-11-02 17:22:42 +08:00
ZhangBiao 46247d8224 【界面优化】QA界面提交 2021-11-02 17:04:17 +08:00
ZhangBiao 2fd25aced5 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-02 16:59:15 +08:00
ZhangBiao 81dadae61f 【界面优化】提交 2021-11-02 16:58:48 +08:00
gaoxin d43b8282ec 【ID1010611】【装备合成优化】合成装备后,下方的装备列表不再重置回默认位置 2021-11-02 16:57:19 +08:00
gaoxin 44415cfded 【坐骑】获取新坐骑,点击前往,展示新坐骑 2021-11-02 16:42:36 +08:00
ZhangBiao 99fd74ec10 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-02 16:24:19 +08:00
ZhangBiao f12a83ec53 【山河社稷图优化】关卡编队界面显示三星条件(主关卡)和特殊要求(副关卡) 2021-11-02 16:24:01 +08:00
gaoxin eef70d053d 【坐骑】解锁的放前面 2021-11-02 15:53:42 +08:00
ZhangBiao 672fcaf974 【界面优化】魂印图鉴界面 2021-11-02 15:14:19 +08:00
ZhangBiao 2dd8f29d45 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-02 14:47:46 +08:00
ZhangBiao 7eb3eeb351 【道具来源】界面错位修改 2021-11-02 14:47:27 +08:00
wangzhenxing bc37810f8b 【玉虚论道】=====修改对战完 点击确定主城列表不刷新问题 2021-11-02 14:43:47 +08:00
ZhangBiao 9303bfc856 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-02 14:31:30 +08:00
ZhangBiao b634ce0d87 【界面优化】提交 2021-11-02 14:31:18 +08:00
jiaoyangna eec3703429 预设漏提
(cherry picked from commit a5aa425168)
2021-11-02 14:25:12 +08:00
jiaoyangna a5aa425168 预设漏提 2021-11-02 14:24:27 +08:00
jiaoyangna 9e422d1772 玲珑宝镜修改提交
(cherry picked from commit eef7fbacdf)
2021-11-02 14:21:32 +08:00
jiaoyangna eef7fbacdf 玲珑宝镜修改提交 2021-11-02 14:20:27 +08:00
ZhangBiao 0e5e559220 【界面优化】法宝归元 2021-11-02 13:52:48 +08:00
ZhangBiao f97de03d43 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-02 13:41:39 +08:00
ZhangBiao 1e203c822c 【界面优化】好感度,天枢密卷 2021-11-02 13:41:27 +08:00
wangzhenxing 673892008d Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-02 13:33:47 +08:00
wangzhenxing 7331cdb7d0 【战斗】======灵兽技能检测方法初始化时清空, 战斗治疗数据记录修改 2021-11-02 13:33:35 +08:00
gaoxin 89162f6294 【GM】优化快速战斗结果显示 2021-11-02 13:31:13 +08:00
ZhangBiao 624e6ffe05 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-02 11:06:26 +08:00
ZhangBiao 68525db92e 【界面优化】提交 2021-11-02 11:06:13 +08:00
gaoxin 5c8186b8cd Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-02 10:55:58 +08:00
gaoxin 2b9457139b 【GM】添加快速战斗GM 2021-11-02 10:55:50 +08:00
wangzhenxing 9fd4d332bd [玉虚论道]==============点击刷新敌方列表 偶先提示赛季结束修改 2021-11-02 10:52:48 +08:00