Commit Graph

9423 Commits (38f41e75176984443cbc1774e4f2755397b9fca2)
 

Author SHA1 Message Date
gaoxin 38f41e7517 【战斗】修复无尽副本战斗结束后报错 2021-09-27 16:57:40 +08:00
wangzhenxing 70ebab2fe1 【功能】====装备合成添加特效 2021-09-27 16:25:20 +08:00
yuanshuai f16bb7ed8e 【四象心法】长按强化bug修改 2021-09-27 15:57:36 +08:00
gaoxin 0233ff87e7 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-27 15:36:00 +08:00
gaoxin 34ade2489d 【无尽副本】修复报错 2021-09-27 15:35:48 +08:00
ZhangBiao 6bc25cd08c Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-27 15:33:52 +08:00
ZhangBiao e4250d3fac 【七界试炼】红点不再请求数据 2021-09-27 15:33:30 +08:00
gaoxin 6c50cdfd09 【无尽副本】修复无尽副本编队没有人得问题 2021-09-27 14:57:27 +08:00
ZhangBiao 810614f226 【四象心法】增加跳转
(cherry picked from commit 98d3911f23)
2021-09-27 14:37:20 +08:00
gaoxin 919740cdae Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-27 13:48:13 +08:00
gaoxin 5ae29d86cd 【织女】法宝资源名修改 2021-09-27 13:48:09 +08:00
gaoxin 2dca8dadf4 【资源】织女音效提交 2021-09-27 13:48:02 +08:00
liujiaqi f17f7cd6dc 【资源】织女技能字音效 2021-09-27 13:47:32 +08:00
wangzhenxing 433ae25590 [战斗]======被动351 353 修改 2021-09-27 13:47:27 +08:00
gaoxin f16fb2680b 【织女特效】资源名重复优化 2021-09-27 13:47:23 +08:00
wangzhenxing 5c5e0e26a3 【资源】=========织女 特效资源提交 2021-09-27 13:46:53 +08:00
ZhangBiao 90d9530b2b 【乾坤宝盒】报错修改 2021-09-27 11:46:17 +08:00
ZhangBiao a3c65ee8d1 【装备名称】金色->白金 2021-09-27 11:12:21 +08:00
ZhangBiao cdd6499fe8 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-27 10:34:19 +08:00
ZhangBiao 0842438fdf 【装备分解】不可分解白金装备and增加mask点击 2021-09-27 10:34:03 +08:00
gaoxin dcdaf48e4d 【玉虚】关闭manager初始化 2021-09-26 21:50:50 +08:00
gaoxin 7b93cc9519 Revert "织女法宝图标和音频"
This reverts commit f8f07c0bea.
2021-09-26 21:26:31 +08:00
gaoxin d770ea347e Revert "bat Resource Commit:2021/09/24,11:02:09"
This reverts commit a807bb6cf5.
2021-09-26 21:23:05 +08:00
gaoxin ace42823db 【战斗】被动353,修复溢出的伤害无法被无敌盾抵消的问题 2021-09-26 20:48:32 +08:00
gaoxin 2bce8547c7 【战斗】被动353直接伤害击杀目标溢出伤害的[a]%将对生命百分比[b]的目标造成伤害 2021-09-26 20:31:51 +08:00
wangzhenxing 3ff3649284 【功能】======白金装备合成 最少显示信息修改 2021-09-26 20:03:14 +08:00
wangzhenxing 306ab999b9 [功能]=============白金装备合成红点修改 2021-09-26 19:47:18 +08:00
liujiaqi f8f07c0bea 织女法宝图标和音频 2021-09-26 19:13:15 +08:00
gaoxin f282fe046b 【白金装备】修改白金装备字体显示 2021-09-26 18:41:47 +08:00
gaoxin 54afaef65a 【GM】一键顶级装备红色一星装备生成错误 2021-09-26 17:43:38 +08:00
gaoxin e318ca197f 【GM】一键顶级装备,增加白金装备 2021-09-26 17:40:48 +08:00
gaoxin 8310c29aaf Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-26 17:38:39 +08:00
gaoxin b21e7efe0d 【角色信息】修复跳转到角色信息界面,点击左右箭头报错 2021-09-26 17:38:23 +08:00
wangzhenxing e763b6472b Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-26 17:31:16 +08:00
wangzhenxing a3e1782007 【功能】==========白金装备合成提交 2021-09-26 17:30:35 +08:00
gaoxin e61dea0f4a 【白金装备】套装显示添加 2021-09-26 17:13:12 +08:00
gaoxin e671673389 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-26 15:02:49 +08:00
gaoxin 59311a8d88 【跨服】算错了跨服前七天的事件 2021-09-26 15:02:33 +08:00
wangzhenxing e1c0ee1613 [战斗]====御甲条图片修改 2021-09-26 14:58:02 +08:00
wangzhenxing 221939e1ec [战斗]==========御甲条显示修改 2021-09-26 14:56:07 +08:00
gaoxin 6a71a972e9 【战斗力】关闭一些log 2021-09-26 11:18:38 +08:00
gaoxin cc68282fb8 【法宝升阶】修复战力提升文字显示错误 2021-09-26 10:16:00 +08:00
ZhangBiao f1dd5d195c Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-26 10:08:38 +08:00
ZhangBiao 59e51aefef 【七界试炼】提交 2021-09-26 10:08:15 +08:00
gaoxin 9b67b9247b Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-26 10:04:06 +08:00
gaoxin b318ed5678 【资源】部分界面战力文字换成评分 2021-09-26 10:03:50 +08:00
ZhangBiao 8f9743d127 【七界试炼】激活遗物提示,奖励遮盖 2021-09-26 10:01:37 +08:00
ZhangBiao bac86d5ec8 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-24 19:23:43 +08:00
liujiaqi cc33532a51 【资源】女儿国王皮肤音效 2021-10-01 18:06:48 +08:00
ZhangBiao 1a866b1068 【七界试炼】提交 2021-09-24 19:23:30 +08:00