ServerPython/CoreServerGroup/GameServer/Script/ChConfig.py
@@ -807,7 +807,7 @@ Def_GiveMoney_SellPackItem, # 出售背包物品 Def_GiveMoney_CollectNPC, # 采集NPC Def_GiveMoney_20, Def_GiveMoney_StallItem, # 摆摊 Def_GiveMoney_21, Def_GiveMoney_Trade, # 交易 Def_GiveMoney_Truck, # 运镖 Def_GiveMoney_FreeGoods, # 极品白拿 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script.ini
@@ -1114,30 +1114,6 @@ PacketSubCMD_2=0x1 PacketCallFunc_2=OnPlayerSetTruckMode ;摆摊 [PlayerShopItem] ScriptName = Player\PlayerShopItem.py Writer = eggxp Releaser = eggxp RegType = 0 RegisterPackCount = 4 PacketCMD_1=0x14 PacketSubCMD_1=0x1 PacketCallFunc_1=BeginShopItem PacketCMD_2=0x14 PacketSubCMD_2=0x2 PacketCallFunc_2=EndShop PacketCMD_3=0x14 PacketSubCMD_3=0x3 PacketCallFunc_3=WatchShop PacketCMD_4=0x14 PacketSubCMD_4=0x4 PacketCallFunc_4=BuyItem ;精力系统 [PlayerEnergySys] ScriptName = Player\PlayerEnergySys.py ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
@@ -532,8 +532,6 @@ Def_Item_Effect_MissionMove = 2001 #鱼竿 Def_Item_Effect_FishTool = 2000 #摆摊证 Def_Item_Effect_ShopItem = 1900 #坐骑进阶 Def_Item_Eff_HorseUpdate = 2819 #官爵进阶 @@ -688,7 +686,6 @@ Def_SkillID_Red = 20021 # 红名 Def_SkillID_ReviveTired = 20030 # 复活疲劳 SkillID Def_SkillID_SkillReBorn = -1 # 技能复活ID Def_SkillID_ShopItem = -1 # 摆摊技能ID Def_SkillID_LimitSuperBuff = 10000 # 有限无敌BUFF SkillID Def_SkillID_TJGSuperBuff = 20039 # 脱机挂死亡复活保护 Def_SkillID_Somersault = 190 # 翻滚快速闪避 @@ -1410,12 +1407,6 @@ Def_GameEventExpLVDiff = 5 #组队经验加成 Def_TeamMemberExp=[1,1,1.1,1.15,1.2,1.25,1.3] #摆摊-------------------------------------------- #可以摆摊的状态 Def_ShopItem_PlayerState = [IPY_GameWorld.paNull, IPY_GameWorld.paAttack] #摆摊距离 Def_ShopItem_Dist = 10 #物品-------------------------------------------- #人物背包最大个数 @@ -4537,13 +4528,12 @@ Def_Cost_FinishTruck, # 完成镖车 Def_Cost_RefreshTimeShop, # 刷新神秘商店 Def_Cost_OpenNoble, # 开通贵族 Def_Cost_BuyStallItem, # 购买摆摊物品 Def_Cost_Warehouse, # 仓库 Def_Cost_BuyItemBack, # 回购 Def_Cost_Trade, # 交易 Def_Cost_Rename, # 改名 Def_Cost_SkillLvUp, # 技能升级 ) = range(2000, 2000 + 57) ) = range(2000, 2000 + 56) Def_Cost_Reason_SonKey = "reason_name_son" # 消费点原因子类说明key @@ -4603,7 +4593,6 @@ Def_Cost_Transport:"Transport", Def_Cost_OffLineExp:"OffLineExp", Def_Cost_GameServer:"GameServer", Def_Cost_BuyStallItem:"BuyStallItem", Def_Cost_Trade:"Trade", Def_Cost_Rename:"Rename", Def_Cost_SkillLvUp:"SkillLvUp", @@ -4648,7 +4637,7 @@ Def_GiveMoney_SellPackItem, # 出售背包物品 Def_GiveMoney_CollectNPC, # 采集NPC Def_GiveMoney_20, Def_GiveMoney_StallItem, # 摆摊 Def_GiveMoney_21, Def_GiveMoney_Trade, # 交易 Def_GiveMoney_Truck, # 运镖 Def_GiveMoney_FreeGoods, # 极品白拿 @@ -4682,7 +4671,6 @@ Def_GiveMoney_Warehouse:"Warehouse", Def_GiveMoney_SellPackItem:"SellPackItem", Def_GiveMoney_CollectNPC:"CollectNPC", Def_GiveMoney_StallItem:"StallItem", Def_GiveMoney_Trade:"Trade", Def_GiveMoney_Truck:"Truck", Def_GiveMoney_FreeGoods:"FreeGoods", 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 玩家实例 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py
@@ -1178,10 +1178,6 @@ NPCCommon.ClearCollectNPC(curPlayer) #结束事件 EventShell.DoExitEvent(curPlayer) # 结束摆摊/查看摆摊 EventShell.ExitShopItem(curPlayer) EventShell.ExitWatchShopItem(curPlayer) #设置玩家的地图位置, 如果是副本, 离开副本 # 副本规则: @@ -1446,11 +1442,6 @@ PlayerTruck.PlayerTruckDown(curPlayer, curTruck) curPlayer.SetChangeMapTakeTruck(takeTruck) # 如果在摆摊中，提示摆摊关闭 playerShop = curPlayer.GetPlayerShop() if playerShop.GetIsStartShop(): NotifyCode(curPlayer, "GeRen_admin_70569") #离开地图服务器 __PlayerLeaveServerLogic(curPlayer, tick, False) ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerShopItem.py
File was deleted
