Browse Source

速刷表现

zhaoyang 3 years ago
parent
commit
bdec919195

+ 23 - 6
FGUIProject/assets/Main/StoryFightQuicklyUI.xml

@@ -1,19 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
 <?xml version="1.0" encoding="utf-8"?>
 <component size="936,1130">
 <component size="936,1130">
   <displayList>
   <displayList>
-    <image id="n0_s2cc" name="n0" src="lwri5u" fileName="imagesExport/hc_kuang_6.png" pkg="mk0fwx0x" xy="0,0" size="936,1130"/>
-    <image id="n18_srnc" name="n18" src="ehs93" fileName="images/yx_btzs.png" pkg="eg2y0ldp" xy="33,-93"/>
-    <image id="n3_s2cc" name="n3" src="srnc98" fileName="images/zd_btzi_1.png" xy="15,-120"/>
-    <list id="n13_s2cc" name="list" xy="20,63" size="895,850" overflow="scroll" lineGap="10" align="center"/>
-    <text id="n15_s2cc" name="txtPowerDesc" xy="613,1080" size="170,42" fontSize="30" color="#c1aa8f" align="center" vars="true" autoSize="none" text="消耗体力{v1=60}"/>
+    <image id="n0_s2cc" name="n0" src="lwri5u" fileName="imagesExport/hc_kuang_6.png" pkg="mk0fwx0x" xy="0,0" size="936,1130" group="n19_mueb"/>
+    <image id="n18_srnc" name="n18" src="ehs93" fileName="images/yx_btzs.png" pkg="eg2y0ldp" xy="33,-93" group="n19_mueb"/>
+    <image id="n3_s2cc" name="n3" src="srnc98" fileName="images/zd_btzi_1.png" xy="15,-120" group="n19_mueb"/>
+    <list id="n13_s2cc" name="list" xy="20,63" size="895,850" group="n19_mueb" overflow="scroll" lineGap="10" align="center"/>
+    <text id="n15_s2cc" name="txtPowerDesc" xy="613,1080" size="170,42" group="n19_mueb" fontSize="30" color="#c1aa8f" align="center" vars="true" autoSize="none" text="消耗体力{v1=60}"/>
     <component id="n6_s2cc" name="btnExit" src="q08x6" fileName="components/Button1.xml" pkg="mk0fwx0x" xy="57,958" group="n16_nzmy">
     <component id="n6_s2cc" name="btnExit" src="q08x6" fileName="components/Button1.xml" pkg="mk0fwx0x" xy="57,958" group="n16_nzmy">
       <Button title="结束挑战"/>
       <Button title="结束挑战"/>
     </component>
     </component>
     <component id="n5_s2cc" name="btnFightTimes" src="q08x7" fileName="components/Button2.xml" pkg="mk0fwx0x" xy="499,960" group="n16_nzmy">
     <component id="n5_s2cc" name="btnFightTimes" src="q08x7" fileName="components/Button2.xml" pkg="mk0fwx0x" xy="499,960" group="n16_nzmy">
       <Button title="挑战十次"/>
       <Button title="挑战十次"/>
     </component>
     </component>
-    <group id="n16_nzmy" name="n16" xy="57,958" size="822,113" advanced="true" layout="hz" colGap="62" excludeInvisibles="true">
+    <group id="n16_nzmy" name="n16" xy="57,958" size="822,113" group="n19_mueb" advanced="true" layout="hz" colGap="62" excludeInvisibles="true">
       <relation target="" sidePair="center-center"/>
       <relation target="" sidePair="center-center"/>
     </group>
     </group>
+    <group id="n19_mueb" name="n19" xy="0,-120" size="936,1250" advanced="true"/>
+    <text id="n25_mueb" name="n25" xy="324,380" size="287,76" group="n24_mueb" fontSize="58" color="#fdf4d1" text="速刷中......"/>
+    <image id="n21_mueb" name="n21" src="muebec" fileName="images/sjsd_ss_1.png" xy="99,489" group="n24_mueb">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <component id="n22_mueb" name="bar" src="muebef" fileName="components/Component4.xml" xy="99,491" size="705,28" group="n24_mueb"/>
+    <image id="n23_mueb" name="n23" src="muebeb" fileName="images/sjsd_ss_3.png" xy="729,491" group="n24_mueb">
+      <relation target="n22_mueb" sidePair="right-right"/>
+    </image>
+    <group id="n24_mueb" name="n24" xy="99,380" size="737,141" advanced="true"/>
   </displayList>
   </displayList>
