技能表修改+单人战斗

FGUIProject/assets/Main/ComClick.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1080,1920">
+  <displayList>
+    <graph id="n30_uo1t" name="grh_0" xy="570,228" pivot="0.5,0.5" size="25,25" group="n49_wono" aspect="true"/>
+    <graph id="n23_uo1t" name="grh_1" xy="139,374" pivot="0.5,0.5" size="25,25" group="n49_wono" aspect="true"/>
+    <graph id="n24_uo1t" name="grh_2" xy="590,492" pivot="0.5,0.5" size="25,25" group="n49_wono" aspect="true"/>
+    <graph id="n25_uo1t" name="grh_3" xy="653,957" pivot="0.5,0.5" size="25,25" group="n49_wono" aspect="true"/>
+    <graph id="n26_uo1t" name="grh_4" xy="89,729" pivot="0.5,0.5" size="25,25" group="n49_wono" aspect="true"/>
+    <graph id="n48_wono" name="grh_5" xy="111,1429" pivot="0.5,0.5" size="25,25" group="n49_wono" aspect="true"/>
+    <group id="n49_wono" name="n49" xy="89,228" size="589,1226" advanced="true">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </group>
+    <component id="n51_f2bf" name="comResult" src="vuz5bi" fileName="components/ComScoreResult.xml" xy="389,836"/>
+  </displayList>
+</component>

FGUIProject/assets/Main/StoryFightSingleScoreUI.xml

@@ -7,6 +7,10 @@
     <image id="n52_wono" name="imgRole" src="v482fx" fileName="zjm_1.jpg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400">
       <relation target="" sidePair="center-center,middle-middle"/>
     </image>
+    <loader id="n40_wono" name="loaGlass" xy="402,823" pivot="0.5,0.5" size="274,274" scale="0,0" url="ui://mfvz4q8kwonogt" align="center" vAlign="middle"/>
+    <component id="n53_f2bf" name="comClick" src="f2bfiw" fileName="ComClick.xml" xy="0,0">
+      <relation target="" sidePair="width-width,height-height"/>
+    </component>
     <component id="n34_tc53" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="34,80">
       <Button icon="ui://eg2y0ldpuyuxtj4"/>
     </component>
@@ -15,8 +19,7 @@
       <ProgressBar max="100"/>
     </component>
     <component id="n42_wono" name="comScoreStage" src="wonoh2" fileName="components/ComSingleScoreStage.xml" xy="1022,108" pivot="0.5,0.5" anchor="true"/>
-    <loader id="n40_wono" name="loaGlass" xy="402,823" pivot="0.5,0.5" size="274,274" scale="0,0" url="ui://mfvz4q8kwonogt" align="center" vAlign="middle"/>
-    <component id="n4_n0js" name="comClickCircle" src="n0js9b" fileName="components/comClickCircle.xml" xy="402,823" pivot="0.5,0.5" scale="0,0"/>
+    <component id="n4_n0js" name="comClickCircle" src="n0js9b" fileName="components/comClickCircle.xml" xy="402,823" pivot="0.5,0.5" scale="0,0" visible="false"/>
     <component id="n36_jj0m" name="btnSpeedUp" src="jj0mdl" fileName="componentsDialog/ButtonSpeedUp1.xml" xy="915,1627">
       <relation target="" sidePair="right-right,bottom-bottom"/>
       <Button title="x1"/>
@@ -33,7 +36,7 @@
     <graph id="n25_uo1t" name="grh_3" xy="653,957" pivot="0.5,0.5" size="25,25" group="n49_wono" aspect="true"/>
     <graph id="n26_uo1t" name="grh_4" xy="89,729" pivot="0.5,0.5" size="25,25" group="n49_wono" aspect="true"/>
     <graph id="n48_wono" name="grh_5" xy="111,1429" pivot="0.5,0.5" size="25,25" group="n49_wono" aspect="true"/>
-    <group id="n49_wono" name="n49" xy="89,228" size="589,1226" advanced="true">
+    <group id="n49_wono" name="n49" xy="89,228" size="589,1226" visible="false" advanced="true">
       <relation target="" sidePair="center-center,middle-middle"/>
     </group>
   </displayList>
@@ -42,11 +45,12 @@
     <item time="0" type="Rotation" target="n40_wono" value="0"/>
     <item time="0" type="Scale" target="n40_wono" value="1,1"/>
     <item time="0" type="Scale" target="n4_n0js" tween="true" startValue="0,0" endValue="1,1" duration="12" ease="Elastic.Out"/>
-    <item time="12" type="Alpha" target="n40_wono" tween="true" startValue="0" endValue="1" duration="12" ease="Linear"/>
-    <item time="36" type="Rotation" target="n40_wono" tween="true" startValue="0" endValue="360" duration="12" ease="Linear"/>
-    <item time="36" type="Scale" target="n40_wono" tween="true" startValue="1,1" endValue="0,0" duration="12" ease="Linear"/>
-    <item time="36" type="Scale" target="n4_n0js" value="0,0"/>
-    <item time="36" type="XY" target="n40_wono" label="start" tween="true" startValue="402,822" endValue="539.5,108" duration="12" label2="end" ease="Linear"/>
+    <item time="0" type="Visible" target="n4_n0js" value="false"/>
+    <item time="24" type="Scale" target="n4_n0js" value="0,0"/>
+    <item time="30" type="Alpha" target="n40_wono" value="1"/>
+    <item time="30" type="Rotation" target="n40_wono" tween="true" startValue="0" endValue="360" duration="12" ease="Linear"/>
+    <item time="30" type="Scale" target="n40_wono" tween="true" startValue="1,1" endValue="0,0" duration="12" ease="Linear"/>
+    <item time="30" type="XY" target="n40_wono" label="start" tween="true" startValue="402,822" endValue="539.5,108" duration="12" label2="end" ease="Linear"/>
   </transition>
   <transition name="t2">
     <item time="0" type="Alpha" target="n51_wono" tween="true" startValue="0" endValue="1" duration="12" ease="Linear"/>

FGUIProject/assets/Main/components/ComScoreResult.xml

@@ -2,39 +2,59 @@
 <component size="256,259">
   <controller name="c1" pages="0,,1,,2," selected="2"/>
   <displayList>
-    <graph id="n14_ecw3" name="holder2" xy="133,135" size="1,1" visible="false"/>
-    <graph id="n12_c2um" name="holder" xy="127,129" size="1,1"/>
-    <graph id="n13_c2um" name="holder1" xy="137,137" size="1,1" visible="false"/>
-    <loader id="n8_vuz5" name="loaType" xy="69,54" size="119,63" url="ui://mfvz4q8kvuz5be" autoSize="true">
+    <image id="n18_f2bf" name="n18" src="vuz5bk" fileName="imagesStory/zd_pfguang_1.png" xy="122,126" pivot="0.48,0.48" anchor="true" group="n21_f2bf"/>
+    <text id="n19_f2bf" name="txtPart" xy="53,83" pivot="0.5,0" size="148,94" group="n21_f2bf" font="ui://eg2y0ldpwonotja" fontSize="72" color="#fff8ed" strokeColor="#cc984a" strokeSize="2" text="上衣"/>
+    <image id="n20_f2bf" name="imgCircle" src="vuz5bp" fileName="imagesStory/zd_pfhd_4.png" xy="6,-1" pivot="0.474,0.5" group="n21_f2bf" scale="1.3,1.3"/>
+    <group id="n21_f2bf" name="grpClick" xy="6,-1" size="247,262" visible="false" advanced="true"/>
+    <graph id="n14_ecw3" name="holder2" xy="133,135" size="1,1" group="n22_f2bf" visible="false"/>
+    <graph id="n12_c2um" name="holder" xy="127,129" size="1,1" group="n22_f2bf"/>
+    <graph id="n13_c2um" name="holder1" xy="137,137" size="1,1" group="n22_f2bf" visible="false"/>
+    <loader id="n17_f2bf" name="loaBg" xy="0,0" pivot="0.5,0.5" size="256,259" group="n22_f2bf" url="ui://mfvz4q8kvuz5b7" autoSize="true">
+      <gearIcon controller="c1" pages="1,2" values="ui://mfvz4q8kvuz5b6|ui://mfvz4q8kvuz5b7" default="ui://mfvz4q8kvuz5b8"/>
+    </loader>
+    <loader id="n8_vuz5" name="loaType" xy="69,54" size="119,63" group="n22_f2bf" url="ui://mfvz4q8kvuz5be" autoSize="true">
       <gearIcon controller="c1" pages="0,1" values="ui://mfvz4q8kvuz5bf|ui://mfvz4q8kvuz5bd" default="ui://mfvz4q8kvuz5be"/>
     </loader>
