Browse Source

登峰造极

zhaoyang 2 năm trước cách đây
mục cha
commit
8acd0d1bc0
58 tập tin đã thay đổi với 1221 bổ sung1844 xóa
  1. 4 30
      FGUIProject/assets/Main/StoryFightSingleScoreUI.xml
  2. 8 69
      FGUIProject/assets/Main/StoryFightTargetScoreUI.xml
  3. 22 15
      FGUIProject/assets/Main/components/ComAllPerfect.xml
  4. 0 1
      FGUIProject/assets/Main/components/ComAllScoreResult.xml
  5. 0 0
      FGUIProject/assets/Main/components/ComClick.xml
  6. 7 0
      FGUIProject/assets/Main/components/ComDeduction.xml
  7. 8 0
      FGUIProject/assets/Main/components/ComScoreResult.xml
  8. 4 2
      FGUIProject/assets/Main/components/ComScoreStage.xml
  9. 6 2
      FGUIProject/assets/Main/components/ComSkillCard.xml
  10. 0 0
      FGUIProject/assets/Main/components/ComSkillTips.xml
  11. 6 4
      FGUIProject/assets/Main/components/ProgressBarTargetScore.xml
  12. 5 4
      FGUIProject/assets/Main/package.xml
  13. 2 2
      GameClient/Assets/Game/HotUpdate/Data/ScoreSystemData.cs
  14. 17 14
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComAllPerfect.cs
  15. 1 1
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComAllPerfect.cs.meta
  16. 0 89
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComBtnSkill.cs
  17. 11 11
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComDeduction.cs
  18. 1 1
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComDeduction.cs.meta
  19. 0 77
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComRoleSkill.cs
  20. 0 77
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComRoleSkill1.cs
  21. 0 11
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComRoleSkill1.cs.meta
  22. 3 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComScoreResult.cs
  23. 0 11
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComSingleScoreStage.cs.meta
  24. 0 74
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComSkillShield.cs
  25. 0 11
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComSkillShield.cs.meta
  26. 0 77
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComSkillTips.cs
  27. 0 11
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComSkillTips.cs.meta
  28. 0 71
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_CompFightResultName.cs
  29. 0 11
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_CompFightResultName.cs.meta
  30. 4 35
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_StoryFightSingleScoreUI.cs
  31. 21 100
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_StoryFightTargetScoreUI.cs
  32. 0 74
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_comClickCircle.cs
  33. 0 11
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_comClickCircle.cs.meta
  34. 0 11
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_comMineCircle.cs.meta
  35. 0 83
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_comTargetCircle.cs
  36. 0 11
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_comTargetCircle.cs.meta
  37. 103 47
      GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightSingleScoreView.cs
  38. 796 796
      GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightTargetScoreView.cs
  39. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0!a.png
  40. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0.png
  41. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_1!a.png
  42. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_1.png
  43. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_2.png
  44. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_3!a.png
  45. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_3.png
  46. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_4!a.png
  47. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_4.png
  48. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_5!a.png
  49. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_5.png
  50. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_6!a.png
  51. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_6.png
  52. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_7!a.png
  53. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_7.png
  54. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas_vuz5bw!a.png
  55. 96 0
      GameClient/Assets/ResIn/UI/Main/Main_atlas_vuz5bw!a.png.meta
  56. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas_vuz5bw.png
  57. 96 0
      GameClient/Assets/ResIn/UI/Main/Main_atlas_vuz5bw.png.meta
  58. BIN
      GameClient/Assets/ResIn/UI/Main/Main_fui.bytes

+ 4 - 30
FGUIProject/assets/Main/StoryFightSingleScoreUI.xml

@@ -7,8 +7,7 @@
     <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">
+    <component id="n53_f2bf" name="comClick" src="f2bfiw" fileName="components/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">
@@ -18,47 +17,22 @@
       <relation target="" sidePair="top-top"/>
       <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"/>
-    <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"/>
     </component>
-    <loader id="n51_wono" name="LoaMask" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" alpha="0" touchable="false" align="center" vAlign="middle" fill="scaleMatchHeight">
+    <component id="n54_psph" name="comAllPerfect" src="cn279k" fileName="components/ComAllPerfect.xml" xy="367,776"/>
+    <loader id="n51_wono" name="LoaMask" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" alpha="0" align="center" vAlign="middle" fill="scaleMatchHeight">
       <relation target="" sidePair="center-center,middle-middle"/>
     </loader>
     <component id="n46_wono" name="comRoleResult" src="wonogk" fileName="components/ComRoleResult.xml" xy="540,937" pivot="0.5,0.5" anchor="true" scale="0,0" touchable="false">
       <relation target="" sidePair="center-center,middle-middle"/>
     </component>
-    <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" visible="false" advanced="true">
-      <relation target="" sidePair="center-center,middle-middle"/>
-    </group>
   </displayList>
-  <transition name="t1" options="2">
-    <item time="0" type="Alpha" target="n40_wono" value="0"/>
-    <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="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"/>
     <item time="0" type="Scale" target="n46_wono" tween="true" startValue="0,0" endValue="1.1,1.1" duration="12" ease="Linear"/>
     <item time="0" type="Skew" target="n46_wono" tween="true" startValue="0,-180" endValue="0,0" duration="12" ease="Linear"/>
-    <item time="0" type="Visible" target="n42_wono" value="false"/>
-  </transition>
-  <transition name="t3">
-    <item time="0" type="Alpha" target="n51_wono" tween="true" startValue="0" endValue="1" duration="12" ease="Linear"/>
+    <item time="0" type="Visible" target="n51_wono" value="true"/>
   </transition>
 </component>

+ 8 - 69
FGUIProject/assets/Main/StoryFightTargetScoreUI.xml

@@ -1,83 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920" designImage="ui://mfvz4q8kmza1c0">
   <displayList>
-    <component id="n2_8xpg" name="btnSkip" src="nmnb2x" fileName="componentsDialog/ButtonSkip.xml" xy="867,1769" visible="false">
-      <relation target="" sidePair="bottom-bottom"/>
-    </component>
     <component id="n37_mhyh" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="34,80">
       <Button icon="ui://eg2y0ldpuyuxtj4"/>
     </component>
-    <component id="n28_uj53" name="proScore" src="v3k9c7" fileName="components/ProgressBarTargetScore.xml" xy="160,127" pivot="0,0.5" anchor="true">
-      <ProgressBar max="100"/>
-    </component>
-    <component id="n17_mza1" name="comMineCircle" src="c2umeg" fileName="components/comMineCircle.xml" xy="252,1300" pivot="0.5,0.5" visible="false">
-      <relation target="" sidePair="bottom-bottom"/>
-    </component>
-    <component id="n15_mza1" name="comTargetCircle" src="v3k9c4" fileName="components/comTargetCircle.xml" xy="572,1300" pivot="0.5,0.5" visible="false">
-      <relation target="" sidePair="bottom-bottom"/>
-    </component>
-    <component id="n24_vbe8" name="proMinusMine" src="mhyhd4" fileName="components/ProgressBar2.xml" xy="190,700">
-      <ProgressBar value="100" max="100"/>
-    </component>
-    <component id="n26_vbe8" name="proMinusNpc" src="mhyhd4" fileName="components/ProgressBar2.xml" xy="710,700">
-      <ProgressBar value="100" max="100"/>
-    </component>
-    <component id="n25_vbe8" name="ComShieldMine" src="v3k9c3" fileName="components/ComSkillShield.xml" xy="230,820"/>
-    <component id="n27_vbe8" name="ComShieldNpc" src="v3k9c3" fileName="components/ComSkillShield.xml" xy="750,820"/>
-    <component id="n29_uj53" name="ComRoleSkillMineAdd" src="v3k9cx" fileName="components/ComRoleSkill.xml" xy="230,1132" group="n43_k1kh"/>
-    <component id="n34_pcn0" name="ComRoleSkillMineMinus" src="v3k9cx" fileName="components/ComRoleSkill.xml" xy="230,1132" group="n43_k1kh"/>
-    <component id="n33_uj53" name="ComRoleSkillNpcAdd" src="v3k9cx" fileName="components/ComRoleSkill.xml" xy="750,1132" group="n43_k1kh"/>
-    <component id="n35_pcn0" name="ComRoleSkillNpcMinus" src="v3k9cx" fileName="components/ComRoleSkill.xml" xy="750,1132" group="n43_k1kh"/>
-    <component id="n39_k1kh" name="ComRoleSkillMineBreak" src="lki4db" fileName="components/ComRoleSkill1.xml" xy="230,1132" group="n43_k1kh"/>
-    <component id="n40_k1kh" name="ComRoleSkillNpcBreak" src="lki4db" fileName="components/ComRoleSkill1.xml" xy="750,1132" group="n43_k1kh"/>
-    <component id="n41_k1kh" name="ComRoleSkillMineShield" src="lki4db" fileName="components/ComRoleSkill1.xml" xy="230,1132" group="n43_k1kh"/>
-    <component id="n42_k1kh" name="ComRoleSkillNpcShield" src="lki4db" fileName="components/ComRoleSkill1.xml" xy="750,1132" group="n43_k1kh"/>
-    <group id="n43_k1kh" name="n43" xy="230,1132" size="620,100"/>
-    <component id="n1_8xpg" name="selfName" src="8xpg41" fileName="components/CompFightResultName.xml" xy="48,1499" visible="false">
-      <relation target="" sidePair="bottom-bottom"/>
-    </component>
-    <component id="n4_8xpg" name="targetName" src="8xpg41" fileName="components/CompFightResultName.xml" xy="596,1499" visible="false">
-      <relation target="" sidePair="bottom-bottom"/>
-    </component>
-    <component id="n20_vbe8" name="btnSkill0" src="v3k9c0" fileName="components/ComBtnSkill.xml" xy="70,1682">
-      <relation target="" sidePair="bottom-bottom"/>
-      <property target="icon" propertyId="1" value="ui://mfvz4q8kv3k9cc"/>
-      <property target="icon1" propertyId="1" value="ui://mfvz4q8kk1khe1"/>
-    </component>
-    <component id="n21_vbe8" name="btnSkill1" src="v3k9c0" fileName="components/ComBtnSkill.xml" xy="314,1682">
-      <relation target="" sidePair="bottom-bottom"/>
-      <property target="icon" propertyId="1" value="ui://mfvz4q8kv3k9cd"/>
-      <property target="icon1" propertyId="1" value="ui://mfvz4q8kk1khe2"/>
-    </component>
-    <component id="n22_vbe8" name="btnSkill2" src="v3k9c0" fileName="components/ComBtnSkill.xml" xy="556,1682">
-      <relation target="" sidePair="bottom-bottom"/>
-      <property target="icon" propertyId="1" value="ui://mfvz4q8kv3k9ce"/>
-      <property target="icon1" propertyId="1" value="ui://mfvz4q8kk1khe3"/>
-    </component>
-    <component id="n23_vbe8" name="btnSkill3" src="v3k9c0" fileName="components/ComBtnSkill.xml" xy="800,1682">
-      <relation target="" sidePair="bottom-bottom"/>
-      <property target="icon" propertyId="1" value="ui://mfvz4q8kv3k9cf"/>
-      <property target="icon1" propertyId="1" value="ui://mfvz4q8kk1khe4"/>
+    <component id="n50_psph" name="comClick" src="f2bfiw" fileName="components/ComClick.xml" xy="0,0">
+      <relation target="" sidePair="width-width,height-height"/>
     </component>
     <component id="n38_jj0m" name="btnSpeedUp" src="jj0mdl" fileName="componentsDialog/ButtonSpeedUp1.xml" xy="943,1546">
       <relation target="" sidePair="right-right,bottom-bottom"/>
       <Button title="x1"/>
     </component>
-    <graph id="n44_t6aj" name="holderPartScore" xy="380,1428" size="1,1" group="n46_t6aj" visible="false">
-      <relation target="n17_mza1" sidePair="bottom-bottom"/>
-    </graph>
-    <graph id="n45_t6aj" name="holderPartScoreNpc" xy="700,1426" size="1,1" group="n46_t6aj" visible="false">
-      <relation target="n15_mza1" sidePair="bottom-bottom"/>
-    </graph>
-    <graph id="n47_wgy9" name="holderAddScore" xy="320,1132" size="1,1" group="n46_t6aj" visible="false">
-      <relation target="n29_uj53" sidePair="bottom-bottom"/>
-    </graph>
-    <graph id="n48_wgy9" name="holderAddScoreNpc" xy="750,1132" size="1,1" group="n46_t6aj" visible="false">
-      <relation target="n34_pcn0" sidePair="bottom-bottom"/>
-    </graph>
-    <group id="n46_t6aj" name="n46" xy="320,1132" size="431,297"/>
-    <component id="n49_v95q" name="comSkillTips" src="v95qie" fileName="ComSkillTips.xml" xy="246,1426">
-      <relation target="" sidePair="bottom-bottom"/>
+    <component id="n51_psph" name="myHead" src="r9ri1h" fileName="components/ComHead.xml" pkg="eg2y0ldp" xy="-29,149"/>
+    <component id="n52_psph" name="targetHead" src="r9ri1h" fileName="components/ComHead.xml" pkg="eg2y0ldp" xy="876,149"/>
+    <component id="n28_uj53" name="proScore" src="v3k9c7" fileName="components/ProgressBarTargetScore.xml" xy="181,262" pivot="0,0.5" anchor="true" size="718,31">
+      <ProgressBar max="100"/>
     </component>
+    <component id="n54_psph" name="comTargetCard" src="py009o" fileName="components/ComSkillCard.xml" xy="891,428" size="137,196" aspect="true"/>
+    <component id="n55_psph" name="comDeduction" src="psphix" fileName="components/ComDeduction.xml" xy="4,402"/>
   </displayList>
 </component>

+ 22 - 15
FGUIProject/assets/Main/components/ComAllCircle.xml → FGUIProject/assets/Main/components/ComAllPerfect.xml

@@ -1,40 +1,47 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="345,367">
   <displayList>
-    <image id="n31_cn27" name="n31" src="vuz5bp" fileName="imagesStory/zd_pfhd_4.png" xy="49,52" pivot="0.5,0.5"/>
-    <image id="n33_cn27" name="imgCircle" src="vuz5bp" fileName="imagesStory/zd_pfhd_4.png" xy="49,52" pivot="0.5,0.5" aspect="true"/>
-    <image id="n35_oixc" name="n35" src="oixcbz" fileName="imagesStory/zd_ztca.png" xy="85,138"/>
-    <movieclip id="n32_cn27" name="n32" src="vuz5bw" fileName="Movie/MovieClip2.jta" xy="139,151" pivot="0.5,0.5" size="66,65" aspect="true" scale="1.5,1.5"/>
+    <loader id="n41_psph" name="n41" xy="49,60" size="247,247"/>
+    <image id="n31_cn27" name="n31" src="vuz5bp" fileName="imagesStory/zd_pfhd_4.png" xy="49,52" pivot="0.5,0.5" group="n40_psph"/>
+    <image id="n33_cn27" name="imgCircle" src="vuz5bp" fileName="imagesStory/zd_pfhd_4.png" xy="49,52" pivot="0.5,0.5" group="n40_psph" aspect="true"/>
+    <image id="n35_oixc" name="n35" src="oixcbz" fileName="imagesStory/zd_ztca.png" xy="85,138" group="n40_psph"/>
+    <movieclip id="n32_cn27" name="n32" src="vuz5bw" fileName="Movie/MovieClip2.jta" xy="139,151" pivot="0.5,0.5" size="66,65" group="n40_psph" aspect="true" scale="1.5,1.5"/>
+    <group id="n40_psph" name="n40" xy="49,52" size="247,262" advanced="true"/>
     <graph id="n36_qgxy" name="holder" xy="181,-236" size="1,1" group="n39_qgxy"/>
     <image id="n37_qgxy" name="img" src="vuz5bg" fileName="imagesStory/zd_pfziti_4.png" xy="65,-308" group="n39_qgxy"/>
     <text id="n38_qgxy" name="txtCount" xy="64,-215" pivot="0.5,0" size="234,69" group="n39_qgxy" font="ui://mfvz4q8kvuz5b5" fontSize="65" text="66666"/>
     <group id="n39_qgxy" name="n39" xy="64,-308" size="234,162" advanced="true"/>
   </displayList>
   <transition name="t0">
-    <item time="0" type="Scale" target="n33_cn27" tween="true" startValue="1.5,1.5" endValue="1,1" duration="18" ease="Linear"/>
+    <item time="0" type="Scale" target="n33_cn27" tween="true" startValue="1.5,1.5" endValue="1,1" duration="24" ease="Linear"/>
     <item time="0" type="Visible" target="n31_cn27" value="true"/>
     <item time="0" type="Visible" target="n32_cn27" value="true"/>
     <item time="0" type="Visible" target="n33_cn27" value="true"/>
     <item time="0" type="Visible" target="n35_oixc" value="true"/>
     <item time="0" type="Visible" target="n39_qgxy" value="false"/>
+    <item time="0" type="Visible" target="n40_psph" value="true"/>
     <item time="0" type="XY" target="n32_cn27" value="512,-55"/>
-    <item time="18" type="Rotation" target="n32_cn27" tween="true" startValue="0" endValue="-250" duration="48" ease="Quad.In"/>
-    <item time="18" type="Visible" target="n33_cn27" value="false"/>
-    <item time="18" type="XY" target="n32_cn27" tween="true" startValue="512,-55" endValue="111,173" duration="48" ease="Quad.In" path="2,0,0,-104,-572,-1143,-217,1,2,-401,228,342.8462,674.1072,0,0,1"/>
-    <item time="66" type="Visible" target="n31_cn27" value="false"/>
-    <item time="66" type="Visible" target="n32_cn27" value="false"/>
-    <item time="66" type="Visible" target="n35_oixc" value="false"/>
+    <item time="24" type="Rotation" target="n32_cn27" tween="true" startValue="0" endValue="-250" duration="48" ease="Quad.In"/>
+    <item time="24" type="Visible" target="n33_cn27" value="false"/>
+    <item time="24" type="XY" target="n32_cn27" tween="true" startValue="512,-55" endValue="111,173" duration="48" ease="Quad.In" path="2,0,0,-104,-572,-1143,-217,1,2,-401,228,342.8462,674.1072,0,0,1"/>
+    <item time="72" type="Visible" target="n31_cn27" value="false"/>
+    <item time="72" type="Visible" target="n32_cn27" value="false"/>
+    <item time="72" type="Visible" target="n35_oixc" value="false"/>
+    <item time="72" type="Visible" target="n39_qgxy" value="false"/>
+    <item time="72" type="Visible" target="n40_psph" value="false"/>
   </transition>
   <transition name="t1">
     <item time="0" type="Visible" target="n36_qgxy" value="true"/>
     <item time="0" type="Visible" target="n37_qgxy" value="false"/>
     <item time="0" type="Visible" target="n38_qgxy" value="false"/>
     <item time="0" type="Visible" target="n39_qgxy" value="true"/>
