战斗选卡

FGUIProject/assets/Card/components/ListCardItem.xml

@@ -4,7 +4,7 @@
     <component id="n6_ojlz" name="comCard" src="jzrr8n" fileName="components/ComCardMask.xml" xy="0,0"/>
     <image id="n27_qkjs" name="n27" src="qkjsav" fileName="imagesNew/name_underprint_card.png" xy="30,445" size="178,40"/>
     <image id="n20_pq5x" name="n20" src="pq5x60" fileName="images/kp_dikuang_1.png" xy="2,342"/>
-    <loader id="n23_94m1" name="loaBorder" xy="-2,-2" size="242,441" url="ui://7l6lvkay94m19w" autoSize="true"/>
+    <loader id="n23_94m1" name="loaBorder" xy="-2,-2" size="242,441" url="ui://eg2y0ldp94m19w" autoSize="true"/>
     <loader id="n19_pq5x" name="loaRarity" xy="178,14" size="44,94" url="ui://eg2y0ldpd4iw52" autoSize="true"/>
     <text id="n8_ojlz" name="txtLv" xy="170,394" pivot="1,0" size="55,34" fontSize="24" color="#fff9f1" align="right" leading="-5" text="30级"/>
     <text id="n9_ojlz" name="txtName" xy="56,443" pivot="0.5,0" size="126,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#ffffee" letterSpacing="-2" text="微光一瞬"/>

FGUIProject/assets/Card/package.xml

@@ -90,10 +90,6 @@
     <component id="rhha9q" name="ComSkillDiscribe.xml" path="/components/"/>
     <component id="qgxy9r" name="ComImgCard.xml" path="/components/"/>
     <component id="qgxy9s" name="ComCardImgRes.xml" path="/components/"/>
-    <image id="94m19t" name="kp_kuang_3.png" path="/images/" exported="true"/>
-    <image id="94m19u" name="kp_kuang_2.png" path="/images/" exported="true"/>
-    <image id="94m19v" name="kp_kuang_1.png" path="/images/" exported="true"/>
-    <image id="94m19w" name="kp_kuang_4.png" path="/images/" exported="true"/>
     <image id="r9ri9x" name="kp_mudan.jpg" path="/images/"/>
     <image id="ysx99y" name="cpcp_ziti.png" path="/images/"/>
     <component id="xtmo9z" name="CardStarRewardUI.xml" path="/" exported="true"/>

FGUIProject/assets/Common/components/BtnSmall.xml

@@ -3,7 +3,7 @@
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
     <loader id="n4_u2u3" name="icon" xy="0,0" size="214,51" aspect="true" url="ui://mk0fwx0xa0cf2w" fill="scale" autoSize="true"/>
-    <text id="n3_u2u3" name="title" xy="102,2" pivot="0.5,0" size="10,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#865118" align="center" text="">
+    <text id="n3_u2u3" name="title" xy="102,3" pivot="0.5,0" size="10,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#865118" align="center" text="">
       <relation target="" sidePair="middle-middle,left-right"/>
     </text>
   </displayList>

FGUIProject/assets/Common/components/Button10.xml

@@ -2,10 +2,10 @@
 <component size="380,105" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <image id="n0_ih75" name="n0" src="ih7592" fileName="images/tctc_anniu_1.png" xy="0,0">
+    <image id="n0_ih75" name="n0" src="ih7592" fileName="imagesExport/tctc_anniu_1.png" xy="0,0">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <text id="n1_ih75" name="title" xy="0,0" size="380,105" fontSize="46" color="#fff7e4" align="center" vAlign="middle" letterSpacing="2" autoSize="none" strokeColor="#ac904e" singleLine="true" text="确定">
+    <text id="n1_ih75" name="title" xy="0,0" size="380,105" font="ui://eg2y0ldpa0cftkz" fontSize="46" color="#fff7e4" align="center" vAlign="middle" letterSpacing="2" autoSize="none" strokeColor="#ac904e" singleLine="true" text="确定">
       <relation target="" sidePair="width-width,height-height"/>
     </text>
   </displayList>

FGUIProject/assets/Common/components/Button11.xml

@@ -2,10 +2,10 @@
 <component size="380,105" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <image id="n0_ih75" name="n0" src="ih7591" fileName="images/tctc_anniu_2.png" xy="0,0">
