From ecaf9ab6fd8c5bebdf848ef9ae373cea5273b188 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 13 六月 2024 18:01:13 +0800
Subject: [PATCH] 8701 【主干】【港台】【越南】【砍树】【后端】活动相关的充值界面显示优化（每日礼包AA25增加折扣百分比信息）；
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerDailyGiftbag.py | 1 +
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py | 11 +++++++++--
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py | 4 +++-
PySysDB/PySysDBPY.h | 1 +
ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py | 11 +++++++++--
5 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/PySysDB/PySysDBPY.h b/PySysDB/PySysDBPY.h
index c533973..2600192 100644
--- a/PySysDB/PySysDBPY.h
+++ b/PySysDB/PySysDBPY.h
@@ -1732,6 +1732,7 @@
DWORD _GiftbagID; //礼包编号
WORD BuyCountLimit; //限购次数,0不限购
list GiftItemList; //礼包物品信息列表 [(物品ID,个数,是否绑定),...]
+ WORD Discount; //折扣百分比
};
//双倍经验活动表
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py b/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py
index 3d7a6f8..0b4c864 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py
@@ -38464,6 +38464,7 @@
RMB = 0 #(DWORD RMB)//所需RMB，元
GiftItemCount = 0 #(BYTE GiftItemCount)// 礼包物品数
ItemInfo = list() #(vector<tagMCDailyGiftbagItem> ItemInfo)// 物品信息
+ Discount = 0 #(WORD Discount)// 折扣力度百分比
data = None
def __init__(self):
@@ -38482,6 +38483,7 @@
temItemInfo = tagMCDailyGiftbagItem()
_pos = temItemInfo.ReadData(_lpData, _pos)
self.ItemInfo.append(temItemInfo)
+ self.Discount,_pos = CommFunc.ReadWORD(_lpData, _pos)
return _pos
def Clear(self):
@@ -38492,6 +38494,7 @@
self.RMB = 0
self.GiftItemCount = 0
self.ItemInfo = list()
+ self.Discount = 0
return
def GetLength(self):
@@ -38504,6 +38507,7 @@
length += 1
for i in range(self.GiftItemCount):
length += self.ItemInfo[i].GetLength()
+ length += 2
return length
@@ -38517,6 +38521,7 @@
data = CommFunc.WriteBYTE(data, self.GiftItemCount)
for i in range(self.GiftItemCount):
data = CommFunc.WriteString(data, self.ItemInfo[i].GetLength(), self.ItemInfo[i].GetBuffer())
+ data = CommFunc.WriteWORD(data, self.Discount)
return data
def OutputString(self):
@@ -38527,7 +38532,8 @@
BuyCountLimit:%d,
RMB:%d,
GiftItemCount:%d,
- ItemInfo:%s
+ ItemInfo:%s,
+ Discount:%d
'''\
%(
self.GiftID,
@@ -38536,7 +38542,8 @@
self.BuyCountLimit,
self.RMB,
self.GiftItemCount,
- "..."
+ "...",
+ self.Discount
)
return DumpString
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py
index 3d7a6f8..0b4c864 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py
@@ -38464,6 +38464,7 @@
RMB = 0 #(DWORD RMB)//所需RMB，元
GiftItemCount = 0 #(BYTE GiftItemCount)// 礼包物品数
ItemInfo = list() #(vector<tagMCDailyGiftbagItem> ItemInfo)// 物品信息
+ Discount = 0 #(WORD Discount)// 折扣力度百分比
data = None
def __init__(self):
@@ -38482,6 +38483,7 @@
temItemInfo = tagMCDailyGiftbagItem()
_pos = temItemInfo.ReadData(_lpData, _pos)
self.ItemInfo.append(temItemInfo)
+ self.Discount,_pos = CommFunc.ReadWORD(_lpData, _pos)
return _pos
def Clear(self):
@@ -38492,6 +38494,7 @@
self.RMB = 0
self.GiftItemCount = 0
self.ItemInfo = list()
+ self.Discount = 0
return
def GetLength(self):
@@ -38504,6 +38507,7 @@
length += 1
for i in range(self.GiftItemCount):
length += self.ItemInfo[i].GetLength()
+ length += 2
return length
@@ -38517,6 +38521,7 @@
data = CommFunc.WriteBYTE(data, self.GiftItemCount)
for i in range(self.GiftItemCount):
data = CommFunc.WriteString(data, self.ItemInfo[i].GetLength(), self.ItemInfo[i].GetBuffer())
+ data = CommFunc.WriteWORD(data, self.Discount)
return data
def OutputString(self):
@@ -38527,7 +38532,8 @@
BuyCountLimit:%d,
RMB:%d,
GiftItemCount:%d,
- ItemInfo:%s
+ ItemInfo:%s,
+ Discount:%d
'''\
%(
self.GiftID,
@@ -38536,7 +38542,8 @@
self.BuyCountLimit,
self.RMB,
self.GiftItemCount,
- "..."
+ "...",
+ self.Discount
)
return DumpString
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py
index e26552f..ea64c4a 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py
@@ -1391,6 +1391,7 @@
("DWORD", "GiftbagID", 1),
("WORD", "BuyCountLimit", 0),
("list", "GiftItemList", 0),
+ ("WORD", "Discount", 0),
),
"ActExpRate":(
@@ -4304,7 +4305,8 @@
def GetGiftbagType(self): return self.attrTuple[0] # 礼包模板类型 WORD
def GetGiftbagID(self): return self.attrTuple[1] # 礼包编号 DWORD
def GetBuyCountLimit(self): return self.attrTuple[2] # 限购次数,0不限购 WORD
- def GetGiftItemList(self): return self.attrTuple[3] # 礼包物品信息列表 [(物品ID,个数,是否绑定),...] list
+ def GetGiftItemList(self): return self.attrTuple[3] # 礼包物品信息列表 [(物品ID,个数,是否绑定),...] list
+ def GetDiscount(self): return self.attrTuple[4] # 折扣百分比 WORD
# 双倍经验活动表
class IPY_ActExpRate():
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerDailyGiftbag.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerDailyGiftbag.py
index 1ae2cea..be153b4 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerDailyGiftbag.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerDailyGiftbag.py
@@ -222,6 +222,7 @@
item.ItemCount = itemCount
giftBag.ItemInfo.append(item)
giftBag.GiftItemCount = len(giftBag.ItemInfo)
+ giftBag.Discount = giftIpyData.GetDiscount()
packInfo.GiftbagInfo.append(giftBag)
packInfo.GiftbagCount = len(packInfo.GiftbagInfo)
--
Gitblit v1.8.0