From 01a6267d756db9dd7f646d4b8e7b607bb5732c6a Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 12 三月 2019 11:38:18 +0800
Subject: [PATCH] 6239 删除仙盟仓库
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.py | 2 +-
ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py | 14 +++++++-------
ServerPython/CoreServerGroup/GameServer/Script/Player/ChPlayer.py | 4 ++--
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/ChPlayer.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/ChPlayer.py
index b159e71..50e942a 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/ChPlayer.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/ChPlayer.py
@@ -47,7 +47,7 @@
import EventReport
import PlayerCompensation
import PlayerFamilyRedPacket
-import PlayerFamilyStore
+#import PlayerFamilyStore
import PyDataManager
import PlayerSocial
import PlayerFamilyParty
@@ -159,7 +159,7 @@
#仙盟红包
PlayerFamilyRedPacket.OnPlayerLogin(curPlayer)
#仙盟仓库
- PlayerFamilyStore.OnPlayerLogin(curPlayer)
+ #PlayerFamilyStore.OnPlayerLogin(curPlayer)
#仙盟宴会
PlayerFamilyParty.OnPlayerLogin(curPlayer)
#封魔坛
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py
index 49df025..5bd2379 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py
@@ -55,7 +55,7 @@
#import PlayerFamilyTech
import PlayerFamilyRedPacket
import PlayerFBHelpBattle
-import PlayerFamilyStore
+#import PlayerFamilyStore
import PlayerFamilySWRH
import GameWorldProcess
import PlayerLVAward
@@ -925,12 +925,12 @@
return
resultName = '%s' % ret
- # 战盟仓库
- if callName == "FamilyStore":
- curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(srcPlayerID)
- if not curPlayer:
- return
- resultName = '%s' % PlayerFamilyStore.DoMapServerFamilyStore(curPlayer, eval(resultName), tick)
+# # 战盟仓库
+# if callName == "FamilyStore":
+# curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(srcPlayerID)
+# if not curPlayer:
+# return
+# resultName = '%s' % PlayerFamilyStore.DoMapServerFamilyStore(curPlayer, eval(resultName), tick)
# 自定义商店物品
if callName == "ShopItem":
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.py
index 2d17a15..08d7b47 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.py
@@ -2562,7 +2562,7 @@
mailItemList = []
for tempItem in tempItemList:
mailItemList.append(ItemCommon.GetMailItemDict(tempItem))
- mailItemList +=extraItemList
+ mailItemList += extraItemList
mailTypeKey = ShareDefine.DefaultLackSpaceMailType if not mailTypeKey else mailTypeKey
PlayerControl.SendMailByKey(mailTypeKey, [curPlayer.GetPlayerID()], mailItemList)
else:
--
Gitblit v1.8.0