From 2120cc2ad13c74ed1c5b4f9432c83c9d37182a12 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 13 二月 2019 15:13:45 +0800
Subject: [PATCH] 6211 【后端】【1.6】合服任务单（删除旧合服相关内容）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py | 92 ++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 81 insertions(+), 11 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py
index 933fd8c..f6939be 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py
@@ -691,7 +691,7 @@
("WORD", "AdvanceMinutes", 0),
("WORD", "LVLimit", 0),
("BYTE", "IsDayReset", 0),
- ("list", "ShopTypeList", 0),
+ ("dict", "ShopTypeList", 0),
("char", "MailKey", 0),
("list", "MailItemPrize", 0),
),
@@ -982,7 +982,7 @@
("WORD", "AdvanceMinutes", 0),
("WORD", "LVLimit", 0),
("BYTE", "IsDayReset", 0),
- ("list", "GiftbagTypeList", 0),
+ ("dict", "GiftbagTypeList", 0),
("char", "MailKey", 0),
("list", "MailItemPrize", 0),
),
@@ -1016,7 +1016,7 @@
("DWORD", "TemplateID", 1),
("DWORD", "NeedCostGold", 0),
("BYTE", "AwardIndex", 0),
- ("list", "AwardItemList", 0),
+ ("dict", "AwardItemList", 0),
("char", "NotifyKey", 0),
),
@@ -1034,7 +1034,7 @@
("BYTE", "ID", 1),
("DWORD", "TotalTimes", 0),
("WORD", "SingleTimes", 0),
- ("list", "Reward", 0),
+ ("dict", "Reward", 0),
),
"ActRealmPoint":(
@@ -1169,6 +1169,7 @@
"CrossRealmPKDan":(
("BYTE", "DanLV", 1),
+ ("WORD", "LVUpScore", 0),
),
"CrossRealmPKDanAward":(
@@ -1352,6 +1353,25 @@
("BYTE", "ShareSoneLV", 1),
("list", "AttrIDList", 0),
("list", "AttrValueList", 0),
+ ),
+
+ "ActLuckyTreasure":(
+ ("DWORD", "CfgID", 1),
+ ("char", "StartDate", 0),
+ ("char", "EndDate", 0),
+ ("BYTE", "ResetType", 0),
+ ("WORD", "LVLimit", 0),
+ ("BYTE", "TemplateID", 0),
+ ("WORD", "LuckyPoint", 0),
+ ),
+
+ "LuckyTreasureTemplate":(
+ ("BYTE", "TemplateID", 1),
+ ("list", "WorldLVLimit", 0),
+ ("DWORD", "ItemID", 0),
+ ("WORD", "ItemCnt", 0),
+ ("BYTE", "IsBind", 0),
+ ("DWORD", "Weight", 0),
),
}
@@ -2718,7 +2738,7 @@
self.AdvanceMinutes = 0
self.LVLimit = 0
self.IsDayReset = 0
- self.ShopTypeList = []
+ self.ShopTypeList = {}
self.MailKey = ""
self.MailItemPrize = []
return
@@ -3334,7 +3354,7 @@
self.AdvanceMinutes = 0
self.LVLimit = 0
self.IsDayReset = 0
- self.GiftbagTypeList = []
+ self.GiftbagTypeList = {}
self.MailKey = ""
self.MailItemPrize = []
return
@@ -3411,14 +3431,14 @@
self.TemplateID = 0
self.NeedCostGold = 0
self.AwardIndex = 0
- self.AwardItemList = []
+ self.AwardItemList = {}
self.NotifyKey = ""
return
def GetTemplateID(self): return self.TemplateID # 模板ID
def GetNeedCostGold(self): return self.NeedCostGold # 需要消费仙玉数
def GetAwardIndex(self): return self.AwardIndex # 返利奖励索引0~31,同个模板中不重复
- def GetAwardItemList(self): return self.AwardItemList # 返利物品信息列表 [(物品ID,个数,是否绑定),...]
+ def GetAwardItemList(self): return self.AwardItemList # 返利物品信息列表 {世界等级范围:[({职业:物品ID,..},个数,是否绑定), ...]}
def GetNotifyKey(self): return self.NotifyKey # 全服广播key，默认两个参数(玩家名, 档位额度)
# BOSS复活活动时间表
@@ -3448,7 +3468,7 @@
self.ID = 0
self.TotalTimes = 0
self.SingleTimes = 0
- self.Reward = []
+ self.Reward = {}
return
def GetTemplateID(self): return self.TemplateID # 模板ID
@@ -3737,10 +3757,12 @@
class IPY_CrossRealmPKDan():
def __init__(self):
- self.DanLV = 0
+ self.DanLV = 0
+ self.LVUpScore = 0
return
- def GetDanLV(self): return self.DanLV # 段位等级
+ def GetDanLV(self): return self.DanLV # 段位等级
+ def GetLVUpScore(self): return self.LVUpScore # 升段位所需积分
# 跨服竞技场段位奖励表
class IPY_CrossRealmPKDanAward():
@@ -4130,6 +4152,46 @@
def GetShareSoneLV(self): return self.ShareSoneLV # 共鸣等级
def GetAttrIDList(self): return self.AttrIDList # 属性ID列表
def GetAttrValueList(self): return self.AttrValueList # 属性值列表
+
+# 幸运鉴宝活动时间表
+class IPY_ActLuckyTreasure():
+
+ def __init__(self):
+ self.CfgID = 0
+ self.StartDate = ""
+ self.EndDate = ""
+ self.ResetType = 0
+ self.LVLimit = 0
+ self.TemplateID = 0
+ self.LuckyPoint = 0
+ return
+
+ def GetCfgID(self): return self.CfgID # 配置ID
+ def GetStartDate(self): return self.StartDate # 开启日期
+ def GetEndDate(self): return self.EndDate # 结束日期
+ def GetResetType(self): return self.ResetType # 重置类型，0-0点重置；1-5点重置
+ def GetLVLimit(self): return self.LVLimit # 限制等级
+ def GetTemplateID(self): return self.TemplateID # 模板编号
+ def GetLuckyPoint(self): return self.LuckyPoint # 总幸运值
+
+# 幸运鉴宝库模板表
+class IPY_LuckyTreasureTemplate():
+
+ def __init__(self):
+ self.TemplateID = 0
+ self.WorldLVLimit = []
+ self.ItemID = 0
+ self.ItemCnt = 0
+ self.IsBind = 0
+ self.Weight = 0
+ return
+
+ def GetTemplateID(self): return self.TemplateID # 模板ID
+ def GetWorldLVLimit(self): return self.WorldLVLimit # 世界等级范围
+ def GetItemID(self): return self.ItemID # 物品ID
+ def GetItemCnt(self): return self.ItemCnt # 物品数量
+ def GetIsBind(self): return self.IsBind # 是否绑定
+ def GetWeight(self): return self.Weight # 权重
def Log(msg, playerID=0, par=0):
@@ -4417,6 +4479,10 @@
self.ipyNewAllPeoplePartyAwardLen = len(self.ipyNewAllPeoplePartyAwardCache)
self.ipyZhuXianStoneAttrCache = self.__LoadFileData("ZhuXianStoneAttr", IPY_ZhuXianStoneAttr)
self.ipyZhuXianStoneAttrLen = len(self.ipyZhuXianStoneAttrCache)
+ self.ipyActLuckyTreasureCache = self.__LoadFileData("ActLuckyTreasure", IPY_ActLuckyTreasure)
+ self.ipyActLuckyTreasureLen = len(self.ipyActLuckyTreasureCache)
+ self.ipyLuckyTreasureTemplateCache = self.__LoadFileData("LuckyTreasureTemplate", IPY_LuckyTreasureTemplate)
+ self.ipyLuckyTreasureTemplateLen = len(self.ipyLuckyTreasureTemplateCache)
Log("IPY_FuncConfig count=%s" % len(self.ipyFuncConfigDict))
Log("IPY_DataMgr InitOK!")
return
@@ -4845,6 +4911,10 @@
def GetNewAllPeoplePartyAwardByIndex(self, index): return self.ipyNewAllPeoplePartyAwardCache[index]
def GetZhuXianStoneAttrCount(self): return self.ipyZhuXianStoneAttrLen
def GetZhuXianStoneAttrByIndex(self, index): return self.ipyZhuXianStoneAttrCache[index]
+ def GetActLuckyTreasureCount(self): return self.ipyActLuckyTreasureLen
+ def GetActLuckyTreasureByIndex(self, index): return self.ipyActLuckyTreasureCache[index]
+ def GetLuckyTreasureTemplateCount(self): return self.ipyLuckyTreasureTemplateLen
+ def GetLuckyTreasureTemplateByIndex(self, index): return self.ipyLuckyTreasureTemplateCache[index]
IPYData = IPY_DataMgr()
def IPY_Data(): return IPYData
--
Gitblit v1.8.0