选卡展示等级

FGUIProject/assets/CommonGame/package.xml

@@ -274,7 +274,7 @@
     <component id="o9ghtlq" name="ComHead2.xml" path="/components/" exported="true"/>
     <image id="a0cf2l" name="lm_huizhangdk.png" path="/imagesNew/"/>
     <component id="o9ghtlr" name="ComHeadLv1.xml" path="/components/" exported="true"/>
-    <image id="a0cf2k" name="lm_db_lvl.png" path="/imagesNew/"/>
+    <image id="a0cf2k" name="lm_db_lvl.png" path="/imagesNew/" exported="true"/>
     <component id="9jv6tls" name="ComItem001_2.xml" path="/components/" exported="true"/>
     <component id="9jv6tlt" name="ComIcon001.xml" path="/components/"/>
     <image id="9jv6tlu" name="lm_daoju_db.png" path="/images/"/>
@@ -367,6 +367,7 @@
     <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"/>
+    <image id="ofwutoc" name="card_jn_db.png" path="/imagesNew/" exported="true"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/Main/ListCardSkillItem.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="108,108">
+  <displayList>
+    <image id="n16_ofwu" name="n16" src="ofwutoc" fileName="imagesNew/card_jn_db.png" pkg="eg2y0ldp" xy="0,0"/>
+    <component id="n14_ofwu" name="comSkill" src="ofwup1" fileName="ListCardSkillItemMask.xml" xy="6,6"/>
+    <image id="n17_ofwu" name="n17" src="a0cf2k" fileName="imagesNew/lm_db_lvl.png" pkg="eg2y0ldp" xy="70,71" group="n19_ofwu"/>
+    <text id="n18_ofwu" name="txtLv" xy="80,65" pivot="0.5,0" size="20,44" group="n19_ofwu" fontSize="32" color="#fdfaf3" align="center" text="9"/>
+    <group id="n19_ofwu" name="n19" xy="70,65" size="39,45"/>
+  </displayList>
+</component>

FGUIProject/assets/Main/ListCardSkillItemMask.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="96,96" mask="n16_ofwu">
+  <displayList>
+    <image id="n14_ofwu" name="n14" src="ofwutoc" fileName="imagesNew/card_jn_db.png" pkg="eg2y0ldp" xy="-6,-6"/>
+    <loader id="n15_ofwu" name="loaSkill" xy="-69,-59" size="234,432" url="ui://eg2y0ldpqkjstlc" autoSize="true"/>
+    <graph id="n16_ofwu" name="n16" xy="2,2" size="92,92" type="eclipse" lineSize="0"/>
+  </displayList>
+</component>

FGUIProject/assets/Main/StoryCardChooseUI.xml

@@ -7,10 +7,7 @@
       <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="80,415" size="933,657" layout="flow_hz" overflow="scroll" lineGap="21" colGap="12" defaultItem="ui://mfvz4q8kr1a99f" autoClearItems="true">
+    <list id="n0_r1a9" name="listCard" xy="84,415" size="912,657" layout="flow_hz" overflow="scroll" lineGap="15" colGap="10" defaultItem="ui://mfvz4q8kr1a99f" autoClearItems="true">
       <item/>
       <item/>
       <item/>
@@ -29,8 +26,16 @@
       <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">
+    <component id="n13_ofwu" name="btnUpCard" src="rv091e" fileName="components/BtnSmall.xml" pkg="mk0fwx0x" xy="768,245">
       <Button title="提升词牌"/>
     </component>
+    <list id="n15_ofwu" name="listSkill" xy="99,207" size="365,110" layout="row" overflow="scroll" colGap="16" defaultItem="ui://mfvz4q8kofwup0">
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <text id="n11_wzce" name="txtTips" xy="719,342" size="267,52" group="n16_ofwu" font="ui://eg2y0ldpa0cftkz" fontSize="38" color="#c67c6b" text="选择适合的词牌"/>
+    <image id="n10_wzce" name="n10" src="sx2v9q" fileName="imagesStory/zd_tctcxian_2.png" xy="680,360" group="n16_ofwu"/>
+    <group id="n16_ofwu" name="n16" xy="680,342" size="306,52"/>
   </displayList>
 </component>

FGUIProject/assets/Main/components/ListCardItem.xml

