From 67d6a2a2fadc1f98f8316cf7e3a0717bfc971a43 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 28 八月 2025 10:23:45 +0800
Subject: [PATCH] 129 【战斗】战斗系统-服务端（技能变更主线阵容战斗中更新技能；B428增加通知是否是添加buff的；buff叠加规则0 4 5；增加效果5002结算目标某种状态持续buff所有回合效果）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/FunctionNPCCommon.py | 36 +-----------------------------------
1 files changed, 1 insertions(+), 35 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/FunctionNPCCommon.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/FunctionNPCCommon.py
index b316024..311a05b 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/FunctionNPCCommon.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/FunctionNPCCommon.py
@@ -49,7 +49,6 @@
import ChPyNetSendPack
import NetPackCommon
import GameWorld
-import EventShell
import IPY_GameWorld
import ItemControler
import ChConfig
@@ -62,17 +61,12 @@
import IpyGameDataPY
import PlayerRune
import GameFuncComm
-import PlayerFairyCeremony
-import PlayerNewFairyCeremony
import PlayerSpringSale
import PyGameData
import random
import math
import time
-
-# 商店类型定义
-ShopType_FairyCeremony = 19 # 仙界盛典烟花
g_mysticalShopDict = {} #神秘商店{等级范围:[等级段,{金钱类型:库}]}
#---------------------------------------------------------------------
@@ -107,17 +101,6 @@
# @return 远程商店的npc
def GetDirectNpcID():
return 0
-
-#---------------------------------------------------------------------
-##结束事件
-# @param curPlayer 玩家实例
-# @param tick 时间戳
-# @return 返回值真, 逻辑运行成功
-# @remarks 结束事件
-def ExitEvent(curPlayer, tick):
-
- EventShell.DoExitEvent(curPlayer)
- return True
#---------------------------------------------------------------------
##请求商店物品列表
@@ -809,8 +792,7 @@
if not sendMailKey:
if not ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, isBind, event=[ChConfig.ItemGive_BuyItem, isForceEvent, dataDict]):
GameWorld.ErrLog("购买商城物品放入背包失败! itemID=%s, itemCount=%s" % (itemID, itemCount), curPlayer.GetPlayerID())
- EventShell.EventRespons_BuyItem(curPlayer, itemID, itemCount)
-
+
if ipyData.GetNotifyMark() and itemID == mainItemID:
PlayerControl.WorldNotify(0, ipyData.GetNotifyMark(), [curPlayer.GetName(), mainItemID, userData])
@@ -824,15 +806,7 @@
PlayerControl.SendMailByKey(sendMailKey, [curPlayer.GetID()], totalItemList, detail=dataDict)
else:
ItemControler.NotifyGiveAwardInfo(curPlayer, totalItemList, ChConfig.ItemGive_BuyItem, dataEx=shopType)
- #触发任务购买物品
- EventShell.EventRespons_ShopBuy(curPlayer, shopType)
- #curPlayer.ShopResult(itemIndex, IPY_GameWorld.tsrShopOK)
SyncShoppingResult(curPlayer, itemIndex, clientBuyCount)
-
- if shopType == ShopType_FairyCeremony:
- PlayerFairyCeremony.OnBuyFireworks(curPlayer, itemIndex, clientBuyCount)
-# if itemIndex in IpyGameDataPY.GetFuncEvalCfg('NewCeremonyFireParty', 1, {}).values():
-# PlayerNewFairyCeremony.AddFCPartyActionCnt(curPlayer, ChConfig.Def_PPAct_Fireworks, clientBuyCount)
return
def GetShopJobItem(job, itemID, jobItemList):
@@ -874,14 +848,6 @@
#playerCreateRoleDays = GameWorld.GetCreateRoleDays(curPlayer)
openServerDay = GameWorld.GetGameWorld().GetGameWorldDictByKey(ShareDefine.Def_Notify_WorldKey_ServerDay)+1
return openServerDay != limitValue
-
- #仙界盛典 - 烟花狂欢
- if shopNPCID == ShopType_FairyCeremony:
- return not PlayerFairyCeremony.IsCanBuyFireworks(curPlayer, itemIndex, clientBuyCount)
-
- #另一个仙界盛典可用其他商店NPCID，这里先注释，之后再改
-# if itemIndex in IpyGameDataPY.GetFuncEvalCfg('NewCeremonyFireParty', 1, {}).values():
-# return not PlayerNewFairyCeremony.IsCanBuyFireworks(curPlayer, itemIndex)
if shopNPCID == 16:#神秘限购
startTime = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_ShopItemStartTime % itemIndex)
--
Gitblit v1.8.0