From 587f43bce904c6350d70181a9c1ac8dc5af8e6f8 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 05 六月 2024 14:11:33 +0800
Subject: [PATCH] 10173 【主干】【香港】【越南】BOSS凭证（购买次数礼包活动增加折扣信息及免费次数礼包）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActLoginNew.py | 4
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActBuyCountGift.py | 33 +++++---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py | 79 +++++++++++++++----
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py | 4
PySysDB/PySysDBPY.h | 2
ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py | 79 +++++++++++++++----
6 files changed, 152 insertions(+), 49 deletions(-)
diff --git a/PySysDB/PySysDBPY.h b/PySysDB/PySysDBPY.h
index e30e2dd..50a7ad4 100644
--- a/PySysDB/PySysDBPY.h
+++ b/PySysDB/PySysDBPY.h
@@ -2419,7 +2419,7 @@
WORD LVLimit; //限制等级
BYTE IsDayReset; //是否每天重置
BYTE ResetType; //重置类型，0-0点重置；1-5点重置
- list CTGIDList; //充值ID列表
+ dict CTGIDInfo; //充值ID信息 {ctgID:折扣力度百分比, ...}
dict CTGCountAwardInfo; //累计充值次数额外奖励
};
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py b/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py
index edb62fd..d61488a 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py
@@ -31702,7 +31702,7 @@
class tagMCActBuyCountGift(Structure):
- NeedBuyCount = 0 #(BYTE NeedBuyCount)// 所需总购买次数
+ NeedBuyCount = 0 #(BYTE NeedBuyCount)// 所需总购买次数，0为免费领取的档次
Count = 0 #(BYTE Count)// 奖励物品数
AwardItemList = list() #(vector<tagMCActBuyCountGiftItem> AwardItemList)// 奖励物品列表
data = None
@@ -31758,6 +31758,45 @@
return DumpString
+class tagMCActBuyCountCTGID(Structure):
+ _pack_ = 1
+ _fields_ = [
+ ("CTGID", c_ushort), # 充值表ID
+ ("Discount", c_ushort), # 折扣力度百分比
+ ]
+
+ def __init__(self):
+ self.Clear()
+ 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.CTGID = 0
+ self.Discount = 0
+ return
+
+ def GetLength(self):
+ return sizeof(tagMCActBuyCountCTGID)
+
+ def GetBuffer(self):
+ return string_at(addressof(self), self.GetLength())
+
+ def OutputString(self):
+ DumpString = '''// AA 74 购买次数礼包活动信息 //tagMCActBuyCountGiftInfo:
+ CTGID:%d,
+ Discount:%d
+ '''\
+ %(
+ self.CTGID,
+ self.Discount
+ )
+ return DumpString
+
+
class tagMCActBuyCountGiftInfo(Structure):
Head = tagHead()
ActNum = 0 #(BYTE ActNum)// 活动编号
@@ -31767,7 +31806,7 @@
ResetType = 0 #(BYTE ResetType)// 重置类型，0-0点重置；1-5点重置
LimitLV = 0 #(WORD LimitLV)// 限制等级
CTGIDCount = 0 #(BYTE CTGIDCount)
- CTGIDList = list() #(vector<DWORD> CTGIDList)// CTGID列表；总购买次数前端自己统计，直接取CTGID对应的累计购买次数累加
+ CTGIDInfoList = list() #(vector<tagMCActBuyCountCTGID> CTGIDInfoList)// CTGID信息列表；总购买次数前端自己统计，直接取CTGID对应的累计购买次数累加
GiftCount = 0 #(BYTE GiftCount)
BuyCountGiftList = list() #(vector<tagMCActBuyCountGift> BuyCountGiftList)// 购买次数礼包列表
data = None
@@ -31789,8 +31828,9 @@
self.LimitLV,_pos = CommFunc.ReadWORD(_lpData, _pos)
self.CTGIDCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
for i in range(self.CTGIDCount):
- value,_pos=CommFunc.ReadDWORD(_lpData,_pos)
- self.CTGIDList.append(value)
+ temCTGIDInfoList = tagMCActBuyCountCTGID()
+ _pos = temCTGIDInfoList.ReadData(_lpData, _pos)
+ self.CTGIDInfoList.append(temCTGIDInfoList)
self.GiftCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
for i in range(self.GiftCount):
temBuyCountGiftList = tagMCActBuyCountGift()
@@ -31810,7 +31850,7 @@
self.ResetType = 0
self.LimitLV = 0
self.CTGIDCount = 0
- self.CTGIDList = list()
+ self.CTGIDInfoList = list()
self.GiftCount = 0
self.BuyCountGiftList = list()
return
@@ -31825,7 +31865,8 @@
length += 1
length += 2
length += 1
- length += 4 * self.CTGIDCount
+ for i in range(self.CTGIDCount):
+ length += self.CTGIDInfoList[i].GetLength()
length += 1
for i in range(self.GiftCount):
length += self.BuyCountGiftList[i].GetLength()
@@ -31843,7 +31884,7 @@
data = CommFunc.WriteWORD(data, self.LimitLV)
data = CommFunc.WriteBYTE(data, self.CTGIDCount)
for i in range(self.CTGIDCount):
- data = CommFunc.WriteDWORD(data, self.CTGIDList[i])
+ data = CommFunc.WriteString(data, self.CTGIDInfoList[i].GetLength(), self.CTGIDInfoList[i].GetBuffer())
data = CommFunc.WriteBYTE(data, self.GiftCount)
for i in range(self.GiftCount):
data = CommFunc.WriteString(data, self.BuyCountGiftList[i].GetLength(), self.BuyCountGiftList[i].GetBuffer())
@@ -31859,7 +31900,7 @@
ResetType:%d,
LimitLV:%d,
CTGIDCount:%d,
- CTGIDList:%s,
+ CTGIDInfoList:%s,
GiftCount:%d,
BuyCountGiftList:%s
'''\
@@ -34250,7 +34291,8 @@
StartDate = "" #(char StartDate[10])// 开始日期 y-m-d
EndtDate = "" #(char EndtDate[10])// 结束日期 y-m-d
LimitLV = 0 #(WORD LimitLV)// 限制等级
- RepSignCostMoney = list() #(DWORD RepSignCostMoney[2])// 补签消耗 [货币类型, 货币值]
+ RepSignMoneyType = 0 #(BYTE RepSignMoneyType)// 补签消耗货币类型
+ RepSignMoneyValue = 0 #(DWORD RepSignMoneyValue)// 补签消耗货币值
DayCount = 0 #(BYTE DayCount)
AwardDayList = list() #(vector<tagMCActLoginNewDay> AwardDayList)// 奖励天列表
data = None
@@ -34268,7 +34310,8 @@
self.StartDate,_pos = CommFunc.ReadString(_lpData, _pos,10)
self.EndtDate,_pos = CommFunc.ReadString(_lpData, _pos,10)
self.LimitLV,_pos = CommFunc.ReadWORD(_lpData, _pos)
- self.RepSignCostMoney, _pos = CommFunc.ReadString(_lpData, _pos, 2*17582024)
+ self.RepSignMoneyType,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ self.RepSignMoneyValue,_pos = CommFunc.ReadDWORD(_lpData, _pos)
self.DayCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
for i in range(self.DayCount):
temAwardDayList = tagMCActLoginNewDay()
@@ -34285,7 +34328,8 @@
self.StartDate = ""
self.EndtDate = ""
self.LimitLV = 0
- self.RepSignCostMoney = list()
+ self.RepSignMoneyType = 0
+ self.RepSignMoneyValue = 0
self.DayCount = 0
self.AwardDayList = list()
return
@@ -34297,7 +34341,8 @@
length += 10
length += 10
length += 2
- length += 4*2
+ length += 1
+ length += 4
length += 1
for i in range(self.DayCount):
length += self.AwardDayList[i].GetLength()
@@ -34311,8 +34356,8 @@
data = CommFunc.WriteString(data, 10, self.StartDate)
data = CommFunc.WriteString(data, 10, self.EndtDate)
data = CommFunc.WriteWORD(data, self.LimitLV)
- for item in self.RepSignCostMoney:
- data = CommFunc.WriteDWORD(data, item)
+ data = CommFunc.WriteBYTE(data, self.RepSignMoneyType)
+ data = CommFunc.WriteDWORD(data, self.RepSignMoneyValue)
data = CommFunc.WriteBYTE(data, self.DayCount)
for i in range(self.DayCount):
data = CommFunc.WriteString(data, self.AwardDayList[i].GetLength(), self.AwardDayList[i].GetBuffer())
@@ -34325,7 +34370,8 @@
StartDate:%s,
EndtDate:%s,
LimitLV:%d,
- RepSignCostMoney:%s,
+ RepSignMoneyType:%d,
+ RepSignMoneyValue:%d,
DayCount:%d,
AwardDayList:%s
'''\
@@ -34335,7 +34381,8 @@
self.StartDate,
self.EndtDate,
self.LimitLV,
- "...",
+ self.RepSignMoneyType,
+ self.RepSignMoneyValue,
self.DayCount,
"..."
)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py
index edb62fd..d61488a 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py
@@ -31702,7 +31702,7 @@
class tagMCActBuyCountGift(Structure):
- NeedBuyCount = 0 #(BYTE NeedBuyCount)// 所需总购买次数
+ NeedBuyCount = 0 #(BYTE NeedBuyCount)// 所需总购买次数，0为免费领取的档次
Count = 0 #(BYTE Count)// 奖励物品数
AwardItemList = list() #(vector<tagMCActBuyCountGiftItem> AwardItemList)// 奖励物品列表
data = None
@@ -31758,6 +31758,45 @@
return DumpString
+class tagMCActBuyCountCTGID(Structure):
+ _pack_ = 1
+ _fields_ = [
+ ("CTGID", c_ushort), # 充值表ID
+ ("Discount", c_ushort), # 折扣力度百分比
+ ]
+
+ def __init__(self):
+ self.Clear()
+ 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.CTGID = 0
+ self.Discount = 0
+ return
+
+ def GetLength(self):
+ return sizeof(tagMCActBuyCountCTGID)
+
+ def GetBuffer(self):
+ return string_at(addressof(self), self.GetLength())
+
+ def OutputString(self):
+ DumpString = '''// AA 74 购买次数礼包活动信息 //tagMCActBuyCountGiftInfo:
+ CTGID:%d,
+ Discount:%d
+ '''\
+ %(
+ self.CTGID,
+ self.Discount
+ )
+ return DumpString
+
+
class tagMCActBuyCountGiftInfo(Structure):
Head = tagHead()
ActNum = 0 #(BYTE ActNum)// 活动编号
@@ -31767,7 +31806,7 @@
ResetType = 0 #(BYTE ResetType)// 重置类型，0-0点重置；1-5点重置
LimitLV = 0 #(WORD LimitLV)// 限制等级
CTGIDCount = 0 #(BYTE CTGIDCount)
- CTGIDList = list() #(vector<DWORD> CTGIDList)// CTGID列表；总购买次数前端自己统计，直接取CTGID对应的累计购买次数累加
+ CTGIDInfoList = list() #(vector<tagMCActBuyCountCTGID> CTGIDInfoList)// CTGID信息列表；总购买次数前端自己统计，直接取CTGID对应的累计购买次数累加
GiftCount = 0 #(BYTE GiftCount)
BuyCountGiftList = list() #(vector<tagMCActBuyCountGift> BuyCountGiftList)// 购买次数礼包列表
data = None
@@ -31789,8 +31828,9 @@
self.LimitLV,_pos = CommFunc.ReadWORD(_lpData, _pos)
self.CTGIDCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
for i in range(self.CTGIDCount):
- value,_pos=CommFunc.ReadDWORD(_lpData,_pos)
- self.CTGIDList.append(value)
+ temCTGIDInfoList = tagMCActBuyCountCTGID()
+ _pos = temCTGIDInfoList.ReadData(_lpData, _pos)
+ self.CTGIDInfoList.append(temCTGIDInfoList)
self.GiftCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
for i in range(self.GiftCount):
temBuyCountGiftList = tagMCActBuyCountGift()
@@ -31810,7 +31850,7 @@
self.ResetType = 0
self.LimitLV = 0
self.CTGIDCount = 0
- self.CTGIDList = list()
+ self.CTGIDInfoList = list()
self.GiftCount = 0
self.BuyCountGiftList = list()
return
@@ -31825,7 +31865,8 @@
length += 1
length += 2
length += 1
- length += 4 * self.CTGIDCount
+ for i in range(self.CTGIDCount):
+ length += self.CTGIDInfoList[i].GetLength()
length += 1
for i in range(self.GiftCount):
length += self.BuyCountGiftList[i].GetLength()
@@ -31843,7 +31884,7 @@
data = CommFunc.WriteWORD(data, self.LimitLV)
data = CommFunc.WriteBYTE(data, self.CTGIDCount)
for i in range(self.CTGIDCount):
- data = CommFunc.WriteDWORD(data, self.CTGIDList[i])
+ data = CommFunc.WriteString(data, self.CTGIDInfoList[i].GetLength(), self.CTGIDInfoList[i].GetBuffer())
data = CommFunc.WriteBYTE(data, self.GiftCount)
for i in range(self.GiftCount):
data = CommFunc.WriteString(data, self.BuyCountGiftList[i].GetLength(), self.BuyCountGiftList[i].GetBuffer())
@@ -31859,7 +31900,7 @@
ResetType:%d,
LimitLV:%d,
CTGIDCount:%d,
- CTGIDList:%s,
+ CTGIDInfoList:%s,
GiftCount:%d,
BuyCountGiftList:%s
'''\
@@ -34250,7 +34291,8 @@
StartDate = "" #(char StartDate[10])// 开始日期 y-m-d
EndtDate = "" #(char EndtDate[10])// 结束日期 y-m-d
LimitLV = 0 #(WORD LimitLV)// 限制等级
- RepSignCostMoney = list() #(DWORD RepSignCostMoney[2])// 补签消耗 [货币类型, 货币值]
+ RepSignMoneyType = 0 #(BYTE RepSignMoneyType)// 补签消耗货币类型
+ RepSignMoneyValue = 0 #(DWORD RepSignMoneyValue)// 补签消耗货币值
DayCount = 0 #(BYTE DayCount)
AwardDayList = list() #(vector<tagMCActLoginNewDay> AwardDayList)// 奖励天列表
data = None
@@ -34268,7 +34310,8 @@
self.StartDate,_pos = CommFunc.ReadString(_lpData, _pos,10)
self.EndtDate,_pos = CommFunc.ReadString(_lpData, _pos,10)
self.LimitLV,_pos = CommFunc.ReadWORD(_lpData, _pos)
- self.RepSignCostMoney, _pos = CommFunc.ReadString(_lpData, _pos, 2*17582024)
+ self.RepSignMoneyType,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ self.RepSignMoneyValue,_pos = CommFunc.ReadDWORD(_lpData, _pos)
self.DayCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
for i in range(self.DayCount):
temAwardDayList = tagMCActLoginNewDay()
@@ -34285,7 +34328,8 @@
self.StartDate = ""
self.EndtDate = ""
self.LimitLV = 0
- self.RepSignCostMoney = list()
+ self.RepSignMoneyType = 0
+ self.RepSignMoneyValue = 0
self.DayCount = 0
self.AwardDayList = list()
return
@@ -34297,7 +34341,8 @@
length += 10
length += 10
length += 2
- length += 4*2
+ length += 1
+ length += 4
length += 1
for i in range(self.DayCount):
length += self.AwardDayList[i].GetLength()
@@ -34311,8 +34356,8 @@
data = CommFunc.WriteString(data, 10, self.StartDate)
data = CommFunc.WriteString(data, 10, self.EndtDate)
data = CommFunc.WriteWORD(data, self.LimitLV)
- for item in self.RepSignCostMoney:
- data = CommFunc.WriteDWORD(data, item)
+ data = CommFunc.WriteBYTE(data, self.RepSignMoneyType)
+ data = CommFunc.WriteDWORD(data, self.RepSignMoneyValue)
data = CommFunc.WriteBYTE(data, self.DayCount)
for i in range(self.DayCount):
data = CommFunc.WriteString(data, self.AwardDayList[i].GetLength(), self.AwardDayList[i].GetBuffer())
@@ -34325,7 +34370,8 @@
StartDate:%s,
EndtDate:%s,
LimitLV:%d,
- RepSignCostMoney:%s,
+ RepSignMoneyType:%d,
+ RepSignMoneyValue:%d,
DayCount:%d,
AwardDayList:%s
'''\
@@ -34335,7 +34381,8 @@
self.StartDate,
self.EndtDate,
self.LimitLV,
- "...",
+ self.RepSignMoneyType,
+ self.RepSignMoneyValue,
self.DayCount,
"..."
)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py
index ce70479..3800279 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py
@@ -1900,7 +1900,7 @@
("WORD", "LVLimit", 0),
("BYTE", "IsDayReset", 0),
("BYTE", "ResetType", 0),
- ("list", "CTGIDList", 0),
+ ("dict", "CTGIDInfo", 0),
("dict", "CTGCountAwardInfo", 0),
),
@@ -5108,7 +5108,7 @@
def GetLVLimit(self): return self.attrTuple[3] # 限制等级 WORD
def GetIsDayReset(self): return self.attrTuple[4] # 是否每天重置 BYTE
def GetResetType(self): return self.attrTuple[5] # 重置类型，0-0点重置；1-5点重置 BYTE
- def GetCTGIDList(self): return self.attrTuple[6] # 充值ID列表 list
+ def GetCTGIDInfo(self): return self.attrTuple[6] # 充值ID信息 {ctgID:折扣力度百分比, ...} dict
def GetCTGCountAwardInfo(self): return self.attrTuple[7] # 累计充值次数额外奖励 dict
# 任务活动时间表
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActBuyCountGift.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActBuyCountGift.py
index 7e56d35..5f0a463 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActBuyCountGift.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActBuyCountGift.py
@@ -86,7 +86,8 @@
ipyData = IpyGameDataPY.GetIpyGameData("ActBuyCountGift", cfgID)
if not ipyData:
return
- resetCTGIDList = ipyData.GetCTGIDList()
+ ctgIDInfo = ipyData.GetCTGIDInfo()
+ resetCTGIDList = ctgIDInfo.keys()
PlayerCoin.DoResetCTGCountByIDList(curPlayer, "ActBuyCountGift", resetCTGIDList)
return
@@ -108,12 +109,19 @@
ipyData = IpyGameDataPY.GetIpyGameData("ActBuyCountGift", cfgID)
if not ipyData:
return
- CTGIDList = ipyData.GetCTGIDList()
+ CTGIDInfo= ipyData.GetCTGIDInfo()
+ CTGIDList = CTGIDInfo.keys()
CTGCountAwardInfo = ipyData.GetCTGCountAwardInfo()
if buyCount not in CTGCountAwardInfo:
GameWorld.DebugLog("购买次数礼包没有该次数礼包奖励! actNum=%s,cfgID=%s,buyCount=%s" % (actNum, cfgID, buyCount), playerID)
return
awardItemList = CTGCountAwardInfo[buyCount]
+
+ awardRecord = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_BuyCountGiftAward % actNum)
+ if awardRecord & pow(2, buyCount):
+ GameWorld.Log("购买次数礼包活动已经领取过该奖励! actNum=%s,cfgID=%s,buyCount=%s,awardRecord=%s"
+ % (actNum, cfgID, buyCount, awardRecord), playerID)
+ return
totalBuyCount = 0
for ctgID in CTGIDList:
@@ -122,12 +130,6 @@
if totalBuyCount < buyCount:
GameWorld.Log("购买次数礼包活动累计购买次数不足，无法免费领取! actNum=%s,cfgID=%s,CTGIDList=%s,totalBuyCount=%s < %s"
% (actNum, cfgID, CTGIDList, totalBuyCount, buyCount), playerID)
- return
-
- awardRecord = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_BuyCountGiftAward % actNum)
- if awardRecord & pow(2, buyCount):
- GameWorld.Log("购买次数礼包活动已经领取过该奖励! actNum=%s,cfgID=%s,buyCount=%s,awardRecord=%s"
- % (actNum, cfgID, buyCount, awardRecord), playerID)
return
# 检查背包
@@ -166,6 +168,7 @@
ipyData = IpyGameDataPY.GetIpyGameData("ActBuyCountGift", cfgID)
if not ipyData:
return
+ CTGIDInfo = ipyData.GetCTGIDInfo()
CTGCountAwardInfo = ipyData.GetCTGCountAwardInfo()
startDateStr, endDateStr = GameWorld.GetOperationActionDateStr(ipyData)
@@ -177,10 +180,15 @@
actInfo.LimitLV = ipyData.GetLVLimit()
actInfo.IsDayReset = ipyData.GetIsDayReset()
actInfo.ResetType = ipyData.GetResetType()
- actInfo.CTGIDList = ipyData.GetCTGIDList()
- actInfo.CTGIDCount = len(actInfo.CTGIDList)
- actInfo.BuyCountGiftList = []
+ actInfo.CTGIDInfoList = []
+ for ctgID, discount in CTGIDInfo.items():
+ ctg = ChPyNetSendPack.tagMCActBuyCountCTGID()
+ ctg.CTGID = ctgID
+ ctg.Discount = discount
+ actInfo.CTGIDInfoList.append(ctg)
+ actInfo.CTGIDCount = len(actInfo.CTGIDInfoList)
+ actInfo.BuyCountGiftList = []
for buyCount, awardItemList in CTGCountAwardInfo.items():
giftbag = ChPyNetSendPack.tagMCActBuyCountGift()
giftbag.NeedBuyCount = buyCount
@@ -192,9 +200,8 @@
giftItem.IsBind = isAuctionItem
giftbag.AwardItemList.append(giftItem)
giftbag.Count = len(giftbag.AwardItemList)
-
actInfo.BuyCountGiftList.append(giftbag)
-
actInfo.GiftCount = len(actInfo.BuyCountGiftList)
+
NetPackCommon.SendFakePack(curPlayer, actInfo)
return
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActLoginNew.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActLoginNew.py
index 56d75f7..ffa9d5b 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActLoginNew.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActLoginNew.py
@@ -161,6 +161,7 @@
ipyData = IpyGameDataPY.GetIpyGameData("ActLoginNew", cfgID)
if not ipyData:
return
+ moneyType, moneyValue = ipyData.GetRepSignCostMoneyInfo()
templateID = ipyData.GetTemplateID()
dayIpyDataList = IpyGameDataPY.GetIpyGameDataList("ActLoginNewAward", templateID)
if not dayIpyDataList:
@@ -173,7 +174,8 @@
actPack.StartDate = startDateStr
actPack.EndtDate = endDateStr
actPack.LimitLV = ipyData.GetLVLimit()
- actPack.RepSignCostMoney = ipyData.GetRepSignCostMoneyInfo()
+ actPack.RepSignMoneyType = moneyType
+ actPack.RepSignMoneyValue = moneyValue
actPack.AwardDayList = []
for dayIpyData in dayIpyDataList:
--
Gitblit v1.8.0