From 6f469af556dea71dea202a9431f1062745d8c10d Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 15 十二月 2025 18:51:32 +0800
Subject: [PATCH] 121 【武将】武将系统-服务端(寻宝系数增加心愿物品规则;武将招募保底产出增加受永久卡限制;武将招募首次获得武将增加全服广播;)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.py |  122 ++++++++++++++++++++++++----------------
 1 files changed, 74 insertions(+), 48 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.py
index df6e0dc..07fd443 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.py
@@ -6834,54 +6834,6 @@
 
 
 #------------------------------------------------------
-# A5 69 刷新寻宝免费次数 #tagCMRefreshTreasureFreeCnt
-
-class  tagCMRefreshTreasureFreeCnt(Structure):
-    _pack_ = 1
-    _fields_ = [
-                  ("Cmd", c_ubyte),
-                  ("SubCmd", c_ubyte),
-                  ]
-
-    def __init__(self):
-        self.Clear()
-        self.Cmd = 0xA5
-        self.SubCmd = 0x69
-        return
-
-    def ReadData(self, stringData, _pos=0, _len=0):
-        self.Clear()
-        memmove(addressof(self), stringData[_pos:], self.GetLength())
-        return _pos + self.GetLength()
-
-    def Clear(self):
-        self.Cmd = 0xA5
-        self.SubCmd = 0x69
-        return
-
-    def GetLength(self):
-        return sizeof(tagCMRefreshTreasureFreeCnt)
-
-    def GetBuffer(self):
-        return string_at(addressof(self), self.GetLength())
-
-    def OutputString(self):
-        DumpString = '''// A5 69 刷新寻宝免费次数 //tagCMRefreshTreasureFreeCnt:
-                                Cmd:%s,
-                                SubCmd:%s
-                                '''\
-                                %(
-                                self.Cmd,
-                                self.SubCmd
-                                )
-        return DumpString
-
-
-m_NAtagCMRefreshTreasureFreeCnt=tagCMRefreshTreasureFreeCnt()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMRefreshTreasureFreeCnt.Cmd,m_NAtagCMRefreshTreasureFreeCnt.SubCmd))] = m_NAtagCMRefreshTreasureFreeCnt
-
-
-#------------------------------------------------------
 # A5 37 请求邮件操作 #tagCMRequestMail
 
 class  tagCMRequestMail(Structure):
@@ -7331,6 +7283,80 @@
 
 
 #------------------------------------------------------
+# A5 69 寻宝心愿物品选择 #tagCSTreasureWishSelect
+
+class  tagCSTreasureWishSelect(Structure):
+    Head = tagHead()
+    TreasureType = 0    #(BYTE TreasureType)//寻宝类型
+    WishCnt = 0    #(BYTE WishCnt)
+    WishIDList = list()    #(vector<DWORD> WishIDList)// 选择的寻宝物品库中的数据ID,注意不是库ID
+    data = None
+
+    def __init__(self):
+        self.Clear()
+        self.Head.Cmd = 0xA5
+        self.Head.SubCmd = 0x69
+        return
+
+    def ReadData(self, _lpData, _pos=0, _Len=0):
+        self.Clear()
+        _pos = self.Head.ReadData(_lpData, _pos)
+        self.TreasureType,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+        self.WishCnt,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+        for i in range(self.WishCnt):
+            value,_pos=CommFunc.ReadDWORD(_lpData,_pos)
+            self.WishIDList.append(value)
+        return _pos
+
+    def Clear(self):
+        self.Head = tagHead()
+        self.Head.Clear()
+        self.Head.Cmd = 0xA5
+        self.Head.SubCmd = 0x69
+        self.TreasureType = 0
+        self.WishCnt = 0
+        self.WishIDList = list()
+        return
+
+    def GetLength(self):
+        length = 0
+        length += self.Head.GetLength()
+        length += 1
+        length += 1
+        length += 4 * self.WishCnt
+
+        return length
+
+    def GetBuffer(self):
+        data = ''
+        data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
+        data = CommFunc.WriteBYTE(data, self.TreasureType)
+        data = CommFunc.WriteBYTE(data, self.WishCnt)
+        for i in range(self.WishCnt):
+            data = CommFunc.WriteDWORD(data, self.WishIDList[i])
+        return data
+
+    def OutputString(self):
+        DumpString = '''
+                                Head:%s,
+                                TreasureType:%d,
+                                WishCnt:%d,
+                                WishIDList:%s
+                                '''\
+                                %(
+                                self.Head.OutputString(),
+                                self.TreasureType,
+                                self.WishCnt,
+                                "..."
+                                )
+        return DumpString
+
+
+m_NAtagCSTreasureWishSelect=tagCSTreasureWishSelect()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCSTreasureWishSelect.Head.Cmd,m_NAtagCSTreasureWishSelect.Head.SubCmd))] = m_NAtagCSTreasureWishSelect
+
+
+#------------------------------------------------------
 # A5 73 解锁命格孔 #tagCMUnLockBirthChartHole
 
 class  tagCMUnLockBirthChartHole(Structure):

--
Gitblit v1.8.0