From ab57c59ab33f5e4bf7e3bfd5514b04cb3d38dc2b Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 04 二月 2026 18:19:05 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_ServerCode

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py |   47 +++++++++++++++++++++++++++++++++++++----------
 1 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py
index a73cf8e..1aa6ea4 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py
@@ -618,6 +618,7 @@
                         ("DWORD", "DefBase", 0),
                         ("DWORD", "HPBase", 0),
                         ("DWORD", "AtkSpeedBase", 0),
+                        ("dict", "BatAttrBaseDict", 0),
                         ),
 
                 "MGGuayuQuality":(
@@ -626,7 +627,6 @@
                         ("float", "DefPlus", 0),
                         ("float", "HPPlus", 0),
                         ("float", "AtkSpeedPlus", 0),
-                        ("BYTE", "AttrLibCnt", 0),
                         ("list", "AttrRange", 0),
                         ("dict", "AttrRangeDict", 0),
                         ),
@@ -2123,6 +2123,13 @@
                         ("dict", "Attr", 0),
                         ),
 
+                "FamilyCross":(
+                        ("char", "AppID", 1),
+                        ("WORD", "ZoneID", 1),
+                        ("DWORD", "CrossServerID", 0),
+                        ("list", "ServerIDList", 0),
+                        ),
+
                 "Family":(
                         ("BYTE", "FamilyLV", 1),
                         ("BYTE", "MemberMax", 0),
@@ -3143,7 +3150,8 @@
     def GetAtkBase(self): return self.attrTuple[2] # 攻击基础值 DWORD
     def GetDefBase(self): return self.attrTuple[3] # 防御基础值 DWORD
     def GetHPBase(self): return self.attrTuple[4] # 生命基础值 DWORD
-    def GetAtkSpeedBase(self): return self.attrTuple[5] # 先攻基础值 DWORD
+    def GetAtkSpeedBase(self): return self.attrTuple[5] # 先攻基础值 DWORD
+    def GetBatAttrBaseDict(self): return self.attrTuple[6] # 其他战斗属性基础值字典,{属性ID:基础值, ...} dict
 
 # 卦玉品质表
 class IPY_MGGuayuQuality():
@@ -3157,9 +3165,8 @@
     def GetDefPlus(self): return self.attrTuple[2] # 防御加成 float
     def GetHPPlus(self): return self.attrTuple[3] # 生命加成 float
     def GetAtkSpeedPlus(self): return self.attrTuple[4] # 先攻加成 float
-    def GetAttrLibCnt(self): return self.attrTuple[5] # 库属性条数 BYTE
-    def GetAttrRange(self): return self.attrTuple[6] # 通用属性范围,下限|上限 list
-    def GetAttrRangeDict(self): return self.attrTuple[7] # 指定属性范围字典,{指定属性ID:[范围下限, 上限], ...} dict
+    def GetAttrRange(self): return self.attrTuple[5] # 其他属性通用加成范围,下限|上限 list
+    def GetAttrRangeDict(self): return self.attrTuple[6] # 其他指定属性加成范围字典,{指定属性ID:[范围下限, 上限], ...} dict
 
 # 卦玉类型表
 class IPY_MGGuayuType():
@@ -5433,7 +5440,19 @@
     def GetCostItem(self): return self.attrTuple[3] # 消耗材料 dict
     def GetAttr(self): return self.attrTuple[4] # 属性 dict
 
-# 仙盟等级表
+# 跨服公会表
+class IPY_FamilyCross():
+    
+    def __init__(self):
+        self.attrTuple = None
+        return
+        
+    def GetAppID(self): return self.attrTuple[0] # AppID char
+    def GetZoneID(self): return self.attrTuple[1] # 分区ID WORD
+    def GetCrossServerID(self): return self.attrTuple[2] # 跨服服务器ID DWORD
+    def GetServerIDList(self): return self.attrTuple[3] # 互通服务器ID列表 list
+
+# 公会等级表
 class IPY_Family():
     
     def __init__(self):
@@ -5447,7 +5466,7 @@
     def GetNeedExp(self): return self.attrTuple[4] # 升级所需经验 DWORD
     def GetZhenbaogeWeights(self): return self.attrTuple[5] # 珍宝阁总权重 DWORD
 
-# 仙盟徽章表
+# 公会徽章表
 class IPY_FamilyEmblem():
     
     def __init__(self):
@@ -5459,7 +5478,7 @@
     def GetExpireMinutes(self): return self.attrTuple[2] # 有效时长,分钟 DWORD
     def GetCustomFamilyID(self): return self.attrTuple[3] # 定制仙盟ID DWORD
 
-# 仙盟捐献表
+# 公会捐献表
 class IPY_FamilyDonate():
     
     def __init__(self):
@@ -5472,7 +5491,7 @@
     def GetMoneyValue(self): return self.attrTuple[3] # 消耗货币值 DWORD
     def GetAwardItemList(self): return self.attrTuple[4] # 获得奖励列表[[物品ID,个数], ...] list
 
-# 仙盟珍宝阁砍价表
+# 公会珍宝阁砍价表
 class IPY_FamilyZhenbaogeCut():
     
     def __init__(self):
@@ -5484,7 +5503,7 @@
     def GetMinRatio(self): return self.attrTuple[2] # 保底比值 float
     def GetRandRatio(self): return self.attrTuple[3] # 随机比值 float
 
-# 仙盟珍宝阁物品表
+# 公会珍宝阁物品表
 class IPY_FamilyZhenbaogeItem():
     
     def __init__(self):
@@ -6001,6 +6020,7 @@
         self.__LoadFileData("EquipShenEvolve", onlyCheck)
         self.__LoadFileData("EquipStarUp", onlyCheck)
         self.__LoadFileData("EquipPlusEvolve", onlyCheck)
+        self.__LoadFileData("FamilyCross", onlyCheck)
         self.__LoadFileData("Family", onlyCheck)
         self.__LoadFileData("FamilyEmblem", onlyCheck)
         self.__LoadFileData("FamilyDonate", onlyCheck)
@@ -7700,6 +7720,13 @@
         self.CheckLoadData("EquipPlusEvolve")
         return self.ipyEquipPlusEvolveCache[index]
 
+    def GetFamilyCrossCount(self):
+        self.CheckLoadData("FamilyCross")
+        return self.ipyFamilyCrossLen
+    def GetFamilyCrossByIndex(self, index):
+        self.CheckLoadData("FamilyCross")
+        return self.ipyFamilyCrossCache[index]
+
     def GetFamilyCount(self):
         self.CheckLoadData("Family")
         return self.ipyFamilyLen

--
Gitblit v1.8.0