zhaoyang 2 жил өмнө
parent
commit
df3d064e26
28 өөрчлөгдсөн 63 нэмэгдсэн , 59 устгасан
  1. 26 18
      FGUIProject/assets/Main/StoryCardChooseUI.xml
  2. 3 3
      FGUIProject/assets/Main/components/ComCardMask.xml
  3. 12 16
      FGUIProject/assets/Main/components/ListCardItem.xml
  4. BIN
      FGUIProject/assets/Main/images/kp_dikuang_1.png
  5. BIN
      FGUIProject/assets/Main/images/kp_dikuang_2.png
  6. BIN
      FGUIProject/assets/Main/imagesStory/zd_tctcdi_1.png
  7. BIN
      FGUIProject/assets/Main/imagesStory/zd_tctcdi_1_zz.png
  8. 4 1
      FGUIProject/assets/Main/package.xml
  9. 3 6
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ListCardItem.cs
  10. 12 12
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_StoryCardChooseUI.cs
  11. 3 3
      GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryCardChoose.cs
  12. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0!a.png
  13. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0.png
  14. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_1!a.png
  15. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_1.png
  16. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_2!a.png
  17. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_2.png
  18. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_3!a.png
  19. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_3.png
  20. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_4!a.png
  21. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_4.png
  22. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_5!a.png
  23. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_5.png
  24. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_6!a.png
  25. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_6.png
  26. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_8!a.png
  27. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_8.png
  28. BIN
      GameClient/Assets/ResIn/UI/Main/Main_fui.bytes

+ 26 - 18
FGUIProject/assets/Main/StoryCardChooseUI.xml

@@ -1,13 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1080,1300">
+<component size="1080,1639">
   <displayList>
   <displayList>
-    <image id="n7_sx2v" name="n7" src="sx2v9r" fileName="imagesStory/zd_tctcdi_1.png" xy="23,-365"/>
+    <image id="n7_sx2v" name="n7" src="sx2v9r" fileName="imagesStory/zd_tctcdi_1.png" xy="0,-600" size="1080,2228"/>
     <image id="n9_wzce" name="n9" src="sx2v9u" fileName="imagesStory/zd_tctcxian_1.png" xy="320,178"/>
     <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" visible="false" url="ui://eg2y0ldp842s6h" fill="scaleMatchWidth">
     <loader id="n4_cn27" name="loaScore" xy="658,114" size="58,58" aspect="true" visible="false" url="ui://eg2y0ldp842s6h" fill="scaleMatchWidth">
       <relation target="n5_cn27" sidePair="left-right"/>
       <relation target="n5_cn27" sidePair="left-right"/>
     </loader>
     </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="n5_cn27" name="txtName" xy="439,107" pivot="0.5,0" size="202,66" font="ui://eg2y0ldpa0cftkz" fontSize="50" color="#9b7853" autoClearText="true" text="技能名字"/>
-    <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">
+    <component id="n13_ofwu" name="btnUpCard" src="rv091e" fileName="components/BtnSmall.xml" pkg="mk0fwx0x" xy="768,245">
+      <Button title="提升词牌"/>
+    </component>
+    <text id="n11_wzce" name="txtTips" xy="719,342" size="267,51" 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"/>
+    <list id="n15_ofwu" name="listSkill" xy="99,207" size="365,113" layout="row" colGap="16" defaultItem="ui://mfvz4q8kofwup0">
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <list id="n0_r1a9" name="listCard" xy="41,415" size="998,961" layout="flow_hz" overflow="scroll" lineGap="15" colGap="10" defaultItem="ui://mfvz4q8kr1a99f" autoClearItems="true">
+      <item/>
+      <item/>
+      <item/>
+      <item/>
       <item/>
       <item/>
       <item/>
       <item/>
       <item/>
       <item/>
@@ -18,25 +33,18 @@
       <item/>
       <item/>
       <item/>
       <item/>
       <item/>
       <item/>
-    </list>
-    <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="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="768,245">
-      <Button title="提升词牌"/>
-    </component>
-    <list id="n15_ofwu" name="listSkill" xy="99,207" size="365,113" layout="row" colGap="16" defaultItem="ui://mfvz4q8kofwup0">
       <item/>
       <item/>
       <item/>
       <item/>
       <item/>
       <item/>
     </list>
     </list>
