zhaoyang 2 жил өмнө
parent
commit
217fb4010b

+ 11 - 5
FGUIProject/assets/Main/MainUI.xml

@@ -34,7 +34,7 @@
       <Button icon="ui://mfvz4q8kv482fq"/>
       <property target="loaLockIcon" propertyId="1" value="ui://mfvz4q8kv95qhw"/>
     </component>
-    <component id="n69_weok" name="loaRight" src="weokii" fileName="components/Component7.xml" xy="918,1447" group="n52_qqat">
+    <component id="n69_weok" name="loaRight" src="weokii" fileName="components/Component7.xml" xy="930,1447" group="n52_qqat">
       <relation target="" sidePair="center-center,middle-middle"/>
     </component>
     <list id="n41_wg7t" name="list" xy="916,308" size="97,158" group="n57_oju1" overflow="hidden" scroll="horizontal" margin="20,0,0,0" lineGap="20" colGap="14" vAlign="middle" foldInvisibleItems="true">
@@ -54,7 +54,7 @@
       <relation target="n41_wg7t" sidePair="center-center,bottom-bottom"/>
     </component>
     <group id="n57_oju1" name="grpList" xy="913,308" size="102,271" group="n52_qqat" advanced="true"/>
-    <group id="n52_qqat" name="grpLeft" xy="0,160" size="1118,1760" group="n59_oju1" advanced="true"/>
+    <group id="n52_qqat" name="grpLeft" xy="0,160" size="1130,1760" group="n59_oju1" advanced="true"/>
     <component id="n73_mzf8" name="btn0" src="mzf8it" fileName="components/ButtonModle6.xml" xy="71,447" group="n58_oju1">
       <Button icon="ui://mfvz4q8kmzf8in"/>
       <property target="loaLockIcon" propertyId="1" value=""/>
@@ -85,13 +85,13 @@
       <property target="loaLockIcon" propertyId="1" value="ui://mfvz4q8kv95qhz"/>
       <property target="icon1" propertyId="1" value="ui://mfvz4q8kv482fv"/>
     </component>
-    <component id="n70_weok" name="loaLeft" src="weokii" fileName="components/Component7.xml" xy="165,1447" size="200,234" group="n58_oju1" scale="-1,1"/>
+    <component id="n70_weok" name="loaLeft" src="weokii" fileName="components/Component7.xml" xy="150,1447" size="200,234" group="n58_oju1" scale="-1,1"/>
     <group id="n58_oju1" name="grpRight" xy="71,447" size="1010,1497" group="n59_oju1" advanced="true">
       <relation target="" sidePair="center-center,middle-middle"/>
     </group>
-    <group id="n59_oju1" name="grpMove" xy="0,90" size="1118,1854" advanced="true"/>
+    <group id="n59_oju1" name="grpMove" xy="0,90" size="1130,1854" advanced="true"/>
     <loader id="n66_v95q" name="loaGuidestudio" xy="0,0" size="1080,1920" visible="false"/>
-    <graph id="n71_mzf8" name="n71" xy="0,0" size="1080,1920" touchable="false" type="rect" lineSize="0">
+    <graph id="n71_mzf8" name="n71" xy="0,0" size="1080,1920" alpha="0" touchable="false" type="rect" lineSize="0">
       <relation target="" sidePair="width-width,height-height"/>
     </graph>
   </displayList>
@@ -117,4 +117,10 @@
     <item time="0" type="Visible" target="n52_qqat" value="false"/>
     <item time="0" type="Visible" target="n58_oju1" value="true"/>
   </transition>
+  <transition name="t16" autoPlay="true" autoPlayRepeat="-1">
+    <item time="0" type="XY" target="n69_weok" tween="true" startValue="930,1447" endValue="920,1447" duration="12" ease="Linear"/>
+    <item time="0" type="XY" target="n70_weok" tween="true" startValue="150,1447" endValue="160,1447" duration="12" ease="Linear"/>
+    <item time="12" type="XY" target="n69_weok" tween="true" startValue="920,1447" endValue="930,1447" duration="12" ease="Linear"/>
+    <item time="12" type="XY" target="n70_weok" tween="true" startValue="160,1447" endValue="150,1447" duration="12" ease="Linear"/>
+  </transition>
 </component>

+ 10 - 8
FGUIProject/assets/Main/StoryFightQuicklyUI.xml

