SnxxServerCode.git

			@@ -33,6 +33,7 @@
			import ItemCommon
			import PyGameData
			import PlayerTJG
			import SkillShell

			import time
			import json
			@@ -134,8 +135,8 @@
			itemDict["Star"] = equipStar

			#部位强化数据
			equipPartPlusLV = ChEquip.GetEquipPartPlusLVByRank(curPlayer, packType, index, curEquip)
			equipPartPlusEvolveLV = ChEquip.GetEquipPartPlusEvolveLVByEquip(curPlayer, packType, index, curEquip)
			equipPartPlusLV = ChEquip.GetEquipPartPlusLV(curPlayer, packType, index)
			equipPartPlusEvolveLV = ChEquip.GetEquipPartPlusEvolveLV(curPlayer, packType, index)
			if equipPartPlusLV:
			itemDict["PlusLV"] = equipPartPlusLV
			if equipPartPlusEvolveLV:
			@@ -147,7 +148,7 @@
			itemDict["Stone"] = stoneIDList

			#部位洗练数据
			washLV = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_EquipWashLV % index) + 1
			washLV = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_EquipWashLV % index)
			valueList = []
			for attrNum in xrange(1, Operate_EquipWash.Def_EquipWashMaxAttrCount + 1):
			value = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_EquipWashValue % (index, attrNum))
			@@ -173,6 +174,8 @@
			curPlayerPropDict["EquipShowSwitch"] = curPlayer.GetEquipShowSwitch()
			curPlayerPropDict["EquipShowID"] = __GetEquipShowIDList(curPlayer)
			curPlayerPropDict["ServerGroupID"] = PlayerControl.GetPlayerServerGroupID(curPlayer)
			curPlayerPropDict["LingGenPoint"] = [PlayerControl.GetMetal(curPlayer), PlayerControl.GetWood(curPlayer), PlayerControl.GetWater(curPlayer),
			PlayerControl.GetFire(curPlayer), PlayerControl.GetEarth(curPlayer)]
			#仙魔之争所需属性
			curPlayerPropDict["MinAtk"] = curPlayer.GetMinAtk()
			curPlayerPropDict["MaxAtk"] = curPlayer.GetMaxAtk()
			@@ -192,11 +195,11 @@
			maxCnt = FBCommon.GetEnterFBMaxCnt(curPlayer, ChConfig.Def_FBMapID_ZhuXianBoss)
			curPlayerPropDict['CntMark_%s' % ChConfig.Def_FBMapID_ZhuXianBoss] = max(maxCnt - enterCnt, 0)
			# 世界BOSS剩余次数
			curPlayerPropDict['CntMark_%s' % ShareDefine.Def_Boss_Func_World] = BossHurtMng.GetCanKillBossCnt(curPlayer, ShareDefine.Def_Boss_Func_World)
			curPlayerPropDict['CntMark_%s' % ShareDefine.Def_Boss_Func_World] = BossHurtMng.GetCanKillBossCnt(curPlayer, ShareDefine.Def_Boss_Func_World)[0]
			# BOSS之家剩余次数
			curPlayerPropDict['CntMark_%s' % ShareDefine.Def_Boss_Func_Home] = BossHurtMng.GetCanKillBossCnt(curPlayer, ShareDefine.Def_Boss_Func_Home)
			curPlayerPropDict['CntMark_%s' % ShareDefine.Def_Boss_Func_Home] = BossHurtMng.GetCanKillBossCnt(curPlayer, ShareDefine.Def_Boss_Func_Home)[0]
			# 神兽BOSS剩余次数
			curPlayerPropDict['CntMark_%s' % ShareDefine.Def_Boss_Func_Dogz] = BossHurtMng.GetCanKillBossCnt(curPlayer, ShareDefine.Def_Boss_Func_Dogz)
			curPlayerPropDict['CntMark_%s' % ShareDefine.Def_Boss_Func_Dogz] = BossHurtMng.GetCanKillBossCnt(curPlayer, ShareDefine.Def_Boss_Func_Dogz)[0]

			#-----------
			#扩展属性缓存
			@@ -210,6 +213,15 @@
			fightPowerDict["%s" % mfpType] = fightPower
			curPlayerPlusDict["FightPowerDict"] = fightPowerDict

			#装备汇总信息
			curPlayerPlusDict["EquipOrangeCount"] = ChEquip.GetEquipOrangeCount(curPlayer)
			curPlayerPlusDict["TotalEquipStar"] = ChEquip.GetTotalEquipStars(curPlayer)
			curPlayerPlusDict["TotalPlusLV"] = ChEquip.GetTotalPlusLV(curPlayer)
			curPlayerPlusDict["TotalPlusEvolveLV"] = ChEquip.GetTotalPlusEvolveLV(curPlayer)
			curPlayerPlusDict["TotalStoneLV"] = Operate_EquipStone.GetTotalStoneLV(curPlayer)
			curPlayerPlusDict["TotalEquipWashLV"] = Operate_EquipWash.GetTotalEquipWashLV(curPlayer)
			#主动技能总等级
			curPlayerPlusDict["TotalSkillLV"] = SkillShell.GetAllSkillLV(curPlayer, ChConfig.Def_SkillFuncType_FbSkill)
			#灵宠数据
			curPlayerPlusDict["Pet"] = __GetPetInfo(curPlayer)

			@@ -263,15 +275,11 @@

			## 坐骑信息
			def __GetHorseInfo(curPlayer):
			horseList = []
			ipyDataMgr = IpyGameDataPY.IPY_Data()
			for i in xrange(ipyDataMgr.GetHorseCount()):
			ipyData = ipyDataMgr.GetHorseByIndex(i)
			horseID = ipyData.GetHorseID()
			horseLV = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_Horser_LV % horseID, 0, ChConfig.Def_PDictType_Horse)
			if horseLV:
			horseList.append({"id":horseID, 'lv':horseLV})
			return horseList
			horseInfo = {"LV":curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_HorserLV),
			"EatItemCount":curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_HorserEatItemCount),
			"SkinPlusState":curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_HorserSkinPlusState),
			}
			return horseInfo

			## 神器信息
			def __GetGodWeaponInfo(curPlayer):
			@@ -286,16 +294,18 @@

			## 符印信息
			def __GetRuneInfo(curPlayer):
			runeDict = {}
			#runeDict = {}
			maxLV = 0
			runeHoleCnt = IpyGameDataPY.GetFuncCfg("RuneUnlock", 4)
			for holeNum in xrange(1, runeHoleCnt + 1):
			runeData = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_Rune_Data % holeNum, 0)
			if not runeData:
			continue
			runeItemID = ItemControler.GetRuneItemID(runeData)
			#runeItemID = ItemControler.GetRuneItemID(runeData)
			runeItemPlusLV = ItemControler.GetRuneItemPlusLV(runeData)
			runeDict[holeNum] = [runeItemID, runeItemPlusLV]
			return len(runeDict)
			#runeDict[holeNum] = [runeItemID, runeItemPlusLV]
			maxLV += runeItemPlusLV
			return maxLV

			## 法宝信息
			def __GetMagicWeaponInfo(curPlayer):