From 5c707e161b1c44e798a7d4f41b9c9b1825b6bb66 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 16 九月 2025 15:54:28 +0800
Subject: [PATCH] 129 【战斗】战斗系统-服务端(贾诩技能,buff计算属性后最终属性支持负值;)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActivity.py |   26 +-------------------------
 1 files changed, 1 insertions(+), 25 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActivity.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActivity.py
index 9214f85..ec38573 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActivity.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActivity.py
@@ -28,15 +28,11 @@
 import IpyGameDataPY
 import PyGameData
 import GameFuncComm
-import EventShell
-import PlayerTJG
 import PlayerPet
-import PlayerVip
 import datetime
 import time
 import FormulaControl
 import PlayerBossReborn
-import PlayerActGarbageSorting
 import PlayerTongTianLing
 import PlayerActTask
 import PlayerSuccess
@@ -312,12 +308,10 @@
     curTotalPoint = __GetPDictValue(curPlayer, ChConfig.Def_PDict_Activity_TotalPoint)
     __SetPDictValue(curPlayer, ChConfig.Def_PDict_Activity_TotalPoint, curTotalPoint + addValue)
     __AddCanCostActivityPoint(curPlayer, addValue, isLVUp)
-    PlayerActGarbageSorting.AddActGarbageTaskProgress(curPlayer, ChConfig.Def_GarbageTask_Activity, addValue)
     PlayerTongTianLing.AddTongTianTaskValue(curPlayer, ChConfig.TTLTaskType_Activity, addValue)
     PlayerActTask.AddActTaskValue(curPlayer, ChConfig.ActTaskType_Activity, addValue)
-    PlayerControl.NotifyCode(curPlayer, "GetActivity", [addValue])
+    #PlayerControl.NotifyCode(curPlayer, "GetActivity", [addValue])
     SyncDailyActivityInfo(curPlayer)
-    EventShell.EventRespons_AddActivityValue(curPlayer)
     GameWorld.DebugLog("增加活跃度,addValue=%s,multiple=%s,addExtraPoint=%s,isLVUp=%s" 
                        % (addValue, multiple, addExtraPoint, isLVUp), curPlayer.GetPlayerID())
     return
@@ -348,10 +342,6 @@
             return
         updPoint = curPoint + addValue
     __SetPDictValue(curPlayer, ChConfig.Def_PDict_ActivityCanCostTotalPoint, updPoint)
-    
-    costPoint = IpyGameDataPY.GetFuncCfg("ActivityPlace", 2) # 单次放置消耗的活跃点数
-    if updPoint >= costPoint:
-        EventShell.EventRespons_ActivityPlace(curPlayer, "canstart", True)
     return
 
 def CostActivityPoint(curPlayer, costPoint, isOnlyCheck=False):
@@ -435,7 +425,6 @@
     SyncDailyActivityInfo(curPlayer)
     GameWorld.DebugLog("领取活跃度奖励OK!awardStage=%s, index=%s,needActivity=%s,totalActivity=%s,awardRecord=%s" 
                        % (awardStage, awardIndex, needActivity, totalActivity, updAwardRecord))
-    EventShell.EventRespons_ActivityAward(curPlayer, awardIndex)
     return
 
 
@@ -491,9 +480,6 @@
     ipyData = IpyGameDataPY.GetIpyGameData('DailyAction', dailyID)
     if not ipyData:
         return
-#    if not GameFuncComm.GetFuncCanUse(curPlayer, ShareDefine.GameFuncID_DailyQuest):
-#        #GameWorld.DebugLog("日常任务功能未开启!dailyID=%s" % dailyID)
-#        return
     
     # 由GameServer决定
     # 目前跨服PK暂不需要判断,因为跨服PK次数结算在本服,玩家可能上次未结算离线,等非匹配期间上线,也需要加上,所以暂不判断
@@ -596,9 +582,6 @@
     
     if addType == 0:
         dayBuyTimesLimit = ipyData.GetDayBuyTimes()
-        buyTimesPrivilegeID = ipyData.GetBuyTimesPrivilegeID()
-        vipBuyCountEx = PlayerVip.GetPrivilegeValue(curPlayer, buyTimesPrivilegeID)
-        dayBuyTimesLimit += vipBuyCountEx
         moneyType = ipyData.GetMoneyType()
         buyNeedMoneyList = ipyData.GetBuyNeedMoney()
         if not dayBuyTimesLimit or not buyNeedMoneyList:
@@ -724,8 +707,6 @@
         PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_ActivityPlaceExpCount, 0)
         GameWorld.DebugLog("    没有剩余次数,更新启动时间: %s" % curTime)
         
-    EventShell.EventRespons_ActivityPlace(curPlayer, "start")
-    
     Sync_ActivityPlaceInfo(curPlayer)
     return
 
@@ -928,8 +909,6 @@
     if isQuick:
         PlayerControl.NotifyCode(curPlayer, "ActivityPlaceQuickFinishOK")
         
-    EventShell.EventRespons_ActivityPlace(curPlayer, "cangetreward")
-    
     Sync_ActivityPlaceInfo(curPlayer)
     
     PlayerBossReborn.AddBossRebornActionCnt(curPlayer, ChConfig.Def_BRAct_ActivityPlace, endCount)
@@ -963,10 +942,7 @@
     
     GameWorld.DebugLog("领取活跃放置奖励: totalCount=%s,rewardCount=%s,rewardItemCount=%s,rewardItemList=%s" % (totalCount, rewardCount, rewardItemCount, rewardItemList))
     ItemControler.GivePlayerItemOrMail(curPlayer, rewardItemList, event=["ActivityPlace", False, {}])
-
     
-    EventShell.EventRespons_ActivityPlace(curPlayer, "getreward")
-    PlayerActGarbageSorting.AddActGarbageTaskProgress(curPlayer, ChConfig.Def_GarbageTask_ActivityPlace, rewardCount)
     PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_ActivityPlace, rewardCount)
     PlayerGubao.AddGubaoItemEffValue(curPlayer, PlayerGubao.GubaoEffType_ActivityPlace, rewardCount)
     

--
Gitblit v1.8.0