+    <image id="n0_ih75" name="n0" src="ih7591" fileName="imagesExport/tctc_anniu_2.png" xy="0,0">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <text id="n1_ih75" name="title" xy="0,0" size="380,105" fontSize="46" color="#fff7e4" align="center" vAlign="middle" letterSpacing="2" autoSize="none" strokeColor="#a8935f" singleLine="true" text="重置">
+    <text id="n1_ih75" name="title" xy="0,0" size="380,105" font="ui://eg2y0ldpa0cftkz" fontSize="46" color="#fff7e4" align="center" vAlign="middle" letterSpacing="2" autoSize="none" strokeColor="#a8935f" singleLine="true" text="重置">
       <relation target="" sidePair="width-width,height-height"/>
     </text>
   </displayList>

FGUIProject/assets/CommonGame/package.xml

@@ -363,6 +363,10 @@
     <image id="e050to7" name="tb_yajizijin.png" path="/imgItemIcon/" exported="true"/>
     <image id="e050to8" name="tb_zhizaoli.png" path="/imgItemIcon/" exported="true"/>
     <component id="e050tob" name="Component2.xml" path="/componentsBg/"/>
+    <image id="94m19v" name="kp_kuang_1.png" path="/imagesExport/" exported="true" scale="9grid" scale9grid="40,110,51,220"/>
+    <image id="94m19u" name="kp_kuang_2.png" path="/imagesExport/" exported="true" scale="9grid" scale9grid="39,110,61,220"/>
+    <image id="94m19t" name="kp_kuang_3.png" path="/imagesExport/" exported="true" scale="9grid" scale9grid="38,110,53,220"/>
+    <image id="94m19w" name="kp_kuang_4.png" path="/imagesExport/" exported="true" scale="9grid" scale9grid="44,110,54,220"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/Main/StoryCardChooseUI.xml

@@ -1,14 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="976,1300">
+<component size="1080,1300">
   <displayList>
-    <image id="n7_sx2v" name="n7" src="sx2v9r" fileName="imagesStory/zd_tctcdi_1.png" xy="1,-365"/>
-    <image id="n9_wzce" name="n9" src="sx2v9u" fileName="imagesStory/zd_tctcxian_1.png" xy="269,178"/>
-    <loader id="n4_cn27" name="loaScore" xy="614,112" size="58,58" url="ui://eg2y0ldp842s6h" autoSize="true"/>
-    <text id="n5_cn27" name="txtName" xy="391,107" pivot="0.5,0" size="202,66" fontSize="50" color="#9b7853" autoClearText="true" text="技能名字"/>
+    <image id="n7_sx2v" name="n7" src="sx2v9r" fileName="imagesStory/zd_tctcdi_1.png" xy="23,-365"/>
+    <image id="n9_wzce" name="n9" src="sx2v9u" fileName="imagesStory/zd_tctcxian_1.png" xy="320,178"/>
+    <loader id="n4_cn27" name="loaScore" xy="658,114" size="58,58" aspect="true" url="ui://eg2y0ldp842s6h" fill="scaleMatchWidth">
+      <relation target="n5_cn27" sidePair="left-right"/>
+    </loader>
+    <text id="n5_cn27" name="txtName" xy="439,107" pivot="0.5,0" size="202,66" font="ui://eg2y0ldpa0cftkz" fontSize="50" color="#9b7853" autoClearText="true" text="技能名字"/>
     <text id="n6_cn27" name="txtDiscribe" xy="67,217" size="847,89" fontSize="34" color="#a28d77" autoSize="none" autoClearText="true" text="旋律在指尖流转，在天幕中划出一道起伏的星轨折线谱， 爱与星光星幕下的奏鸣！"/>
     <text id="n11_wzce" name="txtTips" xy="653,342" size="267,51" fontSize="38" color="#c67c6b" text="选择适合的词牌"/>
     <image id="n10_wzce" name="n10" src="sx2v9q" fileName="imagesStory/zd_tctcxian_2.png" xy="614,360"/>
-    <list id="n0_r1a9" name="listCard" xy="27,415" size="923,657" layout="flow_hz" overflow="scroll" lineGap="21" colGap="20" defaultItem="ui://mfvz4q8kr1a99f" autoClearItems="true">
+    <list id="n0_r1a9" name="listCard" xy="80,415" size="933,657" layout="flow_hz" overflow="scroll" lineGap="21" colGap="12" defaultItem="ui://mfvz4q8kr1a99f" autoClearItems="true">
       <item/>
       <item/>
       <item/>
@@ -20,11 +22,15 @@
       <item/>
       <item/>
     </list>
-    <component id="n2_r1a9" name="btnCancel" src="r9ritjh" fileName="components/Button18.xml" pkg="mk0fwx0x" xy="95,1113">
+    <component id="n2_r1a9" name="btnCancel" src="ih7595" fileName="components/Button11.xml" pkg="mk0fwx0x" xy="129,1113" group="n12_ofwu">
       <Button title="取消"/>
     </component>
