From efaf363493930c5148271e5a50bbddd07909e110 Mon Sep 17 00:00:00 2001 From: hxp <ale99527@vip.qq.com> Date: 星期三, 03 九月 2025 18:27:33 +0800 Subject: [PATCH] 1111 删除旧榜单相关; --- ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTreasure.py | 23 ++++++++--------------- 1 files changed, 8 insertions(+), 15 deletions(-) diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTreasure.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTreasure.py index 97a2280..56dea87 100644 --- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTreasure.py +++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTreasure.py @@ -17,10 +17,7 @@ import GameWorld import PlayerRune -import ShareDefine -import GameFuncComm import IpyGameDataPY -import IPY_GameWorld import FormulaControl import ChPyNetSendPack import PlayerControl @@ -28,8 +25,6 @@ import NetPackCommon import PlayerBossReborn import PlayerFeastTravel -import PlayerFairyCeremony -import PlayerNewFairyCeremony import PlayerActLunhuidian import PlayerActYunshi import PlayerActTask @@ -37,7 +32,6 @@ import ChConfig import random -import time # 寻宝类型: >=100的为策划自行配置的自定义寻宝类型,<100的用于指定系统寻宝功能 TreasureTypeList = ( @@ -48,14 +42,16 @@ TreasureType_Gubao, # 古宝寻宝 5 ) = range(1, 1 + 5) +TreasureType_HeroComm = 11 # 英雄招募 - 普通 +TreasureType_HeroHigh = 12 # 英雄招募 - 高级 +TreasureType_HeroScore = 13 # 英雄招募 - 积分 + def DoTreasureOpen(curPlayer): ## 寻宝开启 Sync_TreasureInfo(curPlayer) return def OnTreasureLogin(curPlayer): - #if not GameFuncComm.GetFuncCanUse(curPlayer, ShareDefine.GameFuncID_Treasure): - # return Sync_TreasureInfo(curPlayer) return @@ -269,7 +265,7 @@ curRateList = [] # 可能会改变饼图,每次抽奖使用新的饼图对象,不要改变配置的饼图概率 # 满幸运必出 - if updLuck >= maxLuck and luckyGridNumList: + if maxLuck and updLuck >= maxLuck and luckyGridNumList: if luckyItemRateList: curRateList = GetRemoveLimitGridRateList(luckyItemRateList, gridNumCountInfo, gridNumMaxLimitInfo) else: @@ -359,6 +355,8 @@ itemWeightList = [] for libItem in libItemList: itemWeight, itemID, itemCount = libItem.GetItemWeight(), libItem.GetItemID(), libItem.GetItemCount() + if not itemWeight: + continue itemData = GameWorld.GetGameData().GetItemByTypeID(itemID) if not itemData: continue @@ -403,25 +401,20 @@ addScoreType = setIpyData.GetAwardMoneyType() # 额外奖励货币类型 addScore = setIpyData.GetAwardMoneyValue() # 单次奖励货币数 if addScoreType and addScore: - PlayerControl.GiveMoney(curPlayer, addScoreType, addScore) + PlayerControl.GiveMoney(curPlayer, addScoreType, addScore * treasureCount) if treasureType == TreasureType_Rune: - PlayerFairyCeremony.AddFCPartyActionCnt(curPlayer, ChConfig.Def_PPAct_RuneTreasure, treasureCount) PlayerFeastTravel.AddFeastTravelTaskValue(curPlayer, ChConfig.Def_FeastTravel_RuneTreasure, treasureCount) PlayerBossReborn.AddBossRebornActionCnt(curPlayer, ChConfig.Def_BRAct_RuneTreasure, treasureCount) PlayerActTask.AddActTaskValue(curPlayer, ChConfig.ActTaskType_TreasureRune, treasureCount) elif treasureType == TreasureType_Jipin: - PlayerFairyCeremony.AddFCPartyActionCnt(curPlayer, ChConfig.Def_PPAct_Treasure, treasureCount) PlayerFeastTravel.AddFeastTravelTaskValue(curPlayer, ChConfig.Def_FeastTravel_Treasure, treasureCount) PlayerBossReborn.AddBossRebornActionCnt(curPlayer, ChConfig.Def_BRAct_Treasure, treasureCount) PlayerActTask.AddActTaskValue(curPlayer, ChConfig.ActTaskType_TreasureJipin, treasureCount) elif treasureType == TreasureType_Jueshi: - PlayerFairyCeremony.AddFCPartyActionCnt(curPlayer, ChConfig.Def_PPAct_JSTreasure, treasureCount) PlayerFeastTravel.AddFeastTravelTaskValue(curPlayer, ChConfig.Def_FeastTravel_JSTreasure, treasureCount) PlayerBossReborn.AddBossRebornActionCnt(curPlayer, ChConfig.Def_BRAct_JSTreasure, treasureCount) PlayerActTask.AddActTaskValue(curPlayer, ChConfig.ActTaskType_TreasureJueshi, treasureCount) - elif treasureType == TreasureType_GatherTheSoul: - PlayerActTask.AddActTaskValue(curPlayer, ChConfig.ActTaskType_TreasureGatherTheSoul, treasureCount) elif treasureType == TreasureType_Gubao: PlayerActTask.AddActTaskValue(curPlayer, ChConfig.ActTaskType_TreasureGubao, treasureCount) -- Gitblit v1.8.0