From 9d9430082ec01ad0c0dcad5b4c062525c4053548 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 07 一月 2025 19:00:09 +0800
Subject: [PATCH] 10289 【越南】【英语】【砍树】【BT】运势-服务端(寻宝设定表增加配置不同的寻宝广播key)

---
 ServerPython/CoreServerGroup/GameServer/Script/IpyGameDataPY.py |  318 +++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 274 insertions(+), 44 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/IpyGameDataPY.py b/ServerPython/CoreServerGroup/GameServer/Script/IpyGameDataPY.py
index 984506e..618c5d7 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/IpyGameDataPY.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/IpyGameDataPY.py
@@ -47,6 +47,16 @@
                         ("list", "LimitServerGroupIDList", 0),
                         ),
 
+                "PlayerFace":(
+                        ("DWORD", "FaceID", 1),
+                        ("BYTE", "UnlockDefault", 0),
+                        ),
+
+                "PlayerFacePic":(
+                        ("DWORD", "FacePicID", 1),
+                        ("BYTE", "UnlockDefault", 0),
+                        ),
+
                 "WorldLV":(
                         ("WORD", "WorldLV", 1),
                         ("DWORD", "OpenServerSecond", 0),
@@ -60,6 +70,27 @@
                         ("DWORD", "NeedMoney", 0),
                         ("DWORD", "WeekMissionMoneyMax", 0),
                         ("BYTE", "BossFBCnt", 0),
+                        ("DWORD", "ZhenbaogeWeights", 0),
+                        ),
+
+                "FamilyEmblem":(
+                        ("BYTE", "EmblemID", 1),
+                        ("BYTE", "UnlockFamilyLV", 0),
+                        ("DWORD", "ExpireMinutes", 0),
+                        ("DWORD", "CustomFamilyID", 0),
+                        ),
+
+                "FamilyZhenbaogeCut":(
+                        ("BYTE", "CutNum", 1),
+                        ("DWORD", "CutWeight", 0),
+                        ("float", "MinRatio", 0),
+                        ("float", "RandRatio", 0),
+                        ),
+
+                "FamilyZhenbaogeItem":(
+                        ("BYTE", "ItemGroupNum", 1),
+                        ("DWORD", "ItemWeight", 0),
+                        ("list", "ItemList", 0),
                         ),
 
                 "FamilyBossHurtAward":(
@@ -497,6 +528,9 @@
                         ("BYTE", "Rank", 0),
                         ("list", "AwardItemList", 0),
                         ("list", "MemAwardItemList", 0),
+                        ("DWORD", "NeedScore", 0),
+                        ("dict", "ScoreAwardEx", 0),
+                        ("WORD", "XiangongID", 0),
                         ),
 
                 "CrossActBossTrial":(
@@ -513,7 +547,6 @@
                         ("list", "NotifyInfoLoop", 0),
                         ("BYTE", "IsDayReset", 0),
                         ("BYTE", "ResetType", 0),
-                        ("list", "RankLimitList", 0),
                         ("WORD", "PersonalTemplateID", 0),
                         ("WORD", "FamilyTemplateID", 0),
                         ),
@@ -539,7 +572,6 @@
                         ("char", "EndDate", 0),
                         ("char", "JoinStartTime", 0),
                         ("char", "JoinEndTime", 0),
-                        ("WORD", "RankLimitPersonal", 0),
                         ("WORD", "PersonalTemplateID", 0),
                         ),
 
@@ -547,6 +579,9 @@
                         ("DWORD", "TemplateID", 1),
                         ("BYTE", "Rank", 0),
                         ("list", "AwardItemList", 0),
+                        ("DWORD", "NeedScore", 0),
+                        ("dict", "ScoreAwardEx", 0),
+                        ("WORD", "XiangongID", 0),
                         ),
 
                 "ActGubao":(
@@ -570,7 +605,6 @@
                         ("char", "EndDate", 0),
                         ("char", "JoinStartTime", 0),
                         ("char", "JoinEndTime", 0),
-                        ("WORD", "RankLimitPersonal", 0),
                         ("WORD", "PersonalTemplateID", 0),
                         ),
 
@@ -578,6 +612,9 @@
                         ("DWORD", "TemplateID", 1),
                         ("BYTE", "Rank", 0),
                         ("list", "AwardItemList", 0),
