对战技能效果

FGUIProject/assets/Main/StoryFightTargetScoreUI.xml

@@ -27,10 +27,10 @@
     <component id="n26_vbe8" name="proMinusNpc" src="mhyhd4" fileName="components/ProgressBar2.xml" xy="708,820">
       <ProgressBar value="100" max="100"/>
     </component>
-    <component id="n29_uj53" name="ComRoleSkillMineAdd" src="v3k9c1" fileName="components/ComRoleSkillScore.xml" xy="100,914"/>
-    <component id="n34_pcn0" name="ComRoleSkillMineMinus" src="v3k9c1" fileName="components/ComRoleSkillScore.xml" xy="100,914"/>
-    <component id="n33_uj53" name="ComRoleSkillNpcAdd" src="v3k9c1" fileName="components/ComRoleSkillScore.xml" xy="620,914"/>
-    <component id="n35_pcn0" name="ComRoleSkillNpcMinus" src="v3k9c1" fileName="components/ComRoleSkillScore.xml" xy="620,914"/>
+    <component id="n29_uj53" name="ComRoleSkillMineAdd" src="v3k9cx" fileName="components/ComRoleSkill.xml" xy="60,914"/>
+    <component id="n34_pcn0" name="ComRoleSkillMineMinus" src="lki4db" fileName="components/ComRoleSkill1.xml" xy="40,914" controller="c1,0"/>
+    <component id="n33_uj53" name="ComRoleSkillNpcAdd" src="v3k9cx" fileName="components/ComRoleSkill.xml" xy="590,914"/>
+    <component id="n35_pcn0" name="ComRoleSkillNpcMinus" src="lki4db" fileName="components/ComRoleSkill1.xml" xy="40,914" controller="c1,1"/>
     <component id="n1_8xpg" name="selfName" src="8xpg41" fileName="components/CompFightResultName.xml" xy="48,1499">
       <relation target="" sidePair="bottom-bottom"/>
     </component>

FGUIProject/assets/Main/components/ComRoleSkill.xml

@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="360,360">
-  <controller name="c1" pages="0,,1," selected="1"/>
+<component size="400,450">
   <displayList>
-    <image id="n30_v3k9" name="n30" src="v3k9cb" fileName="imagesStory/zd_jinengdi_1.png" xy="0,0"/>
-    <text id="n29_uj53" name="txtScore" xy="180,205" pivot="0.5,0" anchor="true" size="231,59" font="ui://mfvz4q8kvuz5b5" fontSize="55" color="#5dd05d" vars="true" text="-{count=10086}">
-      <gearText controller="c1" pages="0,1" values="+{count=9000}|-{count=10086}"/>
-    </text>
-    <image id="n31_v3k9" name="n31" src="v3k9cg" fileName="imagesStory/zd_jnsxzi_1.png" xy="79,101">
-      <gearDisplay controller="c1" pages="0"/>
-    </image>
-    <image id="n32_v3k9" name="n32" src="v3k9ch" fileName="imagesStory/zd_jnsxzi_2.png" xy="79,101">
-      <gearDisplay controller="c1" pages="1"/>
-    </image>
+    <image id="n30_v3k9" name="n30" src="v3k9cb" fileName="imagesStory/zd_jinengdi_1.png" xy="128,0" pivot="0.5,0.5" size="243,243" group="n34_lki4" aspect="true"/>
+    <text id="n33_lki4" name="txtResult" xy="94,123" pivot="0.5,0.5" anchor="true" size="68,114" group="n34_lki4" font="ui://mfvz4q8kvuz5b5" fontSize="110" color="#5dd05d" vars="true" text="+"/>
+    <text id="n29_uj53" name="txtScore" xy="249,122" pivot="0.5,0.5" anchor="true" size="203,74" group="n34_lki4" font="ui://mfvz4q8kvuz5b5" fontSize="70" color="#5dd05d" align="center" vars="true" autoSize="none" text="{count=9000}"/>
+    <group id="n34_lki4" name="n34" xy="60,0" size="311,243" advanced="true"/>
+    <image id="n31_v3k9" name="n31" src="v3k9cg" fileName="imagesStory/zd_jnsxzi_1.png" xy="100,357" pivot="0.5,0.5"/>
   </displayList>
+  <transition name="t0">
+    <item time="0" type="Alpha" target="n34_lki4" value="0"/>
+    <item time="0" type="Scale" target="n31_v3k9" tween="true" startValue="1.6,1.6" endValue="1,1" duration="6" ease="Bounce.Out"/>
+    <item time="6" type="Alpha" target="n34_lki4" tween="true" startValue="1" endValue="0" duration="18" ease="Quart.In"/>
+    <item time="6" type="XY" target="n34_lki4" tween="true" startValue="60,0" endValue="60,-250" duration="18" ease="Linear"/>
+  </transition>
 </component>

