SnxxServerCode.git

			@@ -29,6 +29,7 @@
			import PlayerMagicWeapon
			import IPY_GameWorld
			import OpenServerCampaign
			import DataRecordPack

			g_runeLVExpDict = {}

			@@ -36,6 +37,42 @@
			# @param curPlayer 玩家
			# @return None
			def PlayerRuneLogin(curPlayer):
			if not GameWorld.GetDictValueByBit(curPlayer, ChConfig.Def_Player_Dict_VersionFix, ChConfig.Def_VerFix_RuneSource):
			GameWorld.SetDictValueByBit(curPlayer, ChConfig.Def_Player_Dict_VersionFix, ChConfig.Def_VerFix_RuneSource, 1)
			runeHoleCnt = IpyGameDataPY.GetFuncCfg("RuneUnlock", 4)
			for RuneNum in xrange(1, runeHoleCnt + 1):
			RuneData = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_Rune_Data % RuneNum, 0)
			if not RuneData:
			continue
			RuneItemID = ItemControler.GetRuneItemID(RuneData)
			ipyData = IpyGameDataPY.GetIpyGameDataNotLog('RuneCompound', RuneItemID)
			if not ipyData:
			continue
			RuneSource = ItemControler.GetRuneItemSource(RuneData)
			if RuneSource != ChConfig.Item_Source_Compound:
			RuneItemPlusLV = ItemControler.GetRuneItemPlusLV(RuneData)
			RuneIsLock = ItemControler.GetRuneItemIsLock(RuneData)
			updRuneData = ItemControler.GetRuneItemKeyData(RuneItemID, RuneItemPlusLV, RuneIsLock, ChConfig.Item_Source_Compound)
			PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_Rune_Data % RuneNum, updRuneData)
			GameWorld.Log('上线修复双属性符印来源 RuneNum=%s,oldRuneData=%s,updRuneData=%s'%(RuneNum, RuneData, updRuneData))
			packIndex = ShareDefine.rptRune
			for place in xrange(ItemCommon.GetVPackCnt(packIndex)):
			RuneData = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_VPackItem % (packIndex, place))
			if not RuneData:
			continue
			RuneItemID = ItemControler.GetRuneItemID(RuneData)
			ipyData = IpyGameDataPY.GetIpyGameDataNotLog('RuneCompound', RuneItemID)
			if not ipyData:
			continue
			RuneSource = ItemControler.GetRuneItemSource(RuneData)
			if RuneSource != ChConfig.Item_Source_Compound:
			RuneItemPlusLV = ItemControler.GetRuneItemPlusLV(RuneData)
			RuneIsLock = ItemControler.GetRuneItemIsLock(RuneData)
			updRuneData = ItemControler.GetRuneItemKeyData(RuneItemID, RuneItemPlusLV, RuneIsLock, ChConfig.Item_Source_Compound)
			ItemControler.SetVPackItemKeyData(curPlayer, ShareDefine.rptRune, place, updRuneData)
			GameWorld.Log('上线修复双属性符印来源 place=%s,oldRuneData=%s,updRuneData=%s'%(place, RuneData, updRuneData))


			DoUnlockRuneHole(curPlayer, False)
			Sync_RuneInfo(curPlayer)
			return
			@@ -97,6 +134,9 @@
			qualityPerDict = IpyGameDataPY.GetFuncEvalCfg(keyStr, 2, {})
			if itemColor in qualityPerDict:
			value *= float(qualityPerDict[itemColor])
			extraValueDict = IpyGameDataPY.GetFuncEvalCfg(keyStr, 4, {})
			value += extraValueDict.get(itemColor, 0)

			if isSpecial:
			specialPer = IpyGameDataPY.GetFuncCfg(keyStr, 3)
			if specialPer:
			@@ -165,18 +205,10 @@

			## 获取符印是否已解锁
			def GetIsOpenByRuneID(curPlayer, itemid):
			itemData = GameWorld.GetGameData().GetItemByTypeID(itemid)
			if not itemData:
			return
			curPassLV = curPlayer.NomalDictGetProperty(ChConfig.Def_Player_Dict_TrialTower_PassLV)
			curEff = itemData.GetEffectByIndex(0)
			curRuneType = curEff.GetEffectID()
			floorCnt = IpyGameDataPY.GetFuncCfg('TowerRuneType', 2)
			towerRuneTypeDict = IpyGameDataPY.GetFuncEvalCfg('TowerRuneType')
			for floor, typeList in towerRuneTypeDict.items():
			if curRuneType in typeList:
			floorkey = (int(floor) - 1)*100+ floorCnt if int(floor) > 1 else 0
			return curPassLV >= floorkey
			ipyData = GetRuneIpyData(itemid)
			if ipyData:
			curPassLV = curPlayer.NomalDictGetProperty(ChConfig.Def_Player_Dict_TrialTower_PassLV)
			return curPassLV >= ipyData.GetTowerID()
			# 没配置限制层数解锁的默认解锁
			return True

			@@ -255,11 +287,12 @@
			if emptyIndex == -1:
			GameWorld.DebugLog("符印背包已满，无法摘下! ", curPlayer.GetPlayerID())
			return True

			desRuneData = 0
			# 摘下设置孔数据为0
			PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_Rune_Data % srcRuneNum, 0)
			ItemControler.SetVPackItemKeyData(curPlayer, ShareDefine.rptRune, emptyIndex, srcRuneData)

			dataDict = {'desBackPack':desBackPack, 'srcRuneData':srcRuneData, 'desRuneData':desRuneData}
			DataRecordPack.Cache_FightPowerChangeInfo(curPlayer, ChConfig.PowerDownType_Rune, dataDict)
			RefreshRuneAttr(curPlayer)
			PlayerControl.PlayerControl(curPlayer).RefreshPlayerAttrState()
			Sync_RuneInfo(curPlayer)
			@@ -305,6 +338,7 @@
			RuneItemID = ItemControler.GetRuneItemID(RuneData)
			RuneItemPlusLV = ItemControler.GetRuneItemPlusLV(RuneData)
			RuneIsLock = ItemControler.GetRuneItemIsLock(RuneData)
			RuneSource = ItemControler.GetRuneItemSource(RuneData)
			itemData = GameWorld.GetGameData().GetItemByTypeID(RuneItemID)
			if not itemData:
			return
			@@ -322,7 +356,7 @@
			return


			updRuneData = ItemControler.GetRuneItemKeyData(RuneItemID, RuneItemPlusLV + 1, RuneIsLock)
			updRuneData = ItemControler.GetRuneItemKeyData(RuneItemID, RuneItemPlusLV + 1, RuneIsLock, RuneSource)
			if not PlayerControl.PayMoney(curPlayer, ShareDefine.TYPE_Price_Rune, plusCost):
			curRuneMoney = PlayerControl.GetMoney(curPlayer, ShareDefine.TYPE_Price_Rune)
			GameWorld.DebugLog("符印精华点不足，无法升级!placeType=%s,placeIndex=%s,itemID=%s,plusLV=%s,plusCost=%s,curRuneMoney=%s"
			@@ -425,7 +459,7 @@
			decompose += decompose * addPer / ShareDefine.Def_MaxRateValue

			ipyData = IpyGameDataPY.GetIpyGameDataNotLog('RuneCompound', RuneItemID)
			if ipyData and ItemControler.GetRuneItemSource(RuneData) in [0,2]:
			if ipyData and ItemControler.GetRuneItemSource(RuneData) in [ChConfig.Rune_Source_Unkown,ChConfig.Item_Source_Compound]:
			totalMJ += ipyData.GetNeedMJ()


			@@ -527,19 +561,19 @@
			GameWorld.DebugLog(' 符印合成材料不对 tagItemID=%s, materialsIDList=%s, needItemIDList=%s'%(tagItemID,materialsIDList,needItemIDList))
			return

			needMJ = ipyData.GetNeedMJ()
			infoDict = {"TagItemID":tagItemID}
			if not PlayerControl.PayMoney(curPlayer, ShareDefine.TYPE_Price_Ysog, needMJ, ChConfig.Def_Cost_ItemProduce, infoDict):
			return

			if 0 not in packList:
			#如果没有背包的材料要判断格子数
			emptySpace = ItemCommon.GetItemPackSpace(curPlayer, ShareDefine.rptRune, 1)
			if emptySpace < 1:
			PlayerControl.NotifyCode(curPlayer, "GeRen_chenxin_676165", [ShareDefine.rptRune])
			GameWorld.DebugLog(' 符印合成背包格子数量不足1个')
			return



			needMJ = ipyData.GetNeedMJ()
			infoDict = {"TagItemID":tagItemID}
			if not PlayerControl.PayMoney(curPlayer, ShareDefine.TYPE_Price_Ysog, needMJ, ChConfig.Def_Cost_ItemProduce, infoDict):
			return

			totalPoint = 0
			for itemID in materialsIDList:
			decompose = 0
			@@ -563,7 +597,11 @@
			ItemCommon.DelVPackItem(curPlayer, ShareDefine.rptRune, indexList1, ChConfig.ItemDel_Rune)
			if indexList2:
			for index in indexList2:
			srcRuneData = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_Rune_Data % index, 0)
			PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_Rune_Data % index, 0)
			dataDict = {'doType':'RuneCompound', 'srcRuneData':srcRuneData, 'desRuneData':0}
			DataRecordPack.Cache_FightPowerChangeInfo(curPlayer, ChConfig.PowerDownType_Rune, dataDict)

			Sync_RuneInfo(curPlayer)
			RefreshRuneAttr(curPlayer)
			PlayerControl.PlayerControl(curPlayer).RefreshPlayerAttrState()
			@@ -571,9 +609,10 @@
			#给新物品
			curItem = ItemControler.GetOutPutItemObj(tagItemID)
			curItem.SetUserAttr(ShareDefine.Def_IudetRuneLV, tagItemLV)
			curItem.SetUserAttr(ShareDefine.Def_IudetRuneSource, 2)
			curItem.SetUserAttr(ShareDefine.Def_IudetRuneSource, ChConfig.Item_Source_Compound)
			PlayerItemControler = ItemControler.PlayerItemControler(curPlayer)
			PlayerItemControler.PutInItem(ShareDefine.rptRune, curItem, event=[ChConfig.ItemGive_RuneCompound, False, {}])
			PlayerItemControler.PutInItem(ShareDefine.rptRune, curItem, event=[ChConfig.ItemGive_RuneCompound, False, {'indexList1':indexList1,'indexList2':indexList2}])
			curPlayer.Sync_MakeItemAnswer(ShareDefine.Def_mitRuneCompound, 1)
			return