From f78b5c4fb02a016c43398f512a302b8c24d62698 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期三, 26 十二月 2018 18:16:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/SnxxServerCode
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/ItemCommon.py | 11 -----------
1 files changed, 0 insertions(+), 11 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/ItemCommon.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/ItemCommon.py
index 293b4bc..2818ce6 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/ItemCommon.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/ItemCommon.py
@@ -29,7 +29,6 @@
import DataRecordPack
import EventReport
import ChItem
-import PlayerMergeEvent
import IpyGameDataPY
import Operate_EquipStone
import PlayerViewCacheTube
@@ -1423,11 +1422,6 @@
#系统提示 LostRes 失去物品
#if needSysmsg:
# PlayerControl.NotifyCode(curPlayer, 'LostRes', [itemTypeID, totalUseCnt])
-
- #添加跨服服务器中使用物品事件
- if itemTypeID in ReadChConfig.GetEvalChConfig("MergeServerCanUseItemID"):
- eventInfo = [itemTypeID, totalUseCnt, makeItemBind, eventName, saveDataDict]
- PlayerMergeEvent.AddMSPlayerEvent(curPlayer.GetPlayerID(), PlayerMergeEvent.Def_MSPEvent_DelItem, eventInfo)
return makeItemBind
def GetCostItemIndexList(costItemInfo, itemPack, bindFirst=True):
@@ -1823,11 +1817,6 @@
ItemControler.SetItemCount(curItem, curItemCnt - delCnt,
curPlayer.GetPlayerID(), curPlayer.GetAccID(),
curPlayer.GetPlayerName())
-
- #添加跨服服务器中使用物品事件
- if curItemTypeID in ReadChConfig.GetEvalChConfig("MergeServerCanUseItemID"):
- eventInfo = [curItemTypeID, delCnt, curItemBind, recordName, saveDataDict]
- PlayerMergeEvent.AddMSPlayerEvent(curPlayer.GetPlayerID(), PlayerMergeEvent.Def_MSPEvent_DelItem, eventInfo)
return
def DelVPackItem(curPlayer, packIndex, placeList, eventName=""):
--
Gitblit v1.8.0