From 7090e3f4e6d9d386fd1fdd681889db6c921c9941 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 28 三月 2019 17:54:01 +0800
Subject: [PATCH] 6373 【后端】【2.0】删除无用功能代码、封包、配置(摆摊系统)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventShell.py |   84 ------------------------------------------
 1 files changed, 0 insertions(+), 84 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventShell.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventShell.py
index fbfbc0c..1638a78 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventShell.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventShell.py
@@ -28,8 +28,6 @@
 # @change: "2013-09-18 17:00" Alee 退出锁定退出交易
 # @change: "2013-09-23 19:30" Alee 红名提示修改
 # @change: "2013-11-15 20:20" hxp 关闭07 3A购买背包封包功能,增加背包成功系统提示
-# @change: "2013-11-27 20:30" hxp 修改结束摆摊状态事件单独处理,不在结束事件中处理
-# @change: "2013-12-10 14:00" hxp 修改查看摆摊状态事件单独处理,不在结束事件中处理
 # @change: "2013-12-12 14:30" hxp 增加钻石购买背包计费点事件同步
 # @change: "2013-12-13 12:20" hxp 修改首登物品绑定设置
 # @change: "2013-12-27 16:00" Alee 删除多余代码
@@ -80,7 +78,6 @@
 import PlayerControl
 import FunctionNPCCommon
 import FBLogic
-import PlayerShopItem
 import ItemControler
 import ItemCommon
 import QuestCommon
@@ -3729,8 +3726,6 @@
     ExitCreateFamily(curPlayer)
     ExitBillboard(curPlayer)
     #ExitEventLock(curPlayer)
-    #ExitShopItem(curPlayer) # 奇迹只在切地图及下线时关闭摆摊
-    #ExitWatchShopItem(curPlayer)
     #npc商店退出
     ExitNPCShop(curPlayer)
     
@@ -3770,85 +3765,6 @@
     PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_Player_Dict_PyPlayerAction, 0)      
     return
 
-
-##结束摆摊事件
-#@param curPlayer 玩家实例
-#@return 返回值无意义
-#@remarks 自定义函数:结束摆摊事件
-def ExitShopItem(curPlayer):
-    GameWorld.DebugLog("ExitShopItem", curPlayer.GetPlayerID())
-    playerShop = curPlayer.GetPlayerShop()
-    #在摆摊状态
-    if playerShop.GetIsStartShop():
-        PlayerShopItem.DoExitShop(curPlayer , curPlayer.GetPlayerShop())
-        
-    return
-#---------------------------------------------------------------------
-##结束查看摆摊事件
-#@param curPlayer 玩家实例
-#@return 返回值无意义
-#@remarks 自定义函数:结束查看摆摊事件
-def ExitWatchShopItem(curPlayer):
-    curPlayerShop = curPlayer.GetPlayerShop()
-    
-    if not curPlayerShop.GetIsWatchingShop():
-        return
-
-    openShopPlayer = curPlayer.GetActionPlayer()
-    __DoExitWatchShopItem(curPlayer , openShopPlayer)
-    
-    curPlayerShop.SetIsWatchingShop(0) 
-    return
-#---------------------------------------------------------------------
-##结束查看摆摊事件
-#@param curPlayer 玩家实例
-#@return 返回值无意义
-#@remarks 自定义函数:结束查看摆摊事件
-def __DoExitWatchShopItem(curPlayer , openShopPlayer):
-    
-    if openShopPlayer == None:
-        return
-    
-    shop = openShopPlayer.GetPlayerShop()
-    #没有开店
-    if not shop.GetIsStartShop():
-        return
-    
-    #商店删除这个玩家
-    shop.DeleteWatchPlayer(curPlayer.GetPlayerID())
-    return
-
-#---------------------------------------------------------------------
-##结束事件锁
-#@param curPlayer 玩家实例
-#@return 返回值无意义
-#@remarks 自定义函数:结束事件锁
-#===============================================================================
-# def ExitEventLock(curPlayer):
-#    if not curPlayer.GetHaveSetEventLock() :
-#        return
-#    
-#    #在摆摊状态不解锁,奇迹摆摊物品解锁只在切地图/下线/玩家主动结束摆摊情况下解锁
-#    playerShop = curPlayer.GetPlayerShop()
-#    if playerShop.GetIsStartShop():
-#        return
-#    
-#    #获得玩家物品管理器
-#    ItemManager = curPlayer.GetItemManager()
-#    #获得背包
-#    curPack = ItemManager.GetPack(IPY_GameWorld.rptItem)
-#    for i in range(curPack.GetCount()):
-#        item = curPack.GetAt(i)
-#        if item == None or item.IsEmpty():
-#            continue
-#        
-#        if not item.GetIsEventLocked():
-#            continue
-#        
-#        #离开事件锁
-#        item.SetIsEventLocked(False)
-#===============================================================================
-        
 #---------------------------------------------------------------------
 ##结束查看排行榜
 #@param curPlayer 玩家实例

--
Gitblit v1.8.0