zhaoyang 2 жил өмнө
parent
commit
30f86d314d
32 өөрчлөгдсөн 47 нэмэгдсэн , 213 устгасан
  1. 5 3
      FGUIProject/assets/Card/CardSkillUI.xml
  2. 10 9
      FGUIProject/assets/Card/components/ComFosterBottom.xml
  3. 1 1
      FGUIProject/assets/Card/components/ComSkill.xml
  4. 10 9
      FGUIProject/assets/Card/components/ListSkillItem.xml
  5. BIN
      FGUIProject/assets/Card/imagesNew/jn_tb_jzh.png
  6. 1 0
      FGUIProject/assets/Card/package.xml
  7. 1 1
      FGUIProject/assets/Main/components/ListCardSkillItem.xml
  8. 0 8
      FGUIProject/assets/Main/components/ListCardSkillItemMask.xml
  9. BIN
      FGUIProject/assets/Main/imagesNew/jn_tb_jzh.png
  10. 1 1
      FGUIProject/assets/Main/package.xml
  11. 3 4
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Card/UI_CardSkillUI.cs
  12. 0 71
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Card/UI_ComSkill.cs
  13. 0 11
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Card/UI_ComSkill.cs.meta
  14. 3 4
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Card/UI_ListSkillItem.cs
  15. 3 4
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ListCardSkillItem.cs
  16. 0 71
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ListCardSkillItemMask.cs
  17. 0 11
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ListCardSkillItemMask.cs.meta
  18. 6 2
      GameClient/Assets/Game/HotUpdate/Utils/ResPathUtil.cs
  19. 1 1
      GameClient/Assets/Game/HotUpdate/Views/Card/CardFosterView.cs
  20. 1 1
      GameClient/Assets/Game/HotUpdate/Views/Card/CardSkillView.cs
  21. 1 1
      GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryCardChoose.cs
  22. BIN
      GameClient/Assets/ResIn/UI/Card/Card_atlas0!a.png
  23. BIN
      GameClient/Assets/ResIn/UI/Card/Card_atlas0.png
  24. BIN
      GameClient/Assets/ResIn/UI/Card/Card_atlas0_1!a.png
  25. BIN
      GameClient/Assets/ResIn/UI/Card/Card_atlas0_1.png
  26. BIN
      GameClient/Assets/ResIn/UI/Card/Card_atlas0_2!a.png
  27. BIN
      GameClient/Assets/ResIn/UI/Card/Card_atlas0_2.png
  28. BIN
      GameClient/Assets/ResIn/UI/Card/Card_fui.bytes
  29. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0!a.png
  30. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0.png
  31. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_1.png
  32. BIN
      GameClient/Assets/ResIn/UI/Main/Main_fui.bytes

+ 5 - 3
FGUIProject/assets/Card/CardSkillUI.xml

@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="962,1032">
+<component size="962,1033">
   <controller name="c1" pages="0,,1," selected="0"/>
   <displayList>
-    <component id="n0_rhha" name="n0" src="si5ztih" fileName="components/ComBg.xml" pkg="mk0fwx0x" xy="0,-1" size="962,1032">
+    <component id="n0_rhha" name="n0" src="si5ztih" fileName="components/ComBg.xml" pkg="mk0fwx0x" xy="0,0" size="962,1032">
       <relation target="" sidePair="center-center,middle-middle"/>
     </component>
+    <loader id="n19_fpax" name="loaSkill" xy="396,47" pivot="0.5,0.5" size="172,175" group="n6_rhha" url="ui://7l6lvkayfpaxtlp" align="center" vAlign="middle" fill="scale">
+      <relation target="" sidePair="width-width,height-height"/>
+    </loader>
     <image id="n4_rhha" name="n4" src="j48o99" fileName="images/kp_sjsj_di_3.png" pkg="eg2y0ldp" xy="385,38" group="n6_rhha"/>
     <text id="n3_rhha" name="txtName" xy="480,225" pivot="0.5,0" anchor="true" size="112,49" group="n6_rhha" fontSize="36" color="#85756d" text="赵钱孙"/>
