SnxxServerCode.git

			@@ -36,6 +36,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
			@@ -305,6 +341,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 +359,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 +462,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 +564,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
			@@ -571,9 +608,9 @@
			#给新物品
			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}])
			return

	ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRune.py	59 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

			@@ -4470,7 +4470,8 @@
			(
			Def_VerFix_ChatBubbleBox, # 1.2版本购买VIP礼包可获得激活气泡框道具，针对已购买过VIP礼包的老号处理;
			Def_VerFix_CTGDoublePrize, # 1.2版本开放首充双倍，重置老号充值ID对应累计充值次数;
			) = range(2)
			Def_VerFix_RuneSource, # 修复老号双属性符印的获取途径;
			) = range(3)

			##==================================================================================================
			#游戏消费点类型定义
			@@ -5109,3 +5110,10 @@

			EquipGroupType_Armor = '1' # 防具套装
			EquipGroupType_Relics = '2' # 仙器套装

			# 符印来源类型
			(
			Rune_Source_Unkown, # 老号未知 0
			Rune_Source_Default, # 默认 1
			Item_Source_Compound, # 符印合成 2
			) = range(3)