-    <text id="n11_wzce" name="txtTips" xy="719,342" size="267,51" 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"/>
     <component id="n17_ofwu" name="comSkillTips" src="ofwup2" fileName="components/ComArenaSkillTips.xml" xy="99,316" visible="false"/>
     <component id="n17_ofwu" name="comSkillTips" src="ofwup2" fileName="components/ComArenaSkillTips.xml" xy="99,316" visible="false"/>
+    <image id="n18_ebfi" name="n18" src="ebfipr" fileName="imagesStory/zd_tctcdi_1_zz.png" xy="30,1270"/>
+    <component id="n2_r1a9" name="btnCancel" src="ih7595" fileName="components/Button11.xml" pkg="mk0fwx0x" xy="129,1435" group="n12_ofwu">
+      <Button title="取消"/>
+    </component>
+    <component id="n3_r1a9" name="btnConfirm" src="ih7594" fileName="components/Button10.xml" pkg="mk0fwx0x" xy="571,1435" group="n12_ofwu">
+      <Button title="确认"/>
+    </component>
+    <group id="n12_ofwu" name="n12" xy="129,1435" size="822,105"/>
   </displayList>
   </displayList>
 </component>
 </component>

+ 3 - 3
FGUIProject/assets/Main/components/ComCardMask.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <?xml version="1.0" encoding="utf-8"?>
-<component size="212,224" overflow="hidden" mask="n6_wzce" reversedMask="true">
+<component size="238,437" overflow="hidden">
   <controller name="button" pages="0,up,1,down" selected="0"/>
   <controller name="button" pages="0,up,1,down" selected="0"/>
   <displayList>
   <displayList>
-    <loader id="n4_r1a9" name="loaCard" xy="3,-50" pivot="0.5,0.5" size="210,388" url="ui://7l6lvkayr9ri9x" fill="scaleMatchWidth"/>
-    <image id="n6_wzce" name="n6" src="sx2v9t" fileName="imagesStory/zd_tctcdikugn_2.png" xy="-1,-1"/>
+    <loader id="n7_ebfi" name="loaCard" xy="2,2" size="234,432" fill="scaleFree"/>
+    <image id="n8_ebfi" name="n8" src="ebfips" fileName="images/kp_dikuang_2.png" xy="0,0"/>
   </displayList>
   </displayList>
 </component>
 </component>

+ 12 - 16
FGUIProject/assets/Main/components/ListCardItem.xml

@@ -1,24 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <?xml version="1.0" encoding="utf-8"?>
-<component size="220,279" extention="Button">
+<component size="242,492" extention="Button">
   <controller name="button" pages="0,up,1,down" selected="0"/>
   <controller name="button" pages="0,up,1,down" selected="0"/>
   <displayList>
   <displayList>
-    <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" pivot="0.5,0" size="105,46" group="n23_ofwu" font="ui://eg2y0ldpa0cftkz" fontSize="34" color="#6a5d56" align="center" 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="152,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="177,177" group="n19_v461"/>
-    <group id="n19_v461" name="n19" xy="152,173" size="51,34" group="n23_ofwu" advanced="true" layout="hz" colGap="-2" excludeInvisibles="true">
+    <component id="n9_wzce" name="comCardMask" src="wzce9v" fileName="components/ComCardMask.xml" xy="2,3" group="n23_ofwu"/>
+    <text id="n3_r1a9" name="txtName" xy="68,446" pivot="0.5,0" size="105,46" group="n23_ofwu" font="ui://eg2y0ldpa0cftkz" fontSize="34" color="#6a5d56" align="center" text="赵钱孙"/>
+    <image id="n24_ebfi" name="n24" src="ebfipt" fileName="images/kp_dikuang_1.png" xy="2,341" group="n23_ofwu"/>
+    <text id="n18_v461" name="txtStarLv" xy="177,370" 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="202,374" group="n19_v461"/>
+    <group id="n19_v461" name="n19" xy="177,370" size="51,34" group="n23_ofwu" advanced="true" layout="hz" colGap="-2" excludeInvisibles="true">
       <relation target="" sidePair="right-right"/>
       <relation target="" sidePair="right-right"/>
     </group>
     </group>
