From f97b6ae94c6acdaacf6adf140416df901d1caf6c Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期一, 15 四月 2019 11:56:41 +0800
Subject: [PATCH] 6515 【测试】【主干】新增游戏警报邮件

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerWing.py |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerWing.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerWing.py
index 18a0e9d..2270926 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerWing.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerWing.py
@@ -23,6 +23,7 @@
 import ItemCommon
 import GameFuncComm
 import PlayerSuccess
+import ItemControler
 import ChEquip
 
 import random
@@ -46,7 +47,7 @@
 def OnWingJingLian(index, clientData, tick):
     
     # 根据策划需要,可以选择是否跨服服务器功能限制
-#    if GameWorld.IsMergeServer():
+#    if GameWorld.IsCrossServer():
 #        return
     
     curPlayer = GameWorld.GetPlayerManager().GetPlayerByIndex(index)
@@ -107,7 +108,7 @@
     wingClassLV = ItemCommon.GetItemClassLV(curWing)
     for index in materialMessageList:
         curItem = itemPack.GetAt(index)
-        if not ItemCommon.CheckItemCanUse(curItem):
+        if not ItemCommon.CheckItemCanUse(curItem) or ItemControler.GetIsAuctionItem(curItem):
             GameWorld.DebugLog("这个格子没有合法材料,index=%s" % index)
             continue
         curItemID = curItem.GetItemTypeID()

--
Gitblit v1.8.0