From 560e29fe8dc7af87417abd9c510701fde33d9ebb Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期三, 20 三月 2019 17:31:39 +0800
Subject: [PATCH] 6374 【后端】【2.0】删除无用功能代码、封包、配置(删除修复代码)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBCommon.py |   16 +++++-----------
 1 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBCommon.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBCommon.py
index 4e91a7f..38cff40 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBCommon.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBCommon.py
@@ -30,6 +30,7 @@
 import EventReport
 import PlayerFamily
 import PlayerActivity
+import ItemControler
 import PlayerSuccess
 import GameFuncComm
 import PyGameData
@@ -201,15 +202,6 @@
             if isNotify:
                 PlayerControl.NotifyCode(curPlayer, "FbLV", [mapID])
             return ShareDefine.EntFBAskRet_LVLimit
-        
-        #职业阶判断
-        jobRankLimit = fbLineIpyData.GetJobRankLimit()
-        if jobRankLimit and PlayerControl.GetJobRank(curPlayer) < jobRankLimit:
-            GameWorld.Log("玩家职业阶级不足, 无法进入副本!mapID=%s,lineID=%s,jobRank=%s < jobRankLimit=%s" 
-                          % (mapID, lineID, PlayerControl.GetJobRank(curPlayer), jobRankLimit), playerID)
-            if isNotify:
-                PlayerControl.NotifyCode(curPlayer, "SingleEnterJob", [mapID])
-            return ShareDefine.EntFBAskRet_JobRankLimit
         
         #门票判断
         if not GetFBEnterTicket(curPlayer, mapID, lineID, fbLineIpyData, reqEnterCnt, isTeamAsk)[0]:
@@ -601,7 +593,7 @@
                 continue
             itemDict['ItemID'] = itemInfo.GetItemTypeID()
             itemDict['Count'] = itemInfo.GetCount()
-            itemDict['IsAuctionItem'] = 0 if itemInfo.GetIsBind() else 1
+            itemDict['IsAuctionItem'] = ItemControler.GetIsAuctionItem(itemInfo)
             #itemDict['IsSuite'] = int(itemInfo.GetIsSuite())
             itemDict['UserData'] = itemInfo.GetUserData()
         jsonItemList.append(itemDict)
@@ -1962,7 +1954,7 @@
         return
     
     buffType = SkillCommon.GetBuffType(skillBuff)
-    BuffSkill.DoAddBuff(curPlayer, buffType, skillBuff, tick)
+    
     gameFB.SetPlayerGameFBDict(ownerID, key, encourageLV+1)
     gameFB.SetPlayerGameFBDict(ownerID, encourageCntKey, encourageCnt+1)
     #GameWorld.Log("FbEncourageBuff encourage nextLV=%s success" % encourageLV)
@@ -1976,6 +1968,7 @@
                 continue
             if player.GetFamilyID() != ownerID:
                 continue
+            BuffSkill.DoAddBuff(player, buffType, skillBuff, tick)
             PlayerControl.NotifyCode(player, "AllianceBossText2", [curPlayer.GetName(), encourageLV+1])
             SendFBEncourageInfo(player, encourageLV+1, ownerID)
             if player.GetID() == curPlayer.GetID():
@@ -1983,6 +1976,7 @@
                 EventShell.EventRespons_FBEncourage(curPlayer, curMapID)
             
     else:
+        BuffSkill.DoAddBuff(curPlayer, buffType, skillBuff, tick)
         PlayerControl.NotifyCode(curPlayer, "GeRen_chenxin_628920", [(encourageLV+1)*addHurtNum])
         SendFBEncourageInfo(curPlayer, encourageLV+1, ownerID)
         #成就

--
Gitblit v1.8.0