-    <component id="n7_rhha" name="comSkill" src="rhha9l" fileName="components/ComSkill.xml" xy="392,45" size="177,177" group="n6_rhha" aspect="true"/>
     <group id="n6_rhha" name="n6" xy="385,38" size="192,236"/>
     <component id="n9_rhha" name="comCurLV" src="rhha9q" fileName="components/ComSkillDiscribe.xml" xy="63,295"/>
     <component id="n10_rhha" name="comNextLv" src="rhha9q" fileName="components/ComSkillDiscribe.xml" xy="64,423" group="n17_mza1"/>

+ 10 - 9
FGUIProject/assets/Card/components/ComFosterBottom.xml

@@ -2,8 +2,8 @@
 <component size="1080,831" opaque="false">
   <controller name="ctrlFullStar" pages="0,,1," selected="0"/>
   <controller name="ctrlFullLv" pages="0,,1," selected="0"/>
-  <controller name="ctrlTab" exported="true" pages="0,,1,,2," selected="1"/>
-  <controller name="ctrlSkillCount" pages="0,,1,,2,,3," selected="0"/>
+  <controller name="ctrlTab" exported="true" pages="0,,1,,2," selected="2"/>
+  <controller name="ctrlSkillCount" pages="0,,1,,2,,3," selected="3"/>
   <displayList>
     <image id="n70_lc71" name="n70" src="qkjsbm" fileName="imagesNew/dikuang_back.png" xy="0,-212" size="1080,1039" group="n115_o9gh"/>
     <image id="n97_qkjs" name="n97" src="qkjsbb" fileName="imagesNew/card_DividingLine.png" xy="38,426" size="972,8" group="n115_o9gh"/>
@@ -83,23 +83,24 @@
     <group id="n55_l2by" name="grpStar" xy="99,6" size="980,714" group="n115_o9gh" advanced="true">
       <gearDisplay controller="ctrlTab" pages="1"/>
     </group>
-    <list id="n77_rhha" name="listSkill" xy="50,423" size="1006,289" group="n113_o9gh" layout="row" overflow="hidden" lineGap="25" colGap="170" defaultItem="ui://7l6lvkayrhha9k" align="center">
+    <list id="n77_rhha" name="listSkill" xy="37,423" size="1006,289" group="n113_o9gh" layout="row" overflow="hidden" lineGap="25" colGap="110" defaultItem="ui://7l6lvkayrhha9k" align="center">
+      <item/>
       <item/>
       <item/>
     </list>
-    <image id="n110_o9gh" name="n110" src="qkjsau" fileName="imagesNew/lIne_ItemConect.png" xy="555,520" group="n112_o9gh">
+    <image id="n110_o9gh" name="n110" src="qkjsau" fileName="imagesNew/lIne_ItemConect.png" xy="280,520" group="n112_o9gh">
       <gearDisplay controller="ctrlSkillCount" pages="2,3"/>
     </image>
-    <image id="n111_o9gh" name="n111" src="qkjsau" fileName="imagesNew/lIne_ItemConect.png" xy="945,520" group="n112_o9gh">
+    <image id="n111_o9gh" name="n111" src="qkjsau" fileName="imagesNew/lIne_ItemConect.png" xy="610,520" group="n112_o9gh">
       <gearDisplay controller="ctrlSkillCount" pages="3"/>
     </image>
-    <group id="n112_o9gh" name="n112" xy="555,520" size="0,0" group="n113_o9gh" advanced="true" layout="hz" colGap="200" excludeInvisibles="true">
+    <group id="n112_o9gh" name="n112" xy="280,520" size="520,40" group="n113_o9gh" advanced="true" layout="hz" colGap="140" excludeInvisibles="true">
       <relation target="" sidePair="center-center"/>
     </group>
     <component id="n114_o9gh" name="btnUpSkillLv" src="qkjstlg" fileName="components/BtnNormal0.xml" pkg="eg2y0ldp" xy="706,6" size="374,342" group="n113_o9gh">
       <Button title="升级" icon="ui://7l6lvkayqkjsb4"/>
     </component>
