zhaoyang 3 سال پیش
والد
کامیت
5c2f298afc
20فایلهای تغییر یافته به همراه200 افزوده شده و 51 حذف شده
  1. 1 1
      FGUIProject/assets/Main/StoryFightTargetScoreUI.xml
  2. 22 2
      FGUIProject/assets/Main/components/ComScoreResult.xml
  3. 1 1
      FGUIProject/assets/Main/components/Component2.xml
  4. 1 4
      FGUIProject/assets/Main/components/comClickCircle.xml
  5. 18 10
      FGUIProject/assets/Main/components/comMineCircle.xml
  6. 10 10
      FGUIProject/assets/Main/components/comTargetCircle.xml
  7. 1 1
      FGUIProject/assets/Main/package.xml
  8. 9 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComScoreResult.cs
  9. 2 2
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_StoryFightTargetScoreUI.cs
  10. 86 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_comMineCircle.cs
  11. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_comMineCircle.cs.meta
  12. 0 3
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_comTargetCircle.cs
  13. 26 8
      GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightSingleScoreView.cs
  14. 12 9
      GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightTargetScoreView.cs
  15. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0!a.png
  16. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0.png
  17. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_1!a.png
  18. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_1.png
  19. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_2.png
  20. BIN
      GameClient/Assets/ResIn/UI/Main/Main_fui.bytes

+ 1 - 1
FGUIProject/assets/Main/StoryFightTargetScoreUI.xml

@@ -8,7 +8,7 @@
     <component id="n28_uj53" name="proScore" src="v3k9c7" fileName="components/ProgressBarTargetScore.xml" xy="170,80">
       <ProgressBar max="100"/>
     </component>
-    <component id="n17_mza1" name="comMineCircle" src="v3k9c4" fileName="components/comTargetCircle.xml" xy="380,1428" pivot="0.5,0.5" anchor="true" visible="false"/>
+    <component id="n17_mza1" name="comMineCircle" src="c2umeg" fileName="components/comMineCircle.xml" xy="380,1428" pivot="0.5,0.5" anchor="true" visible="false"/>
     <component id="n15_mza1" name="comTargetCircle" src="v3k9c4" fileName="components/comTargetCircle.xml" xy="700,1428" pivot="0.5,0.5" anchor="true" visible="false"/>
     <component id="n24_vbe8" name="proMinusMine" src="mhyhd4" fileName="components/ProgressBar2.xml" xy="190,700">
       <ProgressBar value="100" max="100"/>

+ 22 - 2
FGUIProject/assets/Main/components/ComScoreResult.xml

@@ -2,9 +2,15 @@
 <component size="256,259">
   <controller name="c1" pages="0,,1,,2," selected="2"/>
   <displayList>
-    <loader id="n7_vuz5" name="loaBg" xy="0,0" size="256,259" url="ui://mfvz4q8kvuz5b7" autoSize="true">
-      <gearIcon controller="c1" pages="0,1" values="ui://mfvz4q8kvuz5b8|ui://mfvz4q8kvuz5b6" default="ui://mfvz4q8kvuz5b7"/>
+    <loader id="n7_vuz5" name="loaBg" xy="0,0" size="256,259" url="ui://mfvz4q8kvuz5b8" autoSize="true">
+      <gearDisplay controller="c1" pages="0"/>
     </loader>
+    <graph id="n12_c2um" name="holder" xy="127,129" size="1,1">
+      <gearDisplay controller="c1" pages="1"/>
+    </graph>
+    <graph id="n13_c2um" name="holder1" xy="137,137" size="1,1">
+      <gearDisplay controller="c1" pages="2"/>
+    </graph>
     <loader id="n8_vuz5" name="loaType" xy="69,54" size="119,63" url="ui://mfvz4q8kvuz5be" autoSize="true">
       <gearIcon controller="c1" pages="0,1" values="ui://mfvz4q8kvuz5bf|ui://mfvz4q8kvuz5bd" default="ui://mfvz4q8kvuz5be"/>
     </loader>
@@ -18,4 +24,18 @@
       <gearDisplay controller="c1" pages="2"/>
     </text>
   </displayList>
