卡牌资源展示

FGUIProject/assets/Card/CardFosterUI.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920" overflow="hidden" scroll="horizontal">
-  <controller name="c1" pages="0,,1," selected="1"/>
+  <controller name="c1" pages="0,,1," selected="0"/>
   <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"/>
@@ -31,13 +31,13 @@
     </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="15" label2="scale" ease="Linear"/>
+    <item time="0" type="Scale" target="n73_sxk4" label="normal" tween="true" startValue="0.8,0.8" endValue="1,1" duration="10" label2="scale" ease="Linear"/>
     <item time="0" type="XY" target="n70_lc71" tween="true" startValue="0,1089" endValue="0,1920" duration="20" ease="Cubic.In"/>
     <item time="0" type="XY" target="n71_lc71" tween="true" startValue="0,0" endValue="0,-634" duration="20" 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="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"/>
+    <item time="2" type="Scale" target="n73_sxk4" label="scale" tween="true" startValue="1,1" endValue="0.8,0.8" duration="10" label2="normal" ease="Linear"/>
   </transition>
 </component>

GameClient/Assets/Game/HotUpdate/Views/Card/CardFosterView.cs

@@ -41,8 +41,11 @@ namespace GFGGame
         private float _cardScale = 0.8f;
         private bool showCard = false;
         private bool playAni = false;
+        private const int _cardResInitWidth = 1440;
+        private const int _cardResInitHight = 1920;
 
         private Vector2 comCardImgResInitSize;
+        private Vector2 comCardImgResTargetSize;
         public override void Dispose()
         {
             for (int i = 0; i < _listLongPress.Count; i++)
@@ -120,10 +123,13 @@ namespace GFGGame
             _comFosterBottom = _ui.m_ComFosterBottom;
 
             playAni = false;
+
+            float imgInitHight = _ui.target.height - 570;//UI界面上小图时的高度
+            _cardScale = imgInitHight / _cardResInitHight;
+
             comCardImgResInitSize = Vector2.zero;
-            _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;
+            comCardImgResTargetSize = Vector2.zero;
+
             showCard = false;
             Input.multiTouchEnabled = false;
             this.ClearItemsCountList();
@@ -243,12 +249,13 @@ namespace GFGGame
                 _ui.m_c1.selectedIndex = 0;
                 if (comCardImgResInitSize == Vector2.zero)
                 {
-                    _ui.m_comImgCard.m_ComCardImgRes.m_loaCard.url = ResPathUtil.GetCardPath(_cardData.resources[_cardData.resIndex]);
                     GLoader loaCard = _ui.m_comImgCard.m_ComCardImgRes.m_loaCard;
-                    float scale = _ui.target.height * _cardScale / loaCard.initHeight;
-                    comCardImgResInitSize = new Vector2(loaCard.initWidth * scale, loaCard.initHeight * scale);
-                    _ui.m_comImgCard.target.scrollPane.SetPercX(0.5f, false);
+                    loaCard.url = ResPathUtil.GetCardPath(_cardData.resources[_cardData.resIndex]);
+
+                    comCardImgResTargetSize = new Vector2(_ui.target.height * _cardResInitWidth / _cardResInitHight, _ui.target.height);
+                    comCardImgResInitSize = new Vector2(_cardResInitWidth * _cardScale, _cardResInitHight * _cardScale);
                     _ui.m_comImgCard.m_ComCardImgRes.target.size = comCardImgResInitSize;
+                    _ui.m_comImgCard.target.scrollPane.SetPercX(0.5f, false);
                 }
             }
 
