Project_SG_ServerCode.git

			@@ -24,6 +24,7 @@
			import IpyGameDataPY
			import FormulaControl
			import PlayerPrestigeSys
			import PlayerGubao
			import PlayerHero
			import GameWorld
			import ChConfig
			@@ -412,6 +413,7 @@
			ChEquip.CalcRoleEquipAttr(curPlayer)
			PlayerHero.CalcHeroAddAttr(curPlayer)
			PlayerPrestigeSys.CalcOfficialRankAttr(curPlayer)
			PlayerGubao.CalcGubaoAttr(curPlayer)
			return

			def doRefreshLineupAttr(curPlayer, olPlayer, lineup):
			@@ -634,6 +636,7 @@
			equipAttrDict = olPlayer.GetCalcAttr(ChConfig.Def_CalcAttr_MainEquip)
			bookAttrDict = olPlayer.GetCalcAttr(ChConfig.Def_CalcAttr_HeroBook)
			realmAttrDict = olPlayer.GetCalcAttr(ChConfig.Def_CalcAttr_Realm)
			gubaoAttrDict = olPlayer.GetCalcAttr(ChConfig.Def_CalcAttr_Gubao)

			GameWorld.DebugLog(" 国家武将统计=%s" % countryHeroInfo, playerID)
			GameWorld.DebugLog(" 羁绊武将统计=%s" % fetterHeroInfo, playerID)
			@@ -649,6 +652,7 @@
			GameWorld.DebugLog(" 主公装备属性=%s" % equipAttrDict, playerID)
			GameWorld.DebugLog(" 主公图鉴属性=%s" % bookAttrDict, playerID)
			GameWorld.DebugLog(" 主公官职属性=%s" % realmAttrDict, playerID)
			GameWorld.DebugLog(" 主公古宝属性=%s" % gubaoAttrDict, playerID)

			PlayerLV = curPlayer.GetLV()
			OfficialLV = curPlayer.GetOfficialRank()
			@@ -683,6 +687,9 @@
			realmValue = realmAttrDict.get(attrID, 0)
			realmPer = realmAttrDict.get(attrPerID, 0) / 10000.0 if attrPerID else 0

			gubaoValue = gubaoAttrDict.get(attrID, 0)
			gubaoPer = gubaoAttrDict.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
			@@ -709,6 +716,7 @@

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