+  <transition name="t0">
+    <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="n8_vuz5" value="false"/>
+    <item time="0" type="Visible" target="n9_vuz5" value="false"/>
+    <item time="14" type="Visible" target="n10_vuz5" value="true"/>
+    <item time="14" type="Visible" target="n11_vuz5" value="true"/>
+    <item time="14" type="Visible" target="n8_vuz5" value="true"/>
+    <item time="14" type="Visible" target="n9_vuz5" value="true"/>
+    <item time="42" type="Visible" target="n10_vuz5" value="false"/>
+    <item time="42" type="Visible" target="n11_vuz5" value="false"/>
+    <item time="42" type="Visible" target="n8_vuz5" value="false"/>
+    <item time="42" type="Visible" target="n9_vuz5" value="false"/>
+  </transition>
 </component>

+ 1 - 1
FGUIProject/assets/Main/components/Component2.xml

@@ -7,7 +7,7 @@
     <image id="n6_uj53" name="imgAni" src="k1khdp" fileName="imagesStory/zd_zdjdt_liang.png" xy="836,15" pivot="0.65,0.6" anchor="true">
       <relation target="" sidePair="right-right"/>
     </image>
-    <graph id="n7_k1kh" name="holder" xy="725,-38" pivot="0.5,0.5" size="100,100">
+    <graph id="n7_k1kh" name="holder" xy="835,11" pivot="0.5,0.5" size="1,1">
       <relation target="" sidePair="right-right"/>
     </graph>
   </displayList>

+ 1 - 4
FGUIProject/assets/Main/components/comClickCircle.xml

@@ -14,11 +14,8 @@
     <item time="29" type="Visible" target="n12_vuz5" value="false"/>
   </transition>
   <transition name="t1">
-    <item time="0" type="Alpha" target="n7_vuz5" value="1"/>
     <item time="0" type="Visible" target="n12_vuz5" value="false"/>
     <item time="0" type="Visible" target="n7_vuz5" value="true"/>
-    <item time="0" type="XY" target="n7_vuz5" tween="true" startValue="-7,-8" endValue="-7,-259" duration="19" ease="Linear"/>
-    <item time="9" type="Alpha" target="n7_vuz5" tween="true" startValue="1" endValue="0" duration="10" ease="Linear"/>
-    <item time="19" type="Visible" target="n7_vuz5" value="false"/>
+    <item time="42" type="Visible" target="n7_vuz5" value="false"/>
   </transition>
 </component>

+ 18 - 10
FGUIProject/assets/Main/components/comMineCircle.xml

@@ -1,18 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="256,256">
   <displayList>
-    <loader id="n16_v3k9" name="loaIcon" xy="0,-1" size="256,259" url="ui://mfvz4q8kvuz5b6" autoSize="true"/>
+    <loader id="n16_v3k9" name="loaIcon" xy="-2,-4" size="256,259" visible="false" url="ui://mfvz4q8kvuz5b7" autoSize="true"/>
+    <graph id="n18_mueb" name="holder" xy="127,127" size="1,1"/>
     <text id="n17_v3k9" name="txtPart" xy="128,78" pivot="0.5,0.5" anchor="true" size="124,79" fontSize="60" color="#fdfbee" align="center" text="饰品"/>
-    <text id="n15_mza1" name="txtCount" xy="0,124" pivot="0.5,0.5" size="256,60" font="ui://mfvz4q8kvuz5b2" fontSize="56" align="center" vAlign="middle" autoSize="none" text="999"/>
+    <text id="n15_mza1" name="txtCount" xy="64,124" pivot="0.5,0.5" size="127,60" font="ui://mfvz4q8kvuz5b3" fontSize="56" color="#fdfbee" align="center" vAlign="middle" text="999"/>
   </displayList>
   <transition name="t0">
