SnxxServerCode.git

parent: 8bb11f63 | 补丁 | 提交 | ignore whitespace

hxp

2023-08-01 44f7d44fcbaa30dd0a06e61e60c42acbe34c18d2

9873 【骨折2】【主干】买1送5活动 master

3个文件已修改

	ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py

@@ -286,6 +286,7 @@
OperationActionName_GarbageSorting = "ActGarbageSorting" # 垃圾分类活动

OperationActionName_XianXiaMJ = "ActXianXiaMJ" # 仙匣秘境活动

OperationActionName_GodGift = "ActGodGift" # 天帝礼包活动

OperationActionName_BuyOne = "ActBuyOne" # 买一送多活动

#节日活动类型列表 - 该类型无视开服天，日期到了就开启

FeastOperationActionNameList = [OperationActionName_FeastWeekParty, OperationActionName_FeastRedPacket,

                                OperationActionName_RechargeRebateGold, OperationActionName_GrowupBuy,

@@ -305,6 +306,7 @@
                           OperationActionName_CollectWords, OperationActionName_ManyDayRecharge,

                           OperationActionName_Turntable, OperationActionName_HorsePetFeast, OperationActionName_GarbageSorting,

                           OperationActionName_XianXiaMJ, OperationActionName_GodGift,

                           OperationActionName_BuyOne,

                           ] + FeastOperationActionNameList

#需要记录开启活动时的世界等级的运营活动

NeedWorldLVOperationActNameList = [OperationActionName_FairyCeremony, OperationActionName_WishingWell, 

@@ -328,6 +330,7 @@
                                   OperationActionName_ManyDayRecharge, OperationActionName_SingleRecharge,

                                   OperationActionName_Turntable, OperationActionName_HorsePetFeast, OperationActionName_GarbageSorting,

                                   OperationActionName_XianXiaMJ, OperationActionName_GodGift,

                                   OperationActionName_BuyOne,

                                   ]



#跨服运营活动表名定义


 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py

@@ -104,6 +104,7 @@
import PlayerFlashGiftbag

import PlayerDailyGiftbag

import PlayerCostRebate

import PlayerActBuyOne

import PlayerActGrowupBuy

import PlayerActCollectWords

import PlayerActTotalRecharge

@@ -775,6 +776,8 @@
    PlayerDailyGiftbag.OnPlayerLogin(curPlayer)

    #限时抢购

    PlayerFlashSale.OnPlayerLogin(curPlayer)

    #买一送多活动

    PlayerActBuyOne.OnPlayerLogin(curPlayer)

    #集字活动

    PlayerActCollectWords.OnPlayerLogin(curPlayer)

    # 世界boss

@@ -5619,6 +5622,9 @@
    # 成就积分奖励

    elif rewardType == ChConfig.Def_RewardType_SuccessScore:

        PlayerSuccess.GetSuccessScoreAward(curPlayer, dataEx)

    # 买一送多活动免费奖励

    elif rewardType == ChConfig.Def_RewardType_BuyOne:

        PlayerActBuyOne.GetBuyOneFreeAward(curPlayer, dataEx, dataExStr)

    #缥缈奇遇领取

    elif rewardType == ChConfig.Def_RewardType_FairyAdventuresAward:

        PlayerFairyDomain.GetFairyAdventuresAward(curPlayer, dataEx, dataExStr)


 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py

@@ -286,6 +286,7 @@
OperationActionName_GarbageSorting = "ActGarbageSorting" # 垃圾分类活动

OperationActionName_XianXiaMJ = "ActXianXiaMJ" # 仙匣秘境活动

OperationActionName_GodGift = "ActGodGift" # 天帝礼包活动

OperationActionName_BuyOne = "ActBuyOne" # 买一送多活动

#节日活动类型列表 - 该类型无视开服天，日期到了就开启

