| 
					
				 | 
			
			
				@@ -378,12 +378,10 @@ namespace GFGGame 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         /// <summary> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         /// index=0:搭配战力 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        /// index=1:卓越点击战力 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        /// index=1:最高点击战力分 = (卓越点击战力+登峰造极额外加分) / 服装部件评分系数2.33 原来:卓越点击战力 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         /// index=2:词牌战力/技能战力 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         /// </summary> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        /// <param name="roleType"></param> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         /// <param name="fightDatas"></param> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        /// <param name="robotDatas"></param> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         /// <returns></returns> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         public List<long> GetFightScoreList(List<FightData> fightDatas) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         { 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -391,6 +389,8 @@ namespace GFGGame 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             long itemSum = 0; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             double clickScore = 0; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             long skillScore = 0; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            //登峰造极额外加分 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            double maxScore = 0; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             for (int i = 0; i < ThemeList.Count; i++) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 if (fightDatas[i].type == FightTargetType.PLAYER) 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -411,12 +411,23 @@ namespace GFGGame 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         fightDatas[i].leagueSkillScore, fightDatas[i].cardId, fightDatas[i].cardScore, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         fightDatas[i].skillLvs); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                //总主属性分 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                double mainScore = ScoreSystemData.Instance.GetMainScore(fightDatas[i]); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                maxScore += ScoreSystemData.Instance.GetAllCircleAddScore(mainScore); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+             
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            //A:(部件基础评分+(角色等级分数+角色雅集技能分+词牌对应主题的属性分数)*点击完美附加评分系数0.2) * 点击系数2.22 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            //A/服装部件评分系数2.33 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             clickScore = clickScore / ConstScoreSystem.PART_SCORE; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             fightScoreDatas.Add(itemSum); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            fightScoreDatas.Add((long)Math.Ceiling(clickScore)); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            // fightScoreDatas.Add((long)Math.Ceiling(clickScore)); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            //最高点击战力分 = (卓越点击战力+登峰造极额外加分) / 服装部件评分系数2.33 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            maxScore = maxScore / ConstScoreSystem.PART_SCORE; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            long maxClickScore = (long)Math.Ceiling(clickScore) + (long)Math.Ceiling(maxScore); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            fightScoreDatas.Add(maxClickScore); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             fightScoreDatas.Add(skillScore); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             return fightScoreDatas; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -442,6 +453,7 @@ namespace GFGGame 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             foreach (int key in roleData.pardScoreListDic.Keys) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 double partBaseScore = ScoreSystemData.Instance.GetPartBaseScore(roleData, key); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                //(部件基础评分+(角色等级分数+角色雅集技能分+词牌对应主题的属性分数)*点击完美附加评分系数0.2) * 点击系数2.22 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 double score = 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     (partBaseScore + (roleData.baseScore + roleData.leagueSkillScore + roleData.cardScore) * 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         ConstScoreSystem.PERFECT_SCORE) * ConstScoreSystem.CLICK_SCORE; 
			 |