-    <group id="n113_o9gh" name="grpSkill" xy="50,6" size="1030,706" group="n115_o9gh" advanced="true">
+    <group id="n113_o9gh" name="grpSkill" xy="37,6" size="1043,706" group="n115_o9gh" advanced="true">
       <gearDisplay controller="ctrlTab" pages="2"/>
     </group>
     <component id="n17_ojlz" name="btnLv" src="ojlzr" fileName="components/BtnTab.xml" pkg="eg2y0ldp" xy="75,331" size="290,70" group="n22_842s">
@@ -107,11 +108,11 @@
       <property target="title" propertyId="0" value="升级"/>
     </component>
     <component id="n18_ojlz" name="btnStar" src="ojlzr" fileName="components/BtnTab.xml" pkg="eg2y0ldp" xy="395,331" size="290,70" group="n22_842s">
-      <Button checked="true" controller="ctrlTab" page="1"/>
+      <Button controller="ctrlTab" page="1"/>
       <property target="title" propertyId="0" value="升星"/>
     </component>
     <component id="n19_ojlz" name="btnSkill" src="ojlzr" fileName="components/BtnTab.xml" pkg="eg2y0ldp" xy="715,331" size="290,70" group="n22_842s">
-      <Button controller="ctrlTab" page="2"/>
+      <Button checked="true" controller="ctrlTab" page="2"/>
       <property target="title" propertyId="0" value="技能"/>
     </component>
     <group id="n22_842s" name="grpTab" xy="75,331" size="930,70" group="n115_o9gh" advanced="true" layout="hz" colGap="30" excludeInvisibles="true"/>

+ 1 - 1
FGUIProject/assets/Card/components/ComSkill.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="124,124" mask="n79_v461">
   <displayList>
-    <loader id="n78_rhha" name="loaSkill" xy="-55,-61" size="234,432" url="ui://7l6lvkayr9ri9x" autoSize="true">
+    <loader id="n78_rhha" name="loaSkill" xy="-11,-13" size="147,150" url="ui://7l6lvkayfpaxtlp" autoSize="true">
       <relation target="" sidePair="width-width,height-height"/>
     </loader>
     <graph id="n79_v461" name="n79" xy="0,0" size="124,124" type="eclipse" lineSize="0"/>

+ 10 - 9
FGUIProject/assets/Card/components/ListSkillItem.xml

@@ -1,27 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="224,230" extention="Button">
-  <controller name="button" pages="0,up,1,down" selected="1"/>
+  <controller name="button" pages="0,up,1,down" selected="0"/>
   <displayList>
-    <image id="n85_o9gh" name="n85" src="qkjsbk" fileName="imagesNew/choose_skill_shine.png" xy="0,0">
+    <image id="n85_o9gh" name="n85" src="qkjsbk" fileName="imagesNew/choose_skill_shine.png" xy="0,0" group="n91_fpax">
       <gearDisplay controller="button" pages="1"/>
     </image>
-    <image id="n86_o9gh" name="n86" src="qkjsbs" fileName="imagesNew/dikuang_SkillItem.png" xy="23,22">
+    <image id="n86_o9gh" name="n86" src="qkjsbs" fileName="imagesNew/dikuang_SkillItem.png" xy="23,22" group="n91_fpax">
       <gearDisplay controller="button" pages="0"/>
     </image>
-    <component id="n75_rhha" name="comSkill" src="rhha9l" fileName="components/ComSkill.xml" xy="40,38" size="124,124" aspect="true" scale="1.2,1.2"/>
-    <image id="n84_o9gh" name="n84" src="qkjsb7" fileName="imagesNew/bk_SKillItem.png" xy="39,37">
+    <loader id="n90_fpax" name="loaSkill" xy="39,37" pivot="0.5,0.5" size="150,150" group="n91_fpax" url="ui://7l6lvkayfpaxtlr" align="center" autoSize="true"/>
+    <image id="n84_o9gh" name="n84" src="qkjsb7" fileName="imagesNew/bk_SKillItem.png" xy="39,37" group="n91_fpax">
       <gearDisplay controller="button" pages="0"/>
     </image>
     <image id="n77_rhha" name="n77" src="qkjsb5" fileName="imagesNew/dikuang_SkillLevel.png" xy="120,156" pivot="0.5,0" size="57,30" group="n88_o9gh">
       <relation target="n80_rhha" sidePair="width-width"/>
     </image>
     <text id="n80_rhha" name="txtLv" xy="122,148" pivot="0.5,0" size="52,44" group="n88_o9gh" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#716660" align="center" text="1级"/>
