From 912176de9ed5b45e5fe0edbb15b8796f54c56ba2 Mon Sep 17 00:00:00 2001 From: hxp <ale99527@vip.qq.com> Date: 星期一, 25 八月 2025 19:26:52 +0800 Subject: [PATCH] 121 【武将】武将系统-服务端(武将表、NPC表 增加性别) --- ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGuaji.py | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGuaji.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGuaji.py index f737e3d..8c8b912 100644 --- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGuaji.py +++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGuaji.py @@ -19,7 +19,6 @@ import ShareDefine import PlayerControl import ChPyNetSendPack -import PlayerWorldAverageLv import PlayerActGarbageSorting import PlayerActCollectWords import PlayerGoldInvest @@ -29,18 +28,19 @@ import ItemControler import GameFuncComm import GameWorld -import PlayerVip import time Def_Process_Seconds = 60 # 在线定时处理间隔,秒,离线上线后一次性处理 def DoGuajiOpen(curPlayer): + return openAwardMinutes = IpyGameDataPY.GetFuncCfg("GuajiTime", 1) # 功能开启获得收益时长,分钟 AddGuajiAward(curPlayer, openAwardMinutes * 60) return def OnPlayerLogin(curPlayer): + return if not GameFuncComm.GetFuncCanUse(curPlayer, ShareDefine.GameFuncID_Guaji): return if not ProcessGuaji(curPlayer): @@ -48,6 +48,7 @@ return def PlayerOnDay(curPlayer): + return if not GameFuncComm.GetFuncCanUse(curPlayer, ShareDefine.GameFuncID_Guaji): return PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_GuajiQuickCount, 0) @@ -56,6 +57,7 @@ def ProcessGuaji(curPlayer): ## 挂机定时处理收益 + return if GameWorld.IsCrossServer(): return @@ -200,7 +202,7 @@ playerID = curPlayer.GetPlayerID() reLV = curPlayer.GetLV() - lvIpyData = PlayerControl.GetPlayerLVIpyData(reLV) + lvIpyData = None #PlayerControl.GetPlayerLVIpyData(reLV) reExp = lvIpyData.GetReExp() if lvIpyData else 0 worldLV = GameWorld.GetGameWorld().GetGameWorldDictByKey(ShareDefine.Def_Notify_WorldKey_WorldAverageLv) #GameWorld.DebugLog("计算挂机收益: awardSeconds=%s,useUnsecond=%s,reLV=%s,reExp=%s,worldLV=%s" @@ -317,8 +319,6 @@ def GetGuajiExpRate(curPlayer): ## 挂机收益经验加成 expRate = curPlayer.GetFightExpRate() # 系统及功能累加 - expRate += PlayerWorldAverageLv.GetWorldAverageLvExpRate(curPlayer) # 世界等级 - expRate += PlayerVip.GetPrivilegeValue(curPlayer, ChConfig.VIPPrivilege_FightExpRate) # VIP加成 return expRate def OnGetGuajiAward(curPlayer, isQuick): @@ -331,8 +331,7 @@ if isQuick: quickCountToday = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_GuajiQuickCount) quickCountFree = IpyGameDataPY.GetFuncCfg("GuajiQuick", 2) - vipCanBuyCount = PlayerVip.GetPrivilegeValue(curPlayer, ChConfig.VIPPrivilege_GuajiQuickBuy) - quickCountMax = quickCountFree + vipCanBuyCount + quickCountMax = quickCountFree if quickCountToday >= quickCountMax: GameWorld.DebugLog("快速挂机收益次数已达每日上限! quickCountToday=%s" % quickCountToday, playerID) return -- Gitblit v1.8.0