Project_SG_ServerCode.git

			@@ -17,7 +17,6 @@
			import PlayerControl
			import ItemCommon
			import GameMap
			import EventShell
			import NPCCommon
			import ReadChConfig
			import BuffSkill
			@@ -168,6 +167,8 @@
			def IsFBPass(curPlayer, mapID, lineID):
			## 副本线路是否已过关
			passLineID = 0
			if mapID == ChConfig.Def_FBMapID_Main:
			return PlayerControl.IsMainLevelPass(curPlayer, lineID)
			if mapID == ChConfig.Def_FBMapID_RealmTower:
			passLineID = curPlayer.NomalDictGetProperty(ChConfig.Def_Player_Dict_RealmTowerFloor)
			elif mapID == ChConfig.Def_FBMapID_SkyTower:
			@@ -670,8 +671,8 @@
			itemDict['ItemID'] = itemInfo[0]
			if infolen > 1:
			itemDict['Count'] = itemInfo[1]
			if infolen > 2:
			itemDict['IsAuctionItem'] = int(itemInfo[2])
			#if infolen > 2:
			# itemDict['IsAuctionItem'] = int(itemInfo[2])
			elif isinstance(itemInfo, int):
			itemDict['ItemID'] = itemInfo
			elif isinstance(itemInfo, dict):
			@@ -681,7 +682,7 @@
			continue
			itemDict['ItemID'] = itemInfo.GetItemTypeID()
			itemDict['Count'] = itemInfo.GetCount()
			itemDict['IsAuctionItem'] = ItemControler.GetIsAuctionItem(itemInfo)
			#itemDict['IsAuctionItem'] = ItemControler.GetIsAuctionItem(itemInfo)
			#itemDict['IsSuite'] = int(itemInfo.GetIsSuite())
			itemDict['UserData'] = itemInfo.GetUserData()
			jsonItemList.append(itemDict)
			@@ -2229,7 +2230,6 @@
			SendFBEncourageInfo(player, encourageLV+1, ownerID)
			if player.GetID() == curPlayer.GetID():
			PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_FBEncourage, 1, [curMapID])
			EventShell.EventRespons_FBEncourage(curPlayer, curMapID)

			else:
			BuffSkill.DoAddBuff(curPlayer, buffType, skillBuff, tick)
			@@ -2237,7 +2237,6 @@
			SendFBEncourageInfo(curPlayer, encourageLV+1, ownerID)
			#成就
			PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_FBEncourage, 1, [curMapID])
			EventShell.EventRespons_FBEncourage(curPlayer, curMapID)
			return True

			## 添加副本鼓舞buff，一般用于玩家掉线后，在规定时间内重新上线回到副本时重新上buff