+                        ("DWORD", "NeedScore", 0),
+                        ("dict", "ScoreAwardEx", 0),
+                        ("WORD", "XiangongID", 0),
                         ),
 
                 "ActXianXiaMJ":(
@@ -603,7 +640,6 @@
                         ("char", "JoinStartTime", 0),
                         ("char", "JoinEndTime", 0),
                         ("BYTE", "IsDayReset", 0),
-                        ("WORD", "RankLimitPersonal", 0),
                         ("WORD", "PersonalTemplateID", 0),
                         ),
 
@@ -611,6 +647,9 @@
                         ("DWORD", "TemplateID", 1),
                         ("BYTE", "Rank", 0),
                         ("list", "AwardItemList", 0),
+                        ("DWORD", "NeedScore", 0),
+                        ("dict", "ScoreAwardEx", 0),
+                        ("WORD", "XiangongID", 0),
                         ),
 
                 "ActGodGift":(
@@ -702,7 +741,7 @@
                         ("list", "NotifyInfoLoop", 0),
                         ("WORD", "LVLimit", 0),
                         ("BYTE", "IsDayReset", 0),
-                        ("list", "ShopTypeList", 0),
+                        ("dict", "ShopTypeList", 0),
                         ),
 
                 "Store":(
@@ -847,6 +886,7 @@
                         ("BYTE", "Rank", 1),
                         ("list", "RankAwardItemList", 0),
                         ("WORD", "MainOfficialID", 0),
+                        ("WORD", "XiangongID", 0),
                         ),
 
                 "ChampionshipOfficial":(
@@ -908,6 +948,26 @@
                         ("WORD", "LVLimit", 0),
                         ),
 
+                "ActYunshi":(
+                        ("DWORD", "CfgID", 1),
+                        ("list", "PlatformList", 0),
+                        ("list", "ServerGroupIDList", 0),
+                        ("BYTE", "ActNum", 0),
+                        ("char", "StartDate", 0),
+                        ("char", "EndDate", 0),
+                        ("BYTE", "ResetType", 0),
+                        ),
+
+                "ActLunhuidian":(
+                        ("DWORD", "CfgID", 1),
+                        ("list", "PlatformList", 0),
+                        ("list", "ServerGroupIDList", 0),
+                        ("BYTE", "ActNum", 0),
+                        ("char", "StartDate", 0),
+                        ("char", "EndDate", 0),
+                        ("BYTE", "ResetType", 0),
+                        ),
+
                 "ActBuyCountGift":(
                         ("DWORD", "CfgID", 1),
                         ("list", "PlatformList", 0),
@@ -915,9 +975,6 @@
                         ("BYTE", "ActNum", 0),
                         ("char", "StartDate", 0),
                         ("char", "EndDate", 0),
-                        ("dict", "NotifyInfoStart", 0),
-                        ("dict", "NotifyInfoEnd", 0),
-                        ("list", "NotifyInfoLoop", 0),
                         ("BYTE", "IsDayReset", 0),
                         ("BYTE", "ResetType", 0),
                         ),
@@ -929,9 +986,6 @@
                         ("BYTE", "ActNum", 0),
                         ("char", "StartDate", 0),
                         ("char", "EndDate", 0),
-                        ("dict", "NotifyInfoStart", 0),
-                        ("dict", "NotifyInfoEnd", 0),
-                        ("list", "NotifyInfoLoop", 0),
                         ("BYTE", "IsDayReset", 0),
                         ("BYTE", "ResetType", 0),
                         ),
@@ -943,9 +997,6 @@
                         ("BYTE", "ActNum", 0),
                         ("char", "StartDate", 0),
                         ("char", "EndDate", 0),
-                        ("dict", "NotifyInfoStart", 0),
-                        ("dict", "NotifyInfoEnd", 0),
-                        ("list", "NotifyInfoLoop", 0),
                         ),
 
                 "ActLoginAward":(
@@ -1137,6 +1188,16 @@
                         ("list", "MoneyRange", 0),
                         ),
 
