From fe40f1881045b901bd5e7365673e3a2b677f7e7f Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 30 十二月 2025 18:07:49 +0800
Subject: [PATCH] 129 【战斗】战斗系统-服务端(吕布所有技能;优化效果5501支持同国层级;7002效果支持配置学习x技能生效;增加效果5511;)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py |   22 ++++++++++++++--------
 1 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py
index b2a4aff..64e95be 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py
@@ -270,6 +270,7 @@
                         ("BYTE", "FatesLV", 1),
                         ("BYTE", "NeedStarTotal", 0),
                         ("BYTE", "NeedHeroCnt", 0),
+                        ("BYTE", "NeedQuality", 0),
                         ),
 
                 "PlayerAttr":(
@@ -1264,12 +1265,13 @@
                         ("BYTE", "LuckyGridNum", 0),
                         ("dict", "GridNumMaxLimitInfo", 0),
                         ("list", "NotifyGridNumList", 0),
-                        ("char", "NotifyKey", 0),
+                        ("dict", "NotifyKeyDict", 0),
                         ("BYTE", "AwardMoneyType", 0),
                         ("WORD", "AwardMoneyValue", 0),
-                        ("BYTE", "WishOutput", 0),
                         ("BYTE", "WishReset", 0),
                         ("dict", "WishLibSelect", 0),
+                        ("dict", "WishLibPubFreeCnt", 0),
+                        ("dict", "WishLibCard", 0),
                         ),
 
                 "TreasureHouse":(
@@ -1292,6 +1294,7 @@
                         ("DWORD", "ItemID", 0),
                         ("DWORD", "ItemCount", 0),
                         ("DWORD", "ItemWeight", 0),
+                        ("BYTE", "IsWishItem", 0),
                         ("BYTE", "WishOutCnt", 0),
                         ),
 
@@ -2551,7 +2554,8 @@
     def GetFatesQuality(self): return self.attrTuple[0] # 宿缘品质 BYTE
     def GetFatesLV(self): return self.attrTuple[1] # 宿缘等级 BYTE
     def GetNeedStarTotal(self): return self.attrTuple[2] #  升到该级所需总星数 BYTE
-    def GetNeedHeroCnt(self): return self.attrTuple[3] #  所需品质武将数 BYTE
+    def GetNeedHeroCnt(self): return self.attrTuple[3] #  所需品质武将数 BYTE
+    def GetNeedQuality(self): return self.attrTuple[4] #  所需武将品质 BYTE
 
 # 属性条目表
 class IPY_PlayerAttr():
@@ -4016,12 +4020,13 @@
     def GetLuckyGridNum(self): return self.attrTuple[15] # 幸运格子编号 BYTE
     def GetGridNumMaxLimitInfo(self): return self.attrTuple[16] # 格子最大产出次数限制,{"格子":最大可产出次数, ...} dict
     def GetNotifyGridNumList(self): return self.attrTuple[17] # 需要额外广播的格子 list
-    def GetNotifyKey(self): return self.attrTuple[18] # 广播key char
+    def GetNotifyKeyDict(self): return self.attrTuple[18] # 广播key dict
     def GetAwardMoneyType(self): return self.attrTuple[19] # 额外奖励货币类型 BYTE
     def GetAwardMoneyValue(self): return self.attrTuple[20] # 单次奖励货币数 WORD
-    def GetWishOutput(self): return self.attrTuple[21] # 心愿产出规则 BYTE
-    def GetWishReset(self): return self.attrTuple[22] # 心愿重置规则 BYTE
-    def GetWishLibSelect(self): return self.attrTuple[23] # 心愿库选择数 dict
+    def GetWishReset(self): return self.attrTuple[21] # 心愿重置规则 BYTE
+    def GetWishLibSelect(self): return self.attrTuple[22] # 心愿库选择数 dict
+    def GetWishLibPubFreeCnt(self): return self.attrTuple[23] # 心愿库公共免费次数 dict
+    def GetWishLibCard(self): return self.attrTuple[24] # 心愿库心愿卡 dict
 
 # 寻宝产出库表
 class IPY_TreasureHouse():
@@ -4054,7 +4059,8 @@
     def GetItemID(self): return self.attrTuple[2] # 物品ID DWORD
     def GetItemCount(self): return self.attrTuple[3] # 物品个数 DWORD
     def GetItemWeight(self): return self.attrTuple[4] # 物品权重 DWORD
-    def GetWishOutCnt(self): return self.attrTuple[5] # 心愿产出次数 BYTE
+    def GetIsWishItem(self): return self.attrTuple[5] # 心愿可选 BYTE
+    def GetWishOutCnt(self): return self.attrTuple[6] # 心愿独立产出次数 BYTE
 
 # 寻宝累计次数奖励表
 class IPY_TreasureCntAward():

--
Gitblit v1.8.0