-    <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>
-    <group id="n23_ofwu" name="n23" xy="0,0" size="220,282"/>
+    <text id="n12_wzce" name="txtLv" xy="177,395" pivot="1,0" size="51,34" group="n23_ofwu" fontSize="24" color="#fff9f1" align="right" leading="-8" ubb="true" vars="true" text="30级"/>
+    <loader id="n7_sx2v" name="loaRarity" xy="187,17" size="40,85" group="n23_ofwu" aspect="true" url="ui://eg2y0ldpo9ghtli" fill="scaleMatchWidth"/>
+    <loader id="n16_qr4e" name="loaMainScore" xy="19,19" size="46,46" group="n23_ofwu" aspect="true" url="ui://eg2y0ldp842s6h" fill="scaleMatchHeight"/>
+    <loader id="n21_ofwu" name="loaBorder" xy="0,0" size="242,441" group="n23_ofwu" url="ui://eg2y0ldp94m19t" fill="scaleFree" autoSize="true"/>
+    <group id="n23_ofwu" name="n23" xy="0,0" size="242,492"/>
   </displayList>
   </displayList>
   <Button mode="Radio"/>
   <Button mode="Radio"/>
 </component>
 </component>

BIN
FGUIProject/assets/Main/images/kp_dikuang_1.png


BIN
FGUIProject/assets/Main/images/kp_dikuang_2.png


BIN
FGUIProject/assets/Main/imagesStory/zd_tctcdi_1.png


BIN
FGUIProject/assets/Main/imagesStory/zd_tctcdi_1_zz.png


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

@@ -207,7 +207,7 @@
     <component id="py009o" name="ComSkillCard.xml" path="/components/"/>
     <component id="py009o" name="ComSkillCard.xml" path="/components/"/>
     <component id="sx2v9p" name="ComSkillName.xml" path="/components/"/>
     <component id="sx2v9p" name="ComSkillName.xml" path="/components/"/>
     <image id="sx2v9q" name="zd_tctcxian_2.png" path="/imagesStory/"/>
     <image id="sx2v9q" name="zd_tctcxian_2.png" path="/imagesStory/"/>
-    <image id="sx2v9r" name="zd_tctcdi_1.png" path="/imagesStory/"/>
+    <image id="sx2v9r" name="zd_tctcdi_1.png" path="/imagesStory/" scale="9grid" scale9grid="270,0,540,66"/>
     <image id="sx2v9s" name="zd_tctcdikugn_1.png" path="/imagesStory/"/>
     <image id="sx2v9s" name="zd_tctcdikugn_1.png" path="/imagesStory/"/>
     <image id="sx2v9t" name="zd_tctcdikugn_2.png" path="/imagesStory/" scale="9grid" scale9grid="54,58,108,116"/>
     <image id="sx2v9t" name="zd_tctcdikugn_2.png" path="/imagesStory/" scale="9grid" scale9grid="54,58,108,116"/>
     <image id="sx2v9u" name="zd_tctcxian_1.png" path="/imagesStory/"/>
     <image id="sx2v9u" name="zd_tctcxian_1.png" path="/imagesStory/"/>
@@ -667,6 +667,9 @@
     <image id="jx6zpo" name="tc_xuanxiangkuang_1.png" path="/imagesNew/"/>
     <image id="jx6zpo" name="tc_xuanxiangkuang_1.png" path="/imagesNew/"/>
     <image id="jx6zpp" name="yf_db_1.png" path="/imagesNew/"/>
     <image id="jx6zpp" name="yf_db_1.png" path="/imagesNew/"/>
     <image id="jx6zpq" name="zs_flower.png" path="/imagesNew/"/>
     <image id="jx6zpq" name="zs_flower.png" path="/imagesNew/"/>
+    <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/"/>
   </resources>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/Main" packageCount="2" genCode="true" extractAlpha="true"/>
   <publish name="" path="../GameClient/Assets/ResIn/UI/Main" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>
 </packageDescription>

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

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

+ 12 - 12
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_StoryCardChooseUI.cs

@@ -9,13 +9,13 @@ namespace UI.Main
         public GComponent target;
         public GComponent target;
         public GLoader m_loaScore;
         public GLoader m_loaScore;
         public GTextField m_txtName;
         public GTextField m_txtName;
