Browse Source

服装升级动画

zhaoyang 3 years ago
parent
commit
5f13971043

+ 9 - 7
FGUIProject/assets/ClothingFoster/SuitUI.xml

@@ -32,24 +32,23 @@
       <relation target="" sidePair="bottom-bottom"/>
       <Button icon="ui://uicwtr5bbd1c18" selectedIcon="ui://uicwtr5bbd1c1j" controller="c1" page="1"/>
     </component>
-    <image id="n36_bd1c" name="n36" src="bd1c1g" fileName="images/fzyc_yhditu_3.png" xy="0,1419" group="n21_nk8d"/>
-    <component id="n19_nk8d" name="comFosterReward" src="nk8d13" fileName="components/ComFosterReward.xml" xy="854,1143" group="n21_nk8d"/>
-    <component id="n16_py5g" name="btnPropertyShow" src="py5gn" fileName="components/Button6.xml" xy="983,1435" group="n21_nk8d"/>
-    <list id="n11_py5g" name="listProperty" xy="118,1435" size="844,58" group="n21_nk8d" layout="row" colGap="10" defaultItem="ui://eg2y0ldpojlzk" align="center" autoClearItems="true">
+    <image id="n36_bd1c" name="n36" src="bd1c1g" fileName="images/fzyc_yhditu_3.png" xy="0,1416" group="n21_nk8d"/>
+    <component id="n19_nk8d" name="comFosterReward" src="nk8d13" fileName="components/ComFosterReward.xml" xy="854,1140" group="n21_nk8d"/>
+    <component id="n16_py5g" name="btnPropertyShow" src="py5gn" fileName="components/Button6.xml" xy="983,1432" group="n21_nk8d"/>
+    <list id="n11_py5g" name="listProperty" xy="118,1432" size="844,58" group="n21_nk8d" layout="row" colGap="10" defaultItem="ui://eg2y0ldpojlzk" align="center" autoClearItems="true">
       <item/>
       <item/>
       <item/>
       <item/>
     </list>
-    <list id="n15_py5g" name="listFoster" xy="44,1592" size="992,255" group="n21_nk8d" layout="row" overflow="hidden" colGap="64" defaultItem="ui://uicwtr5bj5a512" align="center">
+    <list id="n15_py5g" name="listFoster" xy="44,1589" size="992,255" group="n21_nk8d" layout="row" overflow="hidden" colGap="64" defaultItem="ui://uicwtr5bj5a512" align="center">
       <item/>
       <item/>
       <item/>
       <item/>
       <item/>
     </list>
-    <component id="n35_nk8d" name="comFosterAni" src="nk8d17" fileName="components/comFosterAni.xml" xy="424,746" group="n21_nk8d" visible="false"/>
-    <group id="n21_nk8d" name="grpFoster" xy="0,746" size="1080,1101" advanced="true">
+    <group id="n21_nk8d" name="grpFoster" xy="0,1140" size="1080,704" advanced="true">
       <gearDisplay controller="c1" pages="0"/>
       <relation target="" sidePair="bottom-bottom"/>
     </group>
@@ -78,5 +77,8 @@
       <gearDisplay2 controller="c2" pages="1" condition="0"/>
       <relation target="" sidePair="bottom-bottom"/>
     </group>
+    <component id="n35_nk8d" name="comFosterAni" src="nk8d17" fileName="components/comFosterAni.xml" xy="0,0" visible="false">
+      <relation target="" sidePair="width-width,height-height"/>
+    </component>
   </displayList>
 </component>

+ 6 - 0
FGUIProject/assets/ClothingFoster/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="qr4e29" fileName="images/sjsd_ss_2.png" xy="0,0"/>
+  </displayList>
+</component>

+ 18 - 7
FGUIProject/assets/ClothingFoster/components/comFosterAni.xml

@@ -1,12 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920">
   <displayList>