-    <item time="0" type="Alpha" target="n16_v3k9" tween="true" startValue="0" endValue="1" duration="6" ease="Linear"/>
-    <item time="0" type="Rotation" target="n17_v3k9" value="0"/>
-    <item time="0" type="Size" target="n15_mza1" value="10,60"/>
-    <item time="0" type="Skew" target="n17_v3k9" value="90,0"/>
-    <item time="6" type="Rotation" target="n17_v3k9" tween="true" startValue="-15" endValue="0" duration="3" ease="Linear"/>
-    <item time="6" type="Skew" target="n17_v3k9" tween="true" startValue="90,0" endValue="0,0" duration="3" ease="Linear"/>
-    <item time="10" type="Size" target="n15_mza1" tween="true" startValue="10,60" endValue="256,60" duration="8" ease="Linear"/>
-    <item time="48" type="Alpha" target="n16_v3k9" value="1"/>
+    <item time="0" type="Visible" target="n15_mza1" value="false"/>
+    <item time="0" type="Visible" target="n16_v3k9" value="false"/>
+    <item time="0" type="Visible" target="n17_v3k9" value="false"/>
+    <item time="0" type="Visible" target="n18_mueb" value="true"/>
+    <item time="14" type="Visible" target="n15_mza1" value="true"/>
+    <item time="14" type="Visible" target="n16_v3k9" value="true"/>
+    <item time="14" type="Visible" target="n17_v3k9" value="true"/>
+    <item time="42" type="Visible" target="n15_mza1" value="false"/>
+    <item time="42" type="Visible" target="n16_v3k9" value="false"/>
+    <item time="42" type="Visible" target="n17_v3k9" value="false"/>
+    <item time="45" type="Visible" target="n18_mueb" value="true"/>
+  </transition>
+  <transition name="t1">
+    <item time="0" type="Visible" target="n18_mueb" value="true"/>
+    <item time="42" type="Visible" target="n18_mueb" value="true"/>
   </transition>
 </component>

+ 10 - 10
FGUIProject/assets/Main/components/comTargetCircle.xml

@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="256,256">
   <displayList>
-    <loader id="n16_v3k9" name="loaIcon" xy="0,-1" size="256,259" visible="false" url="ui://mfvz4q8kvuz5b7" autoSize="true"/>
-    <image id="n19_wgy9" name="imgGuide" src="vuz5b9" fileName="imagesStory/zd_pfanniu_4.png" xy="-52,-52" scale="0.95,0.95" visible="false"/>
+    <loader id="n16_v3k9" name="loaIcon" xy="-2,-4" size="256,259" visible="false" url="ui://mfvz4q8kvuz5b6" autoSize="true"/>
     <graph id="n18_mueb" name="holder" xy="127,127" size="1,1"/>
-    <text id="n17_v3k9" name="txtPart" xy="128,78" pivot="0.5,0.5" anchor="true" size="148,94" fontSize="72" color="#d1a962" align="center" strokeColor="#feefc0" strokeSize="2" text="饰品"/>
-    <text id="n15_mza1" name="txtCount" xy="0,107" pivot="0.5,0.5" size="256,94" font="ui://eg2y0ldpkst18" fontSize="72" color="#c49c56" align="center" vAlign="middle" autoSize="none" strokeColor="#feefc0" strokeSize="2" text="999"/>
+    <text id="n17_v3k9" name="txtPart" xy="128,78" pivot="0.5,0.5" anchor="true" size="124,79" fontSize="60" color="#fdfbee" align="center" text="饰品"/>
+    <text id="n15_mza1" name="txtCount" xy="64,124" pivot="0.5,0.5" size="127,60" font="ui://mfvz4q8kvuz5b2" fontSize="56" color="#fdfbee" align="center" vAlign="middle" text="999"/>
   </displayList>
   <transition name="t0">
     <item time="0" type="Visible" target="n15_mza1" value="false"/>
+    <item time="0" type="Visible" target="n16_v3k9" value="false"/>
     <item time="0" type="Visible" target="n17_v3k9" value="false"/>
     <item time="0" type="Visible" target="n18_mueb" value="true"/>
-    <item time="0" type="Visible" target="n19_wgy9" value="false"/>
     <item time="14" type="Visible" target="n15_mza1" value="true"/>
+    <item time="14" type="Visible" target="n16_v3k9" value="true"/>
     <item time="14" type="Visible" target="n17_v3k9" value="true"/>