FGUIProject/assets/Main/components/ComRoleSkill1.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1000,450">
+  <controller name="c1" exported="true" pages="0,,1," selected="1"/>
+  <displayList>
+    <image id="n30_v3k9" name="n30" src="v3k9cb" fileName="imagesStory/zd_jinengdi_1.png" xy="148,0" pivot="0.5,0.5" size="243,243" group="n34_lki4" aspect="true"/>
+    <text id="n33_lki4" name="txtResult" xy="114,123" pivot="0.5,0.5" anchor="true" size="68,114" group="n34_lki4" font="ui://mfvz4q8kvuz5b5" fontSize="110" color="#5dd05d" vars="true" text="-"/>
+    <text id="n29_uj53" name="txtScore" xy="269,121" pivot="0.5,0.5" anchor="true" size="203,74" group="n34_lki4" font="ui://mfvz4q8kvuz5b5" fontSize="70" color="#5dd05d" align="center" vars="true" autoSize="none" text="{count=90}"/>
+    <group id="n34_lki4" name="n34" xy="80,0" size="311,243" advanced="true">
+      <gearXY controller="c1" pages="1" values="80,0" default="610,0"/>
+    </group>
+    <image id="n31_v3k9" name="n31" src="v3k9ch" fileName="imagesStory/zd_jnsxzi_2.png" xy="660,357" pivot="0.5,0.5">
+      <gearXY controller="c1" pages="0" values="120,357" default="660,357"/>
+    </image>
+  </displayList>
+  <transition name="t0">
+    <item time="0" type="Alpha" target="n34_lki4" value="0"/>
+    <item time="0" type="Scale" target="n31_v3k9" tween="true" startValue="1.6,1.6" endValue="1,1" duration="6" ease="Bounce.Out"/>
+    <item time="6" type="Alpha" target="n34_lki4" tween="true" startValue="1" endValue="0" duration="18" ease="Quart.In"/>
+    <item time="6" type="XY" target="n34_lki4" tween="true" startValue="610,0" endValue="610,-250" duration="18" ease="Linear"/>
+  </transition>
+  <transition name="t1">
+    <item time="0" type="Alpha" target="n34_lki4" value="0"/>
+    <item time="0" type="Scale" target="n31_v3k9" tween="true" startValue="1.6,1.6" endValue="1,1" duration="6" ease="Bounce.Out"/>
+    <item time="6" type="Alpha" target="n34_lki4" tween="true" startValue="1" endValue="0" duration="18" ease="Quart.In"/>
+    <item time="6" type="XY" target="n34_lki4" tween="true" startValue="80,0" endValue="80,-250" duration="18" ease="Linear"/>
+  </transition>
+</component>

FGUIProject/assets/Main/components/ComRoleSkillScore.xml

@@ -1,20 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="360,360">
+  <controller name="c1" pages="0,,1," selected="1"/>
   <displayList>
     <component id="n30_v3k9" name="comRoleSkill" src="v3k9cx" fileName="components/ComRoleSkill.xml" xy="180,180" pivot="0.5,0.5" anchor="true"/>
   </displayList>
-  <transition name="t0">
-    <item time="0" type="Pivot" target="n30_v3k9" value="0.5,0.5"/>
-    <item time="0" type="Scale" target="n30_v3k9" tween="true" startValue="1.5,1.5" endValue="1,1" duration="12" ease="Bounce.Out"/>
-    <item time="0" type="Visible" target="n30_v3k9" value="true"/>
-    <item time="0" type="XY" target="n30_v3k9" value="180,180"/>
-    <item time="18" type="Visible" target="n30_v3k9" value="false"/>
-  </transition>
-  <transition name="t1">
-    <item time="0" type="Pivot" target="n30_v3k9" value="0,1"/>
-    <item time="0" type="Visible" target="n30_v3k9" value="true"/>
-    <item time="0" type="XY" target="n30_v3k9" value="0,360"/>
-    <item time="6" type="Rotation" target="n30_v3k9" tween="true" startValue="0" endValue="15" duration="6" ease="Bounce.Out"/>
-    <item time="18" type="Visible" target="n30_v3k9" value="false"/>
-  </transition>
 </component>

FGUIProject/assets/Main/package.xml

@@ -368,6 +368,7 @@
     <image id="mhyhd6" name="grxx_txtx.png" path="/images/"/>
     <image id="mhyhd7" name="grxx_mzk_1.png" path="/images/"/>
     <image id="mhyhd8" name="grxx_mzk_2.png" path="/images/"/>
+    <component id="lki4db" name="ComRoleSkill1.xml" path="/components/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\Main" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

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