-    <component id="n3_r1a9" name="btnConfirm" src="wonody" fileName="components/Button19.xml" pkg="mk0fwx0x" xy="537,1113">
+    <component id="n3_r1a9" name="btnConfirm" src="ih7594" fileName="components/Button10.xml" pkg="mk0fwx0x" xy="571,1113" group="n12_ofwu">
       <Button title="确认"/>
     </component>
+    <group id="n12_ofwu" name="n12" xy="129,1113" size="822,105"/>
+    <component id="n13_ofwu" name="btnUpCard" src="rv091e" fileName="components/BtnSmall.xml" pkg="mk0fwx0x" xy="742,257">
+      <Button title="提升词牌"/>
+    </component>
   </displayList>
 </component>

FGUIProject/assets/Main/components/ListCardItem.xml

@@ -1,22 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="215,270" extention="Button">
+<component size="222,279" extention="Button">
   <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="赵钱孙"/>
-    <text id="n12_wzce" name="txtLv" xy="157,192" pivot="1,0" size="51,34" fontSize="24" color="#fff9f1" align="right" leading="-8" ubb="true" vars="true" text="30级"/>
-    <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"/>
-    </graph>
-    <text id="n18_v461" name="txtStarLv" xy="156,171" pivot="1,0" size="27,34" group="n19_v461" fontSize="24" color="#fff9f1" align="right" leading="-5" text="30"/>
-    <image id="n17_v461" name="n17" src="pq5x64" fileName="imagesExport/kp_xingx.png" pkg="eg2y0ldp" xy="183,175" group="n19_v461"/>
-    <group id="n19_v461" name="n19" xy="156,171" size="53,34" advanced="true" layout="hz" excludeInvisibles="true">
+    <component id="n9_wzce" name="comCardMask" src="wzce9v" fileName="components/ComCardMask.xml" xy="5,4" group="n23_ofwu"/>
+    <image id="n8_sx2v" name="n8" src="sx2v9s" fileName="imagesStory/zd_tctcdikugn_1.png" xy="6,157" group="n23_ofwu"/>
+    <text id="n3_r1a9" name="txtName" xy="58,237" size="105,46" group="n23_ofwu" font="ui://eg2y0ldpa0cftkz" fontSize="34" color="#6a5d56" text="赵钱孙"/>
+    <text id="n12_wzce" name="txtLv" xy="159,195" pivot="1,0" size="51,34" group="n23_ofwu" fontSize="24" color="#fff9f1" align="right" leading="-8" ubb="true" vars="true" text="30级"/>
+    <text id="n18_v461" name="txtStarLv" xy="156,174" pivot="1,0" size="27,34" group="n19_v461" fontSize="24" color="#fff9f1" align="right" leading="-5" text="30"/>
+    <image id="n17_v461" name="n17" src="pq5x64" fileName="imagesExport/kp_xingx.png" pkg="eg2y0ldp" xy="183,178" group="n19_v461"/>
+    <group id="n19_v461" name="n19" xy="156,174" size="53,34" group="n23_ofwu" advanced="true" layout="hz" excludeInvisibles="true">
       <relation target="" sidePair="right-right"/>
     </group>
+    <loader id="n7_sx2v" name="loaRarity" xy="169,14" size="40,85" group="n23_ofwu" aspect="true" url="ui://eg2y0ldpo9ghtli" fill="scaleMatchWidth"/>
+    <loader id="n16_qr4e" name="loaMainScore" xy="14,14" size="46,46" group="n23_ofwu" aspect="true" url="ui://eg2y0ldp842s6h" fill="scaleMatchHeight"/>
+    <image id="n15_dcro" name="n15" src="sx2v9t" fileName="imagesStory/zd_tctcdikugn_2.png" xy="4,3" group="n23_ofwu"/>
+    <graph id="n13_dcro" name="holder" xy="112,117" size="1,1" group="n23_ofwu" touchable="false" type="rect">
+      <gearDisplay controller="button" pages="1"/>
+    </graph>
+    <loader id="n21_ofwu" name="loaBorder" xy="0,0" size="222,239" group="n23_ofwu" url="ui://eg2y0ldp94m19v" fill="scaleFree"/>
+    <group id="n23_ofwu" name="n23" xy="0,0" size="222,283"/>
   </displayList>
   <Button mode="Radio"/>
 </component>

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ListCardItem.cs

@@ -10,10 +10,11 @@ namespace UI.Main
         public UI_ComCardMask m_comCardMask;
         public GTextField m_txtName;
         public GTextField m_txtLv;