-    <image id="n35_nk8d" name="n35" src="py5ge" fileName="images/zhuxian_shuoto.png" xy="504,850" group="n39_s1ov"/>
-    <component id="n36_nk8d" name="proFoster" src="py5ga" fileName="images/ProgressBar1.xml" xy="424,958" group="n39_s1ov">
-      <ProgressBar max="100"/>
-    </component>
-    <text id="n37_bd1c" name="txtContent" xy="435,1029" size="209,41" group="n39_s1ov" fontSize="30" text="服装浆洗中......"/>
-    <graph id="n38_lh8v" name="holder" xy="539,906" size="1,1" group="n39_s1ov" type="rect"/>
-    <group id="n39_s1ov" name="n39" xy="424,850" size="232,220"/>
+    <graph id="n40_qr4e" name="n40" xy="0,0" size="1080,1920" alpha="0.6" type="rect" fillColor="#ff000000">
+      <relation target="" sidePair="width-width,height-height"/>
+    </graph>
+    <graph id="n38_lh8v" name="holder" xy="539,1100" size="1,1" type="rect">
+      <relation target="" sidePair="bottom-middle"/>
+    </graph>
+    <text id="n41_qr4e" name="txtContent" xy="400,1200" size="248,66" group="n45_qr4e" fontSize="50" color="#fdf4d1" text="速刷中......"/>
+    <image id="n42_qr4e" name="n42" src="qr4e27" fileName="images/sjsd_ss_1.png" xy="171,1309" group="n45_qr4e"/>
+    <component id="n43_qr4e" name="bar" src="qr4e28" fileName="components/Component4.xml" xy="171,1311" size="705,28" group="n45_qr4e"/>
+    <image id="n44_qr4e" name="n44" src="qr4e2a" fileName="images/sjsd_ss_3.png" xy="801,1311" group="n45_qr4e">
+      <relation target="n43_qr4e" sidePair="right-right"/>
+    </image>
+    <group id="n45_qr4e" name="n45" xy="171,1200" size="737,141" advanced="true">
+      <relation target="" sidePair="top-middle"/>
+    </group>
   </displayList>
+  <transition name="t0">
+    <item time="0" type="Size" target="n43_qr4e" tween="true" startValue="0,28" endValue="705,28" duration="96" ease="Linear"/>
+  </transition>
 </component>

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


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


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


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

@@ -79,6 +79,10 @@
     <component id="bd1c24" name="ComReward.xml" path="/components/"/>
     <image id="l4ui25" name="fzyc_dgogo.png" path="/images/"/>
     <image id="l4ui26" name="fzyc_yhditu_2.png" path="/images/"/>
+    <image id="qr4e27" name="sjsd_ss_1.png" path="/images/"/>
+    <component id="qr4e28" name="Component4.xml" path="/components/"/>
+    <image id="qr4e29" name="sjsd_ss_2.png" path="/images/"/>
+    <image id="qr4e2a" name="sjsd_ss_3.png" path="/images/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\ClothingFoster" packageCount="2" genCode="true"/>
 </packageDescription>

+ 7 - 7
FGUIProject/assets/Field/FieldFightEndUI.xml

@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="936,783">
+<component size="936,700">
   <displayList>
-    <image id="n1_ohun" name="n1" src="lwri5u" fileName="imagesExport/hc_kuang_6.png" pkg="mk0fwx0x" xy="0,0" size="936,783"/>
+    <image id="n1_ohun" name="n1" src="lwri5u" fileName="imagesExport/hc_kuang_6.png" pkg="mk0fwx0x" xy="0,0" size="936,700"/>
     <list id="n2_ohun" name="list" xy="116,203" size="717,240" layout="row" overflow="scroll" lineGap="20" defaultItem="ui://eg2y0ldpj48o98" align="center">
       <item/>
     </list>
     <text id="n3_ohun" name="txtTitle" xy="370,40" size="196,64" fontSize="48" color="#9b7853" text="挑战完成"/>