@@ -1,21 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1071,1336">
-  <controller name="c1" pages="0,,1," selected="0"/>
+  <controller name="c1" pages="0,,1," selected="1"/>
   <displayList>
     <image id="n0_s2cc" name="n0" src="r9rihi" fileName="images/zd_tzhddi_1.png" xy="0,0" group="n19_mueb"/>
     <image id="n27_qe01" name="n27" src="r9rihk" fileName="images/zd_tzhdkua_1.png" xy="274,89" group="n29_qe01"/>
     <text id="n28_qe01" name="txtName" xy="429,93" pivot="0.5,0" size="212,56" group="n29_qe01" font="ui://eg2y0ldpwonotj9" fontSize="42" color="#8f6e30" text="活跃度奖励"/>
     <group id="n29_qe01" name="n29" xy="274,89" size="522,68" group="n19_mueb"/>
     <image id="n36_r9ri" name="n36" src="r9rihh" fileName="images/zd_tzhdbj.png" xy="114,215" group="n35_qe01"/>
-    <text id="n33_qe01" name="txtItemName" xy="170,200" size="364,49" group="n35_qe01" fontSize="36" color="#b97d6d" text="目标道具:孔雀东南飞"/>
-    <text id="n34_qe01" name="txtItemNeedNum" xy="787,200" pivot="1,0" size="170,49" group="n35_qe01" fontSize="36" color="#b97d6d" align="right" text="还需:8个"/>
+    <text id="n33_qe01" name="txtItemName" xy="170,200" size="358,49" group="n35_qe01" fontSize="36" color="#b97d6d" text="目标道具:孔雀东南飞"/>
+    <text id="n34_qe01" name="txtItemNeedNum" xy="791,200" pivot="1,0" size="166,49" group="n35_qe01" fontSize="36" color="#b97d6d" align="right" text="还需:8个"/>
     <group id="n35_qe01" name="grpNeeditem" xy="114,200" size="843,49" group="n19_mueb" advanced="true">
       <gearDisplay controller="c1" pages="1"/>
     </group>
-    <list id="n13_s2cc" name="list" xy="88,200" size="895,870" group="n19_mueb" overflow="scroll" lineGap="20">
-      <gearXY controller="c1" pages="0,1" values="88,200|88,277"/>
-      <gearSize controller="c1" pages="0,1" values="895,870,1,1|895,793,1,1"/>
+    <list id="n13_s2cc" name="list" xy="56,277" size="944,793" group="n19_mueb" overflow="scroll" lineGap="20">
+      <gearXY controller="c1" pages="0,1" values="56,200|56,277"/>
+      <gearSize controller="c1" pages="0,1" values="944,870,1,1|944,793,1,1"/>
       <relation target="" sidePair="bottomext-bottom"/>
+      <item url="ui://mfvz4q8ks2cc5h"/>
+      <item url="ui://mfvz4q8ks2cc5h"/>
     </list>
     <component id="n6_s2cc" name="btnExit" src="r9ritjh" fileName="components/Button18.xml" pkg="mk0fwx0x" xy="148,1110" size="342,96" group="n16_nzmy">
       <Button title="结束挑战" icon="ui://mk0fwx0xr9ritji"/>
@@ -26,9 +28,9 @@
     <group id="n16_nzmy" name="n16" xy="148,1110" size="774,96" group="n19_mueb" advanced="true" layout="hz" colGap="90" excludeInvisibles="true">
       <relation target="" sidePair="center-center"/>
     </group>
-    <component id="n37_r9ri" name="comCostCurrent" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="653,1214" group="n19_mueb"/>
+    <component id="n37_r9ri" name="comCostCurrent" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="653,1214" size="237,46" group="n19_mueb"/>
     <group id="n19_mueb" name="n19" xy="0,0" size="1071,1336" advanced="true"/>
-    <text id="n25_mueb" name="n25" xy="392,597" size="287,76" group="n24_mueb" fontSize="58" color="#fdf4d1" text="速刷中......"/>
+    <text id="n25_mueb" name="n25" xy="392,597" size="278,76" group="n24_mueb" fontSize="58" color="#fdf4d1" text="速刷中......"/>
     <image id="n21_mueb" name="n21" src="muebec" fileName="images/sjsd_ss_1.png" xy="167,706" group="n24_mueb">
       <relation target="" sidePair="width-width,height-height"/>
     </image>

+ 1 - 1
FGUIProject/assets/Main/components/Component7.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="200,234">
   <displayList>
