From a51aad2ddcf0cb2ffc8e77cac145f6f5d70ffc6b Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期四, 04 四月 2019 11:47:52 +0800
Subject: [PATCH] 3335 灵宠坐骑技能整合
---
System/Pet/PetAttributeMethods.cs | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/System/Pet/PetAttributeMethods.cs b/System/Pet/PetAttributeMethods.cs
index 62345dd..fbd8a8f 100644
--- a/System/Pet/PetAttributeMethods.cs
+++ b/System/Pet/PetAttributeMethods.cs
@@ -210,7 +210,8 @@
{
var config = SkillConfig.Get(id);
var skillId = 0;
- if (petmodel.TryGetIntegrationSkill(config.Effect1, out skillId))
+ var effect = SkillConfig.GetSkillEffectValue(config);
+ if (petmodel.TryGetIntegrationSkill(effect, out skillId))
{
if (!displayTotalSkills.Contains(skillId))
{
@@ -668,8 +669,10 @@
var rhs_config = SkillConfig.Get(rhs);
var lhs_Id = 0;
var rhs_Id = 0;
- var lhs_integration = petmodel.TryGetIntegrationSkill(lhs_config.Effect1, out lhs_Id);
- var rhs_integration = petmodel.TryGetIntegrationSkill(rhs_config.Effect1, out rhs_Id);
+ var lhs_effect = SkillConfig.GetSkillEffectValue(lhs_config);
+ var rhs_effect = SkillConfig.GetSkillEffectValue(rhs_config);
+ var lhs_integration = petmodel.TryGetIntegrationSkill(lhs_effect, out lhs_Id);
+ var rhs_integration = petmodel.TryGetIntegrationSkill(rhs_effect, out rhs_Id);
if (lhs_integration != rhs_integration)
{
return -lhs_integration.CompareTo(rhs_integration);
--
Gitblit v1.8.0