-    <group id="n88_o9gh" name="n88" xy="120,148" size="57,44"/>
-    <image id="n89_o9gh" name="n89" src="qkjsbj" fileName="imagesNew/choose_skill_icon.png" xy="81,71">
+    <group id="n88_o9gh" name="n88" xy="120,148" size="57,44" group="n91_fpax"/>
+    <image id="n89_o9gh" name="n89" src="qkjsbj" fileName="imagesNew/choose_skill_icon.png" xy="81,71" group="n91_fpax">
       <gearDisplay controller="button" pages="1"/>
     </image>
-    <image id="n74_rhha" name="n74" src="qkjsav" fileName="imagesNew/name_underprint_card.png" xy="23,230" size="178,40"/>
-    <text id="n81_rhha" name="txtName" xy="52,228" pivot="0.5,0" size="120,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#fefef6" align="center" vAlign="middle" letterSpacing="-4" text="名字名字"/>
+    <image id="n74_rhha" name="n74" src="qkjsav" fileName="imagesNew/name_underprint_card.png" xy="23,230" size="178,40" group="n91_fpax"/>
+    <text id="n81_rhha" name="txtName" xy="52,228" pivot="0.5,0" size="120,44" group="n91_fpax" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#fefef6" align="center" vAlign="middle" letterSpacing="-4" text="名字名字"/>
+    <group id="n91_fpax" name="n91" xy="0,0" size="224,272"/>
   </displayList>
   <Button mode="Radio"/>
 </component>

BIN
FGUIProject/assets/Card/imagesNew/jn_tb_jzh.png


+ 1 - 0
FGUIProject/assets/Card/package.xml

@@ -139,6 +139,7 @@
     <image id="fqortln" name="cp_yeqian_bg_shang.png" path="/images/"/>
     <image id="fqortlo" name="cp_yeqian_bg_xia.png" path="/images/"/>
     <image id="qik1tch" name="wz_shengxing.png" path="/imagesNew/"/>
+    <image id="fpaxtlp" name="jn_tb_jzh.png" path="/imagesNew/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/Card" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

+ 1 - 1
FGUIProject/assets/Main/components/ListCardSkillItem.xml

@@ -2,7 +2,7 @@
 <component size="108,108" extention="Button">
   <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"/>
+    <loader id="n20_fpax" name="loaSkill" xy="8,7" pivot="0.5,0.5" size="94,94" aspect="true" url="ui://mfvz4q8kfpaxpu" align="center" vAlign="middle" fill="scale"/>
     <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"/>

+ 0 - 8
FGUIProject/assets/Main/components/ListCardSkillItemMask.xml

@@ -1,8 +0,0 @@
-<?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>

BIN
FGUIProject/assets/Main/imagesNew/jn_tb_jzh.png


+ 1 - 1
FGUIProject/assets/Main/package.xml

@@ -646,7 +646,6 @@
     <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="/components/"/>
-    <component id="ofwup1" name="ListCardSkillItemMask.xml" path="/components/"/>
     <component id="ofwup2" name="ComArenaSkillTips.xml" path="/components/"/>
     <image id="jx6zp3" name="zjm_dibutb_db.png" path="/imagesNew/"/>
     <image id="jx6zp4" name="fuben_bg.png" path="/"/>
@@ -670,6 +669,7 @@
     <image id="ebfipr" name="zd_tctcdi_1_zz.png" path="/imagesStory/"/>
     <image id="ebfips" name="kp_dikuang_2.png" path="/images/"/>
     <image id="ebfipt" name="kp_dikuang_1.png" path="/images/"/>
+    <image id="fpaxpu" name="jn_tb_jzh.png" path="/imagesNew/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/Main" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

+ 3 - 4
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Card/UI_CardSkillUI.cs