+  <transition name="t0" autoPlay="true">
+    <item time="0" type="Size" target="n22_mueb" tween="true" startValue="0,28" endValue="705,28" duration="48" ease="Linear"/>
+    <item time="0" type="Visible" target="n19_mueb" value="false"/>
+    <item time="0" type="Visible" target="n24_mueb" value="true"/>
+    <item time="48" type="Visible" target="n19_mueb" value="true"/>
+    <item time="48" type="Visible" target="n24_mueb" value="false"/>
+  </transition>
 </component>
 </component>

+ 6 - 0
FGUIProject/assets/Main/components/Component4.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="705,28" overflow="hidden">
+  <displayList>
+    <image id="n1_mueb" name="bar" src="muebed" fileName="images/sjsd_ss_2.png" xy="0,0"/>
+  </displayList>
+</component>

BIN
FGUIProject/assets/Main/images/sjsd_ss_1.png


BIN
FGUIProject/assets/Main/images/sjsd_ss_2.png


BIN
FGUIProject/assets/Main/images/sjsd_ss_3.png


+ 4 - 0
FGUIProject/assets/Main/package.xml

@@ -377,6 +377,10 @@
     <component id="k1khe8" name="Component3.xml" path="/components/"/>
     <component id="k1khe8" name="Component3.xml" path="/components/"/>
     <image id="k1khe9" name="zdsz_10.png" path="/Font5/"/>
     <image id="k1khe9" name="zdsz_10.png" path="/Font5/"/>
     <image id="k1khea" name="zdsz_11.png" path="/Font5/"/>
     <image id="k1khea" name="zdsz_11.png" path="/Font5/"/>
+    <image id="muebeb" name="sjsd_ss_3.png" path="/images/"/>
+    <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/"/>
   </resources>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\Main" packageCount="2" genCode="true" extractAlpha="true"/>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\Main" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>
 </packageDescription>

+ 71 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_Component4.cs

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Main
+{
+    public partial class UI_Component4
+    {
+        public GComponent target;
+        public GImage m_bar;
+        public const string URL = "ui://mfvz4q8kmuebef";
+        public const string PACKAGE_NAME = "Main";
+        public const string RES_NAME = "Component4";
+        private static UI_Component4 _proxy;
+
+        public static UI_Component4 Create(GObject gObject = null)
+        {
+            var ui = new UI_Component4();
+            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_Component4 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_Component4();
+            }
+            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_bar = (GImage)comp.GetChild("bar");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_bar = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

+ 7 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_StoryFightQuicklyUI.cs

@@ -11,6 +11,8 @@ namespace UI.Main
         public GTextField m_txtPowerDesc;
         public GTextField m_txtPowerDesc;
         public GButton m_btnExit;
         public GButton m_btnExit;
         public GButton m_btnFightTimes;
         public GButton m_btnFightTimes;
+        public UI_Component4 m_bar;
+        public Transition m_t0;
         public const string URL = "ui://mfvz4q8ks2cc53";
         public const string URL = "ui://mfvz4q8ks2cc53";
         public const string PACKAGE_NAME = "Main";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "StoryFightQuicklyUI";
         public const string RES_NAME = "StoryFightQuicklyUI";
@@ -62,6 +64,8 @@ namespace UI.Main
             m_txtPowerDesc = (GTextField)comp.GetChild("txtPowerDesc");
             m_txtPowerDesc = (GTextField)comp.GetChild("txtPowerDesc");
             m_btnExit = (GButton)comp.GetChild("btnExit");
             m_btnExit = (GButton)comp.GetChild("btnExit");
             m_btnFightTimes = (GButton)comp.GetChild("btnFightTimes");
             m_btnFightTimes = (GButton)comp.GetChild("btnFightTimes");
+            m_bar = (UI_Component4)UI_Component4.Create(comp.GetChild("bar"));
+            m_t0 = comp.GetTransition("t0");
         }
         }
         public void Dispose(bool disposeTarget = false)
         public void Dispose(bool disposeTarget = false)
         {
         {
@@ -69,6 +73,9 @@ namespace UI.Main
             m_txtPowerDesc = null;
             m_txtPowerDesc = null;
             m_btnExit = null;
             m_btnExit = null;
             m_btnFightTimes = null;
             m_btnFightTimes = null;
+            m_bar.Dispose();
+            m_bar = null;
+            m_t0 = null;
             if(disposeTarget && target != null)
             if(disposeTarget && target != null)
             {
             {
                 target.RemoveFromParent();
                 target.RemoveFromParent();

+ 15 - 15
GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightQuicklyView.cs

@@ -30,16 +30,8 @@ namespace GFGGame
             this.viewCom.Center();
             this.viewCom.Center();
             this.modal = true;
             this.modal = true;
 
 
-            _ui.m_btnExit.onClick.Add(() =>
-            {
-
-                this.Hide();
-            });
-            _ui.m_btnFightTimes.onClick.Add(() =>
-            {
-
-                StartFight();
-            });
+            _ui.m_btnExit.onClick.Add(Hide);
+            _ui.m_btnFightTimes.onClick.Add(StartFight);
         }
         }
 
 
         protected override void OnShown()
         protected override void OnShown()
@@ -76,12 +68,20 @@ namespace GFGGame
                 ItemUtil.AddPower("体力不足", () => { StartFight(); });
                 ItemUtil.AddPower("体力不足", () => { StartFight(); });
                 return;
                 return;
             }
             }
