From ee0976feabc604ac91bdc86fc368941cf85d97b7 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 12 二月 2019 11:39:51 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/SnxxServerCode
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 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..046d524 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":(
@@ -2718,7 +2718,7 @@
self.AdvanceMinutes = 0
self.LVLimit = 0
self.IsDayReset = 0
- self.ShopTypeList = []
+ self.ShopTypeList = {}
self.MailKey = ""
self.MailItemPrize = []
return
@@ -3334,7 +3334,7 @@
self.AdvanceMinutes = 0
self.LVLimit = 0
self.IsDayReset = 0
- self.GiftbagTypeList = []
+ self.GiftbagTypeList = {}
self.MailKey = ""
self.MailItemPrize = []
return
@@ -3411,14 +3411,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 +3448,7 @@
self.ID = 0
self.TotalTimes = 0
self.SingleTimes = 0
- self.Reward = []
+ self.Reward = {}
return
def GetTemplateID(self): return self.TemplateID # 模板ID
--
Gitblit v1.8.0