|
@@ -360,8 +360,7 @@ namespace GFGGame
|
|
string resName = _cardData.resources[_cardData.resIndex];
|
|
string resName = _cardData.resources[_cardData.resIndex];
|
|
string resPath = ResPathUtil.GetCardAnimationPath(_cardData.resources[_cardData.resIndex]);
|
|
string resPath = ResPathUtil.GetCardAnimationPath(_cardData.resources[_cardData.resIndex]);
|
|
float imgInitHight = _ui.target.height - 570;//UI界面上小图时的高度
|
|
float imgInitHight = _ui.target.height - 570;//UI界面上小图时的高度
|
|
- float imgIniWidth = CardDataManager.CardResInitWidth * imgInitHight / CardDataManager.CardResInitHight;//UI界面上小图时的宽度
|
|
|
|
- _cardScale = imgIniWidth < _ui.target.width ? _ui.target.width / CardDataManager.CardResInitWidth : imgInitHight / CardDataManager.CardResInitHight;
|
|
|
|
|
|
+ float imgIniWidth = 0;//UI界面上小图时的宽度
|
|
|
|
|
|
if (_cardData.itemCfg.animationCardStar > 0
|
|
if (_cardData.itemCfg.animationCardStar > 0
|
|
&& _cardData.star >= _cardData.itemCfg.animationCardStar
|
|
&& _cardData.star >= _cardData.itemCfg.animationCardStar
|
|
@@ -371,6 +370,8 @@ namespace GFGGame
|
|
_effectUI1 = new EffectUI();
|
|
_effectUI1 = new EffectUI();
|
|
_effectUI1.Reset(_ui.m_comCard.m_comCardHolder.m_holder, resName, resName, 100, EffectUIType.Card);
|
|
_effectUI1.Reset(_ui.m_comCard.m_comCardHolder.m_holder, resName, resName, 100, EffectUIType.Card);
|
|
|
|
|
|
|
|
+ imgIniWidth = CardDataManager.CardResInitWidth * imgInitHight / CardDataManager.CardResInitHight;
|
|
|
|
+ _cardScale = imgIniWidth < _ui.target.width ? _ui.target.width / CardDataManager.CardResInitWidth : imgInitHight / CardDataManager.CardResInitHight;
|
|
|
|
|
|
_ui.m_comCard.m_comCardHolder.target.width = CardDataManager.CardResInitWidth;
|
|
_ui.m_comCard.m_comCardHolder.target.width = CardDataManager.CardResInitWidth;
|
|
_ui.m_comCard.m_comCardHolder.target.height = CardDataManager.CardResInitHight;
|
|
_ui.m_comCard.m_comCardHolder.target.height = CardDataManager.CardResInitHight;
|
|
@@ -392,6 +393,9 @@ namespace GFGGame
|
|
|
|
|
|
comCardImgResTargetSize = new Vector2(Screen.height * CardDataManager.CardResInitWidth / CardDataManager.CardResInitHight, Screen.height);
|
|
comCardImgResTargetSize = new Vector2(Screen.height * CardDataManager.CardResInitWidth / CardDataManager.CardResInitHight, Screen.height);
|
|
|
|
|
|
|
|
+ imgIniWidth = CardDataManager.CardResInitWidth * imgInitHight / CardDataManager.CardResInitHight;
|
|
|
|
+ _cardScale = imgIniWidth < _ui.target.width ? _ui.target.width / CardDataManager.CardResInitWidth : imgInitHight / CardDataManager.CardResInitHight;
|
|
|
|
+
|
|
comCardImgResInitSize = new Vector2(CardDataManager.CardResInitWidth * _cardScale, CardDataManager.CardResInitHight * _cardScale);
|
|
comCardImgResInitSize = new Vector2(CardDataManager.CardResInitWidth * _cardScale, CardDataManager.CardResInitHight * _cardScale);
|
|
_ui.m_comImgCard.m_ComCardImgRes.target.size = comCardImgResInitSize;
|
|
_ui.m_comImgCard.m_ComCardImgRes.target.size = comCardImgResInitSize;
|
|
_ui.m_comImgCard.target.scrollPane.SetPercX(0.5f, false);
|
|
_ui.m_comImgCard.target.scrollPane.SetPercX(0.5f, false);
|