From 850b484a7f7f55ce82705fd1e0680171e763c3d5 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 18 十月 2022 18:26:28 +0800
Subject: [PATCH] 9437 【越南】【后端】天帝礼包（可配置消耗及奖励货币类型）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActGodGift.py | 9 ++++-----
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py | 10 ++++++++--
PySysDB/PySysDBPY.h | 6 ++++--
3 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/PySysDB/PySysDBPY.h b/PySysDB/PySysDBPY.h
index 8df5233..d4c9c66 100644
--- a/PySysDB/PySysDBPY.h
+++ b/PySysDB/PySysDBPY.h
@@ -1635,8 +1635,10 @@
char EndDate; //结束日期
BYTE IsDayReset; //是否每天重置
WORD LVLimit; //限制等级
- list UseGoldList; //抽奖消耗仙玉列表
- list PrizeMoneyList; //奖励灵石列表
+ BYTE UseMoneyType; //消耗货币类型
+ list UseGoldList; //抽奖消耗货币列表
+ BYTE PrizeMoneyType; //奖励货币类型
+ list PrizeMoneyList; //奖励货币列表
BYTE ResetLimitTimes; //至少抽几次可重置
BYTE ResetCountMax; //可重置次数
dict TemplateIDInfo; //奖池模板信息 {(世界等级A,B):[模板编号列表, ...], ...}
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py
index 637e926..118aaf8 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py
@@ -1302,7 +1302,9 @@
("char", "EndDate", 0),
("BYTE", "IsDayReset", 0),
("WORD", "LVLimit", 0),
+ ("BYTE", "UseMoneyType", 0),
("list", "UseGoldList", 0),
+ ("BYTE", "PrizeMoneyType", 0),
("list", "PrizeMoneyList", 0),
("BYTE", "ResetLimitTimes", 0),
("BYTE", "ResetCountMax", 0),
@@ -4689,7 +4691,9 @@
self.EndDate = ""
self.IsDayReset = 0
self.LVLimit = 0
+ self.UseMoneyType = 0
self.UseGoldList = []
+ self.PrizeMoneyType = 0
self.PrizeMoneyList = []
self.ResetLimitTimes = 0
self.ResetCountMax = 0
@@ -4701,8 +4705,10 @@
def GetEndDate(self): return self.EndDate # 结束日期
def GetIsDayReset(self): return self.IsDayReset # 是否每天重置
def GetLVLimit(self): return self.LVLimit # 限制等级
- def GetUseGoldList(self): return self.UseGoldList # 抽奖消耗仙玉列表
- def GetPrizeMoneyList(self): return self.PrizeMoneyList # 奖励灵石列表
+ def GetUseMoneyType(self): return self.UseMoneyType # 消耗货币类型
+ def GetUseGoldList(self): return self.UseGoldList # 抽奖消耗货币列表
+ def GetPrizeMoneyType(self): return self.PrizeMoneyType # 奖励货币类型
+ def GetPrizeMoneyList(self): return self.PrizeMoneyList # 奖励货币列表
def GetResetLimitTimes(self): return self.ResetLimitTimes # 至少抽几次可重置
def GetResetCountMax(self): return self.ResetCountMax # 可重置次数
def GetTemplateIDInfo(self): return self.TemplateIDInfo # 奖池模板信息 {(世界等级A,B):[模板编号列表, ...], ...}
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActGodGift.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActGodGift.py
index 2ba7ba3..10a1a5f 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActGodGift.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActGodGift.py
@@ -27,9 +27,6 @@
import GameWorld
import ChConfig
-CostMoneyType = IPY_GameWorld.TYPE_Price_Gold_Money
-PrizeMoneyType = IPY_GameWorld.TYPE_Price_Gold_Paper
-
def OnPlayerLogin(curPlayer):
for actInfo in PyGameData.g_operationActionDict.get(ShareDefine.OperationActionName_GodGift, {}).values():
@@ -237,7 +234,9 @@
ipyData = IpyGameDataPY.GetIpyGameData("ActGodGift", cfgID)
if not ipyData:
return
+ CostMoneyType = ipyData.GetUseMoneyType()
costMoneyValueList = ipyData.GetUseGoldList()
+ PrizeMoneyType = ipyData.GetPrizeMoneyType()
prizeMoneyValueList = ipyData.GetPrizeMoneyList()
awardIpyDataList = IpyGameDataPY.GetIpyGameDataList("ActGodGiftAward", templateID) if templateID else []
@@ -405,10 +404,10 @@
clientPack.EndtDate = endDateStr
clientPack.IsDayReset = ipyData.GetIsDayReset()
clientPack.LimitLV = ipyData.GetLVLimit()
- clientPack.CostMoneyType = CostMoneyType
+ clientPack.CostMoneyType = ipyData.GetUseMoneyType()
clientPack.CostMoneyValueList = ipyData.GetUseGoldList()
clientPack.CostMoneyValueCount = len(clientPack.CostMoneyValueList)
- clientPack.PrizeMoneyType = PrizeMoneyType
+ clientPack.PrizeMoneyType = ipyData.GetPrizeMoneyType()
clientPack.PrizeMoneyValueList = ipyData.GetPrizeMoneyList()
clientPack.PrizeMoneyValueCount = len(clientPack.PrizeMoneyValueList)
clientPack.ResetLimitTimes = ipyData.GetResetLimitTimes()
--
Gitblit v1.8.0