zhaoyang 2 жил өмнө
parent
commit
fc8f93c526

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

@@ -21,9 +21,9 @@
       <relation target="" sidePair="right-right,bottom-bottom"/>
       <Button title="x1"/>
     </component>
-    <graph id="n47_wono" name="grhMask" xy="0,0" size="1080,1920" alpha="0" touchable="false" type="rect" lineSize="0" fillColor="#ff000000">
-      <relation target="" sidePair="width-width,height-height"/>
-    </graph>
+    <loader id="n51_wono" name="LoaMask" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" alpha="0" touchable="false" fill="scaleMatchWidth">
+      <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
+    </loader>
     <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>
@@ -49,7 +49,7 @@
     <item time="49" type="Scale" target="n4_n0js" value="0,0"/>
   </transition>
   <transition name="t2">
-    <item time="0" type="Alpha" target="n47_wono" tween="true" startValue="0" endValue="0.6" duration="12" ease="Linear"/>
+    <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" 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"/>

+ 1 - 3
FGUIProject/assets/Main/components/ComRole.xml

@@ -13,9 +13,7 @@
   <transition name="t0">
     <item time="0" type="Visible" target="n17_wono" value="true"/>
     <item time="0" type="XY" target="n17_wono" tween="true" startValue="0,-1000" endValue="0,1300" duration="12" ease="Linear"/>
+    <item time="12" type="Alpha" target="n15_wono" tween="true" startValue="0" endValue="1" duration="12" ease="Linear"/>
     <item time="12" type="Visible" target="n17_wono" value="false"/>
   </transition>
-  <transition name="t1">
-    <item time="0" type="Alpha" target="n15_wono" tween="true" startValue="0" endValue="1" duration="12" ease="Linear"/>
-  </transition>
 </component>

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

@@ -10,7 +10,6 @@ namespace UI.Main
         public GLoader m_loaBg;
         public GLoader m_loaRole;
         public Transition m_t0;
-        public Transition m_t1;
         public const string URL = "ui://mfvz4q8kwonogm";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "ComRole";
@@ -61,14 +60,12 @@ namespace UI.Main
             m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_loaRole = (GLoader)comp.GetChild("loaRole");
             m_t0 = comp.GetTransition("t0");
-            m_t1 = comp.GetTransition("t1");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_loaBg = null;
             m_loaRole = null;
             m_t0 = null;
-            m_t1 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -15,7 +15,7 @@ namespace UI.Main
         public GLoader m_loaGlass;
         public UI_comClickCircle m_comClickCircle;
         public GButton m_btnSpeedUp;
-        public GGraph m_grhMask;
+        public GLoader m_LoaMask;
         public UI_ComRoleResult m_comRoleResult;
         public GGraph m_grh_0;
         public GGraph m_grh_1;
@@ -80,7 +80,7 @@ namespace UI.Main
             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_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");
@@ -104,7 +104,7 @@ namespace UI.Main
             m_comClickCircle.Dispose();
             m_comClickCircle = null;
             m_btnSpeedUp = null;
-            m_grhMask = null;
+            m_LoaMask = null;
             m_comRoleResult.Dispose();
             m_comRoleResult = null;
             m_grh_0 = null;

+ 7 - 3
GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightSingleScoreView.cs

@@ -66,6 +66,8 @@ namespace GFGGame
             _ui.m_comClickCircle.target.onClick.Add(OnComClickCircle);
 
             _ui.m_loaBg.url = ResPathUtil.GetFightBgImgPath("zd_bj_bja_2");
+            _ui.m_LoaMask.url = ResPathUtil.GetFightBgImgPath("zd_jsjm_bjtu");
+
 
         }
         protected override void AddEventListener()
@@ -190,8 +192,9 @@ namespace GFGGame
             if (_index >= FightScoreCfgArray.Instance.dataArray.Length)
             {
                 GetCurStar(out int star, out Transition transition);
+                _ui.m_comRoleResult.m_comRole.m_loaRole.texture = EquipDataCache.cacher.nTexture;
                 _ui.m_comRoleResult.m_c1.selectedIndex = 0;
-                _ui.m_grhMask.touchable = true;
+                _ui.m_LoaMask.touchable = true;
                 _ui.m_t2.Play(() =>
                 {
                     _ui.m_comRoleResult.m_c1.selectedIndex = star;
@@ -275,9 +278,10 @@ namespace GFGGame
             _ui.m_comRoleResult.m_t3.Stop(true, false);
             _ui.m_comRoleResult.m_comRole.m_t0.Stop(true, false);
 
+            _ui.m_comRoleResult.m_comRole.m_loaRole.alpha = 0;
             _ui.m_comRoleResult.target.SetScale(0, 0);
-            _ui.m_grhMask.alpha = 0;
-            _ui.m_grhMask.touchable = false;
+            _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;

+ 3 - 6
GameClient/Assets/Game/HotUpdate/Views/MainStory/StroyFightResultView.cs

@@ -81,6 +81,8 @@ namespace GFGGame
 
             GLoader loaRole = _ui.m_ComRoleResult.m_comRole.m_loaRole;
             loaRole.texture = EquipDataCache.cacher.nTexture;
+            loaRole.alpha = 1;
+
             // loaRole.SetSize(loaRole.width, loaRole.texture.height * loaRole.width / loaRole.texture.width);
 
             _ui.m_comResult.m_c1.selectedIndex = _resultData.Star;
@@ -110,10 +112,7 @@ namespace GFGGame
                 _ui.m_comExpBar.target.visible = false;
                 Timers.inst.Add(3, 1, OnClickBtnClose);
             }
-            _ui.m_t1.Play(() =>
-            {
-                _ui.m_ComRoleResult.m_comRole.m_t1.Play(AddExp);
-            });
+            _ui.m_t1.Play(AddExp);
             // _ui.m_ComRoleResult.m_comRole.m_t1.Play(() =>
             // {
             //     _ui.m_t1.Play(AddExp);
@@ -136,8 +135,6 @@ namespace GFGGame
             _ui.m_comResult.target.height = 0;
             _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)

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