Project_SG_ServerCode.git

			@@ -24,6 +24,7 @@
			import IpyGameDataPY
			import FormulaControl
			import PlayerPrestigeSys
			import PlayerBeauty
			import PlayerFamily
			import PlayerHorse
			import PlayerGubao
			@@ -422,6 +423,7 @@
			PlayerGubao.CalcGubaoAttr(curPlayer)
			PlayerHJG.CalcHJGAttr(curPlayer)
			PlayerHorse.CalcHorseAttr(curPlayer)
			PlayerBeauty.CalcBeautyAttr(curPlayer)
			return

			def doRefreshLineupAttr(curPlayer, olPlayer, lineup):
			@@ -647,6 +649,7 @@
			gubaoAttrDict = olPlayer.GetCalcAttr(ChConfig.Def_CalcAttr_Gubao)
			hjgAttrDict = olPlayer.GetCalcAttr(ChConfig.Def_CalcAttr_HJG)
			horseAttrDict = olPlayer.GetCalcAttr(ChConfig.Def_CalcAttr_Horse)
			beautyAttrDict = olPlayer.GetCalcAttr(ChConfig.Def_CalcAttr_Beauty)

			GameWorld.DebugLog(" 国家武将统计=%s" % countryHeroInfo, playerID)
			GameWorld.DebugLog(" 羁绊武将统计=%s" % fetterHeroInfo, playerID)
			@@ -665,6 +668,7 @@
			GameWorld.DebugLog(" 主公古宝属性=%s" % gubaoAttrDict, playerID)
			GameWorld.DebugLog(" 主幻境阁属性=%s" % hjgAttrDict, playerID)
			GameWorld.DebugLog(" 主公坐骑属性=%s" % horseAttrDict, playerID)
			GameWorld.DebugLog(" 主公红颜属性=%s" % beautyAttrDict, playerID)

			PlayerLV = curPlayer.GetLV()
			OfficialLV = curPlayer.GetOfficialRank()
			@@ -708,6 +712,9 @@
			horseValue = horseAttrDict.get(attrID, 0)
			horsePer = horseAttrDict.get(attrPerID, 0) / 10000.0 if attrPerID else 0

			beautyValue = beautyAttrDict.get(attrID, 0)
			beautyPer = beautyAttrDict.get(attrPerID, 0) / 10000.0 if attrPerID else 0

			lineupInitAddPer, lineupLVAddPer, lineupBreakLVAddPer, lineupStarAddPer = 0, 0, 0, 0
			if attrID in ChConfig.BaseAttrIDList:
			lineupInitAddPer, lineupLVAddPer, lineupBreakLVAddPer, lineupStarAddPer = InitAddPer, LVAddPer, BreakLVAddPer, StarAddPer
			@@ -734,7 +741,8 @@

			# 计算
			attrParamDict = {"lvValue":lvValue, "equipValue":equipValue, "bookValue":bookValue, "bookPer":bookPer, "realmValue":realmValue, "realmPer":realmPer,
			"gubaoValue":gubaoValue, "gubaoPer":gubaoPer, "hjgValue":hjgValue, "hjgPer":hjgPer, "horseValue":horseValue, "horsePer":horsePer,
			"gubaoValue":gubaoValue, "gubaoPer":gubaoPer, "hjgValue":hjgValue, "hjgPer":hjgPer, "horseValue":horseValue, "horsePer":horsePer,
			"beautyValue":beautyValue, "beautyPer":beautyPer,
			"lineupInitAddPer":lineupInitAddPer, "lineupLVAddPer":lineupLVAddPer, "lineupBreakLVAddPer":lineupBreakLVAddPer, "lineupStarAddPer":lineupStarAddPer,
			"heroSelfValue":heroSelfValue, "heroSelfPer":heroSelfPer, "inheritPer":inheritPer,
			"lineupHaloValue":lineupHaloValue, "lineupHaloPer":lineupHaloPer, "fetterValue":fetterValue, "fetterPer":fetterPer,