zhaoyang 2 years ago
parent
commit
85f8103f33

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

@@ -4,12 +4,9 @@
     <loader id="n39_wono" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" fill="scaleMatchWidth">
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
     </loader>
-    <image id="n52_wono" name="imgRole" src="v482fx" fileName="zjm_1.jpg" xy="540,960" pivot="0.5,0.5" anchor="true">
+    <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="n38_wono" name="loaRole" xy="0,-240" size="1080,2400" visible="false" align="center" vAlign="middle" fill="scaleMatchWidth">
-      <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
-    </loader>
     <component id="n34_tc53" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="34,60">
       <Button icon="ui://eg2y0ldpuyuxtj4"/>
     </component>

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

@@ -5,10 +5,7 @@
     <loader id="n16_wono" name="loaBg" xy="1,0" size="583,1317" url="ui://mfvz4q8kwonogw" fill="scaleMatchWidth" autoSize="true">
       <relation target="" sidePair="center-center,middle-middle"/>
     </loader>
-    <loader id="n15_wono" name="loaRole" xy="342,690" pivot="0.5,0.5" anchor="true" size="1110,1973" aspect="true" alpha="0" align="center" vAlign="middle" fill="scaleMatchWidth">
-      <relation target="" sidePair="center-center,middle-middle"/>
-    </loader>
-    <image id="n18_wono" name="imgRole" src="v482fx" fileName="zjm_1.jpg" xy="293,658" pivot="0.5,0.5" anchor="true" size="1110,2466" aspect="true" alpha="0">
+    <image id="n18_wono" name="imgRole" src="v482fx" fileName="zjm_1.jpg" xy="330,658" pivot="0.5,0.5" anchor="true" size="1110,2466" alpha="0">
       <relation target="" sidePair="center-center,middle-middle"/>
     </image>
     <image id="n17_wono" name="n17" src="wonogx" fileName="imagesFight/jz_yjd_f.png" xy="0,0" visible="false"/>
@@ -16,7 +13,6 @@
   <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="Alpha" target="n18_wono" tween="true" startValue="0" endValue="1" duration="12" ease="Linear"/>
     <item time="12" type="Visible" target="n17_wono" value="false"/>
   </transition>

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

@@ -8,7 +8,6 @@ namespace UI.Main
     {
         public GComponent target;
         public GLoader m_loaBg;
-        public GLoader m_loaRole;
         public GImage m_imgRole;
         public Transition m_t0;
         public const string URL = "ui://mfvz4q8kwonogm";
@@ -59,14 +58,12 @@ namespace UI.Main
         private void Init(GComponent comp)
         {
             m_loaBg = (GLoader)comp.GetChild("loaBg");
-            m_loaRole = (GLoader)comp.GetChild("loaRole");
             m_imgRole = (GImage)comp.GetChild("imgRole");
             m_t0 = comp.GetTransition("t0");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_loaBg = null;
-            m_loaRole = null;
             m_imgRole = null;
             m_t0 = null;
             if(disposeTarget && target != null)

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

@@ -9,7 +9,6 @@ namespace UI.Main
         public GComponent target;
         public GLoader m_loaBg;
         public GImage m_imgRole;
-        public GLoader m_loaRole;
         public GButton m_btnBack;
         public UI_ProgressBar1 m_proScore;
         public UI_ComSingleScoreStage m_comScoreStage;
@@ -76,7 +75,6 @@ namespace UI.Main
         {
             m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_imgRole = (GImage)comp.GetChild("imgRole");
-            m_loaRole = (GLoader)comp.GetChild("loaRole");
             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"));
@@ -99,7 +97,6 @@ namespace UI.Main
         {
             m_loaBg = null;
             m_imgRole = null;
-            m_loaRole = null;
             m_btnBack = null;
             m_proScore.Dispose();
             m_proScore = null;

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

@@ -82,7 +82,7 @@ namespace GFGGame
             _nTexture = new NTexture(EquipDataCache.cacher.RoleTextuex);
 
             // _ui.m_loaRole.texture = _nTexture;//EquipDataCache.cacher.FightRoleRes;
-            _ui.m_imgRole.SetSize(_nTexture.width, _nTexture.height);
+            _ui.m_imgRole.SetSize(UnityEngine.Screen.width, UnityEngine.Screen.height);
             _ui.m_imgRole.texture = _nTexture;
 
             _ui.m_btnSpeedUp.visible = EquipDataCache.cacher.autoPlay;
@@ -194,10 +194,8 @@ namespace GFGGame
             {
                 GetCurStar(out int star, out Transition transition);
 
-                // _ui.m_comRoleResult.m_comRole.m_loaRole.texture = _nTexture;
-                // _ui.m_comRoleResult.m_comRole.m_loaRole.texture = _nTexture;
                 _ui.m_comRoleResult.m_comRole.m_imgRole.texture = _nTexture;
-                _ui.m_comRoleResult.m_comRole.m_imgRole.SetSize(_nTexture.width, _nTexture.height);
+                _ui.m_comRoleResult.m_comRole.m_imgRole.SetSize(UnityEngine.Screen.width, UnityEngine.Screen.height);
                 _ui.m_comRoleResult.m_c1.selectedIndex = 0;
                 _ui.m_LoaMask.touchable = true;
                 _ui.m_t3.Play();
@@ -285,7 +283,7 @@ 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.m_comRole.m_imgRole.alpha = 0;
             _ui.m_comRoleResult.target.SetScale(0, 0);
             _ui.m_LoaMask.alpha = 0;
             _ui.m_LoaMask.touchable = false;

+ 2 - 5
GameClient/Assets/Game/HotUpdate/Views/MainStory/StroyFightResultView.cs

@@ -79,14 +79,11 @@ namespace GFGGame
 
             _ui.m_ComRoleResult.m_c1.selectedIndex = _resultData.Star;
 
-            GLoader loaRole = _ui.m_ComRoleResult.m_comRole.m_loaRole;
             NTexture nTexture = new NTexture(EquipDataCache.cacher.RoleTextuex);
-            // loaRole.texture = nTexture;
-            // loaRole.alpha = 1;
+
             _ui.m_ComRoleResult.m_comRole.m_imgRole.alpha = 1;
-            _ui.m_ComRoleResult.m_comRole.m_imgRole.SetSize(nTexture.width, nTexture.height);
+            _ui.m_ComRoleResult.m_comRole.m_imgRole.SetSize(UnityEngine.Screen.width, UnityEngine.Screen.height);
             _ui.m_ComRoleResult.m_comRole.m_imgRole.texture = nTexture;
-            // loaRole.SetSize(loaRole.width, loaRole.texture.height * loaRole.width / loaRole.texture.width);
 
             _ui.m_comResult.m_c1.selectedIndex = _resultData.Star;
             _ui.m_comResult.m_txtScore.text = "" + _resultData.Score;

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