-    <text id="n9_vuz5" name="txtCount0" xy="15,129" pivot="0.5,0" size="226,55" font="ui://mfvz4q8kvuz5b4" fontSize="51" align="center" text="666666">
+    <text id="n9_vuz5" name="txtCount0" xy="15,129" pivot="0.5,0" size="226,55" group="n22_f2bf" font="ui://mfvz4q8kvuz5b4" fontSize="51" align="center" text="666666">
       <gearDisplay controller="c1" pages="0"/>
     </text>
-    <text id="n10_vuz5" name="txtCount1" xy="15,129" pivot="0.5,0" size="226,55" font="ui://mfvz4q8kvuz5b2" fontSize="51" align="center" text="666666">
+    <text id="n10_vuz5" name="txtCount1" xy="15,129" pivot="0.5,0" size="226,55" group="n22_f2bf" font="ui://mfvz4q8kvuz5b2" fontSize="51" align="center" text="666666">
       <gearDisplay controller="c1" pages="1"/>
     </text>
-    <text id="n11_vuz5" name="txtCount2" xy="15,129" pivot="0.5,0" size="226,55" font="ui://mfvz4q8kvuz5b3" fontSize="51" align="center" text="666666">
+    <text id="n11_vuz5" name="txtCount2" xy="15,129" pivot="0.5,0" size="226,55" group="n22_f2bf" font="ui://mfvz4q8kvuz5b3" fontSize="51" align="center" text="666666">
       <gearDisplay controller="c1" pages="2"/>
     </text>
-    <graph id="n15_ez2u" name="graph" xy="133,93" size="1,1">
+    <graph id="n15_ez2u" name="graph" xy="133,93" size="1,1" group="n22_f2bf">
       <gearDisplay controller="c1" pages="1"/>
     </graph>
+    <group id="n22_f2bf" name="grpResult" xy="0,0" size="256,259" visible="false" advanced="true"/>
   </displayList>
-  <transition name="t0" autoPlay="true">
+  <transition name="t0">
+    <item time="0" type="Scale" target="n20_f2bf" tween="true" startValue="1.3,1.3" endValue="0,0" duration="36" ease="Linear"/>
+    <item time="0" type="Visible" target="n21_f2bf" value="true"/>
+    <item time="0" type="Visible" target="n22_f2bf" value="false"/>
+    <item time="15" type="Visible" target="n21_f2bf" label="perfect" value="true"/>
+    <item time="36" type="Visible" target="n21_f2bf" value="false"/>
+  </transition>
+  <transition name="t1">
+    <item time="0" type="Alpha" target="n17_f2bf" tween="true" startValue="0" endValue="1" duration="6" ease="Linear"/>
+    <item time="0" type="Scale" target="n17_f2bf" tween="true" startValue="0,0" endValue="1,1" duration="6" ease="Linear"/>
     <item time="0" type="Visible" target="n10_vuz5" value="false"/>
     <item time="0" type="Visible" target="n11_vuz5" value="false"/>
     <item time="0" type="Visible" target="n15_ez2u" value="false"/>
+    <item time="0" type="Visible" target="n21_f2bf" value="false"/>
+    <item time="0" type="Visible" target="n22_f2bf" value="true"/>
     <item time="0" type="Visible" target="n8_vuz5" value="false"/>
     <item time="0" type="Visible" target="n9_vuz5" value="false"/>
-    <item time="14" type="Visible" target="n10_vuz5" value="true"/>
-    <item time="14" type="Visible" target="n11_vuz5" value="true"/>
-    <item time="14" type="Visible" target="n8_vuz5" value="true"/>
-    <item time="14" type="Visible" target="n9_vuz5" value="true"/>
-    <item time="42" type="Visible" target="n10_vuz5" value="false"/>
-    <item time="42" type="Visible" target="n11_vuz5" value="false"/>
-    <item time="42" type="Visible" target="n8_vuz5" value="false"/>
-    <item time="42" type="Visible" target="n9_vuz5" value="false"/>
-    <item time="48" type="Visible" target="n15_ez2u" value="false"/>
+    <item time="6" type="Visible" target="n10_vuz5" value="true"/>
+    <item time="6" type="Visible" target="n11_vuz5" value="true"/>
+    <item time="6" type="Visible" target="n8_vuz5" value="true"/>
+    <item time="6" type="Visible" target="n9_vuz5" value="true"/>
+    <item time="30" type="Scale" target="n17_f2bf" value="0,0"/>
+    <item time="30" type="Visible" target="n10_vuz5" value="false"/>
+    <item time="30" type="Visible" target="n11_vuz5" value="false"/>
+    <item time="30" type="Visible" target="n15_ez2u" value="false"/>
+    <item time="30" type="Visible" target="n8_vuz5" value="false"/>
+    <item time="30" type="Visible" target="n9_vuz5" value="false"/>
   </transition>
 </component>

FGUIProject/assets/Main/components/comSingleClickCircle.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="274,274">
+  <displayList>
+    <image id="n31_f2bf" name="n31" src="vuz5bk" fileName="imagesStory/zd_pfguang_1.png" xy="132,133" pivot="0.48,0.48" anchor="true"/>
+    <text id="n29_wono" name="txtPart" xy="63,90" pivot="0.5,0" size="148,94" font="ui://eg2y0ldpwonotja" fontSize="72" color="#fff8ed" strokeColor="#cc984a" strokeSize="2" text="上衣"/>
+    <image id="n32_f2bf" name="n32" src="vuz5bp" fileName="imagesStory/zd_pfhd_4.png" xy="16,6" pivot="0.474,0.5" scale="1.3,1.3"/>
+  </displayList>
+  <transition name="t0">
+    <item time="0" type="Scale" target="n32_f2bf" tween="true" startValue="1.3,1.3" endValue="0,0" duration="36" ease="Linear"/>
+  </transition>
+</component>

FGUIProject/assets/Main/package.xml

@@ -451,6 +451,8 @@
     <component id="mzf8is" name="ButtonModle5.xml" path="/components/"/>
     <component id="mzf8it" name="ButtonModle6.xml" path="/components/"/>
     <component id="mzf8iu" name="ButtonModle7.xml" path="/components/"/>
+    <component id="f2bfiv" name="comSingleClickCircle.xml" path="/components/"/>
+    <component id="f2bfiw" name="ComClick.xml" path="/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\Main" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

GameClient/Assets/Game/HotUpdate/Constant/ConstMessage.cs

@@ -25,7 +25,7 @@ namespace GFGGame
         public const string DRESS_FILTER = "DRESS_FILTER";
         public const string DRESS_SEARCH = "DRESS_SEARCH";
         public const string CARD_CHOOSE = "CARD_CHOOSE";