+        public GTextField m_txtStarLv;
         public GLoader m_loaRarity;
         public GLoader m_loaMainScore;
         public GGraph m_holder;
-        public GTextField m_txtStarLv;
+        public GLoader m_loaBorder;
         public const string URL = "ui://mfvz4q8kr1a99f";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "ListCardItem";
@@ -64,10 +65,11 @@ namespace UI.Main
             m_comCardMask = (UI_ComCardMask)UI_ComCardMask.Create(comp.GetChild("comCardMask"));
             m_txtName = (GTextField)comp.GetChild("txtName");
             m_txtLv = (GTextField)comp.GetChild("txtLv");
+            m_txtStarLv = (GTextField)comp.GetChild("txtStarLv");
             m_loaRarity = (GLoader)comp.GetChild("loaRarity");
             m_loaMainScore = (GLoader)comp.GetChild("loaMainScore");
             m_holder = (GGraph)comp.GetChild("holder");
-            m_txtStarLv = (GTextField)comp.GetChild("txtStarLv");
+            m_loaBorder = (GLoader)comp.GetChild("loaBorder");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -75,10 +77,11 @@ namespace UI.Main
             m_comCardMask = null;
             m_txtName = null;
             m_txtLv = null;
+            m_txtStarLv = null;
             m_loaRarity = null;
             m_loaMainScore = null;
             m_holder = null;
-            m_txtStarLv = null;
+            m_loaBorder = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_StoryCardChooseUI.cs

@@ -14,6 +14,7 @@ namespace UI.Main
         public GList m_listCard;
         public GButton m_btnCancel;
         public GButton m_btnConfirm;
+        public GButton m_btnUpCard;
         public const string URL = "ui://mfvz4q8kr1a99d";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "StoryCardChooseUI";
@@ -68,6 +69,7 @@ namespace UI.Main
             m_listCard = (GList)comp.GetChild("listCard");
             m_btnCancel = (GButton)comp.GetChild("btnCancel");
             m_btnConfirm = (GButton)comp.GetChild("btnConfirm");
+            m_btnUpCard = (GButton)comp.GetChild("btnUpCard");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -78,6 +80,7 @@ namespace UI.Main
             m_listCard = null;
             m_btnCancel = null;
             m_btnConfirm = null;
+            m_btnUpCard = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -102,7 +102,7 @@ namespace GFGGame
             RarityIconController.UpdateRarityIcon(listItem.m_loaRarity, data.itemCfg.id, false);// ResPathUtil.GetCommonGameResPath("kp_sxing_x_" + data.itemCfg.rarity);
             listItem.m_loaMainScore.url = ResPathUtil.GetCommonGameResPath("kp_sx_" + (data.itemCfg.mainScore));
 
-            listItem.m_loaBorder.url = "ui://Card/kp_kuang_" + data.itemCfg.rarity;//ResPathUtil.GetCommonGameResPath("kp_sxing_x_" + data.itemCfg.rarity);
+            listItem.m_loaBorder.url = "ui://CommonGame/kp_kuang_" + data.itemCfg.rarity;//ResPathUtil.GetCommonGameResPath("kp_sxing_x_" + data.itemCfg.rarity);
             listItem.m_txtLv.text = data.lv + "级";
             listItem.m_txtName.text = data.itemCfg.name;
             RedDotController.Instance.SetComRedDot(listItem.target, RedDotDataManager.Instance.GetCardSkillsRed(data.id) || RedDotDataManager.Instance.GetCardStarReward(data.id), "", 10, -4);

GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryCardChoose.cs

@@ -96,7 +96,7 @@ namespace GFGGame
             // 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));
-
+            item.m_loaBorder.url = "ui://CommonGame/kp_kuang_" + cardData.itemCfg.rarity;
             // UI_ComStar comStar = UI_ComStar.Proxy(item.m_comStar);
             item.m_txtStarLv.text = cardData.star.ToString();
             // comStar.m_c1.selectedIndex = cardData.star;

GameClient/Assets/ResIn/UI/Card/Card_atlas0_3!a.png.meta → GameClient/Assets/ResIn/UI/Main/Main_atlas0_9!a.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: b8d63117111846347932e0cb2daf16ac
+guid: 5693a3c31479518409027f70f9fae4a3
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

GameClient/Assets/ResIn/UI/Card/Card_atlas0_3.png.meta → GameClient/Assets/ResIn/UI/Main/Main_atlas0_9.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: e9e4b460ac7acf04eab55fb982e230ef
+guid: 8fbfdfb83d755254bb0147d894b2f1cc
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}