@@ -7,8 +7,9 @@ namespace UI.Main
     public partial class UI_ComRoleSkill
     {
         public GComponent target;
-        public Controller m_c1;
+        public GTextField m_txtResult;
         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";
@@ -56,13 +57,15 @@ namespace UI.Main
 
         private void Init(GComponent comp)
         {
-            m_c1 = comp.GetController("c1");
+            m_txtResult = (GTextField)comp.GetChild("txtResult");
             m_txtScore = (GTextField)comp.GetChild("txtScore");
+            m_t0 = comp.GetTransition("t0");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_c1 = null;
+            m_txtResult = null;
             m_txtScore = null;
+            m_t0 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComRoleSkillScore.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComRoleSkill1.cs

@@ -4,20 +4,22 @@ using FairyGUI;
 
 namespace UI.Main
 {
-    public partial class UI_ComRoleSkillScore
+    public partial class UI_ComRoleSkill1
     {
         public GComponent target;
-        public UI_ComRoleSkill m_comRoleSkill;
+        public Controller m_c1;
+        public GTextField m_txtResult;
+        public GTextField m_txtScore;
         public Transition m_t0;
         public Transition m_t1;
-        public const string URL = "ui://mfvz4q8kv3k9c1";
+        public const string URL = "ui://mfvz4q8klki4db";
         public const string PACKAGE_NAME = "Main";
-        public const string RES_NAME = "ComRoleSkillScore";
-        private static UI_ComRoleSkillScore _proxy;
+        public const string RES_NAME = "ComRoleSkill1";
+        private static UI_ComRoleSkill1 _proxy;
 
-        public static UI_ComRoleSkillScore Create(GObject gObject = null)
+        public static UI_ComRoleSkill1 Create(GObject gObject = null)
         {
-            var ui = new UI_ComRoleSkillScore();
+            var ui = new UI_ComRoleSkill1();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -26,11 +28,11 @@ namespace UI.Main
             return ui;
         }
 
-        public static UI_ComRoleSkillScore Proxy(GObject gObject = null)
+        public static UI_ComRoleSkill1 Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_ComRoleSkillScore();
+                _proxy = new UI_ComRoleSkill1();
             }
             var ui = _proxy;
             if(gObject == null)
@@ -57,14 +59,17 @@ namespace UI.Main
 
         private void Init(GComponent comp)
         {
-            m_comRoleSkill = (UI_ComRoleSkill)UI_ComRoleSkill.Create(comp.GetChild("comRoleSkill"));
+            m_c1 = comp.GetController("c1");
+            m_txtResult = (GTextField)comp.GetChild("txtResult");
+            m_txtScore = (GTextField)comp.GetChild("txtScore");
             m_t0 = comp.GetTransition("t0");
             m_t1 = comp.GetTransition("t1");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_comRoleSkill.Dispose();
-            m_comRoleSkill = null;
+            m_c1 = null;
+            m_txtResult = null;
+            m_txtScore = null;
             m_t0 = null;
             m_t1 = null;
             if(disposeTarget && target != null)

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComRoleSkillScore.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComRoleSkill1.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: fa5ea94a729bf304e91b516900c4f923
+guid: db7b7ee5a5e356245a14d5c12d54abce
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

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

@@ -18,10 +18,10 @@ namespace UI.Main
         public UI_ComSkillShield m_ComShieldNpc;
         public GProgressBar m_proMinusMine;
         public GProgressBar m_proMinusNpc;
-        public UI_ComRoleSkillScore m_ComRoleSkillMineAdd;
-        public UI_ComRoleSkillScore m_ComRoleSkillMineMinus;
-        public UI_ComRoleSkillScore m_ComRoleSkillNpcAdd;
-        public UI_ComRoleSkillScore m_ComRoleSkillNpcMinus;
+        public UI_ComRoleSkill m_ComRoleSkillMineAdd;
+        public UI_ComRoleSkill1 m_ComRoleSkillMineMinus;
+        public UI_ComRoleSkill m_ComRoleSkillNpcAdd;
+        public UI_ComRoleSkill1 m_ComRoleSkillNpcMinus;
         public UI_CompFightResultName m_selfName;
         public UI_CompFightResultName m_targetName;
         public UI_ComBtnSkill m_btnSkill0;
@@ -86,10 +86,10 @@ namespace UI.Main
             m_ComShieldNpc = (UI_ComSkillShield)UI_ComSkillShield.Create(comp.GetChild("ComShieldNpc"));
             m_proMinusMine = (GProgressBar)comp.GetChild("proMinusMine");
             m_proMinusNpc = (GProgressBar)comp.GetChild("proMinusNpc");
-            m_ComRoleSkillMineAdd = (UI_ComRoleSkillScore)UI_ComRoleSkillScore.Create(comp.GetChild("ComRoleSkillMineAdd"));
-            m_ComRoleSkillMineMinus = (UI_ComRoleSkillScore)UI_ComRoleSkillScore.Create(comp.GetChild("ComRoleSkillMineMinus"));
-            m_ComRoleSkillNpcAdd = (UI_ComRoleSkillScore)UI_ComRoleSkillScore.Create(comp.GetChild("ComRoleSkillNpcAdd"));
-            m_ComRoleSkillNpcMinus = (UI_ComRoleSkillScore)UI_ComRoleSkillScore.Create(comp.GetChild("ComRoleSkillNpcMinus"));
+            m_ComRoleSkillMineAdd = (UI_ComRoleSkill)UI_ComRoleSkill.Create(comp.GetChild("ComRoleSkillMineAdd"));
+            m_ComRoleSkillMineMinus = (UI_ComRoleSkill1)UI_ComRoleSkill1.Create(comp.GetChild("ComRoleSkillMineMinus"));
+            m_ComRoleSkillNpcAdd = (UI_ComRoleSkill)UI_ComRoleSkill.Create(comp.GetChild("ComRoleSkillNpcAdd"));
+            m_ComRoleSkillNpcMinus = (UI_ComRoleSkill1)UI_ComRoleSkill1.Create(comp.GetChild("ComRoleSkillNpcMinus"));
             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"));

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

@@ -240,7 +240,8 @@ namespace GFGGame
         }
         private void UpdateAddUI(RoleSkillCfg cfg, int role)
         {
-            UI_ComRoleSkillScore comRoleSkillScore = role == SkillDataManager.MINE ? _ui.m_ComRoleSkillMineAdd : _ui.m_ComRoleSkillNpcAdd;
+            UI_ComRoleSkill comRoleSkillScore = role == SkillDataManager.MINE ? _ui.m_ComRoleSkillMineAdd : _ui.m_ComRoleSkillNpcAdd;
+            comRoleSkillScore.target.visible = true;
             int score = 0;
             if (role == SkillDataManager.MINE)
             {
@@ -252,9 +253,12 @@ namespace GFGGame
                 score = (int)_targetMainScore * cfg.value / 100;
                 _targetScore += score;
             }
-            comRoleSkillScore.m_comRoleSkill.m_c1.selectedIndex = 0;
-            comRoleSkillScore.m_comRoleSkill.m_txtScore.SetVar("count", score.ToString()).FlushVars();
-            comRoleSkillScore.m_t0.Play();
+            // comRoleSkillScore.m_comRoleSkill.m_c1.selectedIndex = 0;
+            comRoleSkillScore.m_txtScore.SetVar("count", score.ToString()).FlushVars();
+            comRoleSkillScore.m_t0.Play(() =>
+                {
+                    comRoleSkillScore.target.visible = false;
+                });
 
             UpdateProgressBar();
 
@@ -277,8 +281,9 @@ namespace GFGGame
                     return;
                 }
 
-                UI_ComRoleSkillScore comRoleSkillScore = role == SkillDataManager.MINE ? _ui.m_ComRoleSkillNpcMinus : _ui.m_ComRoleSkillMineMinus;
-
+                UI_ComRoleSkill1 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)
                 {
@@ -292,9 +297,24 @@ namespace GFGGame
                     _score -= score;
                 }
 
-                comRoleSkillScore.m_comRoleSkill.m_c1.selectedIndex = 1;
-                comRoleSkillScore.m_comRoleSkill.m_txtScore.SetVar("count", score.ToString()).FlushVars();
-                comRoleSkillScore.m_t1.Play();
+                // comRoleSkillScore.m_comRoleSkill.m_c1.selectedIndex = 1;
+                comRoleSkillScore.m_txtScore.SetVar("count", score.ToString()).FlushVars();
+                if (role == SkillDataManager.MINE)
+                {
+
+                    comRoleSkillScore.m_t0.Play(() =>
+                    {
+                        comRoleSkillScore.target.visible = false;
+                    });
+                }
+                else
+                {
+                    comRoleSkillScore.m_t1.Play(() =>
+                {
+                    comRoleSkillScore.target.visible = false;
+                });
+                }
+
                 UpdateProgressBar();
 
             });
@@ -362,10 +382,10 @@ namespace GFGGame
             _ui.m_ComShieldNpc.target.visible = false;
             _ui.m_ComShieldMine.target.visible = false;
 
-            _ui.m_ComRoleSkillMineAdd.m_comRoleSkill.target.visible = false;
-            _ui.m_ComRoleSkillMineMinus.m_comRoleSkill.target.visible = false;
-            _ui.m_ComRoleSkillNpcAdd.m_comRoleSkill.target.visible = false;
-            _ui.m_ComRoleSkillNpcMinus.m_comRoleSkill.target.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;
 
             RoleSkillCfg[] roleSkillCfgs = RoleSkillCfgArray.Instance.dataArray;
             for (int i = 0; i < roleSkillCfgs.Length; i++)