From 2d1e1831dc6a29031bf85010e2f0d804d3e342bc Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 27 二月 2020 18:44:08 +0800
Subject: [PATCH] Merge branch 'master' of http://mobile.173on.com:10010/r/SnxxServerCode
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py | 7 +++++--
PySysDB/PySysDBPY.h | 1 +
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/PySysDB/PySysDBPY.h b/PySysDB/PySysDBPY.h
index 45ff2a1..7368aa0 100644
--- a/PySysDB/PySysDBPY.h
+++ b/PySysDB/PySysDBPY.h
@@ -953,6 +953,7 @@
WORD RelatedID; //关联ID
DWORD StoneNPCID; //墓碑NPCID
BYTE CanAssist; //是否可协助
+ BYTE SkillResist; //是否技能抵抗
};
//Boss首杀
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py
index ab8bf03..eadca9e 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py
@@ -787,6 +787,7 @@
("WORD", "RelatedID", 0),
("DWORD", "StoneNPCID", 0),
("BYTE", "CanAssist", 0),
+ ("BYTE", "SkillResist", 0),
),
"BOSSFirstKill":(
@@ -3141,7 +3142,8 @@
self.RelatedType = 0
self.RelatedID = 0
self.StoneNPCID = 0
- self.CanAssist = 0
+ self.CanAssist = 0
+ self.SkillResist = 0
return
def GetNPCID(self): return self.NPCID # ID
@@ -3152,7 +3154,8 @@
def GetRelatedType(self): return self.RelatedType # 刷怪关联类型
def GetRelatedID(self): return self.RelatedID # 关联ID
def GetStoneNPCID(self): return self.StoneNPCID # 墓碑NPCID
- def GetCanAssist(self): return self.CanAssist # 是否可协助
+ def GetCanAssist(self): return self.CanAssist # 是否可协助
+ def GetSkillResist(self): return self.SkillResist # 是否技能抵抗
# Boss首杀
class IPY_BOSSFirstKill():
--
Gitblit v1.8.0