-    <item time="30" type="Visible" target="n15_mza1" value="false"/>
-    <item time="30" type="Visible" target="n17_v3k9" value="false"/>
-    <item time="30" type="Visible" target="n19_wgy9" value="false"/>
-    <item time="72" type="Visible" target="n18_mueb" value="true"/>
+    <item time="42" type="Visible" target="n15_mza1" value="false"/>
+    <item time="42" type="Visible" target="n16_v3k9" value="false"/>
+    <item time="42" type="Visible" target="n17_v3k9" value="false"/>
+    <item time="45" type="Visible" target="n18_mueb" value="true"/>
   </transition>
-  <transition name="t1" autoPlay="true">
+  <transition name="t1">
     <item time="0" type="Visible" target="n18_mueb" value="true"/>
     <item time="30" type="Visible" target="n18_mueb" value="true"/>
   </transition>

+ 1 - 1
FGUIProject/assets/Main/package.xml

@@ -332,7 +332,6 @@
     <image id="v3k9cs" name="zd_zdjdt_3.png" path="/imagesStory/"/>
     <image id="v3k9ct" name="zd_zijia.png" path="/FontScore/"/>
     <image id="v3k9cu" name="zd_zijian.png" path="/FontScore/"/>
-    <component id="v3k9cv" name="comMineCircle.xml" path="/components/"/>
     <component id="v3k9cx" name="ComRoleSkill.xml" path="/components/"/>
     <image id="v3k9cy" name="zd_jinengdi_1.png" path="/images/"/>
     <image id="v3k9cz" name="zd_mcdi.png" path="/imagesStory/"/>
@@ -381,6 +380,7 @@
     <image id="muebec" name="sjsd_ss_1.png" path="/images/"/>
     <image id="muebed" name="sjsd_ss_2.png" path="/images/"/>
     <component id="muebef" name="Component4.xml" path="/components/"/>
+    <component id="c2umeg" name="comMineCircle.xml" path="/components/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\Main" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

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

@@ -9,10 +9,13 @@ namespace UI.Main
         public GComponent target;
         public Controller m_c1;
         public GLoader m_loaBg;
+        public GGraph m_holder;
+        public GGraph m_holder1;
         public GLoader m_loaType;
         public GTextField m_txtCount0;
         public GTextField m_txtCount1;
         public GTextField m_txtCount2;
+        public Transition m_t0;
         public const string URL = "ui://mfvz4q8kvuz5bi";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "ComScoreResult";
@@ -62,19 +65,25 @@ namespace UI.Main
         {
             m_c1 = comp.GetController("c1");
             m_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_holder = (GGraph)comp.GetChild("holder");
+            m_holder1 = (GGraph)comp.GetChild("holder1");
             m_loaType = (GLoader)comp.GetChild("loaType");
             m_txtCount0 = (GTextField)comp.GetChild("txtCount0");
             m_txtCount1 = (GTextField)comp.GetChild("txtCount1");
             m_txtCount2 = (GTextField)comp.GetChild("txtCount2");
+            m_t0 = comp.GetTransition("t0");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
             m_loaBg = null;
+            m_holder = null;
+            m_holder1 = null;
             m_loaType = null;
             m_txtCount0 = null;
             m_txtCount1 = null;
             m_txtCount2 = null;
+            m_t0 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -10,7 +10,7 @@ namespace UI.Main
         public GButton m_btnSkip;
         public GButton m_btnBack;
         public UI_ProgressBarTargetScore m_proScore;
-        public UI_comTargetCircle m_comMineCircle;
+        public UI_comMineCircle m_comMineCircle;
         public UI_comTargetCircle m_comTargetCircle;
         public GProgressBar m_proMinusMine;
         public GProgressBar m_proMinusNpc;
@@ -85,7 +85,7 @@ namespace UI.Main
             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_comTargetCircle)UI_comTargetCircle.Create(comp.GetChild("comMineCircle"));
+            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");

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

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

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

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

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