FeastOperationActionNameList = [OperationActionName_FeastWeekParty, OperationActionName_FeastRedPacket,

                                OperationActionName_RechargeRebateGold, OperationActionName_GrowupBuy,

@@ -305,6 +306,7 @@
                           OperationActionName_CollectWords, OperationActionName_ManyDayRecharge,

                           OperationActionName_Turntable, OperationActionName_HorsePetFeast, OperationActionName_GarbageSorting,

                           OperationActionName_XianXiaMJ, OperationActionName_GodGift,

                           OperationActionName_BuyOne,

                           ] + FeastOperationActionNameList

#需要记录开启活动时的世界等级的运营活动

NeedWorldLVOperationActNameList = [OperationActionName_FairyCeremony, OperationActionName_WishingWell, 

@@ -328,6 +330,7 @@
                                   OperationActionName_ManyDayRecharge, OperationActionName_SingleRecharge,

                                   OperationActionName_Turntable, OperationActionName_HorsePetFeast, OperationActionName_GarbageSorting,

                                   OperationActionName_XianXiaMJ, OperationActionName_GodGift,

                                   OperationActionName_BuyOne,

                                   ]



#跨服运营活动表名定义

			@@ -286,6 +286,7 @@
			OperationActionName_GarbageSorting = "ActGarbageSorting" # 垃圾分类活动
			OperationActionName_XianXiaMJ = "ActXianXiaMJ" # 仙匣秘境活动
			OperationActionName_GodGift = "ActGodGift" # 天帝礼包活动
			OperationActionName_BuyOne = "ActBuyOne" # 买一送多活动
			#节日活动类型列表 - 该类型无视开服天，日期到了就开启
			FeastOperationActionNameList = [OperationActionName_FeastWeekParty, OperationActionName_FeastRedPacket,
			OperationActionName_RechargeRebateGold, OperationActionName_GrowupBuy,
			@@ -305,6 +306,7 @@
			OperationActionName_CollectWords, OperationActionName_ManyDayRecharge,
			OperationActionName_Turntable, OperationActionName_HorsePetFeast, OperationActionName_GarbageSorting,
			OperationActionName_XianXiaMJ, OperationActionName_GodGift,
			OperationActionName_BuyOne,
			] + FeastOperationActionNameList
			#需要记录开启活动时的世界等级的运营活动
			NeedWorldLVOperationActNameList = [OperationActionName_FairyCeremony, OperationActionName_WishingWell,
			@@ -328,6 +330,7 @@
			OperationActionName_ManyDayRecharge, OperationActionName_SingleRecharge,
			OperationActionName_Turntable, OperationActionName_HorsePetFeast, OperationActionName_GarbageSorting,
			OperationActionName_XianXiaMJ, OperationActionName_GodGift,
			OperationActionName_BuyOne,
			]

			#跨服运营活动表名定义

			@@ -104,6 +104,7 @@
			import PlayerFlashGiftbag
			import PlayerDailyGiftbag
			import PlayerCostRebate
			import PlayerActBuyOne
			import PlayerActGrowupBuy
			import PlayerActCollectWords
			import PlayerActTotalRecharge
			@@ -775,6 +776,8 @@
			PlayerDailyGiftbag.OnPlayerLogin(curPlayer)
			#限时抢购
			PlayerFlashSale.OnPlayerLogin(curPlayer)
			#买一送多活动
			PlayerActBuyOne.OnPlayerLogin(curPlayer)
			#集字活动
			PlayerActCollectWords.OnPlayerLogin(curPlayer)
			# 世界boss
			@@ -5619,6 +5622,9 @@
			# 成就积分奖励
			elif rewardType == ChConfig.Def_RewardType_SuccessScore:
			PlayerSuccess.GetSuccessScoreAward(curPlayer, dataEx)
			# 买一送多活动免费奖励
			elif rewardType == ChConfig.Def_RewardType_BuyOne:
			PlayerActBuyOne.GetBuyOneFreeAward(curPlayer, dataEx, dataExStr)
			#缥缈奇遇领取
			elif rewardType == ChConfig.Def_RewardType_FairyAdventuresAward:
			PlayerFairyDomain.GetFairyAdventuresAward(curPlayer, dataEx, dataExStr)