瀏覽代碼

卡牌展示大小调整

zhaoyang 2 年之前
父節點
當前提交
56c0a3ee78

+ 8 - 5
FGUIProject/assets/Card/CardFosterUI.xml

@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920" overflow="hidden" scroll="horizontal">
-  <controller name="c1" pages="0,,1," selected="0"/>
+  <controller name="c1" pages="0,,1," selected="1"/>
   <displayList>
     <loader id="n80_gbqo" 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="n82_fpax" name="n82" src="qkjsbm" fileName="imagesNew/dikuang_back.png" xy="0,881" size="1080,1039">
+      <relation target="" sidePair="bottomext-bottom"/>
+    </image>
     <component id="n77_qgxy" name="comImgCard" src="qgxy9r" fileName="components/ComImgCard.xml" xy="540,0" pivot="0.5,0" anchor="true">
       <gearDisplay controller="c1" pages="0"/>
       <relation target="" sidePair="width-width,height-height"/>
@@ -28,12 +31,12 @@
     </loader>
   </displayList>
   <transition name="t0">
-    <item time="0" type="Scale" target="n73_sxk4" label="normal" tween="true" startValue="0.8,0.8" endValue="1,1" duration="6" label2="scale" ease="Linear"/>
-    <item time="0" type="XY" target="n70_lc71" tween="true" startValue="0,1089" endValue="0,1920" duration="12" ease="Cubic.In"/>
-    <item time="0" type="XY" target="n71_lc71" tween="true" startValue="0,0" endValue="0,-634" duration="12" ease="Cubic.In"/>
+    <item time="0" type="Scale" target="n73_sxk4" label="normal" tween="true" startValue="0.8,0.8" endValue="1,1" duration="15" label2="scale" ease="Linear"/>
+    <item time="0" type="XY" target="n70_lc71" tween="true" startValue="0,1089" endValue="0,1920" duration="18" ease="Cubic.In"/>
+    <item time="0" type="XY" target="n71_lc71" tween="true" startValue="0,0" endValue="0,-634" duration="18" ease="Cubic.In"/>
   </transition>
   <transition name="t1">
-    <item time="0" type="Scale" target="n73_sxk4" label="scale" tween="true" startValue="1,1" endValue="0.8,0.8" duration="6" label2="normal" ease="Linear"/>
+    <item time="0" type="Scale" target="n73_sxk4" label="scale" tween="true" startValue="1,1" endValue="0.8,0.8" duration="12" label2="normal" ease="Linear"/>
     <item time="0" type="XY" target="n70_lc71" tween="true" startValue="0,1920" endValue="0,1089" duration="12" ease="Cubic.Out"/>
     <item time="0" type="XY" target="n71_lc71" tween="true" startValue="0,-634" endValue="0,0" duration="12" ease="Cubic.Out"/>
   </transition>

+ 6 - 2
FGUIProject/assets/Card/components/ListCardStarRewardItem.xml

@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="910,180">
-  <controller name="c1" exported="true" pages="0,,1,,2," selected="2"/>
+  <controller name="c1" exported="true" pages="0,,1,,2," selected="0"/>
   <displayList>
     <image id="n71_lc71" name="n71" src="f2bfa4" fileName="images/cpjl_kdikdi_2.png" xy="0,0"/>
-    <text id="n67_lc71" name="txtTitle" xy="42,60" size="129,56" fontSize="42" color="#a38364" text="第一节"/>
     <component id="n69_lc71" name="btnGet" src="f2bftjz" fileName="components/Button23.xml" pkg="mk0fwx0x" xy="625,48">
       <gearDisplay controller="c1" pages="0,1"/>
       <Button title="领取"/>
@@ -16,5 +15,10 @@
     <component id="n75_psph" name="n75" src="hspqf4" fileName="components/ComRedDot.xml" pkg="eg2y0ldp" xy="844,44">
       <gearDisplay controller="c1" pages="1"/>
     </component>
+    <text id="n67_lc71" name="txtTitle" xy="42,34" size="337,56" group="n77_fpax" fontSize="42" color="#a38364" text="第一节第一节第一"/>
+    <text id="n76_fpax" name="txtTips" xy="41,90" size="273,46" group="n77_fpax" fontSize="34" color="#b4916f" align="center" text="(激活动态牌面)"/>
+    <group id="n77_fpax" name="n77" xy="41,34" size="338,102" advanced="true" layout="vt" excludeInvisibles="true">
+      <relation target="" sidePair="middle-middle"/>
+    </group>
   </displayList>
 </component>

+ 6 - 3
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Card/UI_ListCardStarRewardItem.cs

@@ -8,10 +8,11 @@ namespace UI.Card
     {
         public GComponent target;
         public Controller m_c1;
-        public GTextField m_txtTitle;
         public GButton m_btnGet;
         public GButton m_btnGot;
         public GComponent m_comItem;
+        public GTextField m_txtTitle;
+        public GTextField m_txtTips;
         public const string URL = "ui://7l6lvkayxtmoa0";
         public const string PACKAGE_NAME = "Card";
         public const string RES_NAME = "ListCardStarRewardItem";
@@ -60,18 +61,20 @@ namespace UI.Card
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
-            m_txtTitle = (GTextField)comp.GetChild("txtTitle");
             m_btnGet = (GButton)comp.GetChild("btnGet");
             m_btnGot = (GButton)comp.GetChild("btnGot");
             m_comItem = (GComponent)comp.GetChild("comItem");
+            m_txtTitle = (GTextField)comp.GetChild("txtTitle");
+            m_txtTips = (GTextField)comp.GetChild("txtTips");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
-            m_txtTitle = null;
             m_btnGet = null;
             m_btnGot = null;
             m_comItem = null;
+            m_txtTitle = null;
+            m_txtTips = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 3 - 1
GameClient/Assets/Game/HotUpdate/Views/Card/CardFosterView.cs

@@ -121,7 +121,9 @@ namespace GFGGame
 
             playAni = false;
             comCardImgResInitSize = Vector2.zero;
-            _cardScale = _ui.target.height * 0.8f / _ui.target.initHeight;
+            _cardScale = _cardData.itemCfg.rarity <= ConstCardRarity.Rarity_XUAN ? 0.75f : 0.8f;
+            float screenScale = _ui.target.initHeight / _ui.target.height;
+            _cardScale = _ui.target.height * _cardScale / _ui.target.initHeight * screenScale;
             showCard = false;
             Input.multiTouchEnabled = false;
             this.ClearItemsCountList();

二進制
GameClient/Assets/ResIn/UI/Card/Card_fui.bytes