-        public const string CARD_SKILL = "CARD_SKILL";
+        public const string SHOW_CARD_SKILL_END = "SHOW_CARD_SKILL_END";
         public const string CARD_REFRESH = "CARD_REFRESH";
         public const string CARD_FILTER = "CARD_FILTER";
         public const string CARD_INFO = "CARD_INFO";

GameClient/Assets/Game/HotUpdate/Data/ItemDataManager.cs

@@ -179,7 +179,7 @@ namespace GFGGame
         /// <param name="itemId"></param>
         /// <param name="scoreType"></param>
         /// <returns></returns>
-        public static int GetItemScoreValue(int itemId, int scoreType)
+        public static int GetItemBaseScoreValue(int itemId, int scoreType)
         {
             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(itemId);
             if (scoreType == 1)

GameClient/Assets/Game/HotUpdate/Data/ScoreSystemData.cs

@@ -5,11 +5,36 @@ using UnityEngine;
 
 namespace GFGGame
 {
-    public class ScoreSystemData : SingletonBase<ScoreSystemData>
+    public class ClickType
     {
         public const int MISS_CLICK = 0;
         public const int GREAT_CLICK = 1;
         public const int PREFACT_CLICK = 2;
+    }
+    public class BeginTime
+    {
+        public const int PART_SCORE_1 = 1;//作用第一回合
+        public const int PART_SCORE_2 = 2;//作用第二回合
+        public const int PART_SCORE_3 = 3;//作用第三回合
+        public const int PART_SCORE_4 = 4;//作用第四回合
+        public const int PART_SCORE_5 = 5;//作用第五回合
+        public const int PART_SCORE_6 = 6;//作用第六回合
+        public const int PART_ALL_FIGHT_BEGIN = 7;//对战开始
+        public const int PART_PREFACT_CLICK = 8;//每次优秀点击
+        public const int PART_FIGHT_BEGIN = 9;//每回合开始
+        public const int PART_FIGHT_END = 10;//每回合结束
+    }
+
+    // public class CurrentTime
+    // {
+    //     public const int PART_ALL_FIGHT_BEGIN = 0;//对战开始
+    //     public const int PART_PREFACT_CLICK = 1;//每次优秀点击
+    //     public const int PART_FIGHT_BEGIN = 2;//每回合开始
+    //     public const int PART_FIGHT_END = 3;//每回合结束
+    // }
+    public class ScoreSystemData : SingletonBase<ScoreSystemData>
+    {
+
         private Dictionary<int, List<int>> equipDicWithPartId = new Dictionary<int, List<int>>();
 
         /// <summary>
@@ -49,7 +74,7 @@ namespace GFGGame
         }
 
 
-
+        // public double mainScore { get; set; }
 
         /// <summary>
         /// 返回总主属性分
@@ -95,22 +120,22 @@ namespace GFGGame
         /// 部件评分
         /// </summary>
         /// <param name="partId">部件id</param>
-        /// <param name="clickState">点击状态0：miss，1：优秀，2：完美</param>
+        /// <param name="clickType">点击状态0：miss，1：优秀，2：完美</param>
         /// <param name="mainScore">总主属性</param>
         /// <param name="type">评分部位</param>
         /// <param name="showCard">是否展示卡牌效果</param>
         /// <returns></returns>
-        public int GetPartScore(int partId, double mainScore, double skillScore)
+        public int GetPartScore(int partId, int clickType, double skillScore)
         {
 
             //部件评分=部件基础分*部件系数
             //点击评分=（部件基础分+（+人物基础分+卡牌属性分数）*点击系数）*2.22   (新点击公式，防止点击优秀却因为未穿衣服结果是0分)
             //卡牌评分=总属性*技能配表百分比
             double partScore = GetPartItemScore(partId);
-            // double clickScore = ScoreSystemData.Instance.GetPartItemClickScore(partId, clickState);
+            double clickScore = ScoreSystemData.Instance.GetPartItemClickScore(partId, clickType);
 
-            // return (partScore + clickScore + skillScore);
-            return (int)Math.Round((partScore + skillScore));
+            return (int)Math.Ceiling(partScore + clickScore + skillScore);
+            // return (int)Math.Round((partScore + skillScore));
         }
 
         public double GetPartItemScore(int partId)
@@ -123,7 +148,7 @@ namespace GFGGame
         /// </summary>
         /// <param name="partId">评分部位</param>
         /// <returns></returns>
-        public double GetPartBaseScore(int partId)
+        private double GetPartBaseScore(int partId)
         {
             double partScore = 0;
             if (!equipDicWithPartId.ContainsKey(partId)) return partScore;
@@ -134,52 +159,116 @@ namespace GFGGame
             }
             return partScore;
         }
-        // public double GetPartItemClickScore(int partId, int clickState)
-        // {
-        //     //点击评分=（部件基础分+（+人物基础分+卡牌属性分数）*点击系数）*2.22
-        //     double clickCoefficient = 0;
-        //     switch (clickState)
-        //     {
-        //         case MISS_CLICK:
-        //             clickCoefficient = ConstScoreSystem.MISS_SCORE;
-        //             break;
-        //         case GREAT_CLICK:
-        //             clickCoefficient = ConstScoreSystem.GREAT_SCORE;
-        //             break;
-        //         case PREFACT_CLICK:
-        //             clickCoefficient = ConstScoreSystem.PERFECT_SCORE;
-        //             break;
-        //     }
-        //     int roleScore = RoleLevelCfgArray.Instance.GetCfg(GameGlobal.myNumericComponent.GetAsInt(NumericType.Lvl)).baseScore;
-        //     int cardScore = DressUpMenuItemDataManager.GetItemScore(InstanceZonesDataManager.currentCardId);
-        //     double clickScore = (GetPartBaseScore(partId) + (cardScore + roleScore) * clickCoefficient) * ConstScoreSystem.CLICK_SCORE;
-        //     return clickScore;
-        // }
-        public void GetPartItemCardScore(double mainScore, int partId, out double skillScore, out bool showCard)
+        private double GetPartItemClickScore(int partId, int clickState)
         {
-            skillScore = 0;
-            showCard = false;
+            //点击评分=（部件基础分+（+人物基础分+卡牌属性分数）*点击系数）*2.22
+            double clickCoefficient = 0;
+            switch (clickState)
+            {
+                case ClickType.MISS_CLICK:
+                    clickCoefficient = ConstScoreSystem.MISS_SCORE;
+                    break;
+                case ClickType.GREAT_CLICK:
+                    clickCoefficient = ConstScoreSystem.GREAT_SCORE;
+                    break;
+                case ClickType.PREFACT_CLICK:
+                    clickCoefficient = ConstScoreSystem.PERFECT_SCORE;
+                    break;
+            }
+            int roleScore = RoleLevelCfgArray.Instance.GetCfg(GameGlobal.myNumericComponent.GetAsInt(NumericType.Lvl)).baseScore;
+            int cardScore = ItemDataManager.GetItemAdditionScore(InstanceZonesDataManager.currentCardId, InstanceZonesDataManager.currentScoreType);
+            double clickScore = (GetPartBaseScore(partId) + (cardScore + roleScore) * clickCoefficient) * ConstScoreSystem.CLICK_SCORE;
+            return clickScore;
+        }
 
-            List<PassivitySkillCfg> skillCfgs = PassivitySkillCfgArray.Instance.GetCfgsBycardId(InstanceZonesDataManager.currentCardId);
-            if (skillCfgs.Count == 0) return;
+        /// <summary>
+        /// 获取有效技能配置，过滤掉：被对方失效的、不符合作用时机、未满足触发概率的技能
+        /// </summary>
+        /// <returns></returns>
+        public List<PassivitySkillLvlCfg> GetValidSkills(int currentTime, int cardId, int targetCardId, int partId)
+        {
+            List<PassivitySkillLvlCfg> skillCfgs = new List<PassivitySkillLvlCfg>();
 
-            for (int i = 0; i < skillCfgs.Count; i++)
+            List<PassivitySkillCfg> mySkillCfgs = PassivitySkillCfgArray.Instance.GetCfgsBycardId(cardId);
+            List<PassivitySkillCfg> targetSkillCfgs = PassivitySkillCfgArray.Instance.GetCfgsBycardId(targetCardId);
+
+            List<int> nullifySkillIndex = new List<int>();
+            for (int i = 0; i < targetSkillCfgs.Count; i++)
             {
-                PassivitySkillCfg skillCfg = skillCfgs[i];
-                int skillLv = SkillDataManager.Instance.GetSkillLv(InstanceZonesDataManager.currentCardId, skillCfg.skillId);
-                PassivitySkillLvlCfg skillLvCfg = PassivitySkillLvlCfgArray.Instance.GetCfgByskilllvlAndskillId(skillLv, skillCfg.skillId);
+                PassivitySkillCfg skillCfg = targetSkillCfgs[i];
+                int skillLv = SkillDataManager.Instance.GetSkillLv(targetCardId, skillCfg.skillId);
+                PassivitySkillLvlCfg skillLvlCfg = PassivitySkillLvlCfgArray.Instance.GetCfgByskilllvlAndskillId(skillLv, skillCfg.skillId);
 
-                if (partId == skillCfg.subTypes || skillCfg.subTypes == 0)
+                if (skillLvlCfg.beginTime == BeginTime.PART_ALL_FIGHT_BEGIN && partId <= skillLvlCfg.roundTime
+               || skillLvlCfg.beginTime == BeginTime.PART_PREFACT_CLICK && currentTime == BeginTime.PART_PREFACT_CLICK
+               || skillLvlCfg.beginTime == BeginTime.PART_FIGHT_BEGIN && currentTime == BeginTime.PART_FIGHT_BEGIN
+               || skillLvlCfg.beginTime == BeginTime.PART_FIGHT_END && currentTime == BeginTime.PART_FIGHT_END
+               || skillLvlCfg.beginTime <= BeginTime.PART_SCORE_6 && currentTime == BeginTime.PART_FIGHT_END && partId == skillLvlCfg.beginTime)
                 {
-                    int isProbability = UnityEngine.Random.Range(0, 10000) < skillLvCfg.probability ? 1 : 0;
-                    if (showCard != true && skillCfg.mainSkill == 1 && isProbability == 1)
-                    {
-                        //卡牌中包含主技能且此技能被触发，在评分阶段才展示卡牌效果，一张卡牌只要有一个技能需要显示，那就直接显示
-                        showCard = true;
-                    }
-                    skillScore += mainScore * skillLvCfg.count / 10000 * isProbability;
+
+                    bool isProbability = skillLvlCfg.nullifySkillIndex > 0 && UnityEngine.Random.Range(0, 10000) < skillLvlCfg.probability;
+                    if (isProbability) nullifySkillIndex.Add(skillLvlCfg.nullifySkillIndex);
+                }
+            }
+
+            for (int i = 0; i < mySkillCfgs.Count; i++)
+            {
+                PassivitySkillCfg skillCfg = mySkillCfgs[i];
+                int skillLv = SkillDataManager.Instance.GetSkillLv(cardId, skillCfg.skillId);
+                PassivitySkillLvlCfg skillLvlCfg = PassivitySkillLvlCfgArray.Instance.GetCfgByskilllvlAndskillId(skillLv, skillCfg.skillId);
+
+                if (nullifySkillIndex.IndexOf(i + 1) >= 0) continue;//技能被对手失效
+
+                if (skillLvlCfg.beginTime == BeginTime.PART_ALL_FIGHT_BEGIN && partId <= skillLvlCfg.roundTime
+                || skillLvlCfg.beginTime == BeginTime.PART_PREFACT_CLICK && currentTime == BeginTime.PART_PREFACT_CLICK
+                || skillLvlCfg.beginTime == BeginTime.PART_FIGHT_BEGIN && currentTime == BeginTime.PART_FIGHT_BEGIN
+                || skillLvlCfg.beginTime == BeginTime.PART_FIGHT_END && currentTime == BeginTime.PART_FIGHT_END
+                || skillLvlCfg.beginTime <= BeginTime.PART_SCORE_6 && currentTime == BeginTime.PART_FIGHT_END && partId == skillLvlCfg.beginTime)
+                {
+
+                    bool isProbability = UnityEngine.Random.Range(0, 10000) < skillLvlCfg.probability;
+                    if (isProbability) skillCfgs.Add(skillLvlCfg);
+                }
+
+            }
+            return skillCfgs;
+        }
+
+        /// <summary>
+        /// 本轮技能分数
+        /// </summary>
+        /// <param name="validSkills">有效技能列表</param>
+        /// <param name="mainScore">总主属性</param>
+        /// <returns></returns>
+        public int GetPartItemSkillScore(List<PassivitySkillLvlCfg> validSkills, double mainScore)
+        {
+            double skillScore = 0;
+
+            for (int i = 0; i < validSkills.Count; i++)
+            {
+                skillScore += mainScore * validSkills[i].ratio / 10000;
+            }
+            return (int)Math.Ceiling(skillScore);
+        }
+        /// <summary>
+        /// 是否展示卡牌效果
+        /// </summary>
+        /// <param name="cardId">卡牌id</param>
+        /// <param name="validSkills">被触发的有效技能列表</param>
+        /// <returns></returns>
+        public bool IsShowCard(int cardId, List<PassivitySkillLvlCfg> validSkills)
+        {
+            if (cardId <= 0) return false;//未选卡
+            if (validSkills.Count == 0) return false;//本轮没有技能被触发不显示卡牌
+            List<PassivitySkillCfg> skillCfgs = PassivitySkillCfgArray.Instance.GetCfgsBycardId(cardId);
+            for (int i = 0; i < skillCfgs.Count; i++)
+            {
+                if (skillCfgs[i].mainSkill == 1)
+                {
+                    return true;
                 }
             }
+            return false;
         }
         /// <summary>
         /// 登峰造极额外加分

GameClient/Assets/Game/HotUpdate/Data/SuitFosterDatamanager.cs

@@ -96,7 +96,7 @@ namespace GFGGame
             {
 
                 ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(key);
-                float mainScore = ItemDataManager.GetItemScoreValue(key, itemCfg.mainScore);
+                float mainScore = ItemDataManager.GetItemBaseScoreValue(key, itemCfg.mainScore);
                 float addScore = _data[key];
                 float percent = (addScore / mainScore * 100);
                 _dataPercent.Add(key, percent.ToString("0.00"));

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComClick.cs

@@ -0,0 +1,90 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Main
+{
+    public partial class UI_ComClick
+    {
+        public GComponent target;
+        public GGraph m_grh_0;
+        public GGraph m_grh_1;
+        public GGraph m_grh_2;
+        public GGraph m_grh_3;
+        public GGraph m_grh_4;
+        public GGraph m_grh_5;
+        public UI_ComScoreResult m_comResult;
+        public const string URL = "ui://mfvz4q8kf2bfiw";
+        public const string PACKAGE_NAME = "Main";
+        public const string RES_NAME = "ComClick";
+        private static UI_ComClick _proxy;
+
+        public static UI_ComClick Create(GObject gObject = null)
+        {
+            var ui = new UI_ComClick();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_ComClick Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComClick();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_grh_0 = (GGraph)comp.GetChild("grh_0");
+            m_grh_1 = (GGraph)comp.GetChild("grh_1");
+            m_grh_2 = (GGraph)comp.GetChild("grh_2");
+            m_grh_3 = (GGraph)comp.GetChild("grh_3");
+            m_grh_4 = (GGraph)comp.GetChild("grh_4");
+            m_grh_5 = (GGraph)comp.GetChild("grh_5");
+            m_comResult = (UI_ComScoreResult)UI_ComScoreResult.Create(comp.GetChild("comResult"));
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_grh_0 = null;
+            m_grh_1 = null;
+            m_grh_2 = null;
+            m_grh_3 = null;
+            m_grh_4 = null;
+            m_grh_5 = null;
+            m_comResult.Dispose();
+            m_comResult = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComClick.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 81ca47ab73518e1459e88d6c465df0c9
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComScoreResult.cs

@@ -0,0 +1,116 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Main
+{
+    public partial class UI_ComScoreResult
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public GTextField m_txtPart;
+        public GImage m_imgCircle;
+        public GGroup m_grpClick;
+        public GGraph m_holder2;
+        public GGraph m_holder;
+        public GGraph m_holder1;
+        public GLoader m_loaBg;
+        public GLoader m_loaType;
+        public GTextField m_txtCount0;
+        public GTextField m_txtCount1;
+        public GTextField m_txtCount2;
+        public GGraph m_graph;
+        public GGroup m_grpResult;
+        public Transition m_t0;
+        public Transition m_t1;
+        public const string URL = "ui://mfvz4q8kvuz5bi";
+        public const string PACKAGE_NAME = "Main";
+        public const string RES_NAME = "ComScoreResult";
+        private static UI_ComScoreResult _proxy;
+
+        public static UI_ComScoreResult Create(GObject gObject = null)
+        {
+            var ui = new UI_ComScoreResult();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_ComScoreResult Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComScoreResult();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_c1 = comp.GetController("c1");
+            m_txtPart = (GTextField)comp.GetChild("txtPart");
+            m_imgCircle = (GImage)comp.GetChild("imgCircle");
+            m_grpClick = (GGroup)comp.GetChild("grpClick");
+            m_holder2 = (GGraph)comp.GetChild("holder2");
+            m_holder = (GGraph)comp.GetChild("holder");
+            m_holder1 = (GGraph)comp.GetChild("holder1");
+            m_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_loaType = (GLoader)comp.GetChild("loaType");
+            m_txtCount0 = (GTextField)comp.GetChild("txtCount0");
+            m_txtCount1 = (GTextField)comp.GetChild("txtCount1");
+            m_txtCount2 = (GTextField)comp.GetChild("txtCount2");
+            m_graph = (GGraph)comp.GetChild("graph");
+            m_grpResult = (GGroup)comp.GetChild("grpResult");
+            m_t0 = comp.GetTransition("t0");
+            m_t1 = comp.GetTransition("t1");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_txtPart = null;
+            m_imgCircle = null;
+            m_grpClick = null;
+            m_holder2 = null;
+            m_holder = null;
+            m_holder1 = null;
+            m_loaBg = null;
+            m_loaType = null;
+            m_txtCount0 = null;
+            m_txtCount1 = null;
+            m_txtCount2 = null;
+            m_graph = null;
+            m_grpResult = null;
+            m_t0 = null;
+            m_t1 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComScoreResult.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 00a4808c3eeaa044db81daf97485c7e8
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_StoryFightSingleScoreUI.cs

@@ -9,10 +9,11 @@ namespace UI.Main
         public GComponent target;
         public GLoader m_loaBg;
         public GImage m_imgRole;
+        public GLoader m_loaGlass;
+        public UI_ComClick m_comClick;
         public GButton m_btnBack;
         public UI_ProgressBar1 m_proScore;
         public UI_ComSingleScoreStage m_comScoreStage;
-        public GLoader m_loaGlass;
         public UI_comClickCircle m_comClickCircle;
         public GButton m_btnSpeedUp;
         public GLoader m_LoaMask;
@@ -75,10 +76,11 @@ namespace UI.Main
         {
             m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_imgRole = (GImage)comp.GetChild("imgRole");
+            m_loaGlass = (GLoader)comp.GetChild("loaGlass");
+            m_comClick = (UI_ComClick)UI_ComClick.Create(comp.GetChild("comClick"));
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_proScore = (UI_ProgressBar1)UI_ProgressBar1.Create(comp.GetChild("proScore"));
             m_comScoreStage = (UI_ComSingleScoreStage)UI_ComSingleScoreStage.Create(comp.GetChild("comScoreStage"));
-            m_loaGlass = (GLoader)comp.GetChild("loaGlass");
             m_comClickCircle = (UI_comClickCircle)UI_comClickCircle.Create(comp.GetChild("comClickCircle"));
             m_btnSpeedUp = (GButton)comp.GetChild("btnSpeedUp");
             m_LoaMask = (GLoader)comp.GetChild("LoaMask");
@@ -97,12 +99,14 @@ namespace UI.Main
         {
             m_loaBg = null;
             m_imgRole = null;
+            m_loaGlass = null;
+            m_comClick.Dispose();
+            m_comClick = null;
             m_btnBack = null;
             m_proScore.Dispose();
             m_proScore = null;
             m_comScoreStage.Dispose();
             m_comScoreStage = null;
-            m_loaGlass = null;
             m_comClickCircle.Dispose();
             m_comClickCircle = null;
             m_btnSpeedUp = null;

GameClient/Assets/Game/HotUpdate/Views/Card/CardSkillView.cs

@@ -93,7 +93,7 @@ namespace GFGGame
         {
             PassivitySkillLvlCfg skillLvCfg = PassivitySkillLvlCfgArray.Instance.GetCfgByskilllvlAndskillId(lv, _skillId);
             com.m_txtLv.text = title;
-            com.m_txtDiscribe.text = string.Format(skillCfg.describe, (float)skillLvCfg.probability / 10000f * 100f, (float)skillLvCfg.count / 100f);
+            com.m_txtDiscribe.text = skillLvCfg.describe;
         }
         private void RenderListStarConsumeItem(int index, GObject obj)
         {

GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryCardChoose.cs

@@ -74,7 +74,7 @@ namespace GFGGame
             int skillLv = SkillDataManager.Instance.GetSkillLv(cardId, skillId);
             PassivitySkillLvlCfg skillLvCfg = PassivitySkillLvlCfgArray.Instance.GetCfgByskilllvlAndskillId(skillLv, skillId);
             _ui.m_txtName.text = cfg.name;
-            _ui.m_txtDiscribe.text = string.Format(cfg.describe, ((float)skillLvCfg.probability / 10000f * 100), ((float)skillLvCfg.count / 10000f * 100));
+            _ui.m_txtDiscribe.text = skillLvCfg.describe;
         }
         private void RenderListCardItem(int index, GObject obj)
         {

GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightSingleScoreView.cs

@@ -3,6 +3,7 @@ using UnityEngine;
 using UI.Main;
 using System.Collections;
 using System;
+using System.Collections.Generic;
 
 namespace GFGGame
 {
@@ -11,14 +12,14 @@ namespace GFGGame
         private UI_StoryFightSingleScoreUI _ui;
         private GameObject _sceneObject;
         private GameObject _scenePrefab;
-        private int _index;//当前评分part
+        private int _partId;//当前评分part
         private int _score;//当前总分数
-        private double _skillScore = 0;//当前卡牌技能分
+        private int _skillScore = 0;//当前卡牌技能分
         private int _partScore = 0;//当前部件分+技能评分（_skillScore）
-        private bool _showCard = false;//当前是否显示卡牌技能
+        private int _currentTime = BeginTime.PART_ALL_FIGHT_BEGIN;
         private double _mainScore;//总主属性分
         private const int _range = 100;//圆圈随机范围
-        private const float _prefectScale = 60f;//完美缩放比
+        private const float _prefectScale = 0.866f;//完美缩放比
         private NTexture _nTexture;
         private bool _stopFight = false;
 
@@ -67,7 +68,8 @@ namespace GFGGame
             _ui.m_btnBack.onClick.Add(OnBtnBackClick);
             _ui.m_btnSpeedUp.onClick.Add(OnBtnSpeedUp);
 
-            _ui.m_comClickCircle.target.onClick.Add(OnComClickCircle);
+            // _ui.m_comClickCircle.target.onClick.Add(OnComClickCircle);
+            _ui.m_comClick.target.onClick.Add(CheckPerfectSkill);
 
             _ui.m_loaBg.url = ResPathUtil.GetFightBgImgPath("fightBg");
             _ui.m_LoaMask.url = ResPathUtil.GetFightBgImgPath("fightBg");
@@ -90,17 +92,16 @@ namespace GFGGame
         protected override void AddEventListener()
         {
             base.AddEventListener();
-            EventAgent.AddEventListener(ConstMessage.CARD_SKILL, PartScoreStart);
+            EventAgent.AddEventListener(ConstMessage.SHOW_CARD_SKILL_END, SkillScoreEnd);
         }
         protected override void OnShown()
         {
             base.OnShown();
             ScoreSystemData.Instance.SetEquipDicWithType();
 
-            _ui.m_comClickCircle.target.touchable = false;
+            // _ui.m_comClickCircle.target.touchable = false;
             _nTexture = new NTexture(FightDataManager.Instance.RoleTextuex);
 
-            // _ui.m_loaRole.texture = _nTexture;//EquipDataCache.cacher.FightRoleRes;
             ET.Log.Debug("Screen:" + UnityEngine.Screen.width + "  " + UnityEngine.Screen.height + "   _nTexture:" + _nTexture.width + "   " + _nTexture.height);
             _ui.m_imgRole.SetSize(GRoot.inst.width, GRoot.inst.height);
             _ui.m_imgRole.texture = _nTexture;
@@ -119,70 +120,151 @@ namespace GFGGame
             _gameObject1.SetActive(false);
             _gameObject2.SetActive(false);
             _ui.m_proScore.m_txtCount.text = "总分 0";
+            _ui.m_comClick.target.touchable = false;
 
-            _stopFight = false;
-            _index = 0;
+            _currentTime = BeginTime.PART_ALL_FIGHT_BEGIN;
+            // _stopFight = false;
+            _partId = FightScoreCfgArray.Instance.dataArray[0].id;
             _score = 0;
+            _skillScore = 0;//技能附加分
             _mainScore = ScoreSystemData.Instance.GetMainScore();
 
-            // if (_index == 0 && GuideDataManager.IsGuideFinish(ConstGuideId.SINGLE_FIGHT) <= 0)//引导中禁止自动战斗
-            // {
-            //     EquipDataCache.cacher.fightSpeed = 1;
-            //     EquipDataCache.cacher.autoPlay = false;
-            // }
-            Timers.inst.Add(0.5f, 1, (param) =>
-            {
-                SkillScore(null);
-            });//评分结束
-            // Timers.inst.AddUpdate(CheckGuide);
+            Timers.inst.Add(0.5f, 1, SkillScoreStart);//评分结束
         }
 
-        private void SkillScore(object param)
+        private void SkillScoreStart(object param)
         {
-            if (_stopFight) return;
-            Debug.Log("_index:" + _index + "   length:" + FightScoreCfgArray.Instance.dataArray.Length);
-            int partId = FightScoreCfgArray.Instance.dataArray[_index].id;
 
-            _skillScore = 0;//技能附加分
-            _showCard = false;
-            ScoreSystemData.Instance.GetPartItemCardScore(_mainScore, partId, out _skillScore, out _showCard);
+            List<PassivitySkillLvlCfg> vaildSkills = ScoreSystemData.Instance.GetValidSkills(_currentTime, InstanceZonesDataManager.currentCardId, 0, _partId);
+            _skillScore = ScoreSystemData.Instance.GetPartItemSkillScore(vaildSkills, _mainScore);
+            bool _showCard = ScoreSystemData.Instance.IsShowCard(InstanceZonesDataManager.currentCardId, vaildSkills);
             if (_showCard)
             {
                 ViewManager.Show<StorySkillView>(_skillScore);
             }
             else
             {
-                PartScoreStart();
+                EventAgent.DispatchEvent(ConstMessage.SHOW_CARD_SKILL_END);
+            }
+        }
+        private void SkillScoreEnd()
+        {
+            switch (_currentTime)
+            {
+                case BeginTime.PART_ALL_FIGHT_BEGIN:
+                    _score += _skillScore;
+                    CheckPartBeginSkill(null);
+                    break;
+                case BeginTime.PART_FIGHT_BEGIN:
+                    //这里不把技能分加到总分里，因为技能分会算到部件分里
+                    PartScoreStart();
+                    break;
+                case BeginTime.PART_PREFACT_CLICK:
+                    _score += _skillScore;
+                    PartScoreResultStart(ClickType.PREFACT_CLICK);
+                    break;
+                case BeginTime.PART_FIGHT_END:
+                    _score += _skillScore;
+                    UpdateProgress();
+                    break;
             }
         }
+        private void CheckPartBeginSkill(object param)
+        {
+            _currentTime = BeginTime.PART_FIGHT_BEGIN;
+            SkillScoreStart(null);
 
+        }
         private void PartScoreStart()
         {
-            int partId = FightScoreCfgArray.Instance.dataArray[_index].id;
-            _ui.m_comClickCircle.m_txtPart.text = FightScoreCfgArray.Instance.GetCfg(_index + 1).name;
-            _partScore = ScoreSystemData.Instance.GetPartScore(partId, _mainScore, _skillScore);
-            _ui.m_comClickCircle.m_txtScore.text = _partScore.ToString();
-            _score += _partScore;
+            _ui.m_comClick.target.touchable = !FightDataManager.Instance.autoPlay;
 
-            Debug.Log("index:" + _index);
-            Vector2 pos = (_ui.target.GetChild("grh_" + _index).asGraph).xy;
+            Vector2 pos = (_ui.m_comClick.target.GetChild("grh_" + (_partId - 1)).asGraph).xy;
             float x = 0f;
             float y = 0f;
-            // EquipDataCache.cacher.GetCirclePos(pos, _range, out x, out y);
+
             x = pos.x;
             y = pos.y;
-            _ui.m_comClickCircle.target.SetXY(x, y);
             _ui.m_loaGlass.SetXY(x, y);
             _ui.m_loaGlass.url = string.Format("ui://Main/zd_bl_{0}", UnityEngine.Random.Range(0, 3));
+            _ui.m_comClick.m_comResult.target.SetXY(x, y);
+            _ui.m_comClick.m_comResult.m_t0.ignoreEngineTimeScale = false;
+            _ui.m_comClick.m_comResult.m_t0.timeScale = FightDataManager.Instance.fightSpeed;
+            if (FightDataManager.Instance.autoPlay)
+            {
+                _ui.m_comClick.m_comResult.m_t0.SetHook("perfect", CheckPerfectSkill);
+                _ui.m_comClick.m_comResult.m_t0.Play();
+            }
+            else
+            {
+                _ui.m_comClick.m_comResult.m_t0.Play(CheckPerfectSkill);
+            }
+            _ui.m_comClick.m_comResult.m_txtPart.text = FightScoreCfgArray.Instance.GetCfg(_partId).name;
+
+        }
+        private void CheckPerfectSkill()
+        {
+            _skillScore = 0;
+            _ui.m_comClick.target.touchable = false;
+            int clickType = GetClickType();
+            _ui.m_comClick.m_comResult.m_t0.Stop(true, false);
+
+            if (clickType == ClickType.PREFACT_CLICK)
+            {
+                _currentTime = BeginTime.PART_PREFACT_CLICK;
+                SkillScoreStart(null);
+            }
+            else
+            {
+                PartScoreResultStart(clickType);
+            }
+        }
+        private void PartScoreResultStart(int clickType)
+        {
+            Debug.Log("_partId:" + _partId);
+
+            _ui.m_comClick.target.touchable = false;
+
+            _ui.m_comClick.m_comResult.m_t1.ignoreEngineTimeScale = false;
+            _ui.m_comClick.m_comResult.m_t1.timeScale = FightDataManager.Instance.fightSpeed;
+            _ui.m_comClick.m_comResult.m_t1.Play();
+            _partScore = ScoreSystemData.Instance.GetPartScore(_partId, clickType, _skillScore);
+            _score += _partScore;
+
+            _ui.m_comClick.m_comResult.m_c1.selectedIndex = clickType;
+            switch (clickType)
+            {
+                case ClickType.MISS_CLICK:
+                    _ui.m_comClick.m_comResult.m_txtCount0.text = _partScore.ToString();
+                    break;
+                case ClickType.GREAT_CLICK:
+                    _ui.m_comClick.m_comResult.m_txtCount1.text = _partScore.ToString();
+                    break;
+                case ClickType.PREFACT_CLICK:
+                    _ui.m_comClick.m_comResult.m_txtCount2.text = _partScore.ToString();
+                    break;
+            }
+            PartScoreResultEnd();
+        }
+
+        private void PartScoreResultEnd()
+        {
             _ui.m_t1.ignoreEngineTimeScale = false;
             _ui.m_t1.timeScale = FightDataManager.Instance.fightSpeed;
             _ui.m_t1.SetValue("start", _ui.m_loaGlass.x, _ui.m_loaGlass.y);
-            _ui.m_t1.SetValue("end", _ui.m_proScore.m_imgAni.LocalToGlobal(Vector2.zero).x - _ui.m_loaGlass.width / 2, _ui.m_proScore.target.y - _ui.m_loaGlass.height / 2);
-
-            _ui.m_t1.Play(UpdateProgress);
+            float x = _ui.m_proScore.m_imgAni.LocalToGlobal(Vector2.zero).x - _ui.m_loaGlass.width / 2;
+            float y = _ui.m_proScore.target.y - _ui.m_loaGlass.height / 2;
+            _ui.m_t1.SetValue("end", x, y);
 
+            _ui.m_t1.Play(CheckPartEndSkill);
         }
 
+        private void CheckPartEndSkill()
+        {
+            _skillScore = 0;
+            _currentTime = BeginTime.PART_FIGHT_END;
+            SkillScoreStart(null);
+        }
         private void UpdateProgress()
         {
             double proportion = _score / _ui.m_proScore.target.max;
@@ -203,17 +285,15 @@ namespace GFGGame
                     _gameObject0.SetActive(star > 0 ? true : false);
                     _gameObject1.SetActive(star > 1 ? true : false);
                     _gameObject2.SetActive(star > 2 ? true : false);
-                    CircleResuleEnd();
+                    PartScoreEnd();
                 });
         }
 
-        private void CircleResuleEnd()
+        private void PartScoreEnd()
         {
-            _index++;
-            if (_index >= FightScoreCfgArray.Instance.dataArray.Length)
+            _partId++;
+            if (_partId > FightScoreCfgArray.Instance.dataArray.Length)
             {
-                // GetCurStar(out int star, out Transition transition);
-
                 _ui.m_comRoleResult.m_comRole.m_imgRole.SetSize(GRoot.inst.width, GRoot.inst.height);
                 _ui.m_comRoleResult.m_comRole.m_imgRole.texture = _nTexture;
                 _ui.m_comRoleResult.m_c1.selectedIndex = 0;
@@ -227,7 +307,8 @@ namespace GFGGame
             }
             else
             {
-                Timers.inst.Add(ConstScoreSystem.REFRESH_CIRCLE_WITE_TIME / FightDataManager.Instance.fightSpeed, 1, SkillScore);//下个部分评分
+                // _currentTime = BeginTime.PART_FIGHT_BEGIN;
+                Timers.inst.Add(ConstScoreSystem.REFRESH_CIRCLE_WITE_TIME / FightDataManager.Instance.fightSpeed, 1, CheckPartBeginSkill);//下个部分评分
             }
         }
 
@@ -253,13 +334,29 @@ namespace GFGGame
                 transition = _ui.m_comRoleResult.m_t3;
             }
         }
-
-
-        private void OnComClickCircle()
+        private int GetClickType()
         {
-            _ui.m_comClickCircle.target.touchable = false;
-            _ui.m_t1.Play(1, 0, 2f, 2.5f, UpdateProgress);
+            float scaleX = _ui.m_comClick.m_comResult.m_imgCircle.scale.x;// _ui.m_comClickCircle.m_imgCircle.scaleX;
+            int clickType = ClickType.MISS_CLICK;
+            if (FightDataManager.Instance.autoPlay == true)
+            {
+                return ClickType.PREFACT_CLICK;
+            }
+            if (scaleX <= _prefectScale && scaleX > 0.65f)
+            {
+                clickType = ClickType.PREFACT_CLICK;
+            }
+            else if (scaleX <= 0.216f)
+            {
+                clickType = ClickType.MISS_CLICK;
+            }
+            else
+            {
+                clickType = ClickType.GREAT_CLICK;
+            }
+            return clickType;
         }
+
         private void OnBtnSpeedUp()
         {
             FightDataManager.Instance.fightSpeed = FightDataManager.Instance.fightSpeed == 1 ? FightDataManager.Instance.maxFightSpeed : 1;
@@ -279,11 +376,11 @@ namespace GFGGame
         protected override void RemoveEventListener()
         {
             base.RemoveEventListener();
-            EventAgent.RemoveEventListener(ConstMessage.CARD_SKILL, PartScoreStart);
+            EventAgent.RemoveEventListener(ConstMessage.SHOW_CARD_SKILL_END, SkillScoreEnd);
         }
         private void Reset()
         {
-            Timers.inst.Remove(SkillScore);
+            Timers.inst.Remove(SkillScoreStart);
             Timers.inst.Remove(Skip);
             GTween.Kill(_ui.m_proScore.m_comBar);
             _ui.m_t1.Stop(true, false);
@@ -312,6 +409,9 @@ namespace GFGGame
             _gameObject0.SetActive(false);
             _gameObject1.SetActive(false);
             _gameObject2.SetActive(false);
+
+            // ScoreSystemData.Instance.mainScore = 0;
+            _mainScore = 0;
         }
 
 

GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightTargetScoreView.cs

@@ -16,13 +16,13 @@ namespace GFGGame
 
         private double _targetScore;
         private double _score;//当前总分数
-        private int _index;//当前评分part
+        private int _partId;//当前评分part
         private double _skillScore = 0;//当前卡牌技能分
         private bool _showCard = false;//当前是否显示卡牌技能
         private double _mainScore;//总主属性分
         private double _targetMainScore;//战斗目标总主属性分
         private const int _range = 30;//圆圈随机范围
-
+        private int _currentTime = BeginTime.PART_FIGHT_BEGIN;
         private int _skillCount;
 
         private float _speed = 1;
@@ -233,7 +233,7 @@ namespace GFGGame
 
             _ui.m_btnSkill0.target.onClick.Add(() =>
             {
-                if (_index == 0 && GuideDataManager.IsGuideFinish(ConstGuideId.TARGET_FIGHT) <= 0 && playStop)
+                if (_partId == 0 && GuideDataManager.IsGuideFinish(ConstGuideId.TARGET_FIGHT) <= 0 && playStop)
                 {
                     playStop = false;
 
@@ -251,7 +251,7 @@ namespace GFGGame
         protected override void AddEventListener()
         {
             base.AddEventListener();
-            EventAgent.AddEventListener(ConstMessage.CARD_SKILL, UpdateCircleResult);
+            EventAgent.AddEventListener(ConstMessage.SHOW_CARD_SKILL_END, UpdateCircleResult);
 
         }
         protected override void OnShown()
@@ -282,7 +282,7 @@ namespace GFGGame
 
             ScoreSystemData.Instance.SetEquipDicWithType();
 
-            _index = 0;
+            _partId = FightScoreCfgArray.Instance.dataArray[0].id; ;
             _score = 0;
             _targetScore = 0;
             _mainScore = ScoreSystemData.Instance.GetMainScore();
@@ -297,7 +297,7 @@ namespace GFGGame
         {
             Reset();
 
-            if (_index == 0 && GuideDataManager.IsGuideFinish(ConstGuideId.TARGET_FIGHT) <= 0)//引导中禁止自动战斗
+            if (_partId == 1 && GuideDataManager.IsGuideFinish(ConstGuideId.TARGET_FIGHT) <= 0)//引导中禁止自动战斗
             {
                 _speed = 1;
                 FightDataManager.Instance.autoPlay = false;
@@ -339,9 +339,9 @@ namespace GFGGame
             _skillScore = 0;//技能附加分
             _showCard = false;
 
-            int partId = FightScoreCfgArray.Instance.dataArray[_index].id;
-            ScoreSystemData.Instance.GetPartItemCardScore(_mainScore, partId, out _skillScore, out _showCard);
-
+            List<PassivitySkillLvlCfg> validSkillCfgs = ScoreSystemData.Instance.GetValidSkills(_currentTime, InstanceZonesDataManager.currentCardId, 0, _partId);
+            _skillScore = ScoreSystemData.Instance.GetPartItemSkillScore(validSkillCfgs, _mainScore);
+            _showCard = ScoreSystemData.Instance.IsShowCard(InstanceZonesDataManager.currentCardId, validSkillCfgs);
             if (_showCard)
             {
                 ViewManager.Show<StorySkillView>(_skillScore);
@@ -356,15 +356,14 @@ namespace GFGGame
         //更新部件评分结果，播放结果动画
         private void UpdateCircleResult()
         {
-            int partId = FightScoreCfgArray.Instance.dataArray[_index].id;
-            double partScore = ScoreSystemData.Instance.GetPartItemScore(partId);
+            double partScore = ScoreSystemData.Instance.GetPartItemScore(_partId);
             _ui.m_comMineCircle.m_txtCount.text = ((int)Math.Round(partScore)).ToString();
             _score += (int)Math.Round((partScore + _skillScore)); ;
             FightDataManager.Instance.totalScore = (int)Math.Round(_score);
 
 
             StoryFightCfg fightCfg = StoryFightCfgArray.Instance.GetCfg(_levelCfg.fightID);
-            double targetScore = fightCfg.targetPartsScoreArr[_index] * ConstScoreSystem.PART_SCORE;
+            double targetScore = fightCfg.targetPartsScoreArr[_partId - 1] * ConstScoreSystem.PART_SCORE;
             _ui.m_comTargetCircle.m_txtCount.text = ((int)Math.Round(targetScore)).ToString();
             _targetScore += targetScore;
             FightDataManager.Instance.npcTotalScore = (int)Math.Round(_targetScore);
@@ -395,9 +394,9 @@ namespace GFGGame
         {
             StoryFightCfg fightCfg = StoryFightCfgArray.Instance.GetCfg(_levelCfg.fightID);
 
-            if (fightCfg.targerSkillArr.Length > _index)
+            if (fightCfg.targerSkillArr.Length >= _partId)
             {
-                RoleSkillCfg cfg = RoleSkillCfgArray.Instance.GetCfg(fightCfg.targerSkillArr[_index]);
+                RoleSkillCfg cfg = RoleSkillCfgArray.Instance.GetCfg(fightCfg.targerSkillArr[_partId - 1]);
                 if (cfg == null) return;
                 SetSkillValue(cfg, SkillDataManager.NPC);
             }
@@ -406,13 +405,13 @@ namespace GFGGame
         private void PlayScoreAni()
         {
             _ui.m_comMineCircle.target.visible = true;
-            _ui.m_comMineCircle.m_txtPart.text = FightScoreCfgArray.Instance.GetCfg(_index + 1).name;
+            _ui.m_comMineCircle.m_txtPart.text = FightScoreCfgArray.Instance.GetCfg(_partId).name;
 
             _gameObject13.SetActive(true);
             _gameObject14.SetActive(true);
             _ui.m_comTargetCircle.target.visible = true;
-            _ui.m_comTargetCircle.m_txtPart.text = FightScoreCfgArray.Instance.GetCfg(_index + 1).name;
-            if (_index == 0 && GuideDataManager.IsGuideFinish(ConstGuideId.TARGET_FIGHT) <= 0)
+            _ui.m_comTargetCircle.m_txtPart.text = FightScoreCfgArray.Instance.GetCfg(_partId).name;
+            if (_partId == 1 && GuideDataManager.IsGuideFinish(ConstGuideId.TARGET_FIGHT) <= 0)
             {
                 _ui.m_comMineCircle.m_t0.Play(1, 0, 0, 0.75f, () =>
                 {
@@ -460,8 +459,8 @@ namespace GFGGame
             //当前部件评分结束
             _gameObject13.SetActive(false);
             _gameObject14.SetActive(false);
-            _index++;
-            if (_index >= FightScoreCfgArray.Instance.dataArray.Length)
+            _partId++;
+            if (_partId > FightScoreCfgArray.Instance.dataArray.Length)
             {
                 Timers.inst.Add(1.5f, 1, Skip);
             }
@@ -713,7 +712,7 @@ namespace GFGGame
         protected override void RemoveEventListener()
         {
             base.RemoveEventListener();
-            EventAgent.RemoveEventListener(ConstMessage.CARD_SKILL, UpdateCircleResult);
+            EventAgent.RemoveEventListener(ConstMessage.SHOW_CARD_SKILL_END, UpdateCircleResult);
 
         }
         private async void Skip(object param = null)

GameClient/Assets/Game/HotUpdate/Views/MainStory/StorySkillView.cs

@@ -32,7 +32,7 @@ namespace GFGGame
             _ui.m_comSkillCard.m_loaCard.url = ResPathUtil.GetCardPath(data.resources[data.resIndex]);
             PassivitySkillCfg cfg = ScoreSystemData.Instance.GetMainSkillCfg(data.id);
             _ui.m_ComSkillName.target.GetChild("txtName").asTextField.text = cfg.name;
-            _ui.m_ComSkillScore.target.GetChild("txtCount").asTextField.text = Math.Round((double)viewData).ToString();
+            _ui.m_ComSkillScore.target.GetChild("txtCount").asTextField.text = viewData.ToString();
             _ui.m_t0.Play(() =>
             {
                 this.Hide();
@@ -41,7 +41,7 @@ namespace GFGGame
         protected override void OnHide()
         {
             base.OnHide();
-            EventAgent.DispatchEvent(ConstMessage.CARD_SKILL);
+            EventAgent.DispatchEvent(ConstMessage.SHOW_CARD_SKILL_END);
         }
     }
 }

GameClient/Assets/ResIn/UI/Main/Main_atlas0_8!a.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 88ae8751cfbf4344aba88bd3c5d7837c
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/ResIn/UI/Main/Main_atlas0_8.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: d443b8f05835eb54499f0ff2477d90ce
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: