From 4087d18ce7cbd1578a6e287962bd902386984048 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 14 七月 2025 10:55:57 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_ServerCode
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActivity.py | 14 --------------
1 files changed, 0 insertions(+), 14 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..fd4f707 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActivity.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActivity.py
@@ -28,8 +28,6 @@
import IpyGameDataPY
import PyGameData
import GameFuncComm
-import EventShell
-import PlayerTJG
import PlayerPet
import PlayerVip
import datetime
@@ -317,7 +315,6 @@
PlayerActTask.AddActTaskValue(curPlayer, ChConfig.ActTaskType_Activity, 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 +345,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 +428,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
@@ -724,8 +716,6 @@
PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_ActivityPlaceExpCount, 0)
GameWorld.DebugLog(" 没有剩余次数，更新启动时间: %s" % curTime)
- EventShell.EventRespons_ActivityPlace(curPlayer, "start")
-
Sync_ActivityPlaceInfo(curPlayer)
return
@@ -928,8 +918,6 @@
if isQuick:
PlayerControl.NotifyCode(curPlayer, "ActivityPlaceQuickFinishOK")
- EventShell.EventRespons_ActivityPlace(curPlayer, "cangetreward")
-
Sync_ActivityPlaceInfo(curPlayer)
PlayerBossReborn.AddBossRebornActionCnt(curPlayer, ChConfig.Def_BRAct_ActivityPlace, endCount)
@@ -963,9 +951,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