+    <item time="0" type="Visible" target="n40_psph" value="false"/>
     <item time="9" type="Visible" target="n37_qgxy" value="true"/>
     <item time="9" type="Visible" target="n38_qgxy" value="true"/>
-    <item time="66" type="Visible" target="n37_qgxy" value="false"/>
-    <item time="66" type="Visible" target="n38_qgxy" value="false"/>
-    <item time="72" type="Visible" target="n36_qgxy" value="true"/>
-    <item time="72" type="Visible" target="n39_qgxy" value="false"/>
+    <item time="63" type="Visible" target="n36_qgxy" value="true"/>
+    <item time="63" type="Visible" target="n37_qgxy" value="false"/>
+    <item time="63" type="Visible" target="n38_qgxy" value="false"/>
+    <item time="63" type="Visible" target="n39_qgxy" value="false"/>
+    <item time="72" type="Visible" target="n36_qgxy" value="false"/>
   </transition>
 </component>

+ 0 - 1
FGUIProject/assets/Main/components/ComAllScoreResult.xml

@@ -5,7 +5,6 @@
     <graph id="n37_qgxy" name="holder" xy="179,179" size="1,1" visible="false"/>
     <image id="n35_vuz5" name="img" src="vuz5bg" fileName="imagesStory/zd_pfziti_4.png" xy="63,107"/>
     <text id="n36_vuz5" name="txtCount" xy="62,200" pivot="0.5,0" size="234,69" font="ui://mfvz4q8kvuz5b5" fontSize="65" text="66666"/>
-    <image id="n40_qgxy" name="n40" src="oq7r99" fileName="imagesStory/zx_gka_baoxiang_1.png" xy="69,109"/>
   </displayList>
   <transition name="t0">
     <item time="0" type="Visible" target="n35_vuz5" value="true"/>

+ 0 - 0
FGUIProject/assets/Main/ComClick.xml → FGUIProject/assets/Main/components/ComClick.xml


+ 7 - 0
FGUIProject/assets/Main/components/ComDeduction.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="196,196">
+  <displayList>
+    <image id="n55_psph" name="n55" src="v3k9cf" fileName="imagesStory/zd_jineng_4.png" xy="0,0"/>
+    <text id="n56_psph" name="txtDeduction" xy="54,76" pivot="0.5,0" size="77,46" fontSize="34" align="center" text="-666"/>
+  </displayList>
+</component>

+ 8 - 0
FGUIProject/assets/Main/components/ComScoreResult.xml

@@ -2,6 +2,7 @@
 <component size="256,259">
   <controller name="c1" pages="0,,1,,2," selected="2"/>
   <displayList>
+    <loader id="n23_psph" name="loaGlass" xy="130,129" pivot="0.5,0.5" anchor="true" size="256,259" scale="0,0" url="ui://mfvz4q8kwonoh3" align="center" vAlign="middle"/>
     <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"/>
@@ -38,7 +39,10 @@
   </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="Alpha" target="n23_psph" value="0"/>
+    <item time="0" type="Rotation" target="n23_psph" value="0"/>
     <item time="0" type="Scale" target="n17_f2bf" tween="true" startValue="0,0" endValue="1,1" duration="6" ease="Linear"/>
+    <item time="0" type="Scale" target="n23_psph" value="1,1"/>
     <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"/>
@@ -50,11 +54,15 @@
     <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="Alpha" target="n23_psph" value="1"/>
+    <item time="30" type="Rotation" target="n23_psph" tween="true" startValue="0" endValue="360" duration="12" ease="Linear"/>
     <item time="30" type="Scale" target="n17_f2bf" value="0,0"/>
+    <item time="30" type="Scale" target="n23_psph" tween="true" startValue="1,1" endValue="0,0" duration="12" ease="Linear"/>
     <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"/>
+    <item time="30" type="XY" target="n23_psph" label="start" tween="true" startValue="0,0" endValue="539.5,108" duration="12" label2="end" ease="Linear"/>
   </transition>
 </component>

+ 4 - 2
FGUIProject/assets/Main/components/ComScoreStage.xml

@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="70,80">
-  <controller name="c1" pages="0,,1," selected="1"/>
+  <controller name="c1" pages="0,,1," selected="0"/>
   <displayList>
     <loader id="n6_v95q" name="icon" xy="0,19" size="70,70" url="ui://mfvz4q8kv95qi6" autoSize="true">
       <gearDisplay controller="c1" pages="0"/>
     </loader>
     <image id="n8_v95q" name="n8" src="v95qib" fileName="imagesStory/zd_jdbiao.png" xy="16,-7"/>
-    <graph id="n9_weok" name="holder" xy="36,63" size="1,1"/>
+    <graph id="n9_weok" name="holder" xy="36,63" size="1,1">
+      <gearDisplay controller="c1" pages="1"/>
+    </graph>
   </displayList>
   <customProperty target="icon" propertyId="1"/>
   <customProperty target="icon1" propertyId="1"/>

+ 6 - 2
FGUIProject/assets/Main/components/ComSkillCard.xml

@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="590,842" overflow="hidden">
   <displayList>
-    <loader id="n0_py00" name="loaCard" xy="295,420" pivot="0.5,0.5" anchor="true" size="630,838" url="ui://mfvz4q8kqz50fi" fill="scaleMatchHeight"/>
-    <image id="n1_sx2v" name="n1" src="py009m" fileName="imagesStory/zd_kpdi_2.png" xy="0,0"/>
+    <loader id="n0_py00" name="loaCard" xy="295,420" pivot="0.5,0.5" anchor="true" size="630,838" url="ui://eg2y0ldppsphtke" align="center" fill="scaleMatchHeight">
+      <relation target="" sidePair="width-width,height-height"/>
+    </loader>
+    <image id="n1_sx2v" name="n1" src="py009m" fileName="imagesStory/zd_kpdi_2.png" xy="0,0">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
   </displayList>
 </component>

+ 0 - 0
FGUIProject/assets/Main/ComSkillTips.xml → FGUIProject/assets/Main/components/ComSkillTips.xml


+ 6 - 4
FGUIProject/assets/Main/components/ProgressBarTargetScore.xml

@@ -5,13 +5,15 @@
       <relation target="" sidePair="width-width,height-height"/>
     </image>
     <component id="n1_uj53" name="comBar" src="k1khe7" fileName="components/Component2.xml" xy="0,-2" size="86,31"/>
-    <image id="n7_v3k9" name="n7" src="v3k9cs" fileName="imagesStory/zd_zdjdt_3.png" xy="-17,-2"/>
-    <text id="n4_uj53" name="txtMineScore" xy="10,50" size="193,53" fontSize="36" color="#fff6e3" vAlign="bottom" bold="true" strokeColor="#c09653" strokeSize="2" text="赵四10086">
+    <image id="n7_v3k9" name="n7" src="v3k9cs" fileName="imagesStory/zd_zdjdt_3.png" xy="-17,-2">
       <relation target="" sidePair="width-width,height-height"/>
-    </text>
-    <text id="n5_uj53" name="txtNpcScore" xy="826,50" pivot="1,0" anchor="true" size="230,53" fontSize="36" color="#fff6e3" align="right" vAlign="bottom" bold="true" strokeColor="#c09653" strokeSize="2" text="小宫女10086">
+    </image>
+    <text id="n4_uj53" name="txtMineScore" xy="10,50" size="184,49" fontSize="36" color="#fff6e3" vAlign="bottom" bold="true" strokeColor="#c09653" strokeSize="2" text="赵四10086">
       <relation target="" sidePair="width-width,height-height"/>
     </text>
+    <text id="n5_uj53" name="txtNpcScore" xy="826,50" pivot="1,0" anchor="true" size="220,49" fontSize="36" color="#fff6e3" align="right" vAlign="bottom" bold="true" strokeColor="#c09653" strokeSize="2" text="小宫女10086">
+      <relation target="" sidePair="width-width,height-height,right-right"/>
+    </text>
     <image id="n8_v95q" name="imgAni" src="k1khdp" fileName="imagesStory/zd_zdjdt_liang.png" xy="85,14" pivot="0.518,0.438" anchor="true" alpha="0.76">
       <relation target="n1_uj53" sidePair="right-right"/>
     </image>

+ 5 - 4
FGUIProject/assets/Main/package.xml

@@ -201,7 +201,7 @@
     <component id="r1a99d" name="StoryCardChooseUI.xml" path="/" exported="true"/>
     <component id="r1a99f" name="ListCardItem.xml" path="/components/"/>
     <image id="r1a99g" name="fzd_fzxzhong.png" path="/imagesStory/"/>
-    <component id="cn279k" name="ComAllCircle.xml" path="/components/"/>
+    <component id="cn279k" name="ComAllPerfect.xml" path="/components/"/>
     <component id="py009l" name="StorySkillUI.xml" path="/" exported="true"/>
     <image id="py009m" name="zd_kpdi_2.png" path="/imagesStory/"/>
     <image id="py009n" name="zd_kpdi_1.png" path="/imagesStory/"/>
@@ -293,7 +293,7 @@
     <image id="v3k9cf" name="zd_jineng_4.png" path="/imagesStory/" exported="true"/>
     <image id="v3k9cq" name="zd_zdjdt_1.png" path="/imagesStory/"/>
     <image id="v3k9cr" name="zd_zdjdt_2.png" path="/imagesStory/"/>
-    <image id="v3k9cs" name="zd_zdjdt_3.png" path="/imagesStory/"/>
+    <image id="v3k9cs" name="zd_zdjdt_3.png" path="/imagesStory/" scale="9grid" scale9grid="229,9,458,18"/>
     <image id="v3k9ct" name="zd_zijia.png" path="/FontScore/"/>
     <image id="v3k9cu" name="zd_zijian.png" path="/FontScore/"/>
     <component id="v3k9cx" name="ComRoleSkill.xml" path="/components/"/>
@@ -434,7 +434,7 @@
     <image id="v95qia" name="zd_jz_2.png" path="/imagesStory/"/>
     <image id="v95qib" name="zd_jdbiao.png" path="/imagesStory/"/>
     <image id="v95qid" name="zd_zdjnsm_1.png" path="/imagesFight/"/>
-    <component id="v95qie" name="ComSkillTips.xml" path="/"/>
+    <component id="v95qie" name="ComSkillTips.xml" path="/components/"/>
     <image id="dhoaif" name="zjm_bbbb.png" path="/images/"/>
     <image id="ysx9ig" name="fzl_fzl.png" path="/images/"/>
     <image id="weokih" name="zjm_22.png" path="/images/"/>
@@ -452,7 +452,8 @@
     <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="/"/>
+    <component id="f2bfiw" name="ComClick.xml" path="/components/"/>
+    <component id="psphix" name="ComDeduction.xml" path="/components/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\Main" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

+ 2 - 2
GameClient/Assets/Game/HotUpdate/Data/ScoreSystemData.cs

@@ -275,10 +275,10 @@ namespace GFGGame
         /// </summary>
         /// <param name="mainScore"></param>
         /// <returns></returns>
-        public double GetAllCircleAddScore(double mainScore)
+        public int GetAllCircleAddScore(double mainScore)
         {
             //主属性20%的加分
-            return mainScore * ConstScoreSystem.ALL_PERFECT_SCORE;
+            return (int)Math.Ceiling(mainScore * ConstScoreSystem.ALL_PERFECT_SCORE);
         }
 
 

+ 17 - 14
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_comMineCircle.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComAllPerfect.cs

