From 442a4e3a566cc1a39e0f2eed46c49cdccd7ef1cf Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 16 八月 2021 15:19:41 +0800
Subject: [PATCH] 8721 【主干】【BT3】【后端】H.活动-合服庆典(转盘活动改为支持配置消耗的货币类型)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py |   43 +++++++++++++++++++++++++------------------
 1 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py
index 03da6ed..c038c90 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py
@@ -27292,8 +27292,9 @@
     LimitLV = 0    #(WORD LimitLV)// 限制等级
     CTGPrizeCount = 0    #(BYTE CTGPrizeCount)
     CTGPrizeList = list()    #(vector<DWORD> CTGPrizeList)// 累计充值额度奖励次数列表 [奖励第1次所需累计充值额度, 第2次, ...]
-    UseGoldPrizeCount = 0    #(BYTE UseGoldPrizeCount)
-    UseGoldPrizeList = list()    #(vector<DWORD> UseGoldPrizeList)// 累计消费仙玉奖励次数列表 [奖励第1次所需累计消费仙玉, 第2次, ...]
+    UseMoneyType = 0    #(BYTE UseMoneyType)// 累计消费货币类型
+    UseMoneyPrizeCount = 0    #(BYTE UseMoneyPrizeCount)
+    UseMoneyPrizeList = list()    #(vector<DWORD> UseMoneyPrizeList)// 累计消费货币奖励次数列表 [奖励第1次所需累计消费货币, 第2次, ...]
     TurnItemCount = 0    #(BYTE TurnItemCount)
     TurnItemList = list()    #(vector<tagMCActTurntableItem> TurnItemList)// 转盘已确定的物品列表,包含常规物品+极品物品+终极物品,活动开始时,后端直接随机生成常规物品,已确定的物品不包含极品、终极物品时需要先选择才能使用转盘;
     GoodItemCount = 0    #(BYTE GoodItemCount)
@@ -27322,10 +27323,11 @@
         for i in range(self.CTGPrizeCount):
             value,_pos=CommFunc.ReadDWORD(_lpData,_pos)
             self.CTGPrizeList.append(value)
-        self.UseGoldPrizeCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        for i in range(self.UseGoldPrizeCount):
+        self.UseMoneyType,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+        self.UseMoneyPrizeCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+        for i in range(self.UseMoneyPrizeCount):
             value,_pos=CommFunc.ReadDWORD(_lpData,_pos)
-            self.UseGoldPrizeList.append(value)
+            self.UseMoneyPrizeList.append(value)
         self.TurnItemCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
         for i in range(self.TurnItemCount):
             temTurnItemList = tagMCActTurntableItem()
@@ -27357,8 +27359,9 @@
         self.LimitLV = 0
         self.CTGPrizeCount = 0
         self.CTGPrizeList = list()
-        self.UseGoldPrizeCount = 0
-        self.UseGoldPrizeList = list()
+        self.UseMoneyType = 0
+        self.UseMoneyPrizeCount = 0
+        self.UseMoneyPrizeList = list()
         self.TurnItemCount = 0
         self.TurnItemList = list()
         self.GoodItemCount = 0
@@ -27380,7 +27383,8 @@
         length += 1
         length += 4 * self.CTGPrizeCount
         length += 1
-        length += 4 * self.UseGoldPrizeCount
+        length += 1
+        length += 4 * self.UseMoneyPrizeCount
         length += 1
         for i in range(self.TurnItemCount):
             length += self.TurnItemList[i].GetLength()
@@ -27406,9 +27410,10 @@
         data = CommFunc.WriteBYTE(data, self.CTGPrizeCount)
         for i in range(self.CTGPrizeCount):
             data = CommFunc.WriteDWORD(data, self.CTGPrizeList[i])
-        data = CommFunc.WriteBYTE(data, self.UseGoldPrizeCount)
-        for i in range(self.UseGoldPrizeCount):
-            data = CommFunc.WriteDWORD(data, self.UseGoldPrizeList[i])
+        data = CommFunc.WriteBYTE(data, self.UseMoneyType)
+        data = CommFunc.WriteBYTE(data, self.UseMoneyPrizeCount)
+        for i in range(self.UseMoneyPrizeCount):
+            data = CommFunc.WriteDWORD(data, self.UseMoneyPrizeList[i])
         data = CommFunc.WriteBYTE(data, self.TurnItemCount)
         for i in range(self.TurnItemCount):
             data = CommFunc.WriteString(data, self.TurnItemList[i].GetLength(), self.TurnItemList[i].GetBuffer())
@@ -27432,8 +27437,9 @@
                                 LimitLV:%d,
                                 CTGPrizeCount:%d,
                                 CTGPrizeList:%s,
-                                UseGoldPrizeCount:%d,
-                                UseGoldPrizeList:%s,
+                                UseMoneyType:%d,
+                                UseMoneyPrizeCount:%d,
+                                UseMoneyPrizeList:%s,
                                 TurnItemCount:%d,
                                 TurnItemList:%s,
                                 GoodItemCount:%d,
@@ -27452,7 +27458,8 @@
                                 self.LimitLV,
                                 self.CTGPrizeCount,
                                 "...",
-                                self.UseGoldPrizeCount,
+                                self.UseMoneyType,
+                                self.UseMoneyPrizeCount,
                                 "...",
                                 self.TurnItemCount,
                                 "...",
@@ -27481,7 +27488,7 @@
                   ("ActNum", c_ubyte),    #活动编号
                   ("CanUseCount", c_ubyte),    #可转盘次数
                   ("CTGTotal", c_int),    #累计充值额度
-                  ("UseGoldTotal", c_int),    #累计消费仙玉额度
+                  ("UseMoneyTotal", c_int),    #累计消费货币额度
                   ("TurnItemState", c_int),    #转盘物品已抽中记录,按转盘物品编号二进制位代表是否已抽中
                   ("GetItemNum", c_ubyte),    #本次抽中的物品编号,非转盘结果时为0,大于0时为通知本次转到的物品编号
                   ]
@@ -27503,7 +27510,7 @@
         self.ActNum = 0
         self.CanUseCount = 0
         self.CTGTotal = 0
-        self.UseGoldTotal = 0
+        self.UseMoneyTotal = 0
         self.TurnItemState = 0
         self.GetItemNum = 0
         return
@@ -27521,7 +27528,7 @@
                                 ActNum:%d,
                                 CanUseCount:%d,
                                 CTGTotal:%d,
-                                UseGoldTotal:%d,
+                                UseMoneyTotal:%d,
                                 TurnItemState:%d,
                                 GetItemNum:%d
                                 '''\
@@ -27531,7 +27538,7 @@
                                 self.ActNum,
                                 self.CanUseCount,
                                 self.CTGTotal,
-                                self.UseGoldTotal,
+                                self.UseMoneyTotal,
                                 self.TurnItemState,
                                 self.GetItemNum
                                 )

--
Gitblit v1.8.0