Project_SG_ServerCode.git

			@@ -20,6 +20,7 @@
			import TurnAttack
			import ShareDefine
			import IpyGameDataPY
			import PlayerSuccess
			import PlayerControl
			import PlayerActivity
			import ChPyNetSendPack
			@@ -34,7 +35,6 @@
			import NPCCommon
			import BattleObj
			import ChEquip
			import ObjPool

			import random

			@@ -159,6 +159,7 @@
			curMoney = PlayerControl.GetMoney(curPlayer, ShareDefine.TYPE_Price_ArenaTicket)
			storeMax = PlayerArena.GetArenaTicketStoreMax(curPlayer)
			if curMoney >= storeMax:
			PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_UnXiantaoCntBooty % itemID, 0)
			GameWorld.DebugLog("挑战券已达存储上限! itemID=%s,curMoney=%s >= %s" % (itemID, curMoney, storeMax), playerID)
			continue

			@@ -432,6 +433,7 @@
			ChEquip.RefreshRoleEquipAttr(curPlayer)

			PlayerTask.UpdTaskValue(curPlayer, ChConfig.TaskType_EquipColor)
			PlayerSuccess.UpdateEquipSuccess(curPlayer)
			return

			def __doDecomposeMainEquip(curPlayer, itemIndexList):
			@@ -481,10 +483,11 @@
			moneyTotal = int(round(moneyTotal)) # 四舍五入取整
			GameWorld.DebugLog("moneyTotal=%s,mjExTotal=%s" % (moneyTotal, mjExTotal), playerID)

			PlayerControl.GiveMoney(curPlayer, moneyType, moneyTotal, "DecomposeMainEquip", isSysHint=False)
			PlayerControl.GiveMoney(curPlayer, moneyType, moneyTotal, isSysHint=False)
			PlayerLLMJ.AddExpDecompose(curPlayer, mjExTotal)
			PlayerTask.AddTaskValue(curPlayer, ChConfig.TaskType_EquipDecompose, decomposeCnt)
			PlayerActivity.AddDailyTaskValue(curPlayer, ChConfig.DailyTask_EquipDecompose, decomposeCnt)
			PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_OSAEquipDecompose, decomposeCnt)
			return

			def __doPickupMainItem(curPlayer, itemIndexList):
			@@ -522,11 +525,10 @@
			syncItemIDList = GetBootyItemIDList()
			else:
			syncItemIDList = [itemID]
			poolMgr = ObjPool.GetPoolMgr()
			clientPack = poolMgr.acquire(ChPyNetSendPack.tagSCDropBootyInfo)
			clientPack = ChPyNetSendPack.tagSCDropBootyInfo()
			clientPack.DropBootyList = []
			for itemID in syncItemIDList:
			dropBooty = poolMgr.acquire(ChPyNetSendPack.tagSCDropBooty)
			dropBooty = ChPyNetSendPack.tagSCDropBooty()
			dropBooty.ItemID = itemID
			dropBooty.TodayDropCnt = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_BootyDropToday % itemID)
			clientPack.DropBootyList.append(dropBooty)
			@@ -534,9 +536,10 @@
			NetPackCommon.SendFakePack(curPlayer, clientPack)
			return

			def OnTurnFightOver(curPlayer, turnFight, mapID, funcLineID, overMsg):
			def OnTurnFightOver(turnFight, mapID, funcLineID, overMsg):
			## 回合战斗结束

			curPlayer = turnFight.curPlayer
			if not curPlayer:
			return