From a7ab9baa052c7405877ef0985b4b0d465ab54e25 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 18 十月 2022 18:13:59 +0800
Subject: [PATCH] 9437 【越南】【后端】天帝礼包（冲突）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py | 8 ++++++--
ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py | 6 ++++--
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py | 19 +++++++++++++++----
3 files changed, 25 insertions(+), 8 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
index a514288..3d8353b 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
@@ -285,6 +285,7 @@
OperationActionName_HorsePetFeast = "ActHorsePetFeast" # 骑宠盛宴活动
OperationActionName_GarbageSorting = "ActGarbageSorting" # 垃圾分类活动
OperationActionName_XianXiaMJ = "ActXianXiaMJ" # 仙匣秘境活动
+OperationActionName_GodGift = "ActGodGift" # 天帝礼包活动
#节日活动类型列表 - 该类型无视开服天，日期到了就开启
FeastOperationActionNameList = [OperationActionName_FeastWeekParty, OperationActionName_FeastRedPacket,
OperationActionName_RechargeRebateGold, OperationActionName_GrowupBuy,
@@ -303,7 +304,7 @@
OperationActionName_DailyGiftbag, OperationActionName_SingleRecharge,
OperationActionName_CollectWords, OperationActionName_ManyDayRecharge,
OperationActionName_Turntable, OperationActionName_HorsePetFeast, OperationActionName_GarbageSorting,
- OperationActionName_XianXiaMJ,
+ OperationActionName_XianXiaMJ, OperationActionName_GodGift,
] + FeastOperationActionNameList
#需要记录开启活动时的世界等级的运营活动
NeedWorldLVOperationActNameList = [OperationActionName_FairyCeremony, OperationActionName_WishingWell,
@@ -317,6 +318,7 @@
OperationActionName_FeastLogin, OperationActionName_XianXiaMJ,
OperationActionName_FeastWish, OperationActionName_FeastTravel,
OperationActionName_ManyDayRecharge, OperationActionName_SingleRecharge,
+ OperationActionName_GodGift,
]
#支持多活动分组编号的活动名
@@ -325,7 +327,7 @@
OperationActionName_SpringSale, OperationActionName_FlashSale,
OperationActionName_ManyDayRecharge, OperationActionName_SingleRecharge,
OperationActionName_Turntable, OperationActionName_HorsePetFeast, OperationActionName_GarbageSorting,
- OperationActionName_XianXiaMJ,
+ OperationActionName_XianXiaMJ, OperationActionName_GodGift,
]
#跨服运营活动表名定义
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
index 3a35f81..61fd952 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
@@ -3975,6 +3975,13 @@
Def_PDict_XianXiaMJAwardLayerInfo = "ActXXMJAwardLayerInfo_%s" # 奖池层级信息: 累计抽奖次数*100+层数，参数：(活动编号)
Def_PDict_XianXiaMJAwardItemInfo = "ActXXMJItemInfo_%s_%s_%s" # 奖池物品ID*100+抽中位置编号，参数：(活动编号, 库类型, 物品编号)
Def_PDict_XianXiaMJAwardItemTimes = "ActXXMJItemTimes_%s_%s_%s" # 奖池物品累计产出次数，有限制次数的才记录，参数：(活动编号, 库类型, 物品ID)
+
+#天帝礼包活动
+Def_PDict_GodGiftID = "ActGodGiftID_%s" # 玩家身上的活动ID，唯一标识，取活动开始日期time值，参数：(活动编号)
+Def_PDict_GodGiftWorldLV = "ActGodGiftWorldLV_%s" #玩家身上的活动世界等级，参数：(活动编号)
+Def_PDict_GodGiftResetCount = "ActGodGiftResetCount_%s" #已重置次数，参数：(活动编号)
+Def_PDict_GodGiftAwardPool = "ActGodGiftAwardPool_%s" #奖池状态，参数：(活动编号) 0-未选择；1-已选择；2-已抽完
+Def_PDict_GodGiftItemState = "ActGodGiftItemState_%s_%s_%s" #库物品状态，参数：(活动编号, 库, 编号) 已被选择次数*100+本奖池是否被选择*10+本奖池是否已被抽中
#-------------------------------------------------------------------------------
#开服活动，Def_PDictType_OpenServerCampaign
@@ -4981,8 +4988,8 @@
Def_Cost_Love, # 情缘
Def_Cost_BuyOrderInfo, # 购买充值商品
Def_Cost_ActGodGift, # 天帝礼包活动
-Def_Cost_TongTianLing, # 通天令 55
Def_Cost_CrossBattlefield, # 跨服战场
+Def_Cost_TongTianLing, # 通天令
Def_Cost_LianTi, # 炼体
#-----------以下为暂时没用的，先不删除，如有新增消费点则放在这些之前------------
Def_Cost_RefreshArrestTask, # 刷新悬赏任务
@@ -5082,11 +5089,11 @@
Def_Cost_ActivityPlace:"ActivityPlace",
Def_Cost_FaQi:"FaQi",
Def_Cost_Love:"Love",
-Def_Cost_CrossBattlefield:"CrossBattlefield",
-Def_Cost_LianTi:"LianTi",
Def_Cost_BuyOrderInfo:"BuyOrderInfo",
Def_Cost_ActGodGift:"ActGodGift",
+Def_Cost_CrossBattlefield:"CrossBattlefield",
Def_Cost_TongTianLing:"TongTianLing",
+Def_Cost_LianTi:"LianTi",
}
## -----------------------------------------------------
@@ -5122,7 +5129,9 @@
Def_GiveMoney_AuctionBidReturn, #拍卖竞价返还
Def_GiveMoney_AuctionGain, #拍卖获得利润
Def_GiveMoney_TransformItem, #物品直接转化
-) = range(1000, 1000 + 30)
+Def_GiveMoney_ActGodGift, #天帝礼包
+Def_GiveMoney_BuyOrderInfo, #购买充值商品编号
+) = range(1000, 1000 + 32)
Def_Give_Reason_SonKey = "reason_name_son" # 原因子类说明key
@@ -5157,6 +5166,8 @@
Def_GiveMoney_AuctionBidReturn:"AuctionBidReturn",
Def_GiveMoney_AuctionGain:"AuctionGain",
Def_GiveMoney_TransformItem:"TransformItem",
+Def_GiveMoney_ActGodGift:"ActGodGift",
+Def_GiveMoney_BuyOrderInfo:"BuyOrderInfo",
}
##==================================================================================================
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
index e179ade..3d8353b 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
@@ -285,6 +285,7 @@
OperationActionName_HorsePetFeast = "ActHorsePetFeast" # 骑宠盛宴活动
OperationActionName_GarbageSorting = "ActGarbageSorting" # 垃圾分类活动
OperationActionName_XianXiaMJ = "ActXianXiaMJ" # 仙匣秘境活动
+OperationActionName_GodGift = "ActGodGift" # 天帝礼包活动
#节日活动类型列表 - 该类型无视开服天，日期到了就开启
FeastOperationActionNameList = [OperationActionName_FeastWeekParty, OperationActionName_FeastRedPacket,
OperationActionName_RechargeRebateGold, OperationActionName_GrowupBuy,
@@ -303,7 +304,7 @@
OperationActionName_DailyGiftbag, OperationActionName_SingleRecharge,
OperationActionName_CollectWords, OperationActionName_ManyDayRecharge,
OperationActionName_Turntable, OperationActionName_HorsePetFeast, OperationActionName_GarbageSorting,
- OperationActionName_XianXiaMJ,
+ OperationActionName_XianXiaMJ, OperationActionName_GodGift,
] + FeastOperationActionNameList
#需要记录开启活动时的世界等级的运营活动
NeedWorldLVOperationActNameList = [OperationActionName_FairyCeremony, OperationActionName_WishingWell,
@@ -317,6 +318,7 @@
OperationActionName_FeastLogin, OperationActionName_XianXiaMJ,
OperationActionName_FeastWish, OperationActionName_FeastTravel,
OperationActionName_ManyDayRecharge, OperationActionName_SingleRecharge,
+ OperationActionName_GodGift,
]
#支持多活动分组编号的活动名
@@ -325,7 +327,7 @@
OperationActionName_SpringSale, OperationActionName_FlashSale,
OperationActionName_ManyDayRecharge, OperationActionName_SingleRecharge,
OperationActionName_Turntable, OperationActionName_HorsePetFeast, OperationActionName_GarbageSorting,
- OperationActionName_XianXiaMJ,
+ OperationActionName_XianXiaMJ, OperationActionName_GodGift,
]
#跨服运营活动表名定义
@@ -1449,6 +1451,7 @@
CrossServerMsg_ChampionshipGuess = "ChampionshipGuess" # 跨服排位争霸赛竞猜信息
CrossServerMsg_ChampionshipOfficial = "ChampionshipOfficial" # 跨服排位争霸赛官职信息
CrossServerMsg_ChampionshipDailyOfficial = "ChampionshipDailyOfficial" # 跨服排位争霸赛每日官职信息
+CrossServerMsg_ActAllRechargeInfo = "ActAllRechargeInfo"# 跨服全民充值信息
# 子服发送跨服信息定义
ClientServerMsg_ServerInitOK = "ServerInitOK" # 子服启动成功
@@ -1483,6 +1486,7 @@
ClientServerMsg_ChampionshipOfficialChallenge = "ChampionshipOfficialChallenge" # 跨服排位挑战仙官
ClientServerMsg_ChampionshipGuess = "ChampionshipGuess" # 跨服排位竞猜
ClientServerMsg_ChampionshipWorship = "ChampionshipWorship" # 跨服排位膜拜
+ClientServerMsg_ActAllRechargeValue = "ActAllRechargeValue" # 跨服全民充值额度
#跨服广播类型定义
CrossNotify_CrossAct = "CrossAct"
--
Gitblit v1.8.0