-        public GList m_listCard;
-        public GButton m_btnCancel;
-        public GButton m_btnConfirm;
         public GButton m_btnUpCard;
         public GButton m_btnUpCard;
-        public GList m_listSkill;
         public GTextField m_txtTips;
         public GTextField m_txtTips;
+        public GList m_listSkill;
+        public GList m_listCard;
         public UI_ComArenaSkillTips m_comSkillTips;
         public UI_ComArenaSkillTips m_comSkillTips;
+        public GButton m_btnCancel;
+        public GButton m_btnConfirm;
         public const string URL = "ui://mfvz4q8kr1a99d";
         public const string URL = "ui://mfvz4q8kr1a99d";
         public const string PACKAGE_NAME = "Main";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "StoryCardChooseUI";
         public const string RES_NAME = "StoryCardChooseUI";
@@ -65,26 +65,26 @@ namespace UI.Main
         {
         {
             m_loaScore = (GLoader)comp.GetChild("loaScore");
             m_loaScore = (GLoader)comp.GetChild("loaScore");
             m_txtName = (GTextField)comp.GetChild("txtName");
             m_txtName = (GTextField)comp.GetChild("txtName");
-            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_btnUpCard = (GButton)comp.GetChild("btnUpCard");
-            m_listSkill = (GList)comp.GetChild("listSkill");
             m_txtTips = (GTextField)comp.GetChild("txtTips");
             m_txtTips = (GTextField)comp.GetChild("txtTips");
+            m_listSkill = (GList)comp.GetChild("listSkill");
+            m_listCard = (GList)comp.GetChild("listCard");
             m_comSkillTips = (UI_ComArenaSkillTips)UI_ComArenaSkillTips.Create(comp.GetChild("comSkillTips"));
             m_comSkillTips = (UI_ComArenaSkillTips)UI_ComArenaSkillTips.Create(comp.GetChild("comSkillTips"));
+            m_btnCancel = (GButton)comp.GetChild("btnCancel");
+            m_btnConfirm = (GButton)comp.GetChild("btnConfirm");
         }
         }
         public void Dispose(bool disposeTarget = false)
         public void Dispose(bool disposeTarget = false)
         {
         {
             m_loaScore = null;
             m_loaScore = null;
             m_txtName = null;
             m_txtName = null;
-            m_listCard = null;
-            m_btnCancel = null;
-            m_btnConfirm = null;
             m_btnUpCard = null;
             m_btnUpCard = null;
-            m_listSkill = null;
             m_txtTips = null;
             m_txtTips = null;
+            m_listSkill = null;
+            m_listCard = null;
             m_comSkillTips.Dispose();
             m_comSkillTips.Dispose();
             m_comSkillTips = null;
             m_comSkillTips = null;
+            m_btnCancel = null;
+            m_btnConfirm = null;
             if(disposeTarget && target != null)
             if(disposeTarget && target != null)
             {
             {
                 target.RemoveFromParent();
                 target.RemoveFromParent();

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

@@ -145,9 +145,9 @@ namespace GFGGame
                 string resPath = ResPathUtil.GetViewEffectPath("ui_xz", "ui_xz_zd_kq");
                 string resPath = ResPathUtil.GetViewEffectPath("ui_xz", "ui_xz_zd_kq");
                 GameObject gameObject0;
                 GameObject gameObject0;
                 GoWrapper wrapper0;
                 GoWrapper wrapper0;
-                SceneController.AddObjectToView(null, null, item.m_holder, resPath, out gameObject0, out wrapper0);
-                _effects.Add(gameObject0);
-                _wrappers.Add(wrapper0);
+                // SceneController.AddObjectToView(null, null, item.m_holder, resPath, out gameObject0, out wrapper0);
+                // _effects.Add(gameObject0);
+                // _wrappers.Add(wrapper0);
             }
             }
             UI_ListCardItem.ProxyEnd();
             UI_ListCardItem.ProxyEnd();
             // UI_ComStar.ProxyEnd();
             // UI_ComStar.ProxyEnd();

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!a.png


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


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


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


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


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


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


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


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


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


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


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


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


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


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