@@ -4,22 +4,23 @@ using FairyGUI;
 
 namespace UI.Main
 {
-    public partial class UI_comMineCircle
+    public partial class UI_ComAllPerfect
     {
         public GComponent target;
-        public GLoader m_loaIcon;
+        public GImage m_imgCircle;
         public GGraph m_holder;
-        public GTextField m_txtPart;
+        public GImage m_img;
         public GTextField m_txtCount;
         public Transition m_t0;
-        public const string URL = "ui://mfvz4q8kc2umeg";
+        public Transition m_t1;
+        public const string URL = "ui://mfvz4q8kcn279k";
         public const string PACKAGE_NAME = "Main";
-        public const string RES_NAME = "comMineCircle";
-        private static UI_comMineCircle _proxy;
+        public const string RES_NAME = "ComAllPerfect";
+        private static UI_ComAllPerfect _proxy;
 
-        public static UI_comMineCircle Create(GObject gObject = null)
+        public static UI_ComAllPerfect Create(GObject gObject = null)
         {
-            var ui = new UI_comMineCircle();
+            var ui = new UI_ComAllPerfect();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -28,11 +29,11 @@ namespace UI.Main
             return ui;
         }
 
-        public static UI_comMineCircle Proxy(GObject gObject = null)
+        public static UI_ComAllPerfect Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_comMineCircle();
+                _proxy = new UI_ComAllPerfect();
             }
             var ui = _proxy;
             if(gObject == null)
@@ -59,19 +60,21 @@ namespace UI.Main
 
         private void Init(GComponent comp)
         {
-            m_loaIcon = (GLoader)comp.GetChild("loaIcon");
+            m_imgCircle = (GImage)comp.GetChild("imgCircle");
             m_holder = (GGraph)comp.GetChild("holder");
-            m_txtPart = (GTextField)comp.GetChild("txtPart");
+            m_img = (GImage)comp.GetChild("img");
             m_txtCount = (GTextField)comp.GetChild("txtCount");
             m_t0 = comp.GetTransition("t0");
+            m_t1 = comp.GetTransition("t1");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_loaIcon = null;
+            m_imgCircle = null;
             m_holder = null;
-            m_txtPart = null;
+            m_img = null;
             m_txtCount = null;
             m_t0 = null;
+            m_t1 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 1 - 1
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComBtnSkill.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComAllPerfect.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: cc5ed4231552b554085813d453d2c06c
+guid: fd1299f70820d4a4c867e2c9f128a870
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 0 - 89
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComBtnSkill.cs

@@ -1,89 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-
-namespace UI.Main
-{
-    public partial class UI_ComBtnSkill
-    {
-        public GComponent target;
-        public Controller m_c1;
-        public GLoader m_icon;
-        public GLoader m_icon1;
-        public GProgressBar m_proCD;
-        public GTextField m_txtCount;
-        public GGraph m_holder;
-        public Transition m_t0;
-        public const string URL = "ui://mfvz4q8kv3k9c0";
-        public const string PACKAGE_NAME = "Main";
-        public const string RES_NAME = "ComBtnSkill";
-        private static UI_ComBtnSkill _proxy;
-
-        public static UI_ComBtnSkill Create(GObject gObject = null)
-        {
-            var ui = new UI_ComBtnSkill();
-            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_ComBtnSkill Proxy(GObject gObject = null)
-        {
-            if(_proxy == null)
-            {
-                _proxy = new UI_ComBtnSkill();
-            }
-            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_icon = (GLoader)comp.GetChild("icon");
-            m_icon1 = (GLoader)comp.GetChild("icon1");
-            m_proCD = (GProgressBar)comp.GetChild("proCD");
-            m_txtCount = (GTextField)comp.GetChild("txtCount");
-            m_holder = (GGraph)comp.GetChild("holder");
-            m_t0 = comp.GetTransition("t0");
-        }
-        public void Dispose(bool disposeTarget = false)
-        {
-            m_c1 = null;
-            m_icon = null;
-            m_icon1 = null;
-            m_proCD = null;
-            m_txtCount = null;
-            m_holder = null;
-            m_t0 = null;
-            if(disposeTarget && target != null)
-            {
-                target.RemoveFromParent();
-                target.Dispose();
-            }
-            target = null;
-        }
-    }
-}

+ 11 - 11
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComSingleScoreStage.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComDeduction.cs

@@ -4,18 +4,18 @@ using FairyGUI;
 
 namespace UI.Main
 {
-    public partial class UI_ComSingleScoreStage
+    public partial class UI_ComDeduction
     {
         public GComponent target;
-        public Controller m_c1;
-        public const string URL = "ui://mfvz4q8kwonoh2";
+        public GTextField m_txtDeduction;
+        public const string URL = "ui://mfvz4q8kpsphix";
         public const string PACKAGE_NAME = "Main";
-        public const string RES_NAME = "ComSingleScoreStage";
-        private static UI_ComSingleScoreStage _proxy;
+        public const string RES_NAME = "ComDeduction";
+        private static UI_ComDeduction _proxy;
 
-        public static UI_ComSingleScoreStage Create(GObject gObject = null)
+        public static UI_ComDeduction Create(GObject gObject = null)
         {
-            var ui = new UI_ComSingleScoreStage();
+            var ui = new UI_ComDeduction();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -24,11 +24,11 @@ namespace UI.Main
             return ui;
         }
 
-        public static UI_ComSingleScoreStage Proxy(GObject gObject = null)
+        public static UI_ComDeduction Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_ComSingleScoreStage();
+                _proxy = new UI_ComDeduction();
             }
             var ui = _proxy;
             if(gObject == null)
@@ -55,11 +55,11 @@ namespace UI.Main
 
         private void Init(GComponent comp)
         {
-            m_c1 = comp.GetController("c1");
+            m_txtDeduction = (GTextField)comp.GetChild("txtDeduction");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_c1 = null;
+            m_txtDeduction = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 1 - 1
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComRoleSkill.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComDeduction.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 989c2f692d42a4b49b5278740e4719ea
+guid: f03f7021384a4a04ba0ebc316608a451
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 0 - 77
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComRoleSkill.cs

@@ -1,77 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-
-namespace UI.Main
-{
-    public partial class UI_ComRoleSkill
-    {
-        public GComponent target;
-        public GGraph m_holder;
-        public GTextField m_txtScore;
-        public Transition m_t0;
-        public const string URL = "ui://mfvz4q8kv3k9cx";
-        public const string PACKAGE_NAME = "Main";
-        public const string RES_NAME = "ComRoleSkill";
-        private static UI_ComRoleSkill _proxy;
-
-        public static UI_ComRoleSkill Create(GObject gObject = null)
-        {
-            var ui = new UI_ComRoleSkill();
-            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_ComRoleSkill Proxy(GObject gObject = null)
-        {
-            if(_proxy == null)
-            {
-                _proxy = new UI_ComRoleSkill();
-            }
-            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_holder = (GGraph)comp.GetChild("holder");
-            m_txtScore = (GTextField)comp.GetChild("txtScore");
-            m_t0 = comp.GetTransition("t0");
-        }
-        public void Dispose(bool disposeTarget = false)
-        {
-            m_holder = null;
-            m_txtScore = null;
-            m_t0 = null;
-            if(disposeTarget && target != null)
-            {
-                target.RemoveFromParent();
-                target.Dispose();
-            }
-            target = null;
-        }
-    }
-}

+ 0 - 77
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComRoleSkill1.cs

@@ -1,77 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-
-namespace UI.Main
-{
-    public partial class UI_ComRoleSkill1
-    {
-        public GComponent target;
-        public Controller m_c1;
-        public GGraph m_holder;
-        public Transition m_t0;
-        public const string URL = "ui://mfvz4q8klki4db";
-        public const string PACKAGE_NAME = "Main";
-        public const string RES_NAME = "ComRoleSkill1";
-        private static UI_ComRoleSkill1 _proxy;
-
-        public static UI_ComRoleSkill1 Create(GObject gObject = null)
-        {
-            var ui = new UI_ComRoleSkill1();
-            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_ComRoleSkill1 Proxy(GObject gObject = null)
-        {
-            if(_proxy == null)
-            {
-                _proxy = new UI_ComRoleSkill1();
-            }
-            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_holder = (GGraph)comp.GetChild("holder");
-            m_t0 = comp.GetTransition("t0");
-        }
-        public void Dispose(bool disposeTarget = false)
-        {
-            m_c1 = null;
-            m_holder = null;
-            m_t0 = null;
-            if(disposeTarget && target != null)
-            {
-                target.RemoveFromParent();
-                target.Dispose();
-            }
-            target = null;
-        }
-    }
-}

+ 0 - 11
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComRoleSkill1.cs.meta

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

+ 3 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComScoreResult.cs

@@ -8,6 +8,7 @@ namespace UI.Main
     {
         public GComponent target;
         public Controller m_c1;
+        public GLoader m_loaGlass;
         public GTextField m_txtPart;
         public GImage m_imgCircle;
         public GGroup m_grpClick;
@@ -71,6 +72,7 @@ namespace UI.Main
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
+            m_loaGlass = (GLoader)comp.GetChild("loaGlass");
             m_txtPart = (GTextField)comp.GetChild("txtPart");
             m_imgCircle = (GImage)comp.GetChild("imgCircle");
             m_grpClick = (GGroup)comp.GetChild("grpClick");
@@ -90,6 +92,7 @@ namespace UI.Main
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
+            m_loaGlass = null;
             m_txtPart = null;
             m_imgCircle = null;
             m_grpClick = null;

+ 0 - 11
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComSingleScoreStage.cs.meta

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

+ 0 - 74
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComSkillShield.cs

@@ -1,74 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-
-namespace UI.Main
-{
-    public partial class UI_ComSkillShield
-    {
-        public GComponent target;
-        public GGraph m_holder;
-        public GGraph m_holder1;
-        public const string URL = "ui://mfvz4q8kv3k9c3";
-        public const string PACKAGE_NAME = "Main";
-        public const string RES_NAME = "ComSkillShield";
-        private static UI_ComSkillShield _proxy;
-
-        public static UI_ComSkillShield Create(GObject gObject = null)
-        {
-            var ui = new UI_ComSkillShield();
-            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_ComSkillShield Proxy(GObject gObject = null)
-        {
-            if(_proxy == null)
-            {
-                _proxy = new UI_ComSkillShield();
-            }
-            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_holder = (GGraph)comp.GetChild("holder");
-            m_holder1 = (GGraph)comp.GetChild("holder1");
-        }
-        public void Dispose(bool disposeTarget = false)
-        {
-            m_holder = null;
-            m_holder1 = null;
-            if(disposeTarget && target != null)
-            {
-                target.RemoveFromParent();
-                target.Dispose();
-            }
-            target = null;
-        }
-    }
-}

+ 0 - 11
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComSkillShield.cs.meta

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

+ 0 - 77
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComSkillTips.cs

@@ -1,77 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-
-namespace UI.Main
-{
-    public partial class UI_ComSkillTips
-    {
-        public GComponent target;
-        public Controller m_c1;
-        public GTextField m_txtTitle;
-        public GTextField m_txtContent;
-        public const string URL = "ui://mfvz4q8kv95qie";
-        public const string PACKAGE_NAME = "Main";
-        public const string RES_NAME = "ComSkillTips";
-        private static UI_ComSkillTips _proxy;
-
-        public static UI_ComSkillTips Create(GObject gObject = null)
-        {
-            var ui = new UI_ComSkillTips();
-            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_ComSkillTips Proxy(GObject gObject = null)
-        {
-            if(_proxy == null)
-            {
-                _proxy = new UI_ComSkillTips();
-            }
-            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_txtTitle = (GTextField)comp.GetChild("txtTitle");
-            m_txtContent = (GTextField)comp.GetChild("txtContent");
-        }
-        public void Dispose(bool disposeTarget = false)
-        {
-            m_c1 = null;
-            m_txtTitle = null;
-            m_txtContent = null;
-            if(disposeTarget && target != null)
-            {
-                target.RemoveFromParent();
-                target.Dispose();
-            }
-            target = null;
-        }
-    }
-}

+ 0 - 11
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComSkillTips.cs.meta

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

+ 0 - 71
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_CompFightResultName.cs

@@ -1,71 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-
-namespace UI.Main
-{
-    public partial class UI_CompFightResultName
-    {
-        public GComponent target;
-        public GTextField m_txtName;
-        public const string URL = "ui://mfvz4q8k8xpg41";
-        public const string PACKAGE_NAME = "Main";
-        public const string RES_NAME = "CompFightResultName";
-        private static UI_CompFightResultName _proxy;
-
-        public static UI_CompFightResultName Create(GObject gObject = null)
-        {
-            var ui = new UI_CompFightResultName();
-            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_CompFightResultName Proxy(GObject gObject = null)
-        {
-            if(_proxy == null)
-            {
-                _proxy = new UI_CompFightResultName();
-            }
-            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_txtName = (GTextField)comp.GetChild("txtName");
-        }
-        public void Dispose(bool disposeTarget = false)
-        {
-            m_txtName = null;
-            if(disposeTarget && target != null)
-            {
-                target.RemoveFromParent();
-                target.Dispose();
-            }
-            target = null;
-        }
-    }
-}

+ 0 - 11
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_CompFightResultName.cs.meta

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

+ 4 - 35
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_StoryFightSingleScoreUI.cs

@@ -9,24 +9,14 @@ 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 UI_comClickCircle m_comClickCircle;
         public GButton m_btnSpeedUp;
+        public UI_ComAllPerfect m_comAllPerfect;
         public GLoader m_LoaMask;
         public UI_ComRoleResult m_comRoleResult;
-        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 Transition m_t1;
         public Transition m_t2;
-        public Transition m_t3;
         public const string URL = "ui://mfvz4q8k8xpg3x";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "StoryFightSingleScoreUI";
@@ -76,52 +66,31 @@ 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_comClickCircle = (UI_comClickCircle)UI_comClickCircle.Create(comp.GetChild("comClickCircle"));
             m_btnSpeedUp = (GButton)comp.GetChild("btnSpeedUp");
+            m_comAllPerfect = (UI_ComAllPerfect)UI_ComAllPerfect.Create(comp.GetChild("comAllPerfect"));
             m_LoaMask = (GLoader)comp.GetChild("LoaMask");
             m_comRoleResult = (UI_ComRoleResult)UI_ComRoleResult.Create(comp.GetChild("comRoleResult"));
-            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_t1 = comp.GetTransition("t1");
             m_t2 = comp.GetTransition("t2");
-            m_t3 = comp.GetTransition("t3");
         }
         public void Dispose(bool disposeTarget = false)
         {
             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_comClickCircle.Dispose();
-            m_comClickCircle = null;
             m_btnSpeedUp = null;
+            m_comAllPerfect.Dispose();
+            m_comAllPerfect = null;
             m_LoaMask = null;
             m_comRoleResult.Dispose();
             m_comRoleResult = null;
-            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_t1 = null;
             m_t2 = null;
-            m_t3 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 21 - 100
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_StoryFightTargetScoreUI.cs

@@ -7,35 +7,14 @@ namespace UI.Main
     public partial class UI_StoryFightTargetScoreUI
     {
         public GComponent target;
-        public GButton m_btnSkip;
         public GButton m_btnBack;
-        public UI_ProgressBarTargetScore m_proScore;
-        public UI_comMineCircle m_comMineCircle;
-        public UI_comTargetCircle m_comTargetCircle;
-        public GProgressBar m_proMinusMine;
-        public GProgressBar m_proMinusNpc;
-        public UI_ComSkillShield m_ComShieldMine;
-        public UI_ComSkillShield m_ComShieldNpc;
-        public UI_ComRoleSkill m_ComRoleSkillMineAdd;
-        public UI_ComRoleSkill m_ComRoleSkillMineMinus;
-        public UI_ComRoleSkill m_ComRoleSkillNpcAdd;
-        public UI_ComRoleSkill m_ComRoleSkillNpcMinus;
-        public UI_ComRoleSkill1 m_ComRoleSkillMineBreak;
-        public UI_ComRoleSkill1 m_ComRoleSkillNpcBreak;
-        public UI_ComRoleSkill1 m_ComRoleSkillMineShield;
-        public UI_ComRoleSkill1 m_ComRoleSkillNpcShield;
-        public UI_CompFightResultName m_selfName;
-        public UI_CompFightResultName m_targetName;
-        public UI_ComBtnSkill m_btnSkill0;
-        public UI_ComBtnSkill m_btnSkill1;
-        public UI_ComBtnSkill m_btnSkill2;
-        public UI_ComBtnSkill m_btnSkill3;
+        public UI_ComClick m_comClick;
         public GButton m_btnSpeedUp;
-        public GGraph m_holderPartScore;
-        public GGraph m_holderPartScoreNpc;
-        public GGraph m_holderAddScore;
-        public GGraph m_holderAddScoreNpc;
-        public UI_ComSkillTips m_comSkillTips;
+        public GComponent m_myHead;
+        public GComponent m_targetHead;
+        public UI_ProgressBarTargetScore m_proScore;
+        public UI_ComSkillCard m_comTargetCard;
+        public UI_ComDeduction m_comDeduction;
         public const string URL = "ui://mfvz4q8k8xpg3w";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "StoryFightTargetScoreUI";
@@ -83,87 +62,29 @@ namespace UI.Main
 
         private void Init(GComponent comp)
         {
-            m_btnSkip = (GButton)comp.GetChild("btnSkip");
             m_btnBack = (GButton)comp.GetChild("btnBack");
-            m_proScore = (UI_ProgressBarTargetScore)UI_ProgressBarTargetScore.Create(comp.GetChild("proScore"));
-            m_comMineCircle = (UI_comMineCircle)UI_comMineCircle.Create(comp.GetChild("comMineCircle"));
-            m_comTargetCircle = (UI_comTargetCircle)UI_comTargetCircle.Create(comp.GetChild("comTargetCircle"));
-            m_proMinusMine = (GProgressBar)comp.GetChild("proMinusMine");
-            m_proMinusNpc = (GProgressBar)comp.GetChild("proMinusNpc");
-            m_ComShieldMine = (UI_ComSkillShield)UI_ComSkillShield.Create(comp.GetChild("ComShieldMine"));
-            m_ComShieldNpc = (UI_ComSkillShield)UI_ComSkillShield.Create(comp.GetChild("ComShieldNpc"));
-            m_ComRoleSkillMineAdd = (UI_ComRoleSkill)UI_ComRoleSkill.Create(comp.GetChild("ComRoleSkillMineAdd"));
-            m_ComRoleSkillMineMinus = (UI_ComRoleSkill)UI_ComRoleSkill.Create(comp.GetChild("ComRoleSkillMineMinus"));
-            m_ComRoleSkillNpcAdd = (UI_ComRoleSkill)UI_ComRoleSkill.Create(comp.GetChild("ComRoleSkillNpcAdd"));
-            m_ComRoleSkillNpcMinus = (UI_ComRoleSkill)UI_ComRoleSkill.Create(comp.GetChild("ComRoleSkillNpcMinus"));
-            m_ComRoleSkillMineBreak = (UI_ComRoleSkill1)UI_ComRoleSkill1.Create(comp.GetChild("ComRoleSkillMineBreak"));
-            m_ComRoleSkillNpcBreak = (UI_ComRoleSkill1)UI_ComRoleSkill1.Create(comp.GetChild("ComRoleSkillNpcBreak"));
-            m_ComRoleSkillMineShield = (UI_ComRoleSkill1)UI_ComRoleSkill1.Create(comp.GetChild("ComRoleSkillMineShield"));
-            m_ComRoleSkillNpcShield = (UI_ComRoleSkill1)UI_ComRoleSkill1.Create(comp.GetChild("ComRoleSkillNpcShield"));
-            m_selfName = (UI_CompFightResultName)UI_CompFightResultName.Create(comp.GetChild("selfName"));
-            m_targetName = (UI_CompFightResultName)UI_CompFightResultName.Create(comp.GetChild("targetName"));
-            m_btnSkill0 = (UI_ComBtnSkill)UI_ComBtnSkill.Create(comp.GetChild("btnSkill0"));
-            m_btnSkill1 = (UI_ComBtnSkill)UI_ComBtnSkill.Create(comp.GetChild("btnSkill1"));
-            m_btnSkill2 = (UI_ComBtnSkill)UI_ComBtnSkill.Create(comp.GetChild("btnSkill2"));
-            m_btnSkill3 = (UI_ComBtnSkill)UI_ComBtnSkill.Create(comp.GetChild("btnSkill3"));
+            m_comClick = (UI_ComClick)UI_ComClick.Create(comp.GetChild("comClick"));
             m_btnSpeedUp = (GButton)comp.GetChild("btnSpeedUp");
-            m_holderPartScore = (GGraph)comp.GetChild("holderPartScore");
-            m_holderPartScoreNpc = (GGraph)comp.GetChild("holderPartScoreNpc");
-            m_holderAddScore = (GGraph)comp.GetChild("holderAddScore");
-            m_holderAddScoreNpc = (GGraph)comp.GetChild("holderAddScoreNpc");
-            m_comSkillTips = (UI_ComSkillTips)UI_ComSkillTips.Create(comp.GetChild("comSkillTips"));
+            m_myHead = (GComponent)comp.GetChild("myHead");
+            m_targetHead = (GComponent)comp.GetChild("targetHead");
+            m_proScore = (UI_ProgressBarTargetScore)UI_ProgressBarTargetScore.Create(comp.GetChild("proScore"));
+            m_comTargetCard = (UI_ComSkillCard)UI_ComSkillCard.Create(comp.GetChild("comTargetCard"));
+            m_comDeduction = (UI_ComDeduction)UI_ComDeduction.Create(comp.GetChild("comDeduction"));
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_btnSkip = null;
             m_btnBack = null;
+            m_comClick.Dispose();
+            m_comClick = null;
+            m_btnSpeedUp = null;
+            m_myHead = null;
+            m_targetHead = null;
             m_proScore.Dispose();
             m_proScore = null;
-            m_comMineCircle.Dispose();
-            m_comMineCircle = null;
-            m_comTargetCircle.Dispose();
-            m_comTargetCircle = null;
-            m_proMinusMine = null;
-            m_proMinusNpc = null;
-            m_ComShieldMine.Dispose();
-            m_ComShieldMine = null;
-            m_ComShieldNpc.Dispose();
-            m_ComShieldNpc = null;
-            m_ComRoleSkillMineAdd.Dispose();
-            m_ComRoleSkillMineAdd = null;
-            m_ComRoleSkillMineMinus.Dispose();
-            m_ComRoleSkillMineMinus = null;
-            m_ComRoleSkillNpcAdd.Dispose();
-            m_ComRoleSkillNpcAdd = null;
-            m_ComRoleSkillNpcMinus.Dispose();
-            m_ComRoleSkillNpcMinus = null;
-            m_ComRoleSkillMineBreak.Dispose();
-            m_ComRoleSkillMineBreak = null;
-            m_ComRoleSkillNpcBreak.Dispose();
-            m_ComRoleSkillNpcBreak = null;
-            m_ComRoleSkillMineShield.Dispose();
-            m_ComRoleSkillMineShield = null;
-            m_ComRoleSkillNpcShield.Dispose();
-            m_ComRoleSkillNpcShield = null;
-            m_selfName.Dispose();
-            m_selfName = null;
-            m_targetName.Dispose();
-            m_targetName = null;
-            m_btnSkill0.Dispose();
-            m_btnSkill0 = null;
-            m_btnSkill1.Dispose();
-            m_btnSkill1 = null;
-            m_btnSkill2.Dispose();
-            m_btnSkill2 = null;
-            m_btnSkill3.Dispose();
-            m_btnSkill3 = null;
-            m_btnSpeedUp = null;
-            m_holderPartScore = null;
-            m_holderPartScoreNpc = null;
-            m_holderAddScore = null;
-            m_holderAddScoreNpc = null;
-            m_comSkillTips.Dispose();
-            m_comSkillTips = null;
+            m_comTargetCard.Dispose();
+            m_comTargetCard = null;
+            m_comDeduction.Dispose();
+            m_comDeduction = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 0 - 74
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_comClickCircle.cs

@@ -1,74 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-
-namespace UI.Main
-{
-    public partial class UI_comClickCircle
-    {
-        public GComponent target;
-        public GTextField m_txtPart;
-        public GTextField m_txtScore;
-        public const string URL = "ui://mfvz4q8kn0js9b";
-        public const string PACKAGE_NAME = "Main";
-        public const string RES_NAME = "comClickCircle";
-        private static UI_comClickCircle _proxy;
-
-        public static UI_comClickCircle Create(GObject gObject = null)
-        {
-            var ui = new UI_comClickCircle();
-            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_comClickCircle Proxy(GObject gObject = null)
-        {
-            if(_proxy == null)
-            {
-                _proxy = new UI_comClickCircle();
-            }
-            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_txtPart = (GTextField)comp.GetChild("txtPart");
-            m_txtScore = (GTextField)comp.GetChild("txtScore");
-        }
-        public void Dispose(bool disposeTarget = false)
-        {
-            m_txtPart = null;
-            m_txtScore = null;
-            if(disposeTarget && target != null)
-            {
-                target.RemoveFromParent();
-                target.Dispose();
-            }
-            target = null;
-        }
-    }
-}

+ 0 - 11
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_comClickCircle.cs.meta

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

+ 0 - 11
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_comMineCircle.cs.meta

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

+ 0 - 83
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_comTargetCircle.cs

@@ -1,83 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-
-namespace UI.Main
-{
-    public partial class UI_comTargetCircle
-    {
-        public GComponent target;
-        public GLoader m_loaIcon;
-        public GGraph m_holder;
-        public GTextField m_txtPart;
-        public GTextField m_txtCount;
-        public Transition m_t0;
-        public const string URL = "ui://mfvz4q8kv3k9c4";
-        public const string PACKAGE_NAME = "Main";
-        public const string RES_NAME = "comTargetCircle";
-        private static UI_comTargetCircle _proxy;
-
-        public static UI_comTargetCircle Create(GObject gObject = null)
-        {
-            var ui = new UI_comTargetCircle();
-            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_comTargetCircle Proxy(GObject gObject = null)
-        {
-            if(_proxy == null)
-            {
-                _proxy = new UI_comTargetCircle();
-            }
-            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_loaIcon = (GLoader)comp.GetChild("loaIcon");
-            m_holder = (GGraph)comp.GetChild("holder");
-            m_txtPart = (GTextField)comp.GetChild("txtPart");
-            m_txtCount = (GTextField)comp.GetChild("txtCount");
-            m_t0 = comp.GetTransition("t0");
-        }
-        public void Dispose(bool disposeTarget = false)
-        {
-            m_loaIcon = null;
-            m_holder = null;
-            m_txtPart = null;
-            m_txtCount = null;
-            m_t0 = null;
-            if(disposeTarget && target != null)
-            {
-                target.RemoveFromParent();
-                target.Dispose();
-            }
-            target = null;
-        }
-    }
-}

+ 0 - 11
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_comTargetCircle.cs.meta

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

+ 103 - 47
GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightSingleScoreView.cs

@@ -22,18 +22,22 @@ namespace GFGGame
         private const float _prefectScale = 0.866f;//完美缩放比
         private NTexture _nTexture;
         private bool _stopFight = false;
+        private float _time = 0;// 登峰造极按住的时间
+        private int _prefectCount = 0;//卓越点击数量
 
         private GameObject _gameObject0;
         private GameObject _gameObject1;
         private GameObject _gameObject2;
         private GameObject _gameObject3;
         private GameObject _gameObject4;
+        private GameObject _gameObject5;
 
         private GoWrapper _wrapper0;
         private GoWrapper _wrapper1;
         private GoWrapper _wrapper2;
         private GoWrapper _wrapper3;
         private GoWrapper _wrapper4;
+        private GoWrapper _wrapper5;
 
 
         public override void Dispose()
@@ -48,6 +52,7 @@ namespace GFGGame
             SceneController.DestroyObjectFromView(_gameObject2, _wrapper2);
             SceneController.DestroyObjectFromView(_gameObject3, _wrapper3);
             SceneController.DestroyObjectFromView(_gameObject4, _wrapper4);
+            SceneController.DestroyObjectFromView(_gameObject5, _wrapper5);
 
             if (_ui != null)
             {
@@ -88,6 +93,8 @@ namespace GFGGame
             SceneController.AddObjectToView(null, null, _ui.m_proScore.m_holder, resPath3, out _gameObject3, out _wrapper3);
             string resPath4 = ResPathUtil.GetViewEffectPath("ui_zhandou", "ui_zd_jdt_cz");
             SceneController.AddObjectToView(null, null, _ui.m_proScore.m_holder1, resPath4, out _gameObject4, out _wrapper4);
+            string resPath5 = ResPathUtil.GetViewEffectPath("ui_zhandou", "zd_df_dfzj");
+            SceneController.AddObjectToView(null, null, _ui.m_comAllPerfect.m_holder, resPath5, out _gameObject5, out _wrapper5);
         }
         protected override void AddEventListener()
         {
@@ -99,7 +106,6 @@ namespace GFGGame
             base.OnShown();
             ScoreSystemData.Instance.SetEquipDicWithType();
 
-            // _ui.m_comClickCircle.target.touchable = false;
             _nTexture = new NTexture(FightDataManager.Instance.RoleTextuex);
 
             ET.Log.Debug("Screen:" + UnityEngine.Screen.width + "  " + UnityEngine.Screen.height + "   _nTexture:" + _nTexture.width + "   " + _nTexture.height);
@@ -116,11 +122,11 @@ namespace GFGGame
             _ui.m_proScore.m_comFirstScore.target.x = (((float)fightCfg.score1 / (float)fightCfg.score3)) * _ui.m_proScore.target.width;
             _ui.m_proScore.m_comSecondScore.target.x = (((float)fightCfg.score2 / (float)fightCfg.score3)) * _ui.m_proScore.target.width;
             _ui.m_proScore.m_comThirdScore.target.x = (((float)fightCfg.score3 / (float)fightCfg.score3)) * _ui.m_proScore.target.width;
-            _gameObject0.SetActive(false);
-            _gameObject1.SetActive(false);
-            _gameObject2.SetActive(false);
+
             _ui.m_proScore.m_txtCount.text = "总分 0";
             _ui.m_comClick.target.touchable = false;
+            _ui.m_comAllPerfect.target.visible = false;
+            _ui.m_LoaMask.visible = false;
 
             _currentTime = BeginTime.PART_ALL_FIGHT_BEGIN;
             // _stopFight = false;
@@ -129,6 +135,8 @@ namespace GFGGame
             _skillScore = 0;//技能附加分
             _mainScore = ScoreSystemData.Instance.GetMainScore();
 
+            _ui.m_comAllPerfect.target.onTouchBegin.Add(OnComAllCircleClickBegin);
+            _ui.m_comAllPerfect.target.onTouchEnd.Add(AllCircleScoreEnd);
             Timers.inst.Add(0.5f, 1, SkillScoreStart);//评分结束
         }
 
@@ -185,8 +193,8 @@ namespace GFGGame
 
             x = pos.x;
             y = pos.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.m_loaGlass.SetXY(130, 130);
+            _ui.m_comClick.m_comResult.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;
@@ -225,9 +233,7 @@ namespace GFGGame
 
             _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();
+            PartScoreResultEnd();
             _partScore = ScoreSystemData.Instance.GetPartScore(_partId, clickType, _skillScore);
             _score += _partScore;
 
@@ -241,22 +247,20 @@ namespace GFGGame
                     _ui.m_comClick.m_comResult.m_txtCount1.text = _partScore.ToString();
                     break;
                 case ClickType.PREFACT_CLICK:
+                    _prefectCount++;
                     _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);
-            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);
+            _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.SetValue("start", 130, 130);
+            Vector2 posInB = _ui.m_proScore.target.TransformPoint(_ui.m_proScore.m_imgAni.xy, _ui.m_comClick.m_comResult.target);
+            _ui.m_comClick.m_comResult.m_t1.SetValue("end", posInB.x, posInB.y);
+            _ui.m_comClick.m_comResult.m_t1.Play(CheckPartEndSkill);
         }
 
         private void CheckPartEndSkill()
@@ -265,7 +269,7 @@ namespace GFGGame
             _currentTime = BeginTime.PART_FIGHT_END;
             SkillScoreStart(null);
         }
-        private void UpdateProgress()
+        private void UpdateProgress(object param = null)
         {
             double proportion = _score / _ui.m_proScore.target.max;
             float width = (float)(proportion * _ui.m_proScore.target.width);
@@ -278,13 +282,10 @@ namespace GFGGame
                     FightDataManager.Instance.totalScore = _score;
                     _ui.m_proScore.m_txtCount.text = string.Format("总分 {0}", _score);
                     GetCurStar(out int star, out Transition transition);
-                    _ui.m_comScoreStage.m_c1.selectedIndex = star;
                     _ui.m_proScore.m_comFirstScore.m_c1.selectedIndex = star > 0 ? 1 : 0;
                     _ui.m_proScore.m_comSecondScore.m_c1.selectedIndex = star > 1 ? 1 : 0;
                     _ui.m_proScore.m_comThirdScore.m_c1.selectedIndex = star > 2 ? 1 : 0;
-                    _gameObject0.SetActive(star > 0 ? true : false);
-                    _gameObject1.SetActive(star > 1 ? true : false);
-                    _gameObject2.SetActive(star > 2 ? true : false);
+
                     PartScoreEnd();
                 });
         }
@@ -294,24 +295,85 @@ namespace GFGGame
             _partId++;
             if (_partId > FightScoreCfgArray.Instance.dataArray.Length)
             {
-                _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;
-                _ui.m_LoaMask.touchable = true;
-
-                _ui.m_comRoleResult.m_t0.Play();
-                _ui.m_t2.Play(() =>
+                if (_prefectCount > 0)// FightScoreCfgArray.Instance.dataArray.Length)
                 {
-                    Timers.inst.Add(0.3f, 1, Skip);
-                });
+                    _ui.m_comAllPerfect.target.visible = true;
+                    AllCirclePlayStart();//完美八连击
+                }
+                else
+                {
+                    Timers.inst.Add(0.5f, 1, FightEnd);//评分结束
+                }
             }
             else
             {
-                // _currentTime = BeginTime.PART_FIGHT_BEGIN;
                 Timers.inst.Add(ConstScoreSystem.REFRESH_CIRCLE_WITE_TIME / FightDataManager.Instance.fightSpeed, 1, CheckPartBeginSkill);//下个部分评分
             }
         }
 
+        private void FightEnd(object param = null)
+        {
+            _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;
+
+            _ui.m_comRoleResult.m_t0.Play();
+            _ui.m_t2.Play(() =>
+            {
+                Timers.inst.Add(0.3f, 1, Skip);
+            });
+        }
+
+        private void AllCirclePlayStart()
+        {
+            //登峰造极评分开始
+            _ui.m_comAllPerfect.target.visible = true;
+            _ui.m_comAllPerfect.m_t0.ignoreEngineTimeScale = false;
+            _ui.m_comAllPerfect.m_t0.timeScale = FightDataManager.Instance.fightSpeed;// 1 / _speed;
+            _ui.m_comAllPerfect.m_t0.Play(() =>
+            {
+                AllCircleScoreEnd();
+            });
+        }
+        private void OnComAllCircleClickBegin()
+        {
+            if (_ui.m_comAllPerfect.m_imgCircle.visible == false)
+            {
+                Timers.inst.Remove(ComAllCirclePressTime);
+            }
+            else
+            {
+                Timers.inst.Add(0.1f, 0, ComAllCirclePressTime);
+            }
+        }
+        private void ComAllCirclePressTime(object param = null)
+        {
+            //登峰造极长按时间
+            _time += 0.1f;
+        }
+        private void AllCircleScoreEnd()
+        {
+            Timers.inst.Remove(ComAllCirclePressTime);
+            _ui.m_comAllPerfect.m_t0.Stop();
+            _ui.m_comAllPerfect.target.onTouchBegin.Remove(OnComAllCircleClickBegin);
+            _ui.m_comAllPerfect.target.onTouchEnd.Remove(AllCircleScoreEnd);
+
+            int allCircleScore = 0;
+            if (_time >= ConstScoreSystem.LONG_PRESS_TIME / FightDataManager.Instance.fightSpeed)
+            {
+                allCircleScore = ScoreSystemData.Instance.GetAllCircleAddScore(_mainScore);
+            }
+            _ui.m_comAllPerfect.m_txtCount.text = allCircleScore.ToString();
+
+            _time = 0;
+            _score += allCircleScore;
+            _ui.m_comAllPerfect.m_t1.Play(() =>
+                {
+                    _prefectCount = 0;
+                    UpdateProgress();
+                });
+        }
+
         private void GetCurStar(out int star, out Transition transition)
         {
             StoryLevelCfg levelCfg = StoryLevelCfgArray.Instance.GetCfg(InstanceZonesDataManager.currentLevelCfgId);
@@ -336,7 +398,7 @@ namespace GFGGame
         }
         private int GetClickType()
         {
-            float scaleX = _ui.m_comClick.m_comResult.m_imgCircle.scale.x;// _ui.m_comClickCircle.m_imgCircle.scaleX;
+            float scaleX = _ui.m_comClick.m_comResult.m_imgCircle.scale.x;
             int clickType = ClickType.MISS_CLICK;
             if (FightDataManager.Instance.autoPlay == true)
             {
@@ -383,34 +445,28 @@ namespace GFGGame
             Timers.inst.Remove(SkillScoreStart);
             Timers.inst.Remove(Skip);
             GTween.Kill(_ui.m_proScore.m_comBar);
-            _ui.m_t1.Stop(true, false);
             _ui.m_t2.Stop(true, false);
-            _ui.m_t3.Stop(true, false);
+
             _ui.m_comRoleResult.m_t0.Stop(true, false);
             _ui.m_comRoleResult.m_t1.Stop(true, false);
             _ui.m_comRoleResult.m_t2.Stop(true, false);
             _ui.m_comRoleResult.m_t3.Stop(true, false);
             _ui.m_comRoleResult.m_comRole.m_t0.Stop(true, false);
-
             _ui.m_comRoleResult.m_comRole.m_imgRole.alpha = 0;
             _ui.m_comRoleResult.target.SetScale(0, 0);
-            _ui.m_LoaMask.alpha = 0;
-            _ui.m_LoaMask.touchable = false;
+
             _ui.m_proScore.target.value = 0;
             _ui.m_proScore.m_txtCount.text = "总分 0";
-            _ui.m_comScoreStage.target.visible = true;
-            _ui.m_comScoreStage.m_c1.selectedIndex = 0;
-            _ui.m_comClickCircle.target.SetScale(0, 0);
-            _ui.m_loaGlass.SetScale(0, 0);
 
             _ui.m_proScore.m_comFirstScore.m_c1.selectedIndex = 0;
             _ui.m_proScore.m_comSecondScore.m_c1.selectedIndex = 0;
             _ui.m_proScore.m_comThirdScore.m_c1.selectedIndex = 0;
-            _gameObject0.SetActive(false);
-            _gameObject1.SetActive(false);
-            _gameObject2.SetActive(false);
 
-            // ScoreSystemData.Instance.mainScore = 0;
+            _ui.m_comAllPerfect.m_t0.Stop(true, false);
+            _ui.m_comAllPerfect.m_t1.Stop(true, false);
+            _ui.m_comAllPerfect.target.onTouchBegin.Remove(OnComAllCircleClickBegin);
+            _ui.m_comAllPerfect.target.onTouchEnd.Remove(AllCircleScoreEnd);
+
             _mainScore = 0;
         }
 

+ 796 - 796
GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightTargetScoreView.cs

@@ -1,803 +1,803 @@
-using FairyGUI;
-using UnityEngine;
-using UI.Main;
-using System.Collections;
-using System;
-using System.Collections.Generic;
+// using FairyGUI;
+// using UnityEngine;
+// using UI.Main;
+// using System.Collections;
+// using System;
+// using System.Collections.Generic;
 
 namespace GFGGame
 {
     public class StoryFightTargetScoreView : BaseView
     {
-        private UI_StoryFightTargetScoreUI _ui;
-        private GameObject _sceneObject;
-        private GameObject _scenePrefab;
-
-
-        private double _targetScore;
-        private double _score;//当前总分数
-        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;
-        private bool _isAutoPlay = false;
-        private StoryLevelCfg _levelCfg;
-
-        private GameObject _gameObject0;
-        private GoWrapper _wrapper0;
-        private GameObject _gameObject1;
-        private GoWrapper _wrapper1;
-        private GameObject _gameObject2;
-        private GoWrapper _wrapper2;
-        private GameObject _gameObject3;
-        private GoWrapper _wrapper3;
-        private GameObject _gameObject4;
-        private GoWrapper _wrapper4;
-        private GameObject _gameObject5;
-        private GoWrapper _wrapper5;
-
-        private GameObject _gameObject6;
-        private GoWrapper _wrapper6;
-
-        private GameObject _gameObject7;
-        private GoWrapper _wrapper7;
-
-        private GameObject _gameObject8;
-        private GoWrapper _wrapper8;
-
-        private GameObject _gameObject9;
-        private GoWrapper _wrapper9;
-
-        private GameObject _gameObject10;
-        private GoWrapper _wrapper10;
-
-        private GameObject _gameObject11;
-        private GoWrapper _wrapper11;
-
-        private GameObject _gameObject12;
-        private GoWrapper _wrapper12;
-
-        private GameObject _gameObject13;
-        private GoWrapper _wrapper13;
-
-        private GameObject _gameObject14;
-        private GoWrapper _wrapper14;
-
-        private GameObject _gameObject15;
-        private GoWrapper _wrapper15;
-
-        private GameObject _gameObject16;
-        private GoWrapper _wrapper16;
-
-        private GameObject _gameObject17;
-        private GoWrapper _wrapper17;
-
-        private GameObject _gameObject18;
-        private GoWrapper _wrapper18;
-
-        private GameObject _gameObject19;
-        private GoWrapper _wrapper19;
-
-        private List<GameObject> _gameObjects = new List<GameObject>();
-        private List<GoWrapper> _wrappers = new List<GoWrapper>();
-        private List<LongPressGesture> _listLongPress = new List<LongPressGesture>();
-        // private GoWrapper _wrapper5;
-        // private Dictionary<int, RoleSkillCfg> _npcSkillDic;
-
-        private bool playStop = false;
-
-        public override void Dispose()
-        {
-            if (_sceneObject != null)
-            {
-                GameObject.Destroy(_sceneObject);
-                _sceneObject = null;
-            }
-
-            SceneController.DestroyObjectFromView(_gameObject0, _wrapper0);
-            SceneController.DestroyObjectFromView(_gameObject1, _wrapper1);
-            SceneController.DestroyObjectFromView(_gameObject2, _wrapper2);
-            SceneController.DestroyObjectFromView(_gameObject3, _wrapper3);
-            SceneController.DestroyObjectFromView(_gameObject4, _wrapper4);
-            SceneController.DestroyObjectFromView(_gameObject5, _wrapper5);
-            SceneController.DestroyObjectFromView(_gameObject6, _wrapper6);
-            SceneController.DestroyObjectFromView(_gameObject7, _wrapper7);
-            SceneController.DestroyObjectFromView(_gameObject8, _wrapper8);
-            SceneController.DestroyObjectFromView(_gameObject9, _wrapper9);
-            SceneController.DestroyObjectFromView(_gameObject11, _wrapper11);
-            SceneController.DestroyObjectFromView(_gameObject12, _wrapper12);
-            SceneController.DestroyObjectFromView(_gameObject13, _wrapper13);
-            SceneController.DestroyObjectFromView(_gameObject14, _wrapper14);
-            SceneController.DestroyObjectFromView(_gameObject15, _wrapper15);
-            SceneController.DestroyObjectFromView(_gameObject16, _wrapper16);
-            SceneController.DestroyObjectFromView(_gameObject17, _wrapper17);
-            SceneController.DestroyObjectFromView(_gameObject18, _wrapper18);
-            SceneController.DestroyObjectFromView(_gameObject19, _wrapper19);
-            for (int i = 0; i < _gameObjects.Count; i++)
-            {
-                SceneController.DestroyObjectFromView(_gameObjects[i], _wrappers[i]);
-            }
-
-            for (int i = 0; i < _listLongPress.Count; i++)
-            {
-                _listLongPress[i].Dispose();
-            }
-            _listLongPress.Clear();
-
-            if (_ui != null)
-            {
-                _ui.Dispose();
-                _ui = null;
-            }
-            base.Dispose();
-        }
-        private void AddEffect()
-        {
-            string resPath0 = ResPathUtil.GetViewEffectPath("ui_zhandou", "ui_zd_hd_sc");
-            SceneController.AddObjectToView(_gameObject0, null, _ui.m_ComShieldMine.m_holder, resPath0, out _gameObject0, out GoWrapper _wrapper0);
-            SceneController.AddObjectToView(_gameObject2, null, _ui.m_ComShieldNpc.m_holder, resPath0, out _gameObject2, out GoWrapper _wrapper2);
-            string resPath1 = ResPathUtil.GetViewEffectPath("ui_zhandou", "ui_zd_hd_ps");
-            SceneController.AddObjectToView(_gameObject1, null, _ui.m_ComShieldMine.m_holder1, resPath1, out _gameObject1, out GoWrapper _wrapper1);
-            SceneController.AddObjectToView(_gameObject3, null, _ui.m_ComShieldNpc.m_holder1, resPath1, out _gameObject3, out GoWrapper _wrapper3);
-            string resPath2 = ResPathUtil.GetViewEffectPath("ui_zhandou", "ui_zd_jn_tg");
-            SceneController.AddObjectToView(_gameObject4, null, _ui.m_ComRoleSkillMineAdd.m_holder, resPath2, out _gameObject4, out GoWrapper _wrapper4, 70);
-            SceneController.AddObjectToView(_gameObject5, null, _ui.m_ComRoleSkillNpcAdd.m_holder, resPath2, out _gameObject5, out GoWrapper _wrapper5, 70);
-            string resPath5 = ResPathUtil.GetViewEffectPath("ui_zhandou", "ui_zd_jn_jc");
-            SceneController.AddObjectToView(_gameObject7, null, _ui.m_ComRoleSkillMineMinus.m_holder, resPath5, out _gameObject7, out GoWrapper _wrapper7, 70);
-            SceneController.AddObjectToView(_gameObject8, null, _ui.m_ComRoleSkillNpcMinus.m_holder, resPath5, out _gameObject8, out GoWrapper _wrapper8, 70);
-            string resPath6 = ResPathUtil.GetViewEffectPath("ui_zhandou", "ui_zd_jn_dz");
-            SceneController.AddObjectToView(_gameObject9, null, _ui.m_ComRoleSkillMineBreak.m_holder, resPath6, out _gameObject9, out GoWrapper _wrapper9, 70);
-            SceneController.AddObjectToView(_gameObject10, null, _ui.m_ComRoleSkillNpcBreak.m_holder, resPath6, out _gameObject10, out GoWrapper _wrapper10, 70);
-            string resPath7 = ResPathUtil.GetViewEffectPath("ui_zhandou", "ui_zd_jn_jy");
-            SceneController.AddObjectToView(_gameObject11, null, _ui.m_ComRoleSkillMineShield.m_holder, resPath7, out _gameObject11, out GoWrapper _wrapper11, 70);
-            SceneController.AddObjectToView(_gameObject12, null, _ui.m_ComRoleSkillNpcShield.m_holder, resPath7, out _gameObject12, out GoWrapper _wrapper12, 70);
-            string resPath8 = ResPathUtil.GetViewEffectPath("ui_zhandou", "zd_df_cheng");
-            SceneController.AddObjectToView(_gameObject13, null, _ui.m_comMineCircle.m_holder, resPath8, out _gameObject13, out GoWrapper _wrapper13, 59);
-            string resPath8_1 = ResPathUtil.GetViewEffectPath("ui_zhandou", "zd_df_lv_sr");
-            SceneController.AddObjectToView(_gameObject14, null, _ui.m_comTargetCircle.m_holder, resPath8_1, out _gameObject14, out GoWrapper _wrapper14, 59);
-            string resPath9 = ResPathUtil.GetViewEffectPath("ui_zhandou", "zd_df_tw");
-            SceneController.AddObjectToView(_gameObject15, null, _ui.m_holderPartScore, resPath9, out _gameObject15, out GoWrapper _wrapper15);
-            SceneController.AddObjectToView(_gameObject16, null, _ui.m_holderPartScoreNpc, resPath9, out _gameObject16, out GoWrapper _wrapper16);
-            SceneController.AddObjectToView(_gameObject17, null, _ui.m_holderAddScore, resPath9, out _gameObject17, out GoWrapper _wrapper17);
-            SceneController.AddObjectToView(_gameObject18, null, _ui.m_holderAddScoreNpc, resPath9, out _gameObject18, out GoWrapper _wrapper18);
-
-            string resPath10 = ResPathUtil.GetViewEffectPath("ui_zhandou", "ui_zd_jdt_cz");
-            SceneController.AddObjectToView(_gameObject19, null, _ui.m_proScore.m_holder1, resPath10, out _gameObject19, out GoWrapper _wrapper19);
-            string resPath4 = ResPathUtil.GetViewEffectPath("ui_zhandou", "ui_zd_jdt");
-            SceneController.AddObjectToView(_gameObject6, null, _ui.m_proScore.m_holder, resPath4, out _gameObject6, out GoWrapper _wrapper6);
-
-            string resPath3 = ResPathUtil.GetViewEffectPath("ui_zhandou", "ui_zd_jn_an");
-            for (int i = 0; i < _skillCount; i++)
-            {
-                GComponent btnSkill = _ui.target.GetChild("btnSkill" + i).asCom;
-                UI_ComBtnSkill item = UI_ComBtnSkill.Proxy(btnSkill);
-                SceneController.AddObjectToView(null, null, item.m_holder, resPath3, out GameObject _gameObject, out GoWrapper _wrapper);
-                UI_ComBtnSkill.ProxyEnd();
-                _gameObjects.Add(_gameObject);
-                _wrappers.Add(_wrapper);
-            }
-
-
-
-            _ui.m_ComShieldMine.m_holder.visible = false;
-            _ui.m_ComShieldMine.m_holder1.visible = false;
-            _ui.m_ComShieldNpc.m_holder.visible = false;
-            _ui.m_ComShieldNpc.m_holder1.visible = false;
-        }
-
-        protected override void Init()
-        {
-            base.Init();
-            _ui = UI_StoryFightTargetScoreUI.Create();
-            viewCom = _ui.target;
-            isfullScreen = true;
-
-            _scenePrefab = GFGAsset.Load<GameObject>(ResPathUtil.GetPrefabPath("SceneFightTargetScore"));
-
-            RoleSkillCfg[] roleSkillCfgs = RoleSkillCfgArray.Instance.dataArray;
-            _skillCount = roleSkillCfgs.Length;
-            for (int i = 0; i < roleSkillCfgs.Length; i++)
-            {
-                GComponent btnSkill = _ui.target.GetChild("btnSkill" + i).asCom;
-                btnSkill.data = roleSkillCfgs[i];
-                GLoader icon = btnSkill.GetChild("icon").asLoader;
-                icon.onClick.Add(() => { OnBtnSkillClick(btnSkill); });
-                LongPressGesture longPressGesture = new LongPressGesture(btnSkill);
-                longPressGesture.once = true;
-                LongPressGesture.TRIGGER = 1f;
-                longPressGesture.onAction.Add(OnLongPress);
-                longPressGesture.onEnd.Add(OnLongEnd);
-                _listLongPress.Add(longPressGesture);
-            }
-            _ui.m_btnBack.onClick.Add(OnBtnBackClick);
-
-        }
-
-        protected override void OnInit()
-        {
-            base.OnInit();
-            _ui.m_btnSkip.onClick.Add(() =>
-            {
-                Skip();
-            });
-            _ui.m_comMineCircle.target.onClick.Add(() =>
-            {
-                _ui.m_btnSkill0.m_icon.touchable = true;
-            });
-
-            _ui.m_btnSkill0.target.onClick.Add(() =>
-            {
-                if (_partId == 0 && GuideDataManager.IsGuideFinish(ConstGuideId.TARGET_FIGHT) <= 0 && playStop)
-                {
-                    playStop = false;
-
-                    _ui.m_comMineCircle.m_t0.Play(() =>
-                    {
-                        CircleScoreEnd(null);
-                    });
-                    _ui.m_comTargetCircle.m_t0.Play();
-                }
-            });
-            _ui.m_btnSpeedUp.onClick.Add(OnBtnSpeedUp);
-            AddEffect();
-
-        }
-        protected override void AddEventListener()
-        {
-            base.AddEventListener();
-            EventAgent.AddEventListener(ConstMessage.SHOW_CARD_SKILL_END, UpdateCircleResult);
-
-        }
-        protected override void OnShown()
-        {
-            base.OnShown();
-            if (_sceneObject == null)
-            {
-                _sceneObject = GameObject.Instantiate(_scenePrefab);
-            }
-
-            MyDressUpHelper.dressUpObj.setSceneObj(_sceneObject);
-            MyDressUpHelper.dressUpObj.UpdateRoleView();
-            _levelCfg = StoryLevelCfgArray.Instance.GetCfg(InstanceZonesDataManager.currentLevelCfgId);
-            StoryFightCfg fightCfg = StoryFightCfgArray.Instance.GetCfg(_levelCfg.fightID);
-            SceneController.UpdateFightTarget(fightCfg.targetRes, _sceneObject);
-
-            _ui.m_proScore.m_txtNpcScore.text = fightCfg.targetName + " 0";
-            _ui.m_proScore.m_txtMineScore.text = RoleDataManager.roleName + " 0";
-            _ui.m_btnBack.visible = true;
-
-            _speed = FightDataManager.Instance.fightSpeed;
-            if (_levelCfg.type == ConstInstanceZonesType.Field)
-            {
-                _ui.m_btnBack.visible = false;
-            }
-
-
-
-            ScoreSystemData.Instance.SetEquipDicWithType();
-
-            _partId = FightScoreCfgArray.Instance.dataArray[0].id; ;
-            _score = 0;
-            _targetScore = 0;
-            _mainScore = ScoreSystemData.Instance.GetMainScore();
-            _targetMainScore = fightCfg.targetMainScore;
-
-            UpdateNormal();
-
-            Timers.inst.Add(0.5f / _speed, 1, CircleScoreStart);//评分开始
-            Timers.inst.AddUpdate(CheckGuide);
-        }
-        private void UpdateNormal()
-        {
-            Reset();
-
-            if (_partId == 1 && GuideDataManager.IsGuideFinish(ConstGuideId.TARGET_FIGHT) <= 0)//引导中禁止自动战斗
-            {
-                _speed = 1;
-                FightDataManager.Instance.autoPlay = false;
-                _ui.m_btnSkill0.m_icon.touchable = false;
-            }
-
-            if (_levelCfg.type == ConstInstanceZonesType.Field || FightDataManager.Instance.autoPlay)
-            {
-                _isAutoPlay = true;
-            }
-
-            RoleSkillCfg[] roleSkillCfgs = RoleSkillCfgArray.Instance.dataArray;
-            for (int i = 0; i < roleSkillCfgs.Length; i++)
-            {
-                GComponent btnSkill = _ui.target.GetChild("btnSkill" + i).asCom;
-                UI_ComBtnSkill item = UI_ComBtnSkill.Proxy(btnSkill);
-                item.m_txtCount.text = roleSkillCfgs[i].limiteCount.ToString();
-                item.m_icon.touchable = true;
-                if (_isAutoPlay)
-                {
-
-                    item.m_icon.touchable = !_isAutoPlay;
-                    OnBtnSkillClick(btnSkill);
-                }
-                UI_ComBtnSkill.ProxyEnd();
-
-            }
-            _ui.m_btnSpeedUp.visible = _isAutoPlay;
-            _ui.m_btnSpeedUp.title = "x" + _speed;
-            // if (_index == 0 && GuideDataManager.IsGuideFinish(ConstGuideId.TARGET_FIGHT) <= 0)
-            // {
-            //     _ui.m_btnSkill0.target.touchable = false;
-            // }
-        }
-
-
-        private void CircleScoreStart(object param)
-        {
-            _skillScore = 0;//技能附加分
-            _showCard = false;
-
-            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);
-            }
-            else
-            {
-                UpdateCircleResult();
-            }
-        }
-
-
-        //更新部件评分结果,播放结果动画
-        private void UpdateCircleResult()
-        {
-            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[_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);
-
-            ReleaseNpcSkill();
-            PlayScoreAni();
-        }
-        //顶部评分进度条
-        private void UpdateProgressBar()
-        {
-            StoryFightCfg fightCfg = StoryFightCfgArray.Instance.GetCfg(_levelCfg.fightID);
-            _ui.m_proScore.m_txtNpcScore.text = string.Format("{0} {1}", fightCfg.targetName, (int)Math.Round(_targetScore));
-            _ui.m_proScore.m_txtMineScore.text = string.Format("{0} {1}", RoleDataManager.roleName, (int)Math.Round(_score));
-            // _ui.m_proScore.m_comBar.m_imgAni.visible = true;
-
-            double proportion = (_score + _targetScore) > 0 ? _score / (_score + _targetScore) : 0;
-            float width = (float)(proportion * _ui.m_proScore.target.width);
-
-            GTween.To(_ui.m_proScore.m_comBar.target.width, width, 0.5f).SetTarget(_ui.m_proScore.m_comBar).OnUpdate((GTweener t) =>
-                {
-                    _ui.m_proScore.m_comBar.target.width = t.value.x;
-                }); ;
-
-
-        }
-        //释放NPC技能
-        private void ReleaseNpcSkill()
-        {
-            StoryFightCfg fightCfg = StoryFightCfgArray.Instance.GetCfg(_levelCfg.fightID);
-
-            if (fightCfg.targerSkillArr.Length >= _partId)
-            {
-                RoleSkillCfg cfg = RoleSkillCfgArray.Instance.GetCfg(fightCfg.targerSkillArr[_partId - 1]);
-                if (cfg == null) return;
-                SetSkillValue(cfg, SkillDataManager.NPC);
-            }
-        }
-
-        private void PlayScoreAni()
-        {
-            _ui.m_comMineCircle.target.visible = true;
-            _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(_partId).name;
-            if (_partId == 1 && GuideDataManager.IsGuideFinish(ConstGuideId.TARGET_FIGHT) <= 0)
-            {
-                _ui.m_comMineCircle.m_t0.Play(1, 0, 0, 0.75f, () =>
-                {
-                    _ui.m_comMineCircle.m_holder.visible = false;
-                    playStop = true;
-                });
-                _ui.m_comTargetCircle.m_t0.Play(1, 0, 0, 0.75f, () =>
-                {
-                    _ui.m_comTargetCircle.m_holder.visible = false;
-                });
-                return;
-            }
-            _ui.m_comMineCircle.m_holder.visible = false;
-            _ui.m_comMineCircle.m_t0.ignoreEngineTimeScale = false;
-            _ui.m_comMineCircle.m_t0.timeScale = _speed;
-            _ui.m_comMineCircle.m_t0.Play(() =>
-            {
-                PlayScoreTWEffect(_ui.m_holderPartScore, _ui.m_comMineCircle.target.position, _ui.m_proScore.target.position);
-            });
-
-            _ui.m_comTargetCircle.m_holder.visible = false;
-            _ui.m_comTargetCircle.m_t0.ignoreEngineTimeScale = false;
-            _ui.m_comTargetCircle.m_t0.timeScale = _speed;
-            _ui.m_comTargetCircle.m_t0.Play(() =>
-            {
-                PlayScoreTWEffect(_ui.m_holderPartScoreNpc, _ui.m_comTargetCircle.target.position, _ui.m_proScore.target.position + new Vector3(_ui.m_proScore.target.width, 0, 0));
-            });
-
-            Timers.inst.Add(2.5f / _speed, 1, CircleScoreEnd);
-        }
-        private void PlayScoreTWEffect(GGraph holderScore, Vector3 startValue, Vector3 endValue)
-        {
-            holderScore.visible = true;
-            GTween.To(startValue, endValue, 0.5f).SetTarget(holderScore).OnUpdate((GTweener t) =>
-            {
-                holderScore.position = t.value.vec2;
-            }).OnComplete(() =>
-            {
-                holderScore.visible = false;
-                UpdateProgressBar();
-            });
-        }
-        private void CircleScoreEnd(object param)
-        {
-            //当前部件评分结束
-            _gameObject13.SetActive(false);
-            _gameObject14.SetActive(false);
-            _partId++;
-            if (_partId > FightScoreCfgArray.Instance.dataArray.Length)
-            {
-                Timers.inst.Add(1.5f, 1, Skip);
-            }
-            else
-            {
-                _ui.m_comTargetCircle.target.visible = false;
-                _ui.m_comMineCircle.target.visible = false;
-                Timers.inst.Add(0.5f / _speed, 1, CircleScoreStart);//评分结束
-            }
-
-        }
-
-
-        /***************************************************主动技能**************************************************/
-
-        private void OnBtnSkillClick(GComponent obj)
-        {
-            // if (_isAutoPlay) return;
-            UI_ComBtnSkill item = UI_ComBtnSkill.Proxy(obj);
-            RoleSkillCfg cfg = item.target.data as RoleSkillCfg;
-            int count = (int)item.m_icon.data;
-            if (count >= cfg.limiteCount) return;//超过最大限制次数
-            item.m_c1.selectedIndex = 1;
-            item.m_icon.data = count + 1;
-            item.m_txtCount.text = (cfg.limiteCount - (count + 1)).ToString();
-            UI_ComBtnSkill.ProxyEnd();
-            SetCdState(obj, cfg.cd);
-            SetSkillValue(cfg, SkillDataManager.MINE);
-        }
-        private void SetCdState(GComponent obj, int time)
-        {
-            UI_ComBtnSkill item = UI_ComBtnSkill.Proxy(obj);
-            GProgressBar bar = item.m_proCD;
-            bar.visible = true;
-            bar.value = 100;
-            bar.TweenValue(0, (float)time / 100 / _speed).OnComplete((GTweener tweener) =>
-              {
-                  GProgressBar bar1 = (GProgressBar)tweener.target;
-                  UI_ComBtnSkill item1 = UI_ComBtnSkill.Proxy(bar1.parent);
-                  int count = (int)item1.m_icon.data;
-                  RoleSkillCfg cfg = item1.target.data as RoleSkillCfg;
-                  item1.m_c1.selectedIndex = count >= cfg.limiteCount ? 2 : 0;
-
-                  item1.m_proCD.visible = false;
-                  if (_isAutoPlay)
-                  {
-                      OnBtnSkillClick(item1.target);
-                  }
-                  UI_ComBtnSkill.ProxyEnd();
-
-              });
-            UI_ComBtnSkill.ProxyEnd();
-        }
-
-        private void SetSkillValue(RoleSkillCfg cfg, int role)
-        {
-            if (cfg.buff == SkillDataManager.SKILL_ADD)
-            {
-                UpdateAddUI(cfg, role);
-            }
-            else if (cfg.buff == SkillDataManager.SKILL_MINUS)
-            {
-                UpdateMinusUI(cfg, role);
-            }
-            else if (cfg.buff == SkillDataManager.SKILL_BREAK)
-            {
-                UpdateBreakUI(cfg, role);
-            }
-            else if (cfg.buff == SkillDataManager.SKILL_SHIELD)
-            {
-                UpdateShieldUI(cfg, role);
-            }
-
-        }
-        private void UpdateAddUI(RoleSkillCfg cfg, int role)
-        {
-            UI_ComRoleSkill comRoleSkillScore = role == SkillDataManager.MINE ? _ui.m_ComRoleSkillMineAdd : _ui.m_ComRoleSkillNpcAdd;
-            comRoleSkillScore.target.visible = true;
-            int score = 0;
-            if (role == SkillDataManager.MINE)
-            {
-                score = (int)_mainScore * cfg.value / 100;
-                _score += score;
-            }
-            else
-            {
-                score = (int)_targetMainScore * cfg.value / 100;
-                _targetScore += score;
-            }
-            // comRoleSkillScore.m_comRoleSkill.m_c1.selectedIndex = 0;
-            comRoleSkillScore.m_txtScore.SetVar("count", "+" + score.ToString()).FlushVars();
-            comRoleSkillScore.m_t0.ignoreEngineTimeScale = false;
-            comRoleSkillScore.m_t0.timeScale = _speed;
-            comRoleSkillScore.m_t0.Play(() =>
-                {
-                    comRoleSkillScore.target.visible = false;
-                    GGraph graph = role == SkillDataManager.MINE ? _ui.m_holderAddScore : _ui.m_holderAddScoreNpc;
-                    Vector3 targetPos = role == SkillDataManager.MINE ? _ui.m_proScore.target.position : _ui.m_proScore.target.position + new Vector3(_ui.m_proScore.target.width, 0, 0);
-                    PlayScoreTWEffect(graph, comRoleSkillScore.target.position, targetPos);
-                });
-        }
-
-        //荆钗效果
-        private void UpdateMinusUI(RoleSkillCfg cfg, int role)
-        {
-            GProgressBar comSkillMinus = role == SkillDataManager.MINE ? _ui.m_proMinusMine : _ui.m_proMinusNpc;
-            UI_ComSkillShield targetComSkillShield = role == SkillDataManager.MINE ? _ui.m_ComShieldNpc : _ui.m_ComShieldMine;
-
-            comSkillMinus.visible = true;
-            comSkillMinus.value = 0;
-            comSkillMinus.TweenValue(100, 2f / _speed).OnComplete(() =>
-              {
-                  comSkillMinus.visible = false;
-
-                  if (targetComSkillShield.m_holder.visible)
-                  {
-                      targetComSkillShield.m_holder.visible = false;
-                      targetComSkillShield.m_holder1.visible = true;
-                      return;
-                  }
-
-                  UI_ComRoleSkill comRoleSkillScore = role == SkillDataManager.MINE ? _ui.m_ComRoleSkillNpcMinus : _ui.m_ComRoleSkillMineMinus;
-                  comRoleSkillScore.target.visible = true;
-                  //   comRoleSkillScore.m_c1.selectedIndex = role == SkillDataManager.MINE ? 0 : 1;
-                  int score = 0;
-                  if (role == SkillDataManager.MINE)
-                  {
-                      score = (int)_targetMainScore * cfg.value / 100;
-                      _targetScore -= score;
-                      if (_targetScore < 0) _targetScore = 0;
-                  }
-                  else
-                  {
-                      score = (int)_mainScore * cfg.value / 100;
-                      _score -= score;
-                      if (_score < 0) _score = 0;
-
-                  }
-
-                  comRoleSkillScore.m_txtScore.SetVar("count", "-" + score.ToString()).FlushVars();
-                  comRoleSkillScore.m_t0.ignoreEngineTimeScale = false;
-                  comRoleSkillScore.m_t0.timeScale = _speed;
-                  comRoleSkillScore.m_t0.Play(() =>
-                  {
-                      comRoleSkillScore.target.visible = false;
-                  });
-
-
-                  UpdateProgressBar();
-
-              });
-        }
-        private void UpdateBreakUI(RoleSkillCfg cfg, int role)
-        {
-
-            GProgressBar targetSkillMinus = role == SkillDataManager.MINE ? _ui.m_proMinusNpc : _ui.m_proMinusMine;
-            targetSkillMinus.visible = false;
-            UI_ComRoleSkill1 comSkillBreak = role == SkillDataManager.MINE ? _ui.m_ComRoleSkillMineBreak : _ui.m_ComRoleSkillNpcBreak;
-            comSkillBreak.target.visible = true;
-            comSkillBreak.m_t0.ignoreEngineTimeScale = false;
-            comSkillBreak.m_t0.timeScale = _speed;
-            comSkillBreak.m_t0.Play(() =>
-            {
-                comSkillBreak.target.visible = false;
-            });
-
-            GTweener twener = GTween.GetTween(targetSkillMinus, TweenPropType.Progress);
-            if (twener != null)
-            {
-                twener.Kill();
-            }
-        }
-        //锦衣效果
-        private void UpdateShieldUI(RoleSkillCfg cfg, int role)
-        {
-            UI_ComSkillShield comSkillShield = role == SkillDataManager.MINE ? _ui.m_ComShieldMine : _ui.m_ComShieldNpc;
-
-            comSkillShield.m_holder.visible = true;
-            comSkillShield.m_holder1.visible = false;
-
-            Timers.inst.Add((float)cfg.duration / 100 / _speed, 1, (param) =>
-              {
-                  // comSkillShield.target.visible = false;
-                  comSkillShield.m_holder.visible = false;
-
-              });
-
-            UI_ComRoleSkill1 comSkillShieldEff = role == SkillDataManager.MINE ? _ui.m_ComRoleSkillMineShield : _ui.m_ComRoleSkillNpcShield;
-            comSkillShieldEff.target.visible = true;
-            comSkillShieldEff.m_t0.ignoreEngineTimeScale = false;
-            comSkillShieldEff.m_t0.timeScale = _speed;
-            comSkillShieldEff.m_t0.Play(() =>
-            {
-                comSkillShieldEff.target.visible = false;
-            });
-
-        }
-        private void OnBtnSpeedUp()
-        {
-            FightDataManager.Instance.fightSpeed = FightDataManager.Instance.fightSpeed == 1 ? FightDataManager.Instance.maxFightSpeed : 1;
-            _speed = FightDataManager.Instance.fightSpeed;
-
-            _ui.m_btnSpeedUp.title = "x" + _speed;
-        }
-
-        private void OnLongPress(EventContext context)
-        {
-            LongPressGesture gesture = (LongPressGesture)context.sender;
-            RoleSkillCfg skillCfg = gesture.host.data as RoleSkillCfg;
-            _ui.m_comSkillTips.target.visible = true;
-            if (skillCfg.skillId <= 2)
-            {
-                _ui.m_comSkillTips.m_c1.selectedIndex = 0;
-                _ui.m_comSkillTips.target.x = gesture.host.x + 90;
-            }
-            else
-            {
-                _ui.m_comSkillTips.m_c1.selectedIndex = 1;
-                _ui.m_comSkillTips.target.x = gesture.host.x - 240;
-            }
-            _ui.m_comSkillTips.m_txtTitle.text = skillCfg.name;
-            _ui.m_comSkillTips.m_txtContent.text = skillCfg.desc;
-        }
-        private void OnLongEnd()
-        {
-            _ui.m_comSkillTips.target.visible = false;
-        }
-
-        private void OnBtnBackClick()
-        {
-            // Reset();
-            InstanceZonesController.OnFinishStoryLevel(InstanceZonesDataManager.currentLevelCfgId, false, false);
-            this.Hide();
-
-        }
-        protected override void OnHide()
-        {
-            base.OnHide();
-            Reset();
-            if (_sceneObject != null)
-            {
-                GameObject.Destroy(_sceneObject);
-                _sceneObject = null;
-            }
-            // _npcSkillDic.Clear();
-
-            Timers.inst.Remove(CheckGuide);
-        }
-        protected override void RemoveEventListener()
-        {
-            base.RemoveEventListener();
-            EventAgent.RemoveEventListener(ConstMessage.SHOW_CARD_SKILL_END, UpdateCircleResult);
-
-        }
-        private async void Skip(object param = null)
-        {
-            FightDataManager.Instance.totalScore = (int)Math.Round(_score);
-            FightDataManager.Instance.npcTotalScore = (int)Math.Round(_targetScore);
-            await InstanceZonesController.CheckStoryFightResult();
-            Reset();
-        }
-        private void Reset()
-        {
-            _ui.m_comSkillTips.target.visible = false;
-
-            _ui.m_proScore.target.max = 100;
-            _ui.m_proScore.target.value = 0;
-            _ui.m_proScore.m_comBar.target.width = 0;
-
-
-            _ui.m_comMineCircle.target.visible = false;
-            _ui.m_comTargetCircle.target.visible = false;
-
-            _ui.m_proMinusMine.visible = false;
-            _ui.m_proMinusNpc.visible = false;
-            GTweener twenerMine = GTween.GetTween(_ui.m_proMinusMine, TweenPropType.Progress);
-            if (twenerMine != null) twenerMine.Kill(true);
-            GTweener twenerNpc = GTween.GetTween(_ui.m_proMinusNpc, TweenPropType.Progress);
-            if (twenerNpc != null) twenerNpc.Kill(true);
-            GTween.Kill(_ui.m_proScore.m_comBar);
-            GTween.Kill(_ui.m_holderPartScore);
-            GTween.Kill(_ui.m_holderPartScoreNpc);
-            //   GTween.To(startValue, endValue, 0.5f).SetTarget(holderScore)
-            _gameObject13.SetActive(false);
-            _gameObject14.SetActive(false);
-
-            _ui.m_ComShieldMine.m_holder.visible = false;
-            _ui.m_ComShieldNpc.m_holder1.visible = false;
-
-            _ui.m_ComRoleSkillMineAdd.target.visible = false;
-            _ui.m_ComRoleSkillMineMinus.target.visible = false;
-            _ui.m_ComRoleSkillNpcAdd.target.visible = false;
-            _ui.m_ComRoleSkillNpcMinus.target.visible = false;
-            _ui.m_ComRoleSkillMineBreak.target.visible = false;
-            _ui.m_ComRoleSkillNpcBreak.target.visible = false;
-            _ui.m_ComRoleSkillMineShield.target.visible = false;
-            _ui.m_ComRoleSkillNpcShield.target.visible = false;
-
-
-            for (int i = 0; i < _skillCount; i++)
-            {
-                GComponent btnSkill = _ui.target.GetChild("btnSkill" + i).asCom;
-
-                btnSkill.GetChild("icon").asLoader.data = 0;
-                btnSkill.GetController("c1").selectedIndex = 0;
-            }
-            _isAutoPlay = false;
-            Timers.inst.Remove(CircleScoreStart);
-            Timers.inst.Remove(Skip);
-            Timers.inst.Remove(CircleScoreEnd);
-
-            _gameObjects.Clear();
-            _wrappers.Clear();
-        }
-        private void CheckGuide(object param)
-        {
-            if (GuideDataManager.IsGuideFinish(ConstGuideId.TARGET_FIGHT) <= 0)
-            {
-                UpdateToCheckGuide(null);
-            }
-            else
-            {
-                Timers.inst.Remove(CheckGuide);
-            }
-        }
-
-        protected override void UpdateToCheckGuide(object param)
-        {
-            if (!ViewManager.CheckIsTopView(this.viewCom)) return;
-
-            if (playStop)
-            {
-                GuideController.TryGuide(_ui.m_comMineCircle.target, ConstGuideId.TARGET_FIGHT, 1, "这里可以观察双方的分数计算。");
-            }
-            GuideController.TryGuide(_ui.m_btnSkill0.target, ConstGuideId.TARGET_FIGHT, 2, "使用技能,可以增加胜出的几率哦,长按查看技能说明。");
-            GuideController.TryCompleteGuide(ConstGuideId.TARGET_FIGHT, 2);
-
-        }
+        //         private UI_StoryFightTargetScoreUI _ui;
+        //         private GameObject _sceneObject;
+        //         private GameObject _scenePrefab;
+
+
+        //         private double _targetScore;
+        //         private double _score;//当前总分数
+        //         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;
+        //         private bool _isAutoPlay = false;
+        //         private StoryLevelCfg _levelCfg;
+
+        //         private GameObject _gameObject0;
+        //         private GoWrapper _wrapper0;
+        //         private GameObject _gameObject1;
+        //         private GoWrapper _wrapper1;
+        //         private GameObject _gameObject2;
+        //         private GoWrapper _wrapper2;
+        //         private GameObject _gameObject3;
+        //         private GoWrapper _wrapper3;
+        //         private GameObject _gameObject4;
+        //         private GoWrapper _wrapper4;
+        //         private GameObject _gameObject5;
+        //         private GoWrapper _wrapper5;
+
+        //         private GameObject _gameObject6;
+        //         private GoWrapper _wrapper6;
+
+        //         private GameObject _gameObject7;
+        //         private GoWrapper _wrapper7;
+
+        //         private GameObject _gameObject8;
+        //         private GoWrapper _wrapper8;
+
+        //         private GameObject _gameObject9;
+        //         private GoWrapper _wrapper9;
+
+        //         private GameObject _gameObject10;
+        //         private GoWrapper _wrapper10;
+
+        //         private GameObject _gameObject11;
+        //         private GoWrapper _wrapper11;
+
+        //         private GameObject _gameObject12;
+        //         private GoWrapper _wrapper12;
+
+        //         private GameObject _gameObject13;
+        //         private GoWrapper _wrapper13;
+
+        //         private GameObject _gameObject14;
+        //         private GoWrapper _wrapper14;
+
+        //         private GameObject _gameObject15;
+        //         private GoWrapper _wrapper15;
+
+        //         private GameObject _gameObject16;
+        //         private GoWrapper _wrapper16;
+
+        //         private GameObject _gameObject17;
+        //         private GoWrapper _wrapper17;
+
+        //         private GameObject _gameObject18;
+        //         private GoWrapper _wrapper18;
+
+        //         private GameObject _gameObject19;
+        //         private GoWrapper _wrapper19;
+
+        //         private List<GameObject> _gameObjects = new List<GameObject>();
+        //         private List<GoWrapper> _wrappers = new List<GoWrapper>();
+        //         private List<LongPressGesture> _listLongPress = new List<LongPressGesture>();
+        //         // private GoWrapper _wrapper5;
+        //         // private Dictionary<int, RoleSkillCfg> _npcSkillDic;
+
+        //         private bool playStop = false;
+
+        //         public override void Dispose()
+        //         {
+        //             if (_sceneObject != null)
+        //             {
+        //                 GameObject.Destroy(_sceneObject);
+        //                 _sceneObject = null;
+        //             }
+
+        //             SceneController.DestroyObjectFromView(_gameObject0, _wrapper0);
+        //             SceneController.DestroyObjectFromView(_gameObject1, _wrapper1);
+        //             SceneController.DestroyObjectFromView(_gameObject2, _wrapper2);
+        //             SceneController.DestroyObjectFromView(_gameObject3, _wrapper3);
+        //             SceneController.DestroyObjectFromView(_gameObject4, _wrapper4);
+        //             SceneController.DestroyObjectFromView(_gameObject5, _wrapper5);
+        //             SceneController.DestroyObjectFromView(_gameObject6, _wrapper6);
+        //             SceneController.DestroyObjectFromView(_gameObject7, _wrapper7);
+        //             SceneController.DestroyObjectFromView(_gameObject8, _wrapper8);
+        //             SceneController.DestroyObjectFromView(_gameObject9, _wrapper9);
+        //             SceneController.DestroyObjectFromView(_gameObject11, _wrapper11);
+        //             SceneController.DestroyObjectFromView(_gameObject12, _wrapper12);
+        //             SceneController.DestroyObjectFromView(_gameObject13, _wrapper13);
+        //             SceneController.DestroyObjectFromView(_gameObject14, _wrapper14);
+        //             SceneController.DestroyObjectFromView(_gameObject15, _wrapper15);
+        //             SceneController.DestroyObjectFromView(_gameObject16, _wrapper16);
+        //             SceneController.DestroyObjectFromView(_gameObject17, _wrapper17);
+        //             SceneController.DestroyObjectFromView(_gameObject18, _wrapper18);
+        //             SceneController.DestroyObjectFromView(_gameObject19, _wrapper19);
+        //             for (int i = 0; i < _gameObjects.Count; i++)
+        //             {
+        //                 SceneController.DestroyObjectFromView(_gameObjects[i], _wrappers[i]);
+        //             }
+
+        //             for (int i = 0; i < _listLongPress.Count; i++)
+        //             {
+        //                 _listLongPress[i].Dispose();
+        //             }
+        //             _listLongPress.Clear();
+
+        //             if (_ui != null)
+        //             {
+        //                 _ui.Dispose();
+        //                 _ui = null;
+        //             }
+        //             base.Dispose();
+        //         }
+        //         private void AddEffect()
+        //         {
+        //             string resPath0 = ResPathUtil.GetViewEffectPath("ui_zhandou", "ui_zd_hd_sc");
+        //             SceneController.AddObjectToView(_gameObject0, null, _ui.m_ComShieldMine.m_holder, resPath0, out _gameObject0, out GoWrapper _wrapper0);
+        //             SceneController.AddObjectToView(_gameObject2, null, _ui.m_ComShieldNpc.m_holder, resPath0, out _gameObject2, out GoWrapper _wrapper2);
+        //             string resPath1 = ResPathUtil.GetViewEffectPath("ui_zhandou", "ui_zd_hd_ps");
+        //             SceneController.AddObjectToView(_gameObject1, null, _ui.m_ComShieldMine.m_holder1, resPath1, out _gameObject1, out GoWrapper _wrapper1);
+        //             SceneController.AddObjectToView(_gameObject3, null, _ui.m_ComShieldNpc.m_holder1, resPath1, out _gameObject3, out GoWrapper _wrapper3);
+        //             string resPath2 = ResPathUtil.GetViewEffectPath("ui_zhandou", "ui_zd_jn_tg");
+        //             SceneController.AddObjectToView(_gameObject4, null, _ui.m_ComRoleSkillMineAdd.m_holder, resPath2, out _gameObject4, out GoWrapper _wrapper4, 70);
+        //             SceneController.AddObjectToView(_gameObject5, null, _ui.m_ComRoleSkillNpcAdd.m_holder, resPath2, out _gameObject5, out GoWrapper _wrapper5, 70);
+        //             string resPath5 = ResPathUtil.GetViewEffectPath("ui_zhandou", "ui_zd_jn_jc");
+        //             SceneController.AddObjectToView(_gameObject7, null, _ui.m_ComRoleSkillMineMinus.m_holder, resPath5, out _gameObject7, out GoWrapper _wrapper7, 70);
+        //             SceneController.AddObjectToView(_gameObject8, null, _ui.m_ComRoleSkillNpcMinus.m_holder, resPath5, out _gameObject8, out GoWrapper _wrapper8, 70);
+        //             string resPath6 = ResPathUtil.GetViewEffectPath("ui_zhandou", "ui_zd_jn_dz");
+        //             SceneController.AddObjectToView(_gameObject9, null, _ui.m_ComRoleSkillMineBreak.m_holder, resPath6, out _gameObject9, out GoWrapper _wrapper9, 70);
+        //             SceneController.AddObjectToView(_gameObject10, null, _ui.m_ComRoleSkillNpcBreak.m_holder, resPath6, out _gameObject10, out GoWrapper _wrapper10, 70);
+        //             string resPath7 = ResPathUtil.GetViewEffectPath("ui_zhandou", "ui_zd_jn_jy");
+        //             SceneController.AddObjectToView(_gameObject11, null, _ui.m_ComRoleSkillMineShield.m_holder, resPath7, out _gameObject11, out GoWrapper _wrapper11, 70);
+        //             SceneController.AddObjectToView(_gameObject12, null, _ui.m_ComRoleSkillNpcShield.m_holder, resPath7, out _gameObject12, out GoWrapper _wrapper12, 70);
+        //             string resPath8 = ResPathUtil.GetViewEffectPath("ui_zhandou", "zd_df_cheng");
+        //             SceneController.AddObjectToView(_gameObject13, null, _ui.m_comMineCircle.m_holder, resPath8, out _gameObject13, out GoWrapper _wrapper13, 59);
+        //             string resPath8_1 = ResPathUtil.GetViewEffectPath("ui_zhandou", "zd_df_lv_sr");
+        //             SceneController.AddObjectToView(_gameObject14, null, _ui.m_comTargetCircle.m_holder, resPath8_1, out _gameObject14, out GoWrapper _wrapper14, 59);
+        //             string resPath9 = ResPathUtil.GetViewEffectPath("ui_zhandou", "zd_df_tw");
+        //             SceneController.AddObjectToView(_gameObject15, null, _ui.m_holderPartScore, resPath9, out _gameObject15, out GoWrapper _wrapper15);
+        //             SceneController.AddObjectToView(_gameObject16, null, _ui.m_holderPartScoreNpc, resPath9, out _gameObject16, out GoWrapper _wrapper16);
+        //             SceneController.AddObjectToView(_gameObject17, null, _ui.m_holderAddScore, resPath9, out _gameObject17, out GoWrapper _wrapper17);
+        //             SceneController.AddObjectToView(_gameObject18, null, _ui.m_holderAddScoreNpc, resPath9, out _gameObject18, out GoWrapper _wrapper18);
+
+        //             string resPath10 = ResPathUtil.GetViewEffectPath("ui_zhandou", "ui_zd_jdt_cz");
+        //             SceneController.AddObjectToView(_gameObject19, null, _ui.m_proScore.m_holder1, resPath10, out _gameObject19, out GoWrapper _wrapper19);
+        //             string resPath4 = ResPathUtil.GetViewEffectPath("ui_zhandou", "ui_zd_jdt");
+        //             SceneController.AddObjectToView(_gameObject6, null, _ui.m_proScore.m_holder, resPath4, out _gameObject6, out GoWrapper _wrapper6);
+
+        //             string resPath3 = ResPathUtil.GetViewEffectPath("ui_zhandou", "ui_zd_jn_an");
+        //             for (int i = 0; i < _skillCount; i++)
+        //             {
+        //                 GComponent btnSkill = _ui.target.GetChild("btnSkill" + i).asCom;
+        //                 UI_ComBtnSkill item = UI_ComBtnSkill.Proxy(btnSkill);
+        //                 SceneController.AddObjectToView(null, null, item.m_holder, resPath3, out GameObject _gameObject, out GoWrapper _wrapper);
+        //                 UI_ComBtnSkill.ProxyEnd();
+        //                 _gameObjects.Add(_gameObject);
+        //                 _wrappers.Add(_wrapper);
+        //             }
+
+
+
+        //             _ui.m_ComShieldMine.m_holder.visible = false;
+        //             _ui.m_ComShieldMine.m_holder1.visible = false;
+        //             _ui.m_ComShieldNpc.m_holder.visible = false;
+        //             _ui.m_ComShieldNpc.m_holder1.visible = false;
+        //         }
+
+        //         protected override void Init()
+        //         {
+        //             base.Init();
+        //             _ui = UI_StoryFightTargetScoreUI.Create();
+        //             viewCom = _ui.target;
+        //             isfullScreen = true;
+
+        //             _scenePrefab = GFGAsset.Load<GameObject>(ResPathUtil.GetPrefabPath("SceneFightTargetScore"));
+
+        //             RoleSkillCfg[] roleSkillCfgs = RoleSkillCfgArray.Instance.dataArray;
+        //             _skillCount = roleSkillCfgs.Length;
+        //             for (int i = 0; i < roleSkillCfgs.Length; i++)
+        //             {
+        //                 GComponent btnSkill = _ui.target.GetChild("btnSkill" + i).asCom;
+        //                 btnSkill.data = roleSkillCfgs[i];
+        //                 GLoader icon = btnSkill.GetChild("icon").asLoader;
+        //                 icon.onClick.Add(() => { OnBtnSkillClick(btnSkill); });
+        //                 LongPressGesture longPressGesture = new LongPressGesture(btnSkill);
+        //                 longPressGesture.once = true;
+        //                 LongPressGesture.TRIGGER = 1f;
+        //                 longPressGesture.onAction.Add(OnLongPress);
+        //                 longPressGesture.onEnd.Add(OnLongEnd);
+        //                 _listLongPress.Add(longPressGesture);
+        //             }
+        //             _ui.m_btnBack.onClick.Add(OnBtnBackClick);
+
+        //         }
+
+        //         protected override void OnInit()
+        //         {
+        //             base.OnInit();
+        //             _ui.m_btnSkip.onClick.Add(() =>
+        //             {
+        //                 Skip();
+        //             });
+        //             _ui.m_comMineCircle.target.onClick.Add(() =>
+        //             {
+        //                 _ui.m_btnSkill0.m_icon.touchable = true;
+        //             });
+
+        //             _ui.m_btnSkill0.target.onClick.Add(() =>
+        //             {
+        //                 if (_partId == 0 && GuideDataManager.IsGuideFinish(ConstGuideId.TARGET_FIGHT) <= 0 && playStop)
+        //                 {
+        //                     playStop = false;
+
+        //                     _ui.m_comMineCircle.m_t0.Play(() =>
+        //                     {
+        //                         CircleScoreEnd(null);
+        //                     });
+        //                     _ui.m_comTargetCircle.m_t0.Play();
+        //                 }
+        //             });
+        //             _ui.m_btnSpeedUp.onClick.Add(OnBtnSpeedUp);
+        //             AddEffect();
+
+        //         }
+        //         protected override void AddEventListener()
+        //         {
+        //             base.AddEventListener();
+        //             EventAgent.AddEventListener(ConstMessage.SHOW_CARD_SKILL_END, UpdateCircleResult);
+
+        //         }
+        //         protected override void OnShown()
+        //         {
+        //             base.OnShown();
+        //             if (_sceneObject == null)
+        //             {
+        //                 _sceneObject = GameObject.Instantiate(_scenePrefab);
+        //             }
+
+        //             MyDressUpHelper.dressUpObj.setSceneObj(_sceneObject);
+        //             MyDressUpHelper.dressUpObj.UpdateRoleView();
+        //             _levelCfg = StoryLevelCfgArray.Instance.GetCfg(InstanceZonesDataManager.currentLevelCfgId);
+        //             StoryFightCfg fightCfg = StoryFightCfgArray.Instance.GetCfg(_levelCfg.fightID);
+        //             SceneController.UpdateFightTarget(fightCfg.targetRes, _sceneObject);
+
+        //             _ui.m_proScore.m_txtNpcScore.text = fightCfg.targetName + " 0";
+        //             _ui.m_proScore.m_txtMineScore.text = RoleDataManager.roleName + " 0";
+        //             _ui.m_btnBack.visible = true;
+
+        //             _speed = FightDataManager.Instance.fightSpeed;
+        //             if (_levelCfg.type == ConstInstanceZonesType.Field)
+        //             {
+        //                 _ui.m_btnBack.visible = false;
+        //             }
+
+
+
+        //             ScoreSystemData.Instance.SetEquipDicWithType();
+
+        //             _partId = FightScoreCfgArray.Instance.dataArray[0].id; ;
+        //             _score = 0;
+        //             _targetScore = 0;
+        //             _mainScore = ScoreSystemData.Instance.GetMainScore();
+        //             _targetMainScore = fightCfg.targetMainScore;
+
+        //             UpdateNormal();
+
+        //             Timers.inst.Add(0.5f / _speed, 1, CircleScoreStart);//评分开始
+        //             Timers.inst.AddUpdate(CheckGuide);
+        //         }
+        //         private void UpdateNormal()
+        //         {
+        //             Reset();
+
+        //             if (_partId == 1 && GuideDataManager.IsGuideFinish(ConstGuideId.TARGET_FIGHT) <= 0)//引导中禁止自动战斗
+        //             {
+        //                 _speed = 1;
+        //                 FightDataManager.Instance.autoPlay = false;
+        //                 _ui.m_btnSkill0.m_icon.touchable = false;
+        //             }
+
+        //             if (_levelCfg.type == ConstInstanceZonesType.Field || FightDataManager.Instance.autoPlay)
+        //             {
+        //                 _isAutoPlay = true;
+        //             }
+
+        //             RoleSkillCfg[] roleSkillCfgs = RoleSkillCfgArray.Instance.dataArray;
+        //             for (int i = 0; i < roleSkillCfgs.Length; i++)
+        //             {
+        //                 GComponent btnSkill = _ui.target.GetChild("btnSkill" + i).asCom;
+        //                 UI_ComBtnSkill item = UI_ComBtnSkill.Proxy(btnSkill);
+        //                 item.m_txtCount.text = roleSkillCfgs[i].limiteCount.ToString();
+        //                 item.m_icon.touchable = true;
+        //                 if (_isAutoPlay)
+        //                 {
+
+        //                     item.m_icon.touchable = !_isAutoPlay;
+        //                     OnBtnSkillClick(btnSkill);
+        //                 }
+        //                 UI_ComBtnSkill.ProxyEnd();
+
+        //             }
+        //             _ui.m_btnSpeedUp.visible = _isAutoPlay;
+        //             _ui.m_btnSpeedUp.title = "x" + _speed;
+        //             // if (_index == 0 && GuideDataManager.IsGuideFinish(ConstGuideId.TARGET_FIGHT) <= 0)
+        //             // {
+        //             //     _ui.m_btnSkill0.target.touchable = false;
+        //             // }
+        //         }
+
+
+        //         private void CircleScoreStart(object param)
+        //         {
+        //             _skillScore = 0;//技能附加分
+        //             _showCard = false;
+
+        //             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);
+        //             }
+        //             else
+        //             {
+        //                 UpdateCircleResult();
+        //             }
+        //         }
+
+
+        //         //更新部件评分结果,播放结果动画
+        //         private void UpdateCircleResult()
+        //         {
+        //             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[_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);
+
+        //             ReleaseNpcSkill();
+        //             PlayScoreAni();
+        //         }
+        //         //顶部评分进度条
+        //         private void UpdateProgressBar()
+        //         {
+        //             StoryFightCfg fightCfg = StoryFightCfgArray.Instance.GetCfg(_levelCfg.fightID);
+        //             _ui.m_proScore.m_txtNpcScore.text = string.Format("{0} {1}", fightCfg.targetName, (int)Math.Round(_targetScore));
+        //             _ui.m_proScore.m_txtMineScore.text = string.Format("{0} {1}", RoleDataManager.roleName, (int)Math.Round(_score));
+        //             // _ui.m_proScore.m_comBar.m_imgAni.visible = true;
+
+        //             double proportion = (_score + _targetScore) > 0 ? _score / (_score + _targetScore) : 0;
+        //             float width = (float)(proportion * _ui.m_proScore.target.width);
+
+        //             GTween.To(_ui.m_proScore.m_comBar.target.width, width, 0.5f).SetTarget(_ui.m_proScore.m_comBar).OnUpdate((GTweener t) =>
+        //                 {
+        //                     _ui.m_proScore.m_comBar.target.width = t.value.x;
+        //                 }); ;
+
+
+        //         }
+        //         //释放NPC技能
+        //         private void ReleaseNpcSkill()
+        //         {
+        //             StoryFightCfg fightCfg = StoryFightCfgArray.Instance.GetCfg(_levelCfg.fightID);
+
+        //             if (fightCfg.targerSkillArr.Length >= _partId)
+        //             {
+        //                 RoleSkillCfg cfg = RoleSkillCfgArray.Instance.GetCfg(fightCfg.targerSkillArr[_partId - 1]);
+        //                 if (cfg == null) return;
+        //                 SetSkillValue(cfg, SkillDataManager.NPC);
+        //             }
+        //         }
+
+        //         private void PlayScoreAni()
+        //         {
+        //             _ui.m_comMineCircle.target.visible = true;
+        //             _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(_partId).name;
+        //             if (_partId == 1 && GuideDataManager.IsGuideFinish(ConstGuideId.TARGET_FIGHT) <= 0)
+        //             {
+        //                 _ui.m_comMineCircle.m_t0.Play(1, 0, 0, 0.75f, () =>
+        //                 {
+        //                     _ui.m_comMineCircle.m_holder.visible = false;
+        //                     playStop = true;
+        //                 });
+        //                 _ui.m_comTargetCircle.m_t0.Play(1, 0, 0, 0.75f, () =>
+        //                 {
+        //                     _ui.m_comTargetCircle.m_holder.visible = false;
+        //                 });
+        //                 return;
+        //             }
+        //             _ui.m_comMineCircle.m_holder.visible = false;
+        //             _ui.m_comMineCircle.m_t0.ignoreEngineTimeScale = false;
+        //             _ui.m_comMineCircle.m_t0.timeScale = _speed;
+        //             _ui.m_comMineCircle.m_t0.Play(() =>
+        //             {
+        //                 PlayScoreTWEffect(_ui.m_holderPartScore, _ui.m_comMineCircle.target.position, _ui.m_proScore.target.position);
+        //             });
+
+        //             _ui.m_comTargetCircle.m_holder.visible = false;
+        //             _ui.m_comTargetCircle.m_t0.ignoreEngineTimeScale = false;
+        //             _ui.m_comTargetCircle.m_t0.timeScale = _speed;
+        //             _ui.m_comTargetCircle.m_t0.Play(() =>
+        //             {
+        //                 PlayScoreTWEffect(_ui.m_holderPartScoreNpc, _ui.m_comTargetCircle.target.position, _ui.m_proScore.target.position + new Vector3(_ui.m_proScore.target.width, 0, 0));
+        //             });
+
+        //             Timers.inst.Add(2.5f / _speed, 1, CircleScoreEnd);
+        //         }
+        //         private void PlayScoreTWEffect(GGraph holderScore, Vector3 startValue, Vector3 endValue)
+        //         {
+        //             holderScore.visible = true;
+        //             GTween.To(startValue, endValue, 0.5f).SetTarget(holderScore).OnUpdate((GTweener t) =>
+        //             {
+        //                 holderScore.position = t.value.vec2;
+        //             }).OnComplete(() =>
+        //             {
+        //                 holderScore.visible = false;
+        //                 UpdateProgressBar();
+        //             });
+        //         }
+        //         private void CircleScoreEnd(object param)
+        //         {
+        //             //当前部件评分结束
+        //             _gameObject13.SetActive(false);
+        //             _gameObject14.SetActive(false);
+        //             _partId++;
+        //             if (_partId > FightScoreCfgArray.Instance.dataArray.Length)
+        //             {
+        //                 Timers.inst.Add(1.5f, 1, Skip);
+        //             }
+        //             else
+        //             {
+        //                 _ui.m_comTargetCircle.target.visible = false;
+        //                 _ui.m_comMineCircle.target.visible = false;
+        //                 Timers.inst.Add(0.5f / _speed, 1, CircleScoreStart);//评分结束
+        //             }
+
+        //         }
+
+
+        //         /***************************************************主动技能**************************************************/
+
+        //         private void OnBtnSkillClick(GComponent obj)
+        //         {
+        //             // if (_isAutoPlay) return;
+        //             UI_ComBtnSkill item = UI_ComBtnSkill.Proxy(obj);
+        //             RoleSkillCfg cfg = item.target.data as RoleSkillCfg;
+        //             int count = (int)item.m_icon.data;
+        //             if (count >= cfg.limiteCount) return;//超过最大限制次数
+        //             item.m_c1.selectedIndex = 1;
+        //             item.m_icon.data = count + 1;
+        //             item.m_txtCount.text = (cfg.limiteCount - (count + 1)).ToString();
+        //             UI_ComBtnSkill.ProxyEnd();
+        //             SetCdState(obj, cfg.cd);
+        //             SetSkillValue(cfg, SkillDataManager.MINE);
+        //         }
+        //         private void SetCdState(GComponent obj, int time)
+        //         {
+        //             UI_ComBtnSkill item = UI_ComBtnSkill.Proxy(obj);
+        //             GProgressBar bar = item.m_proCD;
+        //             bar.visible = true;
+        //             bar.value = 100;
+        //             bar.TweenValue(0, (float)time / 100 / _speed).OnComplete((GTweener tweener) =>
+        //               {
+        //                   GProgressBar bar1 = (GProgressBar)tweener.target;
+        //                   UI_ComBtnSkill item1 = UI_ComBtnSkill.Proxy(bar1.parent);
+        //                   int count = (int)item1.m_icon.data;
+        //                   RoleSkillCfg cfg = item1.target.data as RoleSkillCfg;
+        //                   item1.m_c1.selectedIndex = count >= cfg.limiteCount ? 2 : 0;
+
+        //                   item1.m_proCD.visible = false;
+        //                   if (_isAutoPlay)
+        //                   {
+        //                       OnBtnSkillClick(item1.target);
+        //                   }
+        //                   UI_ComBtnSkill.ProxyEnd();
+
+        //               });
+        //             UI_ComBtnSkill.ProxyEnd();
+        //         }
+
+        //         private void SetSkillValue(RoleSkillCfg cfg, int role)
+        //         {
+        //             if (cfg.buff == SkillDataManager.SKILL_ADD)
+        //             {
+        //                 UpdateAddUI(cfg, role);
+        //             }
+        //             else if (cfg.buff == SkillDataManager.SKILL_MINUS)
+        //             {
+        //                 UpdateMinusUI(cfg, role);
+        //             }
+        //             else if (cfg.buff == SkillDataManager.SKILL_BREAK)
+        //             {
+        //                 UpdateBreakUI(cfg, role);
+        //             }
+        //             else if (cfg.buff == SkillDataManager.SKILL_SHIELD)
+        //             {
+        //                 UpdateShieldUI(cfg, role);
+        //             }
+
+        //         }
+        //         private void UpdateAddUI(RoleSkillCfg cfg, int role)
+        //         {
+        //             UI_ComRoleSkill comRoleSkillScore = role == SkillDataManager.MINE ? _ui.m_ComRoleSkillMineAdd : _ui.m_ComRoleSkillNpcAdd;
+        //             comRoleSkillScore.target.visible = true;
+        //             int score = 0;
+        //             if (role == SkillDataManager.MINE)
+        //             {
+        //                 score = (int)_mainScore * cfg.value / 100;
+        //                 _score += score;
+        //             }
+        //             else
+        //             {
+        //                 score = (int)_targetMainScore * cfg.value / 100;
+        //                 _targetScore += score;
+        //             }
+        //             // comRoleSkillScore.m_comRoleSkill.m_c1.selectedIndex = 0;
+        //             comRoleSkillScore.m_txtScore.SetVar("count", "+" + score.ToString()).FlushVars();
+        //             comRoleSkillScore.m_t0.ignoreEngineTimeScale = false;
+        //             comRoleSkillScore.m_t0.timeScale = _speed;
+        //             comRoleSkillScore.m_t0.Play(() =>
+        //                 {
+        //                     comRoleSkillScore.target.visible = false;
+        //                     GGraph graph = role == SkillDataManager.MINE ? _ui.m_holderAddScore : _ui.m_holderAddScoreNpc;
+        //                     Vector3 targetPos = role == SkillDataManager.MINE ? _ui.m_proScore.target.position : _ui.m_proScore.target.position + new Vector3(_ui.m_proScore.target.width, 0, 0);
+        //                     PlayScoreTWEffect(graph, comRoleSkillScore.target.position, targetPos);
+        //                 });
+        //         }
+
+        //         //荆钗效果
+        //         private void UpdateMinusUI(RoleSkillCfg cfg, int role)
+        //         {
+        //             GProgressBar comSkillMinus = role == SkillDataManager.MINE ? _ui.m_proMinusMine : _ui.m_proMinusNpc;
+        //             UI_ComSkillShield targetComSkillShield = role == SkillDataManager.MINE ? _ui.m_ComShieldNpc : _ui.m_ComShieldMine;
+
+        //             comSkillMinus.visible = true;
+        //             comSkillMinus.value = 0;
+        //             comSkillMinus.TweenValue(100, 2f / _speed).OnComplete(() =>
+        //               {
+        //                   comSkillMinus.visible = false;
+
+        //                   if (targetComSkillShield.m_holder.visible)
+        //                   {
+        //                       targetComSkillShield.m_holder.visible = false;
+        //                       targetComSkillShield.m_holder1.visible = true;
+        //                       return;
+        //                   }
+
+        //                   UI_ComRoleSkill comRoleSkillScore = role == SkillDataManager.MINE ? _ui.m_ComRoleSkillNpcMinus : _ui.m_ComRoleSkillMineMinus;
+        //                   comRoleSkillScore.target.visible = true;
+        //                   //   comRoleSkillScore.m_c1.selectedIndex = role == SkillDataManager.MINE ? 0 : 1;
+        //                   int score = 0;
+        //                   if (role == SkillDataManager.MINE)
+        //                   {
+        //                       score = (int)_targetMainScore * cfg.value / 100;
+        //                       _targetScore -= score;
+        //                       if (_targetScore < 0) _targetScore = 0;
+        //                   }
+        //                   else
+        //                   {
+        //                       score = (int)_mainScore * cfg.value / 100;
+        //                       _score -= score;
+        //                       if (_score < 0) _score = 0;
+
+        //                   }
+
+        //                   comRoleSkillScore.m_txtScore.SetVar("count", "-" + score.ToString()).FlushVars();
+        //                   comRoleSkillScore.m_t0.ignoreEngineTimeScale = false;
+        //                   comRoleSkillScore.m_t0.timeScale = _speed;
+        //                   comRoleSkillScore.m_t0.Play(() =>
+        //                   {
+        //                       comRoleSkillScore.target.visible = false;
+        //                   });
+
+
+        //                   UpdateProgressBar();
+
+        //               });
+        //         }
+        //         private void UpdateBreakUI(RoleSkillCfg cfg, int role)
+        //         {
+
+        //             GProgressBar targetSkillMinus = role == SkillDataManager.MINE ? _ui.m_proMinusNpc : _ui.m_proMinusMine;
+        //             targetSkillMinus.visible = false;
+        //             UI_ComRoleSkill1 comSkillBreak = role == SkillDataManager.MINE ? _ui.m_ComRoleSkillMineBreak : _ui.m_ComRoleSkillNpcBreak;
+        //             comSkillBreak.target.visible = true;
+        //             comSkillBreak.m_t0.ignoreEngineTimeScale = false;
+        //             comSkillBreak.m_t0.timeScale = _speed;
+        //             comSkillBreak.m_t0.Play(() =>
+        //             {
+        //                 comSkillBreak.target.visible = false;
+        //             });
+
+        //             GTweener twener = GTween.GetTween(targetSkillMinus, TweenPropType.Progress);
+        //             if (twener != null)
+        //             {
+        //                 twener.Kill();
+        //             }
+        //         }
+        //         //锦衣效果
+        //         private void UpdateShieldUI(RoleSkillCfg cfg, int role)
+        //         {
+        //             UI_ComSkillShield comSkillShield = role == SkillDataManager.MINE ? _ui.m_ComShieldMine : _ui.m_ComShieldNpc;
+
+        //             comSkillShield.m_holder.visible = true;
+        //             comSkillShield.m_holder1.visible = false;
+
+        //             Timers.inst.Add((float)cfg.duration / 100 / _speed, 1, (param) =>
+        //               {
+        //                   // comSkillShield.target.visible = false;
+        //                   comSkillShield.m_holder.visible = false;
+
+        //               });
+
+        //             UI_ComRoleSkill1 comSkillShieldEff = role == SkillDataManager.MINE ? _ui.m_ComRoleSkillMineShield : _ui.m_ComRoleSkillNpcShield;
+        //             comSkillShieldEff.target.visible = true;
+        //             comSkillShieldEff.m_t0.ignoreEngineTimeScale = false;
+        //             comSkillShieldEff.m_t0.timeScale = _speed;
+        //             comSkillShieldEff.m_t0.Play(() =>
+        //             {
+        //                 comSkillShieldEff.target.visible = false;
+        //             });
+
+        //         }
+        //         private void OnBtnSpeedUp()
+        //         {
+        //             FightDataManager.Instance.fightSpeed = FightDataManager.Instance.fightSpeed == 1 ? FightDataManager.Instance.maxFightSpeed : 1;
+        //             _speed = FightDataManager.Instance.fightSpeed;
+
+        //             _ui.m_btnSpeedUp.title = "x" + _speed;
+        //         }
+
+        //         private void OnLongPress(EventContext context)
+        //         {
+        //             LongPressGesture gesture = (LongPressGesture)context.sender;
+        //             RoleSkillCfg skillCfg = gesture.host.data as RoleSkillCfg;
+        //             _ui.m_comSkillTips.target.visible = true;
+        //             if (skillCfg.skillId <= 2)
+        //             {
+        //                 _ui.m_comSkillTips.m_c1.selectedIndex = 0;
+        //                 _ui.m_comSkillTips.target.x = gesture.host.x + 90;
+        //             }
+        //             else
+        //             {
+        //                 _ui.m_comSkillTips.m_c1.selectedIndex = 1;
+        //                 _ui.m_comSkillTips.target.x = gesture.host.x - 240;
+        //             }
+        //             _ui.m_comSkillTips.m_txtTitle.text = skillCfg.name;
+        //             _ui.m_comSkillTips.m_txtContent.text = skillCfg.desc;
+        //         }
+        //         private void OnLongEnd()
+        //         {
+        //             _ui.m_comSkillTips.target.visible = false;
+        //         }
+
+        //         private void OnBtnBackClick()
+        //         {
+        //             // Reset();
+        //             InstanceZonesController.OnFinishStoryLevel(InstanceZonesDataManager.currentLevelCfgId, false, false);
+        //             this.Hide();
+
+        //         }
+        //         protected override void OnHide()
+        //         {
+        //             base.OnHide();
+        //             Reset();
+        //             if (_sceneObject != null)
+        //             {
+        //                 GameObject.Destroy(_sceneObject);
+        //                 _sceneObject = null;
+        //             }
+        //             // _npcSkillDic.Clear();
+
+        //             Timers.inst.Remove(CheckGuide);
+        //         }
+        //         protected override void RemoveEventListener()
+        //         {
+        //             base.RemoveEventListener();
+        //             EventAgent.RemoveEventListener(ConstMessage.SHOW_CARD_SKILL_END, UpdateCircleResult);
+
+        //         }
+        //         private async void Skip(object param = null)
+        //         {
+        //             FightDataManager.Instance.totalScore = (int)Math.Round(_score);
+        //             FightDataManager.Instance.npcTotalScore = (int)Math.Round(_targetScore);
+        //             await InstanceZonesController.CheckStoryFightResult();
+        //             Reset();
+        //         }
+        //         private void Reset()
+        //         {
+        //             _ui.m_comSkillTips.target.visible = false;
+
+        //             _ui.m_proScore.target.max = 100;
+        //             _ui.m_proScore.target.value = 0;
+        //             _ui.m_proScore.m_comBar.target.width = 0;
+
+
+        //             _ui.m_comMineCircle.target.visible = false;
+        //             _ui.m_comTargetCircle.target.visible = false;
+
+        //             _ui.m_proMinusMine.visible = false;
+        //             _ui.m_proMinusNpc.visible = false;
+        //             GTweener twenerMine = GTween.GetTween(_ui.m_proMinusMine, TweenPropType.Progress);
+        //             if (twenerMine != null) twenerMine.Kill(true);
+        //             GTweener twenerNpc = GTween.GetTween(_ui.m_proMinusNpc, TweenPropType.Progress);
+        //             if (twenerNpc != null) twenerNpc.Kill(true);
+        //             GTween.Kill(_ui.m_proScore.m_comBar);
+        //             GTween.Kill(_ui.m_holderPartScore);
+        //             GTween.Kill(_ui.m_holderPartScoreNpc);
+        //             //   GTween.To(startValue, endValue, 0.5f).SetTarget(holderScore)
+        //             _gameObject13.SetActive(false);
+        //             _gameObject14.SetActive(false);
+
+        //             _ui.m_ComShieldMine.m_holder.visible = false;
+        //             _ui.m_ComShieldNpc.m_holder1.visible = false;
+
+        //             _ui.m_ComRoleSkillMineAdd.target.visible = false;
+        //             _ui.m_ComRoleSkillMineMinus.target.visible = false;
+        //             _ui.m_ComRoleSkillNpcAdd.target.visible = false;
+        //             _ui.m_ComRoleSkillNpcMinus.target.visible = false;
+        //             _ui.m_ComRoleSkillMineBreak.target.visible = false;
+        //             _ui.m_ComRoleSkillNpcBreak.target.visible = false;
+        //             _ui.m_ComRoleSkillMineShield.target.visible = false;
+        //             _ui.m_ComRoleSkillNpcShield.target.visible = false;
+
+
+        //             for (int i = 0; i < _skillCount; i++)
+        //             {
+        //                 GComponent btnSkill = _ui.target.GetChild("btnSkill" + i).asCom;
+
+        //                 btnSkill.GetChild("icon").asLoader.data = 0;
+        //                 btnSkill.GetController("c1").selectedIndex = 0;
+        //             }
+        //             _isAutoPlay = false;
+        //             Timers.inst.Remove(CircleScoreStart);
+        //             Timers.inst.Remove(Skip);
+        //             Timers.inst.Remove(CircleScoreEnd);
+
+        //             _gameObjects.Clear();
+        //             _wrappers.Clear();
+        //         }
+        //         private void CheckGuide(object param)
+        //         {
+        //             if (GuideDataManager.IsGuideFinish(ConstGuideId.TARGET_FIGHT) <= 0)
+        //             {
+        //                 UpdateToCheckGuide(null);
+        //             }
+        //             else
+        //             {
+        //                 Timers.inst.Remove(CheckGuide);
+        //             }
+        //         }
+
+        //         protected override void UpdateToCheckGuide(object param)
+        //         {
+        //             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
+
+        //             if (playStop)
+        //             {
+        //                 GuideController.TryGuide(_ui.m_comMineCircle.target, ConstGuideId.TARGET_FIGHT, 1, "这里可以观察双方的分数计算。");
+        //             }
+        //             GuideController.TryGuide(_ui.m_btnSkill0.target, ConstGuideId.TARGET_FIGHT, 2, "使用技能,可以增加胜出的几率哦,长按查看技能说明。");
+        //             GuideController.TryCompleteGuide(ConstGuideId.TARGET_FIGHT, 2);
+
+        //         }
     }
 }

BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0!a.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_1!a.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_1.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_2.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_3!a.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_3.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_4!a.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_4.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_5!a.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_5.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_6!a.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_6.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_7!a.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_7.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas_vuz5bw!a.png


+ 96 - 0
GameClient/Assets/ResIn/UI/Main/Main_atlas_vuz5bw!a.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: f21b5e84ae865fe4c8ee426a73ffe8c4
+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: 

BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas_vuz5bw.png


+ 96 - 0
GameClient/Assets/ResIn/UI/Main/Main_atlas_vuz5bw.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 71a5a6d3d384aa54da774c96d5468df0
+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: 

BIN
GameClient/Assets/ResIn/UI/Main/Main_fui.bytes