From 9040765fce1fa447db48cccad0b40df5de67b6b1 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期五, 14 六月 2019 14:33:04 +0800
Subject: [PATCH] 7273 【2.0】【后端】活跃令兑换支持青鸾之羽
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFamily.py | 20 ++++++++++++--------
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py | 10 ++--------
PySysDB/PySysDBPY.h | 2 --
3 files changed, 14 insertions(+), 18 deletions(-)
diff --git a/PySysDB/PySysDBPY.h b/PySysDB/PySysDBPY.h
index d0e465d..0a3ab7a 100644
--- a/PySysDB/PySysDBPY.h
+++ b/PySysDB/PySysDBPY.h
@@ -965,7 +965,6 @@
{
DWORD _NPCID; //ID
BYTE LineID;
- WORD KillTime; //击杀总时间秒
};
//副本鼓舞表
@@ -1668,7 +1667,6 @@
{
DWORD NPCID; //ID
BYTE _LineID;
- WORD KillTime; //击杀总时间秒
WORD RealmLV; //需要境界
DWORD ZhuXianScore; //需要诛仙总评分
};
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py
index 62e848a..e63df06 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py
@@ -778,7 +778,6 @@
"SealDemon":(
("DWORD", "NPCID", 1),
("BYTE", "LineID", 0),
- ("WORD", "KillTime", 0),
),
"FbEncourage":(
@@ -1294,7 +1293,6 @@
"ZhuXianBoss":(
("DWORD", "NPCID", 0),
("BYTE", "LineID", 1),
- ("WORD", "KillTime", 0),
("WORD", "RealmLV", 0),
("DWORD", "ZhuXianScore", 0),
),
@@ -3031,13 +3029,11 @@
def __init__(self):
self.NPCID = 0
- self.LineID = 0
- self.KillTime = 0
+ self.LineID = 0
return
def GetNPCID(self): return self.NPCID # ID
- def GetLineID(self): return self.LineID
- def GetKillTime(self): return self.KillTime # 击杀总时间秒
+ def GetLineID(self): return self.LineID
# 副本鼓舞表
class IPY_FbEncourage():
@@ -4125,14 +4121,12 @@
def __init__(self):
self.NPCID = 0
self.LineID = 0
- self.KillTime = 0
self.RealmLV = 0
self.ZhuXianScore = 0
return
def GetNPCID(self): return self.NPCID # ID
def GetLineID(self): return self.LineID
- def GetKillTime(self): return self.KillTime # 击杀总时间秒
def GetRealmLV(self): return self.RealmLV # 需要境界
def GetZhuXianScore(self): return self.ZhuXianScore # 需要诛仙总评分
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFamily.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFamily.py
index 74471cf..326e94d 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFamily.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFamily.py
@@ -958,6 +958,7 @@
eatItemIDList = clientData.ItemIDList
givePoint = 0 #分解得到活跃令
familyDonateDict = IpyGameDataPY.GetFuncEvalCfg('FamilyDonate', 1, {})
+ familyDonateSpecialDict = IpyGameDataPY.GetFuncEvalCfg('FamilyDonate', 2, {})
itemPack = curPlayer.GetItemManager().GetPack(IPY_GameWorld.rptItem)
for i, index in enumerate(eatIndexList):
eatItem = itemPack.GetAt(index)
@@ -974,14 +975,17 @@
if eatItem.GetEndureReduceType():
GameWorld.DebugLog("有时效耐久物品，无法兑换！itemIndex=%s" % index)
continue
- if not ItemCommon.CheckItemIsEquip(eatItem):
- GameWorld.DebugLog("非装备，无法兑换！itemIndex=%s" % index)
- continue
- itemColor = eatItem.GetItemColor()
- if str(itemColor) not in familyDonateDict:
- continue
- isSuite = eatItem.GetSuiteID()
- addPoint = familyDonateDict[str(itemColor)][1 if isSuite else 0]
+ if eatItemID in familyDonateSpecialDict:
+ addPoint = familyDonateSpecialDict[eatItemID]
+ else:
+ if not ItemCommon.CheckItemIsEquip(eatItem):
+ GameWorld.DebugLog("非装备，无法兑换！itemIndex=%s" % index)
+ continue
+ itemColor = eatItem.GetItemColor()
+ if str(itemColor) not in familyDonateDict:
+ continue
+ isSuite = eatItem.GetSuiteID()
+ addPoint = familyDonateDict[str(itemColor)][1 if isSuite else 0]
givePoint += addPoint
ItemCommon.DelItem(curPlayer, eatItem, 1, True, ChConfig.ItemDel_ZhuXianDecompose, {'addPoint':addPoint}, True)
--
Gitblit v1.8.0