zhaoyang vor 2 Jahren
Ursprung
Commit
9fc1953fdf

+ 9 - 6
FGUIProject/assets/Main/StoryFightSingleScoreUI.xml

@@ -17,12 +17,6 @@
     <component id="n42_wono" name="comScoreStage" src="wonoh2" fileName="components/ComSingleScoreStage.xml" xy="1022,108" pivot="0.5,0.5" anchor="true"/>
     <loader id="n40_wono" name="loaGlass" xy="402,823" pivot="0.5,0.5" size="274,274" scale="0,0" url="ui://mfvz4q8kwonogt" align="center" vAlign="middle"/>
     <component id="n4_n0js" name="comClickCircle" src="n0js9b" fileName="components/comClickCircle.xml" xy="120,1439" pivot="0.5,0.5"/>
-    <graph id="n30_uo1t" name="grh_0" xy="570,228" pivot="0.5,0.5" size="25,25" aspect="true"/>
-    <graph id="n23_uo1t" name="grh_1" xy="139,374" pivot="0.5,0.5" size="25,25" aspect="true"/>
-    <graph id="n24_uo1t" name="grh_2" xy="590,492" pivot="0.5,0.5" size="25,25" aspect="true"/>
-    <graph id="n25_uo1t" name="grh_3" xy="653,957" pivot="0.5,0.5" size="25,25" aspect="true"/>
-    <graph id="n26_uo1t" name="grh_4" xy="89,729" pivot="0.5,0.5" size="25,25" aspect="true"/>
-    <graph id="n48_wono" name="grh_5" xy="111,1429" pivot="0.5,0.5" size="25,25" aspect="true"/>
     <component id="n36_jj0m" name="btnSpeedUp" src="jj0mdl" fileName="componentsDialog/ButtonSpeedUp1.xml" xy="915,1627">
       <relation target="" sidePair="right-right,bottom-bottom"/>
       <Button title="x1"/>
@@ -33,6 +27,15 @@
     <component id="n46_wono" name="comRoleResult" src="wonogk" fileName="components/ComRoleResult.xml" xy="540,959" 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" 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"/>

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

@@ -14,15 +14,15 @@ namespace UI.Main
         public UI_ComSingleScoreStage m_comScoreStage;
         public GLoader m_loaGlass;
         public UI_comClickCircle m_comClickCircle;
+        public GButton m_btnSpeedUp;
+        public GGraph m_grhMask;
+        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 GButton m_btnSpeedUp;
-        public GGraph m_grhMask;
-        public UI_ComRoleResult m_comRoleResult;
         public Transition m_t1;
         public Transition m_t2;
         public const string URL = "ui://mfvz4q8k8xpg3x";
@@ -79,15 +79,15 @@ namespace UI.Main
             m_comScoreStage = (UI_ComSingleScoreStage)UI_ComSingleScoreStage.Create(comp.GetChild("comScoreStage"));
             m_loaGlass = (GLoader)comp.GetChild("loaGlass");
             m_comClickCircle = (UI_comClickCircle)UI_comClickCircle.Create(comp.GetChild("comClickCircle"));
+            m_btnSpeedUp = (GButton)comp.GetChild("btnSpeedUp");
+            m_grhMask = (GGraph)comp.GetChild("grhMask");
+            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_btnSpeedUp = (GButton)comp.GetChild("btnSpeedUp");
-            m_grhMask = (GGraph)comp.GetChild("grhMask");
-            m_comRoleResult = (UI_ComRoleResult)UI_ComRoleResult.Create(comp.GetChild("comRoleResult"));
             m_t1 = comp.GetTransition("t1");
             m_t2 = comp.GetTransition("t2");
         }
@@ -103,16 +103,16 @@ namespace UI.Main
             m_loaGlass = null;
             m_comClickCircle.Dispose();
             m_comClickCircle = null;
+            m_btnSpeedUp = null;
+            m_grhMask = 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_btnSpeedUp = null;
-            m_grhMask = null;
-            m_comRoleResult.Dispose();
-            m_comRoleResult = null;
             m_t1 = null;
             m_t2 = null;
             if(disposeTarget && target != null)

+ 2 - 0
GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightSingleScoreView.cs

@@ -191,6 +191,7 @@ namespace GFGGame
             {
                 GetCurStar(out int star, out Transition transition);
                 _ui.m_comRoleResult.m_c1.selectedIndex = 0;
+                _ui.m_grhMask.touchable = true;
                 _ui.m_t2.Play(() =>
                 {
                     _ui.m_comRoleResult.m_c1.selectedIndex = star;
@@ -276,6 +277,7 @@ namespace GFGGame
 
             _ui.m_comRoleResult.target.SetScale(0, 0);
             _ui.m_grhMask.alpha = 0;
+            _ui.m_grhMask.touchable = false;
             _ui.m_proScore.target.value = 0;
             _ui.m_proScore.m_txtCount.text = "总分 0";
             _ui.m_comScoreStage.target.visible = true;

+ 1 - 0
GameClient/Assets/Game/HotUpdate/Views/MainStory/StroyFightResultView.cs

@@ -137,6 +137,7 @@ namespace GFGGame
             _ui.m_comExpBar.target.alpha = 0;
             _ui.m_t1.Stop(true, false);
             _ui.m_ComRoleResult.m_comRole.m_t1.Stop(true, false);
+            _ui.m_ComRoleResult.m_comRole.m_loaRole.alpha = 0;
         }
 
         private async void OnClickBtnClose(object param)