@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="222,279" extention="Button">
+<component size="220,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="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">
+    <component id="n9_wzce" name="comCardMask" src="wzce9v" fileName="components/ComCardMask.xml" xy="4,3" group="n23_ofwu"/>
+    <image id="n8_sx2v" name="n8" src="sx2v9s" fileName="imagesStory/zd_tctcdikugn_1.png" xy="5,156" group="n23_ofwu"/>
+    <text id="n3_r1a9" name="txtName" xy="57,236" size="105,46" group="n23_ofwu" font="ui://eg2y0ldpa0cftkz" fontSize="34" color="#6a5d56" text="赵钱孙"/>
+    <text id="n12_wzce" name="txtLv" xy="153,192" 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="153,173" 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="180,177" group="n19_v461"/>
+    <group id="n19_v461" name="n19" xy="153,173" 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">
+    <loader id="n7_sx2v" name="loaRarity" xy="168,13" size="40,85" group="n23_ofwu" aspect="true" url="ui://eg2y0ldpo9ghtli" fill="scaleMatchWidth"/>
+    <loader id="n16_qr4e" name="loaMainScore" xy="13,13" 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="3,2" group="n23_ofwu"/>
+    <loader id="n21_ofwu" name="loaBorder" xy="0,0" size="220,235" group="n23_ofwu" url="ui://eg2y0ldp94m19v" fill="scaleFree"/>
+    <graph id="n13_dcro" name="holder" xy="110,115" 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"/>
+    <group id="n23_ofwu" name="n23" xy="0,0" size="220,282"/>
   </displayList>
   <Button mode="Radio"/>
 </component>

FGUIProject/assets/Main/package.xml

@@ -648,6 +648,8 @@
     <image id="t6j1ox" name="zd_shanghai_db.png" path="/imagesNew/"/>
     <image id="jt8doy" name="db_qipaokuang.png" path="/imagesNew/" scale="9grid" scale9grid="17,9,177,18"/>
     <image id="e050oz" name="jdt_shuangrenzd.png" path="/imagesNew/"/>
+    <component id="ofwup0" name="ListCardSkillItem.xml" path="/"/>
+    <component id="ofwup1" name="ListCardSkillItemMask.xml" path="/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/Main" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

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

@@ -13,8 +13,8 @@ namespace UI.Main
         public GTextField m_txtStarLv;
         public GLoader m_loaRarity;
         public GLoader m_loaMainScore;
-        public GGraph m_holder;
         public GLoader m_loaBorder;
+        public GGraph m_holder;
         public const string URL = "ui://mfvz4q8kr1a99f";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "ListCardItem";
@@ -68,8 +68,8 @@ namespace UI.Main
             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_loaBorder = (GLoader)comp.GetChild("loaBorder");
+            m_holder = (GGraph)comp.GetChild("holder");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -80,8 +80,8 @@ namespace UI.Main
             m_txtStarLv = null;
             m_loaRarity = null;
             m_loaMainScore = null;
-            m_holder = null;
             m_loaBorder = null;
