From 8ebdcb8980b7a630beb6a1ff82381baa0ab2ddb5 Mon Sep 17 00:00:00 2001
From: client_Lhy <995049470@qq.com>
Date: 星期四, 04 七月 2019 13:58:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into LuaOrgan
---
Core/GameEngine/Model/Player/Skill/PlayerSkillDatas.cs | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/Core/GameEngine/Model/Player/Skill/PlayerSkillDatas.cs b/Core/GameEngine/Model/Player/Skill/PlayerSkillDatas.cs
index dde9857..4eee6c6 100644
--- a/Core/GameEngine/Model/Player/Skill/PlayerSkillDatas.cs
+++ b/Core/GameEngine/Model/Player/Skill/PlayerSkillDatas.cs
@@ -199,7 +199,7 @@
public void SetQuickSkill(int pos, int id)
{
- if (model.GetXpSkillID() == id)
+ if (model.IsXpSkill(id))
{
return;
}
@@ -349,6 +349,8 @@
public void ClearSkillData()
{
+ hasInitQuickSkill = false;
+ isServerPrepare = false;
m_QuickSkills.Clear();
m_PlayerSkills.Clear();
}
--
Gitblit v1.8.0