-    <component id="n0_s20j" name="btnConfirm" src="ih7594" fileName="components/Button10.xml" pkg="mk0fwx0x" xy="278,600">
+    <component id="n0_s20j" name="btnConfirm" src="ih7594" fileName="components/Button10.xml" pkg="mk0fwx0x" xy="278,535">
       <Button title="确定"/>
     </component>
     <text id="n4_ohun" name="txtNum" xy="380,140" size="175,46" fontSize="34" color="#a17d5f" ubb="true" text="第20/20轮"/>
     <image id="n5_ohun" name="n5" src="ehs99" fileName="images/yx_xiant_1.png" pkg="eg2y0ldp" xy="44,120"/>
     <text id="n7_ohun" name="txtHas" xy="338,463" pivot="0.5,0" size="260,49" visible="false" fontSize="36" color="#a17d5f" text="已拥有:38000"/>
-    <text id="n8_ohun" name="n8" xy="326,531" size="148,49" group="n11_ohun" fontSize="36" color="#a17d5f" text="本次消耗"/>
-    <loader id="n9_ohun" name="loaCost" xy="475,530" size="50,50" group="n11_ohun" url="ui://eg2y0ldpq08x4"/>
-    <text id="n10_ohun" name="txtCostNum" xy="541,531" size="69,49" group="n11_ohun" fontSize="36" color="#a17d5f" text="x16"/>
-    <group id="n11_ohun" name="n11" xy="326,530" size="284,50"/>
+    <text id="n8_ohun" name="n8" xy="326,466" size="148,49" group="n11_ohun" fontSize="36" color="#a17d5f" text="本次消耗"/>
+    <loader id="n9_ohun" name="loaCost" xy="475,465" size="50,50" group="n11_ohun" url="ui://eg2y0ldpq08x4"/>
+    <text id="n10_ohun" name="txtCostNum" xy="541,466" size="69,49" group="n11_ohun" fontSize="36" color="#a17d5f" text="x16"/>
+    <group id="n11_ohun" name="n11" xy="326,465" size="284,50"/>
   </displayList>
 </component>

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

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ClothingFoster
+{
+    public partial class UI_Component4
+    {
+        public GComponent target;
+        public GImage m_bar;
+        public const string URL = "ui://uicwtr5bqr4e28";
+        public const string PACKAGE_NAME = "ClothingFoster";
+        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/ClothingFoster/UI_Component4.cs.meta

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

+ 4 - 4
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_SuitUI.cs

@@ -22,7 +22,6 @@ namespace UI.ClothingFoster
         public GButton m_btnPropertyShow;
         public GList m_listProperty;
         public GList m_listFoster;
-        public UI_comFosterAni m_comFosterAni;
         public GGroup m_grpFoster;
         public GTextField m_txtRenewProperty;
         public GComponent m_comRenewCost;
@@ -34,6 +33,7 @@ namespace UI.ClothingFoster
         public GTextField m_txtRenewShow;
         public UI_ComRenewRewardGet m_comRenewRewardGet;
         public GGroup m_grpRenewFinish;
+        public UI_comFosterAni m_comFosterAni;
         public const string URL = "ui://uicwtr5bpy5gf";
         public const string PACKAGE_NAME = "ClothingFoster";
         public const string RES_NAME = "SuitUI";
@@ -96,7 +96,6 @@ namespace UI.ClothingFoster
             m_btnPropertyShow = (GButton)comp.GetChild("btnPropertyShow");
             m_listProperty = (GList)comp.GetChild("listProperty");
             m_listFoster = (GList)comp.GetChild("listFoster");
-            m_comFosterAni = (UI_comFosterAni)UI_comFosterAni.Create(comp.GetChild("comFosterAni"));
             m_grpFoster = (GGroup)comp.GetChild("grpFoster");
             m_txtRenewProperty = (GTextField)comp.GetChild("txtRenewProperty");
             m_comRenewCost = (GComponent)comp.GetChild("comRenewCost");
@@ -108,6 +107,7 @@ namespace UI.ClothingFoster
             m_txtRenewShow = (GTextField)comp.GetChild("txtRenewShow");
             m_comRenewRewardGet = (UI_ComRenewRewardGet)UI_ComRenewRewardGet.Create(comp.GetChild("comRenewRewardGet"));
             m_grpRenewFinish = (GGroup)comp.GetChild("grpRenewFinish");
+            m_comFosterAni = (UI_comFosterAni)UI_comFosterAni.Create(comp.GetChild("comFosterAni"));
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -127,8 +127,6 @@ namespace UI.ClothingFoster
             m_btnPropertyShow = null;
             m_listProperty = null;
             m_listFoster = null;
-            m_comFosterAni.Dispose();
-            m_comFosterAni = null;
             m_grpFoster = null;
             m_txtRenewProperty = null;
             m_comRenewCost = null;
@@ -142,6 +140,8 @@ namespace UI.ClothingFoster
             m_comRenewRewardGet.Dispose();
             m_comRenewRewardGet = null;
             m_grpRenewFinish = null;
+            m_comFosterAni.Dispose();
+            m_comFosterAni = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 10 - 6
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_comFosterAni.cs

@@ -7,9 +7,10 @@ namespace UI.ClothingFoster
     public partial class UI_comFosterAni
     {
         public GComponent target;
-        public GProgressBar m_proFoster;
-        public GTextField m_txtContent;
         public GGraph m_holder;
+        public GTextField m_txtContent;
+        public UI_Component4 m_bar;
+        public Transition m_t0;
         public const string URL = "ui://uicwtr5bnk8d17";
         public const string PACKAGE_NAME = "ClothingFoster";
         public const string RES_NAME = "comFosterAni";
@@ -57,15 +58,18 @@ namespace UI.ClothingFoster
 
         private void Init(GComponent comp)
         {
-            m_proFoster = (GProgressBar)comp.GetChild("proFoster");
-            m_txtContent = (GTextField)comp.GetChild("txtContent");
             m_holder = (GGraph)comp.GetChild("holder");
+            m_txtContent = (GTextField)comp.GetChild("txtContent");
+            m_bar = (UI_Component4)UI_Component4.Create(comp.GetChild("bar"));
+            m_t0 = comp.GetTransition("t0");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_proFoster = null;
-            m_txtContent = null;
             m_holder = null;
+            m_txtContent = null;
+            m_bar.Dispose();
+            m_bar = null;
+            m_t0 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 9 - 3
GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/SuitView.cs

@@ -247,16 +247,22 @@ namespace GFGGame
         {
             _ui.m_comFosterAni.target.visible = true;
             _ui.m_comFosterAni.m_txtContent.text = string.Format("服装{0}中......", SuitFosterDataManager.Instance.stepNames[_index]);
-            _ui.m_comFosterAni.m_proFoster.value = 0;
+            // _ui.m_comFosterAni.m_proFoster.value = 0;
             string resPath = ResPathUtil.GetViewEffectPath("ui_gcdh", "ui_gcdh_" + (_index + 1));
             SceneController.AddObjectToView(_gameobject1, _wrapper1, _ui.m_comFosterAni.m_holder, resPath, out _gameobject1, out _wrapper1);
-            _ui.m_comFosterAni.m_proFoster.TweenValue(100, 4f).OnComplete(() =>
+            // _ui.m_comFosterAni.m_proFoster.TweenValue(100, 4f).OnComplete(() =>
+            // {
+            //     ViewManager.Show<SuitFosterFinishView>(new object[] { _suitId, _index, _propertyList });
+            //     UpdateFoster();
+            //     _ui.m_comFosterAni.target.visible = false;
+            // });
+
+            _ui.m_comFosterAni.m_t0.Play(() =>
             {
                 ViewManager.Show<SuitFosterFinishView>(new object[] { _suitId, _index, _propertyList });
                 UpdateFoster();
                 _ui.m_comFosterAni.target.visible = false;
             });
-
         }
         private void OnListenerGetFosterReward(EventContext context)
         {

BIN
GameClient/Assets/ResIn/UI/ClothingFoster/ClothingFoster_atlas0.png


BIN
GameClient/Assets/ResIn/UI/ClothingFoster/ClothingFoster_fui.bytes


BIN
GameClient/Assets/ResIn/UI/Field/Field_fui.bytes