@@ -8,8 +8,8 @@ namespace UI.Card
     {
         public GComponent target;
         public Controller m_c1;
+        public GLoader m_loaSkill;
         public GTextField m_txtName;
-        public UI_ComSkill m_comSkill;
         public UI_ComSkillDiscribe m_comCurLV;
         public UI_ComSkillDiscribe m_comNextLv;
         public GList m_listConsume;
@@ -63,8 +63,8 @@ namespace UI.Card
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
+            m_loaSkill = (GLoader)comp.GetChild("loaSkill");
             m_txtName = (GTextField)comp.GetChild("txtName");
-            m_comSkill = (UI_ComSkill)UI_ComSkill.Create(comp.GetChild("comSkill"));
             m_comCurLV = (UI_ComSkillDiscribe)UI_ComSkillDiscribe.Create(comp.GetChild("comCurLV"));
             m_comNextLv = (UI_ComSkillDiscribe)UI_ComSkillDiscribe.Create(comp.GetChild("comNextLv"));
             m_listConsume = (GList)comp.GetChild("listConsume");
@@ -74,9 +74,8 @@ namespace UI.Card
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
+            m_loaSkill = null;
             m_txtName = null;
-            m_comSkill.Dispose();
-            m_comSkill = null;
             m_comCurLV.Dispose();
             m_comCurLV = null;
             m_comNextLv.Dispose();

+ 0 - 71
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Card/UI_ComSkill.cs

@@ -1,71 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-
-namespace UI.Card
-{
-    public partial class UI_ComSkill
-    {
-        public GComponent target;
-        public GLoader m_loaSkill;
-        public const string URL = "ui://7l6lvkayrhha9l";
-        public const string PACKAGE_NAME = "Card";
-        public const string RES_NAME = "ComSkill";
-        private static UI_ComSkill _proxy;
-
-        public static UI_ComSkill Create(GObject gObject = null)
-        {
-            var ui = new UI_ComSkill();
-            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_ComSkill Proxy(GObject gObject = null)
-        {
-            if(_proxy == null)
-            {
-                _proxy = new UI_ComSkill();
-            }
-            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;
-        }
-    }
-}

+ 0 - 11
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Card/UI_ComSkill.cs.meta

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

+ 3 - 4
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Card/UI_ListSkillItem.cs

@@ -7,7 +7,7 @@ namespace UI.Card
     public partial class UI_ListSkillItem
     {
         public GButton target;
-        public UI_ComSkill m_comSkill;
+        public GLoader m_loaSkill;
         public GTextField m_txtLv;
         public GTextField m_txtName;
         public const string URL = "ui://7l6lvkayrhha9k";
@@ -57,14 +57,13 @@ namespace UI.Card
 
         private void Init(GComponent comp)
         {
-            m_comSkill = (UI_ComSkill)UI_ComSkill.Create(comp.GetChild("comSkill"));
+            m_loaSkill = (GLoader)comp.GetChild("loaSkill");
             m_txtLv = (GTextField)comp.GetChild("txtLv");
             m_txtName = (GTextField)comp.GetChild("txtName");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_comSkill.Dispose();
-            m_comSkill = null;
+            m_loaSkill = null;
             m_txtLv = null;
             m_txtName = null;
             if(disposeTarget && target != null)

+ 3 - 4
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ListCardSkillItem.cs

@@ -7,7 +7,7 @@ namespace UI.Main
     public partial class UI_ListCardSkillItem
     {
         public GButton target;
-        public UI_ListCardSkillItemMask m_comSkill;
+        public GLoader m_loaSkill;
         public GTextField m_txtLv;
         public const string URL = "ui://mfvz4q8kofwup0";
         public const string PACKAGE_NAME = "Main";
@@ -56,13 +56,12 @@ namespace UI.Main
 
         private void Init(GComponent comp)
         {
-            m_comSkill = (UI_ListCardSkillItemMask)UI_ListCardSkillItemMask.Create(comp.GetChild("comSkill"));
+            m_loaSkill = (GLoader)comp.GetChild("loaSkill");
             m_txtLv = (GTextField)comp.GetChild("txtLv");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_comSkill.Dispose();
-            m_comSkill = null;
+            m_loaSkill = null;
             m_txtLv = null;
             if(disposeTarget && target != null)
             {

+ 0 - 71
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ListCardSkillItemMask.cs

@@ -1,71 +0,0 @@
-/** 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;
-        }
-    }
-}

+ 0 - 11
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ListCardSkillItemMask.cs.meta

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

+ 6 - 2
GameClient/Assets/Game/HotUpdate/Utils/ResPathUtil.cs

@@ -85,6 +85,10 @@ namespace GFGGame
         {
             return $"{TEXTURE_DIR_PATH}/Card/Card/{res}.{extName}";
         }
+        public static string GetCardSkillPath(string res, string extName = "pnj")
+        {
+            return $"{TEXTURE_DIR_PATH}/Card/Skill/{res}.{extName}";
+        }
         public static string GetCardSoundPath(string res, string extName = "mp3")
         {
             return $"{SOUND_DIR_PATH}/Card/{res}.{extName}";
@@ -113,7 +117,7 @@ namespace GFGGame
 
         public static bool CheckDressUpAnimationResExist(string res, string extName = "prefab")
         {
-            if(string.IsNullOrEmpty(res))
+            if (string.IsNullOrEmpty(res))
             {
                 return false;
             }
@@ -128,7 +132,7 @@ namespace GFGGame
 
         public static string GetDressUpEffectPath(string res, bool inAniDir = false, string extName = "prefab")
         {
-            if(inAniDir)
+            if (inAniDir)
             {
                 return $"{GetDressUpEffectDirPath(res)}/{res}_2.{extName}";
             }

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/Card/CardFosterView.cs

@@ -759,7 +759,7 @@ namespace GFGGame
 
             int skillLv = SkillDataManager.Instance.GetCardSkillLv(_cardData.id, skillCfg.skillId);
             CardData data = CardDataManager.GetCardDataById(InstanceZonesDataManager.currentCardId);
-            item.m_comSkill.m_loaSkill.url = ResPathUtil.GetCardSmallPath(_cardData.resources[_cardData.resIndex]);
+            item.m_loaSkill.url = ResPathUtil.GetCardSkillPath(skillCfg.res);
             item.m_txtName.text = skillCfg.name;
             item.m_txtLv.text = string.Format("{0}级", skillLv);
             PassivitySkillLvlCfg skillLvlCfg = PassivitySkillLvlCfgArray.Instance.GetCfgByskilllvlAndskillId(skillLv, skillCfg.skillId);

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/Card/CardSkillView.cs

@@ -57,7 +57,7 @@ namespace GFGGame
             skillLvCfg = PassivitySkillLvlCfgArray.Instance.GetCfgByskilllvlAndskillId(_skillLv, _skillId);
 
             _ui.m_txtName.text = skillCfg.name;
-            _ui.m_comSkill.m_loaSkill.url = ResPathUtil.GetCardSmallPath(skillCfg.res);
+            _ui.m_loaSkill.url = ResPathUtil.GetCardSkillPath(skillCfg.res);
 
             UpdateView();
         }

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

@@ -95,7 +95,7 @@ namespace GFGGame
         {
             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_loaSkill.url = ResPathUtil.GetCardSkillPath(skillCfgs[index].res);
             item.m_txtLv.text = SkillDataManager.Instance.GetCardSkillLv(skillCfgs[index].cardId, skillCfgs[index].skillId).ToString();
             if (item.target.data == null)
             {

BIN
GameClient/Assets/ResIn/UI/Card/Card_atlas0!a.png


BIN
GameClient/Assets/ResIn/UI/Card/Card_atlas0.png


BIN
GameClient/Assets/ResIn/UI/Card/Card_atlas0_1!a.png


BIN
GameClient/Assets/ResIn/UI/Card/Card_atlas0_1.png


BIN
GameClient/Assets/ResIn/UI/Card/Card_atlas0_2!a.png


BIN
GameClient/Assets/ResIn/UI/Card/Card_atlas0_2.png


BIN
GameClient/Assets/ResIn/UI/Card/Card_fui.bytes


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0!a.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_1.png


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