@@ -8,7 +8,6 @@ namespace UI.Main
     {
         public GComponent target;
         public GLoader m_loaIcon;
-        public GImage m_imgGuide;
         public GGraph m_holder;
         public GTextField m_txtPart;
         public GTextField m_txtCount;
@@ -62,7 +61,6 @@ namespace UI.Main
         private void Init(GComponent comp)
         {
             m_loaIcon = (GLoader)comp.GetChild("loaIcon");
-            m_imgGuide = (GImage)comp.GetChild("imgGuide");
             m_holder = (GGraph)comp.GetChild("holder");
             m_txtPart = (GTextField)comp.GetChild("txtPart");
             m_txtCount = (GTextField)comp.GetChild("txtCount");
@@ -72,7 +70,6 @@ namespace UI.Main
         public void Dispose(bool disposeTarget = false)
         {
             m_loaIcon = null;
-            m_imgGuide = null;
             m_holder = null;
             m_txtPart = null;
             m_txtCount = null;

+ 26 - 8
GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightSingleScoreView.cs

@@ -24,6 +24,8 @@ namespace GFGGame
 
         private GameObject _gameObject0;
         private GameObject _gameObject1;
+        private GameObject _gameObject2;
+        private GameObject _gameObject3;
 
         protected override void OnInit()
         {
@@ -135,14 +137,27 @@ namespace GFGGame
 
             int clickState = GetClickState();
             _ui.m_comClickCircle.m_t0.Stop(true, false);
-            UpdateCircleResult(clickState);
-
-            _ui.m_comClickCircle.m_t1.ignoreEngineTimeScale = false;
-            _ui.m_comClickCircle.m_t1.timeScale = EquipDataCache.cacher.fightSpeed;// 1 / _speed;
-            _ui.m_comClickCircle.m_t1.Play(() =>
+            _ui.m_comClickCircle.m_grpCircle.visible = false;
+            _ui.m_comClickCircle.m_ComScoreResult.target.visible = true;
+            _ui.m_comClickCircle.m_ComScoreResult.m_c1.selectedIndex = clickState;
+            _ui.m_comClickCircle.m_ComScoreResult.m_t0.ignoreEngineTimeScale = false;
+            _ui.m_comClickCircle.m_ComScoreResult.m_t0.timeScale = EquipDataCache.cacher.fightSpeed;
+            _ui.m_comClickCircle.m_ComScoreResult.m_t0.Play(() =>
             {
+                // _ui.m_comClickCircle.m_grpCircle.visible = true;
+                _ui.m_comClickCircle.m_ComScoreResult.target.visible = false;
                 CircleResuleEnd();
+                PlayScoreTWEffect();
+
             });
+            UpdateCircleResult(clickState);
+
+            // _ui.m_comClickCircle.m_t1.ignoreEngineTimeScale = false;
+            // _ui.m_comClickCircle.m_t1.timeScale = EquipDataCache.cacher.fightSpeed;// 1 / _speed;
+            // _ui.m_comClickCircle.m_t1.Play(() =>
+            // {
+            //     CircleResuleEnd();
+            // });
 
 
 
@@ -151,7 +166,7 @@ namespace GFGGame
         private void UpdateCircleResult(int clickState)
         {
             //只显示部件分加基础分
-            _ui.m_comClickCircle.m_ComScoreResult.m_c1.selectedIndex = clickState;
+            // _ui.m_comClickCircle.m_ComScoreResult.m_c1.selectedIndex = clickState;
             UI_ComScoreResult comScoreResult = UI_ComScoreResult.Proxy(_ui.m_comClickCircle.m_ComScoreResult.target);
             int partId = FightScoreCfgArray.Instance.dataArray[_index].id;
             double partScore = ScoreSystemData.Instance.GetPartItemScore(partId);
@@ -165,7 +180,6 @@ namespace GFGGame
             // int partId = FightScoreCfgArray.Instance.dataArray[_index].id;
             _score += ScoreSystemData.Instance.GetPartScore(partId, clickState, _mainScore, _skillScore);
             // SetScoreUI();
-            PlayScoreTWEffect();
         }
 
         private void CircleResuleEnd()
@@ -308,7 +322,11 @@ namespace GFGGame
             string resPath0 = ResPathUtil.GetViewEffectPath("ui_zhandou", "zd_df_tw");
             SceneController.AddObjectToView(_gameObject0, null, _ui.m_holderPartScore, resPath0, out _gameObject0, out GoWrapper _wrapper0);
             string resPath1 = ResPathUtil.GetViewEffectPath("ui_zhandou", "ui_zd_jdt");
-            SceneController.AddObjectToView(_gameObject1, null, _ui.m_proScore.m_comBar.m_holder, resPath1, out _gameObject1, out GoWrapper _wrapper6);
+            SceneController.AddObjectToView(_gameObject1, null, _ui.m_proScore.m_comBar.m_holder, resPath1, out _gameObject1, out GoWrapper _wrapper1);
+            string resPath8 = ResPathUtil.GetViewEffectPath("ui_zhandou", "zd_df_cheng");
+            SceneController.AddObjectToView(_gameObject2, null, _ui.m_comClickCircle.m_ComScoreResult.m_holder1, resPath8, out _gameObject2, out GoWrapper _wrapper2, 59);
+            string resPath8_1 = ResPathUtil.GetViewEffectPath("ui_zhandou", "zd_df_lv");
+            SceneController.AddObjectToView(_gameObject3, null, _ui.m_comClickCircle.m_ComScoreResult.m_holder, resPath8_1, out _gameObject3, out GoWrapper _wrapper3, 59);
         }
         protected override void OnHide()
         {

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

@@ -110,9 +110,10 @@ namespace GFGGame
             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_dfzj");
-            SceneController.AddObjectToView(_gameObject13, null, _ui.m_comMineCircle.m_holder, resPath8, out _gameObject13, out GoWrapper _wrapper13, 55);
-            SceneController.AddObjectToView(_gameObject14, null, _ui.m_comTargetCircle.m_holder, resPath8, out _gameObject14, out GoWrapper _wrapper14, 55);
+            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");
+            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);
@@ -296,7 +297,7 @@ namespace GFGGame
             StoryFightCfg fightCfg = StoryFightCfgArray.Instance.GetCfg(levelCfg.fightID);
             _ui.m_proScore.m_txtNpcScore.text = string.Format("{0}{1}", fightCfg.targetName, (int)_targetScore);
             _ui.m_proScore.m_txtMineScore.text = string.Format("{0}{1}", RoleDataManager.roleName, (int)_score);
-            _ui.m_proScore.m_comBar.m_imgAni.visible = true;
+            // _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);
@@ -325,14 +326,16 @@ namespace GFGGame
             _ui.m_comTargetCircle.m_txtPart.text = FightScoreCfgArray.Instance.GetCfg(_index + 1).name;
             if (_index == 0 && GuideDataManager.IsGuideFinish(ConstGuideId.TARGET_FIGHT) <= 0)
             {
-                _ui.m_comMineCircle.m_t0.Play(1, 0, 0, 1f, () =>
+                _ui.m_comMineCircle.m_t0.Play(1, 0, 0, 0.75f, () =>
                 {
-                    _ui.m_comMineCircle.m_imgGuide.visible = true;
+                    _ui.m_comMineCircle.m_holder.visible = false;
+                    // _ui.m_comMineCircle.m_loaIcon.visible = true;
                     playStop = true;
                 });
-                _ui.m_comTargetCircle.m_t0.Play(1, 0, 0, 1f, () =>
+                _ui.m_comTargetCircle.m_t0.Play(1, 0, 0, 0.75f, () =>
                 {
-                    _ui.m_comTargetCircle.m_imgGuide.visible = true;
+                    _ui.m_comTargetCircle.m_holder.visible = false;
+                    // _ui.m_comTargetCircle.m_loaIcon.visible = true;
                 });
                 return;
             }
@@ -604,7 +607,7 @@ namespace GFGGame
             _ui.m_proScore.target.max = 100;
             _ui.m_proScore.target.value = 0;
             _ui.m_proScore.m_comBar.target.width = 0;
-            _ui.m_proScore.m_comBar.m_imgAni.visible = false;
+            // _ui.m_proScore.m_comBar.m_imgAni.visible = false;
 
             _ui.m_comMineCircle.target.visible = false;
             _ui.m_comTargetCircle.target.visible = false;

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_fui.bytes