+                "Xiangong":(
+                        ("WORD", "XiangongID", 1),
+                        ("BYTE", "ShowDays", 0),
+                        ("BYTE", "MoneyType", 0),
+                        ("DWORD", "MoneyValue", 0),
+                        ("DWORD", "TitleID", 0),
+                        ("list", "AwardItemList", 0),
+                        ("char", "MailKey", 0),
+                        ),
+
                 "FairyDomain":(
                         ("WORD", "ID", 1),
                         ("DWORD", "HourCntPubLimit", 0),
@@ -1169,6 +1230,26 @@
     def GetLimitServerGroupIDRangeList(self): return self.attrTuple[0] # 限制创角的服务器组ID范围列表 list
     def GetLimitServerGroupIDList(self): return self.attrTuple[1] # 限制创角的服务器组ID列表 list
 
+# 头像表
+class IPY_PlayerFace():
+    
+    def __init__(self):
+        self.attrTuple = None
+        return
+        
+    def GetFaceID(self): return self.attrTuple[0] # 头像ID DWORD
+    def GetUnlockDefault(self): return self.attrTuple[1] # 是否默认激活 BYTE
+
+# 头像框表
+class IPY_PlayerFacePic():
+    
+    def __init__(self):
+        self.attrTuple = None
+        return
+        
+    def GetFacePicID(self): return self.attrTuple[0] # 头像框ID DWORD
+    def GetUnlockDefault(self): return self.attrTuple[1] # 是否默认激活 BYTE
+
 # 世界等级表格
 class IPY_WorldLV():
     
@@ -1192,7 +1273,43 @@
     def GetEliteCnt(self): return self.attrTuple[3] # 精英数量 BYTE
     def GetNeedMoney(self): return self.attrTuple[4] # 升级需要资金 DWORD
     def GetWeekMissionMoneyMax(self): return self.attrTuple[5] # 每周任务最大可获得仙盟资金 DWORD
-    def GetBossFBCnt(self): return self.attrTuple[6] # BOSS副本次数 BYTE
+    def GetBossFBCnt(self): return self.attrTuple[6] # BOSS副本次数 BYTE
+    def GetZhenbaogeWeights(self): return self.attrTuple[7] # 珍宝阁总权重 DWORD
+
+# 仙盟徽章表
+class IPY_FamilyEmblem():
+    
+    def __init__(self):
+        self.attrTuple = None
+        return
+        
+    def GetEmblemID(self): return self.attrTuple[0] # 徽章ID BYTE
+    def GetUnlockFamilyLV(self): return self.attrTuple[1] # 解锁仙盟等级,为0时代表其他方式解锁 BYTE
+    def GetExpireMinutes(self): return self.attrTuple[2] # 有效时长,分钟 DWORD
+    def GetCustomFamilyID(self): return self.attrTuple[3] # 定制仙盟ID DWORD
+
+# 仙盟珍宝阁砍价
+class IPY_FamilyZhenbaogeCut():
+    
+    def __init__(self):
+        self.attrTuple = None
+        return
+        
+    def GetCutNum(self): return self.attrTuple[0] # 砍价人次 BYTE
+    def GetCutWeight(self): return self.attrTuple[1] # 砍价权重 DWORD
+    def GetMinRatio(self): return self.attrTuple[2] # 保底比值 float
+    def GetRandRatio(self): return self.attrTuple[3] # 随机比值 float
+
+# 仙盟珍宝阁物品
+class IPY_FamilyZhenbaogeItem():
+    
+    def __init__(self):
+        self.attrTuple = None
+        return
+        
+    def GetItemGroupNum(self): return self.attrTuple[0] # 物品组编号 BYTE
+    def GetItemWeight(self): return self.attrTuple[1] # 随机权重 DWORD
+    def GetItemList(self): return self.attrTuple[2] # 物品列表[[物品ID,个数,是否拍品], ...] list
 
 # 仙盟试炼伤血奖励表
 class IPY_FamilyBossHurtAward():
@@ -1834,7 +1951,10 @@
     def GetTemplateID(self): return self.attrTuple[0] # 模板编号 DWORD
     def GetRank(self): return self.attrTuple[1] # 名次 BYTE
     def GetAwardItemList(self): return self.attrTuple[2] # 奖励物品列表[[物品ID,个数,是否拍品], ...] 仙盟榜时为盟主奖励,如果没有配置,则统一取成员奖励 list
-    def GetMemAwardItemList(self): return self.attrTuple[3] # 仙盟榜成员奖励物品信息列表[[物品ID,个数,是否拍品], ...] list
+    def GetMemAwardItemList(self): return self.attrTuple[3] # 仙盟榜成员奖励物品信息列表[[物品ID,个数,是否拍品], ...] list
+    def GetNeedScore(self): return self.attrTuple[4] # 上榜所需积分 DWORD
+    def GetScoreAwardEx(self): return self.attrTuple[5] # 达标积分额外奖励 {积分:[[物品ID,个数,是否拍品], ...], ...} dict
+    def GetXiangongID(self): return self.attrTuple[6] # 晋升仙宫ID WORD
 
 # Boss历练跨服活动表
 class IPY_CrossActBossTrial():
@@ -1856,9 +1976,8 @@
     def GetNotifyInfoLoop(self): return self.attrTuple[10] # 全服提示信息 - 循环广播[循环分钟, 广播key, [广播参数列表可选]] list
     def GetIsDayReset(self): return self.attrTuple[11] # 是否每天重置 BYTE
     def GetResetType(self): return self.attrTuple[12] # 重置类型,0-0点重置;1-5点重置 BYTE
-    def GetRankLimitList(self): return self.attrTuple[13] # 上榜个数限制 个人|仙盟 list
-    def GetPersonalTemplateID(self): return self.attrTuple[14] # 个人排行模板编号 WORD
-    def GetFamilyTemplateID(self): return self.attrTuple[15] # 仙盟排行模板编号 WORD
+    def GetPersonalTemplateID(self): return self.attrTuple[13] # 个人排行模板编号 WORD
+    def GetFamilyTemplateID(self): return self.attrTuple[14] # 仙盟排行模板编号 WORD
 
 # 骑宠养成活动时间表
 class IPY_ActHorsePetTrain():
@@ -1892,8 +2011,7 @@
     def GetEndDate(self): return self.attrTuple[5] # 结束日期 char
     def GetJoinStartTime(self): return self.attrTuple[6] # 参与开始时间点 char
     def GetJoinEndTime(self): return self.attrTuple[7] # 参与结束时间点 char
-    def GetRankLimitPersonal(self): return self.attrTuple[8] # 个人上榜积分限制 WORD
-    def GetPersonalTemplateID(self): return self.attrTuple[9] # 个人排行模板编号 WORD
+    def GetPersonalTemplateID(self): return self.attrTuple[8] # 个人排行模板编号 WORD
 
 # 骑宠养成榜单模版表
 class IPY_ActHorsePetTrainBillTemp():
@@ -1904,7 +2022,10 @@
         
     def GetTemplateID(self): return self.attrTuple[0] # 模板编号 DWORD
     def GetRank(self): return self.attrTuple[1] # 名次 BYTE
-    def GetAwardItemList(self): return self.attrTuple[2] # 奖励物品列表[[物品ID,个数,是否拍品], ...] list
+    def GetAwardItemList(self): return self.attrTuple[2] # 奖励物品列表[[物品ID,个数,是否拍品], ...] list
+    def GetNeedScore(self): return self.attrTuple[3] # 上榜所需积分 DWORD
+    def GetScoreAwardEx(self): return self.attrTuple[4] # 达标积分额外奖励 {积分:[[物品ID,个数,是否拍品], ...], ...} dict
+    def GetXiangongID(self): return self.attrTuple[5] # 晋升仙宫ID WORD
 
 # 古宝养成活动时间表
 class IPY_ActGubao():
@@ -1938,8 +2059,7 @@
     def GetEndDate(self): return self.attrTuple[5] # 结束日期 char
     def GetJoinStartTime(self): return self.attrTuple[6] # 参与开始时间点 char
     def GetJoinEndTime(self): return self.attrTuple[7] # 参与结束时间点 char
-    def GetRankLimitPersonal(self): return self.attrTuple[8] # 个人上榜积分限制 WORD
-    def GetPersonalTemplateID(self): return self.attrTuple[9] # 个人排行模板编号 WORD
+    def GetPersonalTemplateID(self): return self.attrTuple[8] # 个人排行模板编号 WORD
 
 # 古宝养成榜单模版表
 class IPY_ActGubaoBillTemp():
@@ -1950,7 +2070,10 @@
         
     def GetTemplateID(self): return self.attrTuple[0] # 模板编号 DWORD
     def GetRank(self): return self.attrTuple[1] # 名次 BYTE
-    def GetAwardItemList(self): return self.attrTuple[2] # 奖励物品列表[[物品ID,个数,是否拍品], ...] list
+    def GetAwardItemList(self): return self.attrTuple[2] # 奖励物品列表[[物品ID,个数,是否拍品], ...] list
+    def GetNeedScore(self): return self.attrTuple[3] # 上榜所需积分 DWORD
+    def GetScoreAwardEx(self): return self.attrTuple[4] # 达标积分额外奖励 {积分:[[物品ID,个数,是否拍品], ...], ...} dict
+    def GetXiangongID(self): return self.attrTuple[5] # 晋升仙宫ID WORD
 
 # 仙匣秘境活动时间表
 class IPY_ActXianXiaMJ():
@@ -1986,8 +2109,7 @@
     def GetJoinStartTime(self): return self.attrTuple[6] # 参与开始时间点 char
     def GetJoinEndTime(self): return self.attrTuple[7] # 参与结束时间点 char
     def GetIsDayReset(self): return self.attrTuple[8] # 是否每天重置 BYTE
-    def GetRankLimitPersonal(self): return self.attrTuple[9] # 个人上榜积分限制 WORD
-    def GetPersonalTemplateID(self): return self.attrTuple[10] # 个人排行模板编号 WORD
+    def GetPersonalTemplateID(self): return self.attrTuple[9] # 个人排行模板编号 WORD
 
 # 仙匣秘境榜单模版表
 class IPY_ActXianXiaMJBillTemp():
@@ -1998,7 +2120,10 @@
         
     def GetTemplateID(self): return self.attrTuple[0] # 模板编号 DWORD
     def GetRank(self): return self.attrTuple[1] # 名次 BYTE
-    def GetAwardItemList(self): return self.attrTuple[2] # 奖励物品列表[[物品ID,个数,是否拍品], ...] list
+    def GetAwardItemList(self): return self.attrTuple[2] # 奖励物品列表[[物品ID,个数,是否拍品], ...] list
+    def GetNeedScore(self): return self.attrTuple[3] # 上榜所需积分 DWORD
+    def GetScoreAwardEx(self): return self.attrTuple[4] # 达标积分额外奖励 {积分:[[物品ID,个数,是否拍品], ...], ...} dict
+    def GetXiangongID(self): return self.attrTuple[5] # 晋升仙宫ID WORD
 
 # 天帝礼包活动时间表
 class IPY_ActGodGift():
@@ -2125,7 +2250,7 @@
     def GetNotifyInfoLoop(self): return self.attrTuple[11] # 全服提示信息 - 循环广播[间隔分钟, 广播key] list
     def GetLVLimit(self): return self.attrTuple[12] # 限制等级 WORD
     def GetIsDayReset(self): return self.attrTuple[13] # 是否每天重置 BYTE
-    def GetShopTypeList(self): return self.attrTuple[14] # 商店类型列表 list
+    def GetShopTypeList(self): return self.attrTuple[14] # 商店类型列表 dict
 
 # 商城表
 class IPY_Store():
@@ -2339,7 +2464,8 @@
         
     def GetRank(self): return self.attrTuple[0] #  名次 BYTE
     def GetRankAwardItemList(self): return self.attrTuple[1] # 名次奖励物品列表 list
-    def GetMainOfficialID(self): return self.attrTuple[2] # 主官职ID WORD
+    def GetMainOfficialID(self): return self.attrTuple[2] # 主官职ID WORD
+    def GetXiangongID(self): return self.attrTuple[3] # 晋升仙宫ID WORD
 
 # 跨服排位官职表
 class IPY_ChampionshipOfficial():
@@ -2435,6 +2561,36 @@
     def GetNotifyInfoEnd(self): return self.attrTuple[10] # 全服提示信息 - 相对结束时间 dict
     def GetLVLimit(self): return self.attrTuple[11] # 限制等级 WORD
 
+# 运势活动时间表
+class IPY_ActYunshi():
+    
+    def __init__(self):
+        self.attrTuple = None
+        return
+        
+    def GetCfgID(self): return self.attrTuple[0] # 配置ID DWORD
+    def GetPlatformList(self): return self.attrTuple[1] # 活动平台列表["平台A", "平台A", ...],配[]代表所有 list
+    def GetServerGroupIDList(self): return self.attrTuple[2] # 服务器ID列表 list
+    def GetActNum(self): return self.attrTuple[3] # 活动分组编号, 活动类型 * 10 + 不同界面编号 BYTE
+    def GetStartDate(self): return self.attrTuple[4] # 开启日期 char
+    def GetEndDate(self): return self.attrTuple[5] # 结束日期 char
+    def GetResetType(self): return self.attrTuple[6] # 重置类型,0-0点重置;1-5点重置 BYTE
+
+# 轮回殿活动时间表
+class IPY_ActLunhuidian():
+    
+    def __init__(self):
+        self.attrTuple = None
+        return
+        
+    def GetCfgID(self): return self.attrTuple[0] # 配置ID DWORD
+    def GetPlatformList(self): return self.attrTuple[1] # 活动平台列表["平台A", "平台A", ...],配[]代表所有 list
+    def GetServerGroupIDList(self): return self.attrTuple[2] # 服务器ID列表 list
+    def GetActNum(self): return self.attrTuple[3] # 活动分组编号, 活动类型 * 10 + 不同界面编号 BYTE
+    def GetStartDate(self): return self.attrTuple[4] # 开启日期 char
+    def GetEndDate(self): return self.attrTuple[5] # 结束日期 char
+    def GetResetType(self): return self.attrTuple[6] # 重置类型,0-0点重置;1-5点重置 BYTE
+
 # 购买次数礼包活动时间表
 class IPY_ActBuyCountGift():
     
@@ -2448,11 +2604,8 @@
     def GetActNum(self): return self.attrTuple[3] # 活动分组编号, 活动类型 * 10 + 不同界面编号 BYTE
     def GetStartDate(self): return self.attrTuple[4] # 开启日期 char
     def GetEndDate(self): return self.attrTuple[5] # 结束日期 char
-    def GetNotifyInfoStart(self): return self.attrTuple[6] # 全服提示信息 - 相对开始时间 dict
-    def GetNotifyInfoEnd(self): return self.attrTuple[7] # 全服提示信息 - 相对结束时间 dict
-    def GetNotifyInfoLoop(self): return self.attrTuple[8] # 全服提示信息 - 循环广播[间隔分钟, 广播key] list
-    def GetIsDayReset(self): return self.attrTuple[9] # 是否每天重置 BYTE
-    def GetResetType(self): return self.attrTuple[10] # 重置类型,0-0点重置;1-5点重置 BYTE
+    def GetIsDayReset(self): return self.attrTuple[6] # 是否每天重置 BYTE
+    def GetResetType(self): return self.attrTuple[7] # 重置类型,0-0点重置;1-5点重置 BYTE
 
 # 任务活动时间表
 class IPY_ActTask():
@@ -2467,11 +2620,8 @@
     def GetActNum(self): return self.attrTuple[3] # 活动分组编号, 活动类型 * 10 + 不同界面编号 BYTE
     def GetStartDate(self): return self.attrTuple[4] # 开启日期 char
     def GetEndDate(self): return self.attrTuple[5] # 结束日期 char
-    def GetNotifyInfoStart(self): return self.attrTuple[6] # 全服提示信息 - 相对开始时间 dict
-    def GetNotifyInfoEnd(self): return self.attrTuple[7] # 全服提示信息 - 相对结束时间 dict
-    def GetNotifyInfoLoop(self): return self.attrTuple[8] # 全服提示信息 - 循环广播[间隔分钟, 广播key] list
-    def GetIsDayReset(self): return self.attrTuple[9] # 是否每天重置 BYTE
-    def GetResetType(self): return self.attrTuple[10] # 重置类型,0-0点重置;1-5点重置 BYTE
+    def GetIsDayReset(self): return self.attrTuple[6] # 是否每天重置 BYTE
+    def GetResetType(self): return self.attrTuple[7] # 重置类型,0-0点重置;1-5点重置 BYTE
 
 # 登录活动奖励时间表新
 class IPY_ActLoginNew():
@@ -2485,10 +2635,7 @@
     def GetServerGroupIDList(self): return self.attrTuple[2] # 服务器ID列表 list
     def GetActNum(self): return self.attrTuple[3] # 活动分组编号, 活动类型 * 10 + 不同界面编号 BYTE
     def GetStartDate(self): return self.attrTuple[4] # 开启日期 char
-    def GetEndDate(self): return self.attrTuple[5] # 结束日期 char
-    def GetNotifyInfoStart(self): return self.attrTuple[6] # 全服提示信息 - 相对开始时间 dict
-    def GetNotifyInfoEnd(self): return self.attrTuple[7] # 全服提示信息 - 相对结束时间 dict
-    def GetNotifyInfoLoop(self): return self.attrTuple[8] # 全服提示信息 - 循环广播[间隔分钟, 广播key] list
+    def GetEndDate(self): return self.attrTuple[5] # 结束日期 char
 
 # 登录奖励时间表
 class IPY_ActLoginAward():
@@ -2769,6 +2916,21 @@
     def GetMoneyType(self): return self.attrTuple[3] # 膜拜货币类型 BYTE
     def GetMoneyRange(self): return self.attrTuple[4] # 货币值范围 list
 
+# 仙宫表
+class IPY_Xiangong():
+    
+    def __init__(self):
+        self.attrTuple = None
+        return
+        
+    def GetXiangongID(self): return self.attrTuple[0] # 仙宫ID WORD
+    def GetShowDays(self): return self.attrTuple[1] # 展示天数 BYTE
+    def GetMoneyType(self): return self.attrTuple[2] # 点赞货币类型 BYTE
+    def GetMoneyValue(self): return self.attrTuple[3] # 货币值 DWORD
+    def GetTitleID(self): return self.attrTuple[4] # 称号ID DWORD
+    def GetAwardItemList(self): return self.attrTuple[5] # 晋级仙宫奖励物品列表 list
+    def GetMailKey(self): return self.attrTuple[6] # 仙官通知邮件 char
+
 # 缥缈仙域表
 class IPY_FairyDomain():
     
@@ -2837,8 +2999,13 @@
             self.ipyConfigEx = {}
         self.__LoadFileData("FuncConfig", onlyCheck)
         self.__LoadFileData("CreateRoleLimitServer", onlyCheck)
+        self.__LoadFileData("PlayerFace", onlyCheck)
+        self.__LoadFileData("PlayerFacePic", onlyCheck)
         self.__LoadFileData("WorldLV", onlyCheck)
         self.__LoadFileData("Family", onlyCheck)
+        self.__LoadFileData("FamilyEmblem", onlyCheck)
+        self.__LoadFileData("FamilyZhenbaogeCut", onlyCheck)
+        self.__LoadFileData("FamilyZhenbaogeItem", onlyCheck)
         self.__LoadFileData("FamilyBossHurtAward", onlyCheck)
         self.__LoadFileData("FamilyZhenfa", onlyCheck)
         self.__LoadFileData("MarketQuery", onlyCheck)
@@ -2918,6 +3085,8 @@
         self.__LoadFileData("CrossDemonLandZoneMap", onlyCheck)
         self.__LoadFileData("CrossFamilyFlagwarZoneMap", onlyCheck)
         self.__LoadFileData("ActWeekParty", onlyCheck)
+        self.__LoadFileData("ActYunshi", onlyCheck)
+        self.__LoadFileData("ActLunhuidian", onlyCheck)
         self.__LoadFileData("ActBuyCountGift", onlyCheck)
         self.__LoadFileData("ActTask", onlyCheck)
         self.__LoadFileData("ActLoginNew", onlyCheck)
@@ -2939,6 +3108,7 @@
         self.__LoadFileData("FamilyWarRankAward", onlyCheck)
         self.__LoadFileData("AssistThanksGift", onlyCheck)
         self.__LoadFileData("Worship", onlyCheck)
+        self.__LoadFileData("Xiangong", onlyCheck)
         self.__LoadFileData("FairyDomain", onlyCheck)
         Log("IPY_DataMgr ReloadOK! onlyCheck=%s" % onlyCheck)
         return
@@ -3019,8 +3189,12 @@
                         attrValue = value
                     elif fieldType == "dict":
                         attrValue = self.__StrToDict(value)
+                        if type(attrValue) != dict:
+                            raise
                     elif fieldType == "list":
                         attrValue = self.__StrToList(value)
+                        if type(attrValue) not in [list, tuple]:
+                            raise
                     elif fieldType == "eval":
                         attrValue = self.__StrToEval(value)
                     elif fieldType == "float":
@@ -3159,6 +3333,20 @@
         self.CheckLoadData("CreateRoleLimitServer")
         return self.ipyCreateRoleLimitServerCache[index]
 
+    def GetPlayerFaceCount(self):
+        self.CheckLoadData("PlayerFace")
+        return self.ipyPlayerFaceLen
+    def GetPlayerFaceByIndex(self, index):
+        self.CheckLoadData("PlayerFace")
+        return self.ipyPlayerFaceCache[index]
+
+    def GetPlayerFacePicCount(self):
+        self.CheckLoadData("PlayerFacePic")
+        return self.ipyPlayerFacePicLen
+    def GetPlayerFacePicByIndex(self, index):
+        self.CheckLoadData("PlayerFacePic")
+        return self.ipyPlayerFacePicCache[index]
+
     def GetWorldLVCount(self):
         self.CheckLoadData("WorldLV")
         return self.ipyWorldLVLen
@@ -3172,6 +3360,27 @@
     def GetFamilyByIndex(self, index):
         self.CheckLoadData("Family")
         return self.ipyFamilyCache[index]
+
+    def GetFamilyEmblemCount(self):
+        self.CheckLoadData("FamilyEmblem")
+        return self.ipyFamilyEmblemLen
+    def GetFamilyEmblemByIndex(self, index):
+        self.CheckLoadData("FamilyEmblem")
+        return self.ipyFamilyEmblemCache[index]
+
+    def GetFamilyZhenbaogeCutCount(self):
+        self.CheckLoadData("FamilyZhenbaogeCut")
+        return self.ipyFamilyZhenbaogeCutLen
+    def GetFamilyZhenbaogeCutByIndex(self, index):
+        self.CheckLoadData("FamilyZhenbaogeCut")
+        return self.ipyFamilyZhenbaogeCutCache[index]
+
+    def GetFamilyZhenbaogeItemCount(self):
+        self.CheckLoadData("FamilyZhenbaogeItem")
+        return self.ipyFamilyZhenbaogeItemLen
+    def GetFamilyZhenbaogeItemByIndex(self, index):
+        self.CheckLoadData("FamilyZhenbaogeItem")
+        return self.ipyFamilyZhenbaogeItemCache[index]
 
     def GetFamilyBossHurtAwardCount(self):
         self.CheckLoadData("FamilyBossHurtAward")
@@ -3726,6 +3935,20 @@
         self.CheckLoadData("ActWeekParty")
         return self.ipyActWeekPartyCache[index]
 
+    def GetActYunshiCount(self):
+        self.CheckLoadData("ActYunshi")
+        return self.ipyActYunshiLen
+    def GetActYunshiByIndex(self, index):
+        self.CheckLoadData("ActYunshi")
+        return self.ipyActYunshiCache[index]
+
+    def GetActLunhuidianCount(self):
+        self.CheckLoadData("ActLunhuidian")
+        return self.ipyActLunhuidianLen
+    def GetActLunhuidianByIndex(self, index):
+        self.CheckLoadData("ActLunhuidian")
+        return self.ipyActLunhuidianCache[index]
+
     def GetActBuyCountGiftCount(self):
         self.CheckLoadData("ActBuyCountGift")
         return self.ipyActBuyCountGiftLen
@@ -3873,6 +4096,13 @@
         self.CheckLoadData("Worship")
         return self.ipyWorshipCache[index]
 
+    def GetXiangongCount(self):
+        self.CheckLoadData("Xiangong")
+        return self.ipyXiangongLen
+    def GetXiangongByIndex(self, index):
+        self.CheckLoadData("Xiangong")
+        return self.ipyXiangongCache[index]
+
     def GetFairyDomainCount(self):
         self.CheckLoadData("FairyDomain")
         return self.ipyFairyDomainLen

--
Gitblit v1.8.0