+            m_holder = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -0,0 +1,75 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Main
+{
+    public partial class UI_ListCardSkillItem
+    {
+        public GComponent target;
+        public UI_ListCardSkillItemMask m_comSkill;
+        public GTextField m_txtLv;
+        public const string URL = "ui://mfvz4q8kofwup0";
+        public const string PACKAGE_NAME = "Main";
+        public const string RES_NAME = "ListCardSkillItem";
+        private static UI_ListCardSkillItem _proxy;
+
+        public static UI_ListCardSkillItem Create(GObject gObject = null)
+        {
+            var ui = new UI_ListCardSkillItem();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_ListCardSkillItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ListCardSkillItem();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_comSkill = (UI_ListCardSkillItemMask)UI_ListCardSkillItemMask.Create(comp.GetChild("comSkill"));
+            m_txtLv = (GTextField)comp.GetChild("txtLv");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_comSkill.Dispose();
+            m_comSkill = null;
+            m_txtLv = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ListCardSkillItem.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 04ca77a2ad7a9f245aaae23d42322675
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Main
+{
+    public partial class UI_ListCardSkillItemMask
+    {
+        public GComponent target;
+        public GLoader m_loaSkill;
+        public const string URL = "ui://mfvz4q8kofwup1";
+        public const string PACKAGE_NAME = "Main";
+        public const string RES_NAME = "ListCardSkillItemMask";
+        private static UI_ListCardSkillItemMask _proxy;
+
+        public static UI_ListCardSkillItemMask Create(GObject gObject = null)
+        {
+            var ui = new UI_ListCardSkillItemMask();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_ListCardSkillItemMask Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ListCardSkillItemMask();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_loaSkill = (GLoader)comp.GetChild("loaSkill");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaSkill = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ListCardSkillItemMask.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 230e33fb2b095ca4480d3c8e2fe1165e
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -9,12 +9,12 @@ namespace UI.Main
         public GComponent target;
         public GLoader m_loaScore;
         public GTextField m_txtName;
-        public GTextField m_txtDiscribe;
-        public GTextField m_txtTips;
         public GList m_listCard;
         public GButton m_btnCancel;
         public GButton m_btnConfirm;
         public GButton m_btnUpCard;
+        public GList m_listSkill;
+        public GTextField m_txtTips;
         public const string URL = "ui://mfvz4q8kr1a99d";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "StoryCardChooseUI";
@@ -64,23 +64,23 @@ namespace UI.Main
         {
             m_loaScore = (GLoader)comp.GetChild("loaScore");
             m_txtName = (GTextField)comp.GetChild("txtName");
-            m_txtDiscribe = (GTextField)comp.GetChild("txtDiscribe");
-            m_txtTips = (GTextField)comp.GetChild("txtTips");
             m_listCard = (GList)comp.GetChild("listCard");
             m_btnCancel = (GButton)comp.GetChild("btnCancel");
             m_btnConfirm = (GButton)comp.GetChild("btnConfirm");
             m_btnUpCard = (GButton)comp.GetChild("btnUpCard");
+            m_listSkill = (GList)comp.GetChild("listSkill");
+            m_txtTips = (GTextField)comp.GetChild("txtTips");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_loaScore = null;
             m_txtName = null;
-            m_txtDiscribe = null;
-            m_txtTips = null;
             m_listCard = null;
             m_btnCancel = null;
             m_btnConfirm = null;
             m_btnUpCard = null;
+            m_listSkill = null;
+            m_txtTips = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -46,8 +46,11 @@ namespace GFGGame
             _ui.m_listCard.itemRenderer = RenderListCardItem;
             _ui.m_listCard.onClickItem.Add(OnListCardItemClick);
 
+            _ui.m_listSkill.itemRenderer = RenderListSkillItem;
+
             _ui.m_btnCancel.onClick.Add(OnBtnCancelClick);
             _ui.m_btnConfirm.onClick.Add(OnBtnComfirmClick);
+            _ui.m_btnUpCard.onClick.Add(OnBtnUpCardClikc);
         }
         protected override void OnShown()
         {
@@ -75,16 +78,25 @@ namespace GFGGame
 
             int cardId = cardList[index].id;
             _ui.m_txtName.text = "";
-            _ui.m_txtDiscribe.text = "";
 
             PassivitySkillCfg cfg = ScoreSystemData.Instance.GetShowSkillCfg(cardId);
             if (cfg == null) return;
-            int skillId = ScoreSystemData.Instance.GetShowSkillCfg(cardId).skillId;
-            int skillLv = SkillDataManager.Instance.GetCardSkillLv(cardId, skillId);
-            PassivitySkillLvlCfg skillLvCfg = PassivitySkillLvlCfgArray.Instance.GetCfgByskilllvlAndskillId(skillLv, skillId);
             _ui.m_txtName.text = cfg.name;
-            _ui.m_txtDiscribe.text = skillLvCfg.describe;
+
+            List<PassivitySkillCfg> skillCfgs = PassivitySkillCfgArray.Instance.GetCfgsBycardId(cardId);
+            _ui.m_listSkill.data = skillCfgs;
+            _ui.m_listSkill.numItems = skillCfgs.Count;
+        }
+
+        private void RenderListSkillItem(int index, GObject obj)
+        {
+            List<PassivitySkillCfg> skillCfgs = obj.parent.data as List<PassivitySkillCfg>;
+            UI_ListCardSkillItem item = UI_ListCardSkillItem.Proxy(obj);
+            item.m_comSkill.m_loaSkill.url = ResPathUtil.GetCardSmallPath(skillCfgs[index].res);
+            item.m_txtLv.text = SkillDataManager.Instance.GetCardSkillLv(skillCfgs[index].cardId, skillCfgs[index].skillId).ToString();
+            UI_ListCardSkillItem.ProxyEnd();
         }
+
         private void RenderListCardItem(int index, GObject obj)
         {
             CardData cardData = cardList[index];
@@ -130,6 +142,11 @@ namespace GFGGame
                 EventAgent.DispatchEvent(ConstMessage.CARD_SELECTED);
             }
         }
+        private void OnBtnUpCardClikc()
+        {
+            ViewManager.Show<CardFosterView>(cardList[_ui.m_listCard.selectedIndex], new object[] { typeof(StoryCardChoose).FullName, _scoreType });
+            this.Hide();
+        }
         private void OnBtnComfirmClick()
         {
             int cardId = cardList[_ui.m_listCard.selectedIndex].id;