@@ -265,7 +272,6 @@ namespace GFGGame
         /***********************************************************升级***************************************************/
         private void UpdateUpLvView(bool isPreview = false, int lv = 0, int exp = 0)
         {
-            // _comLvConsumeGold = UI_ComCostCurrency.Proxy(_comFosterBottom.m_ComLvConsumeGold);
 
             _showLv = isPreview == true ? lv : _cardData.lv;
             _showExp = isPreview == true ? exp : _cardData.exp;
@@ -282,12 +288,6 @@ namespace GFGGame
             _comFosterBottom.m_txtCurLv.text = _showLv.ToString();
             _comFosterBottom.m_txtMaxExp.text = cardLvCfg.needExp.ToString();
             _comFosterBottom.m_txtCurExp.text = _showExp.ToString();
-            //    = "0";
-            // _comLvConsumeGold = UI_ComCostCurrency.Proxy(_comFosterBottom.m_ComLvConsumeGold);
-            // _comFosterBottom.m_btnUpLv.grayed = _comLvConsumeGold.m_txtNeed.text == "0" ? true : false;
-            // UI_ComCostCurrency.ProxyEnd();
-
-            // _comFosterBottom.m_btnUpLv.GetChild("ani").asMovieClip.visible = false;// !_comFosterBottom.m_btnUpLv.grayed;
 
             _comFosterBottom.m_ctrlFullLv.selectedIndex = CardDataManager.isFullLv(_cardData.id, _cardData.lv, false) ? 1 : 0;
 
@@ -787,16 +787,15 @@ namespace GFGGame
         {
             if (playAni) return;
             playAni = true;
-            float scale = _ui.target.height / comCardImgResInitSize.y;
             if (!showCard)
             {
                 _ui.m_loaListener1.visible = false;
-                GTween.To(_ui.m_comImgCard.m_ComCardImgRes.target.size, comCardImgResInitSize * scale, 0.5f).SetTarget(_ui.m_comImgCard.m_ComCardImgRes).OnUpdate((GTweener t) =>
+                GTween.To(comCardImgResInitSize, comCardImgResTargetSize, 0.5f).SetTarget(_ui.m_comImgCard.m_ComCardImgRes).OnUpdate((GTweener t) =>
                 {
                     _ui.m_comImgCard.m_ComCardImgRes.target.size = t.value.vec2;
                 });
 
-                GTween.To(_ui.m_comImgCard.target.scrollPane.posX, ((comCardImgResInitSize * scale).x - _ui.target.width) / 2, 0.5f).SetTarget(_ui.m_comImgCard.target.scrollPane).OnUpdate((GTweener t) =>
+                GTween.To(_ui.m_comImgCard.target.scrollPane.posX, (comCardImgResTargetSize.x - _ui.target.width) / 2, 0.5f).SetTarget(_ui.m_comImgCard.target.scrollPane).OnUpdate((GTweener t) =>
                 {
                     _ui.m_comImgCard.target.scrollPane.posX = t.value.x;
                 });
@@ -808,20 +807,22 @@ namespace GFGGame
             }
             else
             {
-                // _ui.target.touchable = false;
                 _ui.m_loaListener1.visible = true;
-                GTween.To(_ui.m_comImgCard.m_ComCardImgRes.target.size, comCardImgResInitSize, 0.5f).SetTarget(_ui.m_comImgCard.m_ComCardImgRes).OnUpdate((GTweener t) =>
-               {
-                   _ui.m_comImgCard.m_ComCardImgRes.target.size = t.value.vec2;
-               });
-                GTween.To(_ui.m_comImgCard.target.scrollPane.posX, (comCardImgResInitSize.x - _ui.target.width) / 2, 0.5f).SetTarget(_ui.m_comImgCard.target.scrollPane).OnUpdate((GTweener t) =>
+                _ui.m_t1.SetHook("scale", () =>
                 {
-                    _ui.m_comImgCard.target.scrollPane.posX = t.value.x;
+                    GTween.To(comCardImgResTargetSize, comCardImgResInitSize, 0.5f).SetTarget(_ui.m_comImgCard.m_ComCardImgRes).OnUpdate((GTweener t) =>
+                   {
+                       _ui.m_comImgCard.m_ComCardImgRes.target.size = t.value.vec2;
+                   });
+                    GTween.To(_ui.m_comImgCard.target.scrollPane.posX, (comCardImgResInitSize.x - _ui.target.width) / 2, 0.5f).SetTarget(_ui.m_comImgCard.target.scrollPane).OnUpdate((GTweener t) =>
+                    {
+                        _ui.m_comImgCard.target.scrollPane.posX = t.value.x;
+                    });
                 });
+
                 _ui.m_t1.Play(() =>
                 {
                     playAni = false;
-                    // _ui.target.touchable = true;
                 });
                 showCard = false;
             }