-            _ui.m_btnExit.visible = false;
-            _ui.m_btnFightTimes.visible = false;
-            _ui.m_txtPowerDesc.visible = false;
-            _ui.m_list.RemoveChildren();
+            this.clickBlankToClose = false;
 
 
-            InstanceZonesSProxy.FinishStoryFightQuickly(_levelID, _fightType == 1 ? 1 : times).Coroutine();
+            _ui.m_t0.Play(() =>
+            {
+
+                _ui.m_btnExit.visible = false;
+                _ui.m_btnFightTimes.visible = false;
+                _ui.m_txtPowerDesc.visible = false;
+                _ui.m_list.RemoveChildren();
+
+                InstanceZonesSProxy.FinishStoryFightQuickly(_levelID, _fightType == 1 ? 1 : times).Coroutine();
+                this.clickBlankToClose = true;
+
+            });
         }
         }
 
 
         private void StartShowBonus(EventContext eventContext)
         private void StartShowBonus(EventContext eventContext)

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

@@ -9,14 +9,12 @@ namespace GFGGame
     public class StoryLevelInfoView : BaseWindow
     public class StoryLevelInfoView : BaseWindow
     {
     {
         private UI_StoryLevelInfoUI _ui;
         private UI_StoryLevelInfoUI _ui;
-        private int _fightID;
+
         private int _levelID;
         private int _levelID;
         private int _type;
         private int _type;
         private int _storyType;
         private int _storyType;
         private List<ItemData> _bonusList = new List<ItemData>();
         private List<ItemData> _bonusList = new List<ItemData>();
-        private int _fightTimes;
 
 
-        private const int _timeCount = 10;
         protected override void OnInit()
         protected override void OnInit()
         {
         {
             base.OnInit();
             base.OnInit();
@@ -86,6 +84,7 @@ namespace GFGGame
             if (times > 0)
             if (times > 0)
             {
             {
                 ViewManager.Show(ViewName.STORY_FIGHT_QUICKLY_VIEW, 1);
                 ViewManager.Show(ViewName.STORY_FIGHT_QUICKLY_VIEW, 1);
+                this.Hide();
             }
             }
             else
             else
             {
             {
@@ -106,11 +105,14 @@ namespace GFGGame
                 else
                 else
                 {
                 {
                     ViewManager.Show(ViewName.STORY_FIGHT_QUICKLY_VIEW, times);
                     ViewManager.Show(ViewName.STORY_FIGHT_QUICKLY_VIEW, times);
+                    this.Hide();
                 }
                 }
             }
             }
             else
             else
             {
             {
                 ViewManager.Show(ViewName.STORY_FIGHT_QUICKLY_VIEW, times);
                 ViewManager.Show(ViewName.STORY_FIGHT_QUICKLY_VIEW, times);
+                this.Hide();
+
             }
             }
         }
         }
 
 

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!a.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_2.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_3!a.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_3.png


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