Browse Source

卡牌属性资源

zhaoyang 3 years ago
parent
commit
5bf1858d33

+ 3 - 2
FGUIProject/assets/Main/components/ListCardItem.xml

@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="215,270" extention="Button">
-  <controller name="button" pages="0,up,1,down" selected="1"/>
+  <controller name="button" pages="0,up,1,down" selected="0"/>
   <displayList>
     <component id="n9_wzce" name="comCardMask" src="wzce9v" fileName="components/ComCardMask.xml" xy="0,1"/>
     <image id="n8_sx2v" name="n8" src="sx2v9s" fileName="imagesStory/zd_tctcdikugn_1.png" xy="1,154"/>
     <text id="n3_r1a9" name="txtName" xy="55,228" size="105,46" fontSize="34" color="#6a5d56" text="赵钱孙"/>
     <component id="n11_wzce" name="comStar" src="ojlzh" fileName="components/ComStar.xml" pkg="eg2y0ldp" xy="10,196"/>
     <text id="n12_wzce" name="txtLv" xy="169,170" pivot="0.5,0" size="39,56" fontSize="24" color="#fff9f1" leading="-8" ubb="true" vars="true" text="Lv.&#xA;30"/>
-    <loader id="n7_sx2v" name="loaRarity" xy="160,6" size="50,50" url="ui://eg2y0ldppq5x62" autoSize="true"/>
+    <loader id="n7_sx2v" name="loaRarity" xy="162,10" size="44,94" url="ui://eg2y0ldpd4iw52" autoSize="true"/>
+    <loader id="n16_qr4e" name="loaMainScore" xy="9,11" size="46,46" aspect="true" url="ui://eg2y0ldp842s6h" fill="scaleMatchHeight"/>
     <image id="n15_dcro" name="n15" src="sx2v9t" fileName="imagesStory/zd_tctcdikugn_2.png" xy="-1,0"/>
     <graph id="n13_dcro" name="holder" xy="107,114" size="1,1" touchable="false" type="rect">
       <gearDisplay controller="button" pages="1"/>

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

@@ -12,6 +12,7 @@ namespace UI.Main
         public GComponent m_comStar;
         public GTextField m_txtLv;
         public GLoader m_loaRarity;
+        public GLoader m_loaMainScore;
         public GGraph m_holder;
         public const string URL = "ui://mfvz4q8kr1a99f";
         public const string PACKAGE_NAME = "Main";
@@ -65,6 +66,7 @@ namespace UI.Main
             m_comStar = (GComponent)comp.GetChild("comStar");
             m_txtLv = (GTextField)comp.GetChild("txtLv");
             m_loaRarity = (GLoader)comp.GetChild("loaRarity");
+            m_loaMainScore = (GLoader)comp.GetChild("loaMainScore");
             m_holder = (GGraph)comp.GetChild("holder");
         }
         public void Dispose(bool disposeTarget = false)
@@ -75,6 +77,7 @@ namespace UI.Main
             m_comStar = null;
             m_txtLv = null;
             m_loaRarity = null;
+            m_loaMainScore = null;
             m_holder = null;
             if(disposeTarget && target != null)
             {

+ 5 - 2
GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryCardChoose.cs

@@ -36,10 +36,10 @@ namespace GFGGame
 
             _ui.m_listCard.SetVirtual();
             _ui.m_listCard.itemRenderer = RenderListCardItem;
+            _ui.m_listCard.onClickItem.Add(OnListCardItemClick);
 
             _ui.m_btnCancel.onClick.Add(OnBtnCancelClick);
             _ui.m_btnConfirm.onClick.Add(OnBtnComfirmClick);
-            _ui.m_listCard.onClickItem.Add(OnListCardItemClick);
         }
         protected override void OnShown()
         {
@@ -77,7 +77,10 @@ namespace GFGGame
             item.m_txtName.text = cardData.itemCfg.name;
             item.m_comCardMask.m_loaCard.asLoader.url = ResPathUtil.GetCardSmallPath(cardData.resources[cardData.resIndex]);
             item.m_txtLv.text = string.Format("Lv.\n{0}", cardData.lv);
-            item.m_loaRarity.url = ResPathUtil.GetCommonGameResPath("kp_sxing_x_" + cardData.itemCfg.rarity);
+            // item.m_loaRarity.url = ResPathUtil.GetCommonGameResPath("kp_sxing_x_" + cardData.itemCfg.rarity);
+            RarityIconController.UpdateRarityIcon(item.m_loaRarity, cardData.itemCfg.id, false);// ResPathUtil.GetCommonGameResPath("kp_sxing_x_" + data.itemCfg.rarity);
+            item.m_loaMainScore.url = ResPathUtil.GetCommonGameResPath("kp_sx_" + (cardData.itemCfg.mainScore));
+
             UI_ComStar comStar = UI_ComStar.Proxy(item.m_comStar);
             comStar.m_c1.selectedIndex = cardData.star;
             if (_effects.Count <= index)

BIN
GameClient/Assets/ResIn/Config/excelConfig.sqlite.bytes


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