-    <loader id="n69_weok" name="loaRight" xy="100,117" pivot="0.5,0.5" anchor="true" size="200,234" url="ui://mfvz4q8kv95qhx" autoSize="true"/>
+    <loader id="n69_weok" name="loaRight" xy="100,117" pivot="0.5,0.5" anchor="true" size="200,234" scale="0.8,0.8" url="ui://mfvz4q8kv95qhx" autoSize="true"/>
     <graph id="n70_weok" name="holder" xy="90,120" size="1,1"/>
   </displayList>
 </component>

+ 6 - 5
FGUIProject/assets/Main/components/StoryFightQuicklyBonusListItem.xml

@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="882,324">
+<component size="944,324">
   <displayList>
-    <image id="n12_r9ri" name="n12" src="r9rihj" fileName="images/zd_tzhddi_2.png" xy="0,0">
+    <image id="n12_r9ri" name="n12" src="r9rihj" fileName="images/zd_tzhddi_2.png" xy="40,0" group="n14_mzf8">
       <relation target="n11_s2cc" sidePair="height-height"/>
     </image>
-    <text id="n7_s2cc" name="txtTimes" xy="50,11" size="109,54" font="ui://eg2y0ldpwonotjc" fontSize="40" color="#a07c49" vars="true" text="第{n=1}次"/>
-    <text id="n9_s2cc" name="txtExp" xy="642,17" size="195,41" fontSize="30" color="#bb9b6c" vars="true" text="经验值:+{n=300}"/>
-    <list id="n11_s2cc" name="list" xy="23,72" pivot="0.5,0" size="835,252" layout="flow_hz" lineGap="-10" colGap="-20" defaultItem="ui://eg2y0ldpj48o98" autoClearItems="true">
+    <text id="n7_s2cc" name="txtTimes" xy="90,11" size="109,54" group="n14_mzf8" font="ui://eg2y0ldpwonotjc" fontSize="40" color="#a07c49" vars="true" text="第{n=1}次"/>
+    <text id="n9_s2cc" name="txtExp" xy="682,17" size="188,41" group="n14_mzf8" fontSize="30" color="#bb9b6c" vars="true" text="经验值:+{n=300}"/>
+    <list id="n11_s2cc" name="list" xy="63,72" pivot="0.5,0" size="835,252" group="n14_mzf8" layout="flow_hz" lineGap="-10" colGap="-20" defaultItem="ui://eg2y0ldpj48o98" autoClearItems="true">
       <item/>
       <item/>
       <item/>
     </list>
+    <group id="n14_mzf8" name="n14" xy="40,0" size="882,324"/>
   </displayList>
   <relation target="n11_s2cc" sidePair="height-height"/>
 </component>

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

@@ -34,6 +34,7 @@ namespace UI.Main
         public Transition m_t2;
         public Transition m_t3;
         public Transition m_t4;
+        public Transition m_t16;
         public const string URL = "ui://mfvz4q8kq08x0";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "MainUI";
@@ -108,6 +109,7 @@ namespace UI.Main
             m_t2 = comp.GetTransition("t2");
             m_t3 = comp.GetTransition("t3");
             m_t4 = comp.GetTransition("t4");
+            m_t16 = comp.GetTransition("t16");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -154,6 +156,7 @@ namespace UI.Main
             m_t2 = null;
             m_t3 = null;
             m_t4 = null;
+            m_t16 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 2 - 2
GameClient/Assets/Game/HotUpdate/Views/Common/Controller/ValueBarController.cs

@@ -36,13 +36,13 @@ namespace GFGGame
             _valueBar.m_btnCJLuoXing.onClick.Add(() =>
             {
 
-                ViewManager.Show(ViewName.LUCKY_BOX_VIEW);
+                ViewManager.Show<LuckyBoxView>(LuckyBoxDataManager.BOX_ID_2, new object[] { typeof(ClothingShopView).FullName, new object[] { LuckyBoxDataManager.BOX_ID_2 } });
 
             });
             _valueBar.m_btnCJHuoDong.onClick.Add(() =>
             {
 
-                ViewManager.Show(ViewName.LUCKY_BOX_VIEW);
+                ViewManager.Show<LuckyBoxView>(LuckyBoxDataManager.BOX_ID_1, new object[] { typeof(ClothingShopView).FullName, new object[] { LuckyBoxDataManager.BOX_ID_1 } });
 
             });
 

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