工作室副本

FGUIProject/assets/ClothingFoster/SuitFosterUI.xml

@@ -17,6 +17,6 @@
       <item/>
     </list>
     <component id="n9_py5g" name="btnFoster" src="ih7594" fileName="components/Button10.xml" pkg="mk0fwx0x" xy="278,849"/>
-    <component id="n10_j5a5" name="ComConsume" src="ojlz61" fileName="components/ComConsumeCurrency.xml" pkg="eg2y0ldp" xy="328,778"/>
+    <component id="n10_j5a5" name="ComConsume" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="328,778"/>
   </displayList>
 </component>

FGUIProject/assets/ClothingFoster/SuitListUI.xml

@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920">
   <displayList>
-    <image id="n0_py5g" name="n0" src="vxw539" fileName="bgimg/zhangjie_bg.jpg" pkg="eg2y0ldp" xy="0,-240"/>
+    <image id="n0_py5g" name="n0" src="vxw539" fileName="bgimg/zhangjie_bg.jpg" pkg="eg2y0ldp" xy="0,-240">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </image>
     <component id="n1_py5g" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="156,105">
       <relation target="" sidePair="right-right,top-top"/>
     </component>

FGUIProject/assets/CommonGame/components/ComCostCurrency.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="280,42">
+  <displayList>
+    <image id="n4_a713" name="n4" src="a71377" fileName="imagesExport/kp_dikuang_3.png" xy="60,3"/>
+    <text id="n2_ojlz" name="n2" xy="0,0" size="65,42" fontSize="30" color="#7d634a" autoSize="none" text="消耗"/>
+    <loader id="n1_ojlz" name="loaIcon" xy="70,-9" size="60,60" url="ui://eg2y0ldpq08x3" autoSize="true"/>
+    <text id="n6_j5a5" name="txtNeed" xy="165,1" pivot="0.5,0" size="73,39" fontSize="28" color="#ffffff" align="center" vAlign="middle" ubb="true" autoClearText="true" text="9993"/>
+  </displayList>
+</component>

FGUIProject/assets/CommonGame/package.xml

@@ -166,7 +166,7 @@
     <image id="tt1q9x" name="xjs_ditu_2.png" path="/images/"/>
     <image id="tt1q9y" name="xjs_ditu_3.png" path="/images/"/>
     <image id="tc539z" name="zx_jqgka_stjl.png" path="/images/"/>
-    <component id="ojlz61" name="ComConsumeCurrency.xml" path="/components/" exported="true"/>
+    <component id="ojlz61" name="ComCostCurrencyWithHas.xml" path="/components/" exported="true"/>
     <image id="ly9g1d" name="cj_xhua.png" path="/imagesExport/" exported="true"/>
     <component id="ly9g1e" name="Button13.xml" path="/components/" exported="true"/>
     <image id="qdrt15" name="hd_sxicon_1.png" path="/imagesExport/" exported="true"/>
@@ -174,6 +174,7 @@
     <image id="qdrt17" name="hd_sxicon_3.png" path="/imagesExport/" exported="true"/>
     <image id="qdrt18" name="hd_sxicon_4.png" path="/imagesExport/" exported="true"/>
     <image id="bd1ca0" name="jingzhongh_bg.jpg" path="/bgimg/" exported="true" atlas="alone_npot"/>
+    <component id="n3xha1" name="ComCostCurrency.xml" path="/components/" exported="true"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/Main/MainUI.xml

@@ -29,6 +29,9 @@
       <relation target="" sidePair="bottom-bottom"/>
       <Button icon="ui://mfvz4q8kq08x7"/>
     </component>
+    <component id="n44_n3xh" name="btnStudio" src="q08xu" fileName="components/ButtonModle1.xml" xy="397,1374">
+      <relation target="" sidePair="bottom-bottom"/>
+    </component>
     <image id="n42_wg7t" name="n42" src="wg7t8t" fileName="images/zjm_gn_dik_1.png" xy="131,1756" size="995,105">
       <gearDisplay controller="c1" pages="1"/>
       <relation target="" sidePair="bottom-bottom"/>

FGUIProject/assets/Studio/StudioBuyNumUI.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="936,536">
+  <displayList>
+    <image id="n0_hinb" name="bg" src="lwri5u" fileName="imagesExport/hc_kuang_6.png" pkg="mk0fwx0x" xy="0,0" size="936,536"/>
+    <loader id="n26_eiwu" name="n26" xy="0,0" size="936,536" visible="false" url="ui://mk0fwx0xlwri5u" fill="scaleFree"/>
+    <component id="n6_hinb" name="btnBuy" src="q08x7" fileName="components/Button2.xml" pkg="mk0fwx0x" xy="496,354">
+      <Button title="购买"/>
+    </component>
+    <component id="n7_hinb" name="btnExchange" src="q08x6" fileName="components/Button1.xml" pkg="mk0fwx0x" xy="54,354">
+      <Button title="兑换"/>
+    </component>
+    <component id="n27_n3xh" name="comCostItem" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="106,301"/>
+    <component id="n28_n3xh" name="comCostCurrent" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="545,304"/>
+    <text id="n30_n3xh" name="txtTitle" xy="432,62" pivot="0.5,0" size="87,56" fontSize="42" color="#876e54" text="提示"/>
+    <text id="n29_n3xh" name="txtTips" xy="325,150" pivot="0.5,0" size="306,46" fontSize="34" color="#a0845c" text="请选择获取次数方式"/>
+    <text id="n31_n3xh" name="txtNum" xy="348,227" pivot="0.5,0" size="272,42" fontSize="30" color="#a0845c" text="(今日已兑换0/10次)"/>
+  </displayList>
+</component>

FGUIProject/assets/Studio/StudioEctypeUI.xml

@@ -2,18 +2,17 @@
 <component size="1080,1920">
   <controller name="c1" pages="0,,1," selected="1"/>
   <displayList>
-    <list id="n17_n3xh" name="listProperty" xy="119,64" size="842,142" layout="row" selectionMode="multipleSingleClick" colGap="40" defaultItem="ui://xz8kxrecn3xhg" align="center">
+    <list id="n17_n3xh" name="listProperty" xy="119,235" size="842,142" layout="row" colGap="40" defaultItem="ui://xz8kxrecn3xhn" align="center">
       <gearDisplay controller="c1" pages="1"/>
       <item/>
       <item/>
       <item/>
       <item/>
     </list>
-    <list id="n16_n3xh" name="list" xy="201,261" pivot="0.5,1" size="678,1621" overflow="scroll" lineGap="20" defaultItem="ui://xz8kxrecn3xha" align="center">
-      <gearSize controller="c1" pages="0,1" values="678,1815,1,1|678,1621,1,1"/>
-      <relation target="" sidePair="top-top,bottom-bottom"/>
-      <item/>
-      <item/>
+    <list id="n16_n3xh" name="list" xy="201,418" pivot="0.5,0" size="678,1328" overflow="scroll" lineGap="20" defaultItem="ui://xz8kxrecn3xha" align="center">
+      <gearXY controller="c1" pages="0,1" values="201,234|201,418"/>
+      <gearSize controller="c1" pages="0,1" values="678,1507,1,1|678,1328,1,1"/>
+      <relation target="" sidePair="bottomext-bottom"/>
       <item/>
       <item/>
       <item/>
@@ -23,5 +22,9 @@
       <item/>
     </list>
     <component id="n18_n3xh" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80"/>
+    <component id="n19_n3xh" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="159,105"/>
+    <text id="n21_n3xh" name="txtNum" xy="76,1791" size="225,42" fontSize="30" text="剩余次数：1/10"/>
+    <text id="n20_n3xh" name="txtTime" xy="78,1846" size="189,42" fontSize="30" text="12小时候刷新"/>
+    <component id="n22_n3xh" name="btnBuy" src="n3xhi" fileName="components/Button12.xml" xy="311,1776"/>
   </displayList>
 </component>

FGUIProject/assets/Studio/components/Button12.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="144,75" extention="Button">
+  <Button/>
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver"/>
+  <displayList>
+    <image id="n0_ai2z" src="n3xhj" name="n0" xy="0,0">
+      <relation target="" sidePair="width,height"/>
+    </image>
+  </displayList>
+</component>

FGUIProject/assets/Studio/components/ComEctype.xml

@@ -1,7 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="164,162">
+  <controller name="c1" pages="0,,1," selected="0"/>
   <displayList>
-    <image id="n0_rbxq" name="n0" src="rbxq3" fileName="images/sc_zizhuan_6.png" xy="0,0"/>
-    <image id="n2_rbxq" name="n2" src="rbxq4" fileName="images/zhuxian_shuoto.png" xy="47,47"/>
+    <loader id="n4_n3xh" name="icon" xy="0,0" size="164,162" url="ui://xz8kxrecrbxq3"/>
+    <image id="n3_n3xh" name="img" src="n3xhe" fileName="images/sxsx_sxdian.png" xy="11,10">
+      <gearDisplay controller="c1" pages="0"/>
+    </image>
+    <image id="n2_rbxq" name="imgLock" src="rbxq4" fileName="images/zhuxian_shuoto.png" xy="46,62">
+      <gearDisplay controller="c1" pages="0"/>
+    </image>
   </displayList>
 </component>

FGUIProject/assets/Studio/components/ListItem.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="682,300">
-  <controller name="c1" pages="0,,1,,2,,3," selected="3"/>
+  <controller name="star" pages="0,,1,,2,,3," selected="1"/>
   <displayList>
     <image id="n16_n3xh" name="n16" src="n3xhb" fileName="images/fzjl_dik_2.png" xy="-6,4" size="682,297"/>
     <loader id="n6_rbxq" name="loaIcon" xy="70,70" size="164,162" url="ui://xz8kxrecrbxq3"/>
@@ -10,13 +10,13 @@
     <image id="n9_rbxq" name="n9" src="rbxq4" fileName="images/zhuxian_shuoto.png" xy="117,130" group="n15_rbxq"/>
     <group id="n15_rbxq" name="grpLock" xy="0,0" size="300,300" advanced="true"/>
     <image id="n11_rbxq" name="n11" src="rbxq9" fileName="images/zx_jq_djtubiao_1.png" xy="357,207" group="n14_rbxq">
-      <gearDisplay controller="c1" pages="1,2,3"/>
+      <gearDisplay controller="star" pages="1,2,3"/>
     </image>
     <image id="n12_rbxq" name="n12" src="rbxq9" fileName="images/zx_jq_djtubiao_1.png" xy="414,208" group="n14_rbxq">
-      <gearDisplay controller="c1" pages="2,3"/>
+      <gearDisplay controller="star" pages="2,3"/>
     </image>
     <image id="n13_rbxq" name="n13" src="rbxq9" fileName="images/zx_jq_djtubiao_1.png" xy="478,209" group="n14_rbxq">
-      <gearDisplay controller="c1" pages="3"/>
+      <gearDisplay controller="star" pages="3"/>
     </image>
     <group id="n14_rbxq" name="n14" xy="357,207" size="162,47" advanced="true"/>
   </displayList>

FGUIProject/assets/Studio/components/ListPropertyItem.xml

@@ -1,18 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="142,142">
-  <controller name="button" pages="0,up,1,down" selected="0"/>
+<component size="142,142" extention="Button">
+  <controller name="button" pages="0,up,1,down" selected="1"/>
   <displayList>
-    <image id="n0_ih75" name="n0" src="n3xhd" fileName="images/sxsx_sxdi.png" xy="0,0">
+    <image id="n3_n3xh" name="n3" src="n3xhd" fileName="images/sxsx_sxdi.png" xy="0,0">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <text id="n1_ih75" name="title" xy="0,0" size="142,142" fontSize="46" color="#fff7eb" align="center" vAlign="middle" autoSize="none" singleLine="true" text="风">
+    <text id="n4_n3xh" name="title" xy="-21,-61" size="184,264" fontSize="46" color="#fff7eb" align="center" vAlign="middle" autoSize="none" singleLine="true" text="风">
       <relation target="" sidePair="width-width,height-height"/>
     </text>
-    <image id="n2_ih75" name="n2" src="n3xhe" fileName="images/sxsx_sxdian.png" xy="0,0">
+    <image id="n5_n3xh" name="n5" src="n3xhe" fileName="images/sxsx_sxdian.png" xy="0,0">
       <gearDisplay controller="button" pages="1"/>
     </image>
-    <image id="n3_ih75" name="n3" src="n3xhf" fileName="images/sxsx_dgdg.png" xy="40,44">
+    <image id="n6_n3xh" name="n6" src="n3xhf" fileName="images/sxsx_dgdg.png" xy="40,44">
       <gearDisplay controller="button" pages="1"/>
     </image>
   </displayList>
+  <Button mode="Radio"/>
 </component>

FGUIProject/assets/Studio/package.xml

@@ -5,7 +5,7 @@
     <component id="rbxq1" name="StudioEctypeUI.xml" path="/" exported="true"/>
     <image id="rbxq3" name="sc_zizhuan_6.png" path="/images/" exported="true"/>
     <image id="rbxq4" name="zhuxian_shuoto.png" path="/images/"/>
-    <component id="rbxq5" name="ComEctype.xml" path="/components/"/>
+    <component id="rbxq5" name="ComEctype.xml" path="/components/" exported="true"/>
     <image id="rbxq6" name="fzyc_hxk_1.png" path="/images/"/>
     <image id="rbxq7" name="fzyc_hxkan_1.png" path="/images/"/>
     <image id="rbxq9" name="zx_jq_djtubiao_1.png" path="/images/"/>
@@ -14,7 +14,12 @@
     <image id="n3xhd" name="sxsx_sxdi.png" path="/images/"/>
     <image id="n3xhe" name="sxsx_sxdian.png" path="/images/"/>
     <image id="n3xhf" name="sxsx_dgdg.png" path="/images/"/>
-    <component id="n3xhg" name="ListPropertyItem.xml" path="/components/"/>
+    <component id="n3xhh" name="StudioBuyNumUI.xml" path="/" exported="true"/>
+    <component id="n3xhi" name="Button12.xml" path="/components/"/>
+    <image id="n3xhj" name="hb_anniu_3.png" path="/imagesExport/"/>
+    <image id="n3xhk" name="hb_kuangdi_2.png" path="/imagesExport/"/>
+    <image id="n3xhl" name="hb_kuangdi_1.png" path="/imagesExport/"/>
+    <component id="n3xhn" name="ListPropertyItem.xml" path="/components/"/>
   </resources>
-  <publish name="" genCode="true"/>
+  <publish name="" path="..\GameClient\Assets\ResIn\UI\Studio" packageCount="2" genCode="true"/>
 </packageDescription>

GameClient/Assets/Game/CSShare

@@ -1 +1 @@
-Subproject commit f5a091e069da3bb5b4dbce42e6da2396cb9f6b58
+Subproject commit f16a216c2b61a0e24fd19bef2cb5dcf7f1793959

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Studio/UI_ListPropertyItem.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComCostCurrency.cs

@@ -2,21 +2,21 @@
 
 using FairyGUI;
 
-namespace UI.Studio
+namespace UI.CommonGame
 {
-    public partial class UI_ListPropertyItem
+    public partial class UI_ComCostCurrency
     {
         public GComponent target;
-        public Controller m_button;
-        public GTextField m_title;
-        public const string URL = "ui://xz8kxrecn3xhg";
-        public const string PACKAGE_NAME = "Studio";
-        public const string RES_NAME = "ListPropertyItem";
-        private static UI_ListPropertyItem _proxy;
+        public GLoader m_loaIcon;
+        public GTextField m_txtNeed;
+        public const string URL = "ui://eg2y0ldpn3xha1";
+        public const string PACKAGE_NAME = "CommonGame";
+        public const string RES_NAME = "ComCostCurrency";
+        private static UI_ComCostCurrency _proxy;
 
-        public static UI_ListPropertyItem Create(GObject gObject = null)
+        public static UI_ComCostCurrency Create(GObject gObject = null)
         {
-            var ui = new UI_ListPropertyItem();
+            var ui = new UI_ComCostCurrency();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -25,11 +25,11 @@ namespace UI.Studio
             return ui;
         }
 
-        public static UI_ListPropertyItem Proxy(GObject gObject = null)
+        public static UI_ComCostCurrency Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_ListPropertyItem();
+                _proxy = new UI_ComCostCurrency();
             }
             var ui = _proxy;
             if(gObject == null)
@@ -56,13 +56,13 @@ namespace UI.Studio
 
         private void Init(GComponent comp)
         {
-            m_button = comp.GetController("button");
-            m_title = (GTextField)comp.GetChild("title");
+            m_loaIcon = (GLoader)comp.GetChild("loaIcon");
+            m_txtNeed = (GTextField)comp.GetChild("txtNeed");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_button = null;
-            m_title = null;
+            m_loaIcon = null;
+            m_txtNeed = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Studio/UI_ListPropertyItem.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComCostCurrency.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: e33254f949bc959448191a7b8bc22658
+guid: f60eb3712906a0744bbfa3205622d001
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComConsumeCurrency.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComCostCurrencyWithHas.cs

@@ -4,7 +4,7 @@ using FairyGUI;
 
 namespace UI.CommonGame
 {
-    public partial class UI_ComConsumeCurrency
+    public partial class UI_ComCostCurrencyWithHas
     {
         public GComponent target;
         public GLoader m_loaIcon;
@@ -13,12 +13,12 @@ namespace UI.CommonGame
         public GTextField m_txtHas;
         public const string URL = "ui://eg2y0ldpojlz61";
         public const string PACKAGE_NAME = "CommonGame";
-        public const string RES_NAME = "ComConsumeCurrency";
-        private static UI_ComConsumeCurrency _proxy;
+        public const string RES_NAME = "ComCostCurrencyWithHas";
+        private static UI_ComCostCurrencyWithHas _proxy;
 
-        public static UI_ComConsumeCurrency Create(GObject gObject = null)
+        public static UI_ComCostCurrencyWithHas Create(GObject gObject = null)
         {
-            var ui = new UI_ComConsumeCurrency();
+            var ui = new UI_ComCostCurrencyWithHas();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -27,11 +27,11 @@ namespace UI.CommonGame
             return ui;
         }
 
-        public static UI_ComConsumeCurrency Proxy(GObject gObject = null)
+        public static UI_ComCostCurrencyWithHas Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_ComConsumeCurrency();
+                _proxy = new UI_ComCostCurrencyWithHas();
             }
             var ui = _proxy;
             if(gObject == null)

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComConsumeCurrency.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComCostCurrencyWithHas.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 11e0a336d85efca489653ad5b55c9a7d
+guid: 17c8f2ca653605649856f59a4d5a8260
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

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

@@ -15,6 +15,7 @@ namespace UI.Main
         public UI_ButtonModle1 m_btnHuanZhuang;
         public UI_ButtonModle1 m_btnZhaiXing;
         public UI_ButtonModle1 m_btnCiPai;
+        public UI_ButtonModle1 m_btnStudio;
         public GList m_list;
         public GButton m_btnChange;
         public const string URL = "ui://mfvz4q8kq08x0";
@@ -72,6 +73,7 @@ namespace UI.Main
             m_btnHuanZhuang = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnHuanZhuang"));
             m_btnZhaiXing = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnZhaiXing"));
             m_btnCiPai = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnCiPai"));
+            m_btnStudio = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnStudio"));
             m_list = (GList)comp.GetChild("list");
             m_btnChange = (GButton)comp.GetChild("btnChange");
         }
@@ -91,6 +93,8 @@ namespace UI.Main
             m_btnZhaiXing = null;
             m_btnCiPai.Dispose();
             m_btnCiPai = null;
+            m_btnStudio.Dispose();
+            m_btnStudio = null;
             m_list = null;
             m_btnChange = null;
             if(disposeTarget && target != null)

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Studio/UI_ComEctype.cs

@@ -0,0 +1,80 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Studio
+{
+    public partial class UI_ComEctype
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public GLoader m_icon;
+        public GImage m_img;
+        public GImage m_imgLock;
+        public const string URL = "ui://xz8kxrecrbxq5";
+        public const string PACKAGE_NAME = "Studio";
+        public const string RES_NAME = "ComEctype";
+        private static UI_ComEctype _proxy;
+
+        public static UI_ComEctype Create(GObject gObject = null)
+        {
+            var ui = new UI_ComEctype();
+            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_ComEctype Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComEctype();
+            }
+            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_c1 = comp.GetController("c1");
+            m_icon = (GLoader)comp.GetChild("icon");
+            m_img = (GImage)comp.GetChild("img");
+            m_imgLock = (GImage)comp.GetChild("imgLock");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_icon = null;
+            m_img = null;
+            m_imgLock = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Studio/UI_ComEctype.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Studio/UI_ListItem.cs

@@ -7,7 +7,7 @@ namespace UI.Studio
     public partial class UI_ListItem
     {
         public GComponent target;
-        public Controller m_c1;
+        public Controller m_star;
         public GLoader m_loaIcon;
         public GTextField m_txtTitle;
         public GGroup m_grpLock;
@@ -58,14 +58,14 @@ namespace UI.Studio
 
         private void Init(GComponent comp)
         {
-            m_c1 = comp.GetController("c1");
+            m_star = comp.GetController("star");
             m_loaIcon = (GLoader)comp.GetChild("loaIcon");
             m_txtTitle = (GTextField)comp.GetChild("txtTitle");
             m_grpLock = (GGroup)comp.GetChild("grpLock");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_c1 = null;
+            m_star = null;
             m_loaIcon = null;
             m_txtTitle = null;
             m_grpLock = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Studio/UI_StudioBuyNumUI.cs

@@ -0,0 +1,92 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Studio
+{
+    public partial class UI_StudioBuyNumUI
+    {
+        public GComponent target;
+        public GImage m_bg;
+        public GButton m_btnBuy;
+        public GButton m_btnExchange;
+        public GComponent m_comCostItem;
+        public GComponent m_comCostCurrent;
+        public GTextField m_txtTitle;
+        public GTextField m_txtTips;
+        public GTextField m_txtNum;
+        public const string URL = "ui://xz8kxrecn3xhh";
+        public const string PACKAGE_NAME = "Studio";
+        public const string RES_NAME = "StudioBuyNumUI";
+        private static UI_StudioBuyNumUI _proxy;
+
+        public static UI_StudioBuyNumUI Create(GObject gObject = null)
+        {
+            var ui = new UI_StudioBuyNumUI();
+            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_StudioBuyNumUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_StudioBuyNumUI();
+            }
+            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_bg = (GImage)comp.GetChild("bg");
+            m_btnBuy = (GButton)comp.GetChild("btnBuy");
+            m_btnExchange = (GButton)comp.GetChild("btnExchange");
+            m_comCostItem = (GComponent)comp.GetChild("comCostItem");
+            m_comCostCurrent = (GComponent)comp.GetChild("comCostCurrent");
+            m_txtTitle = (GTextField)comp.GetChild("txtTitle");
+            m_txtTips = (GTextField)comp.GetChild("txtTips");
+            m_txtNum = (GTextField)comp.GetChild("txtNum");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_bg = null;
+            m_btnBuy = null;
+            m_btnExchange = null;
+            m_comCostItem = null;
+            m_comCostCurrent = null;
+            m_txtTitle = null;
+            m_txtTips = null;
+            m_txtNum = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Studio/UI_StudioBuyNumUI.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Studio/UI_StudioEctypeUI.cs

@@ -11,6 +11,10 @@ namespace UI.Studio
         public GList m_listProperty;
         public GList m_list;
         public GButton m_btnBack;
+        public GComponent m_valueBar;
+        public GTextField m_txtNum;
+        public GTextField m_txtTime;
+        public GButton m_btnBuy;
         public const string URL = "ui://xz8kxrecrbxq1";
         public const string PACKAGE_NAME = "Studio";
         public const string RES_NAME = "StudioEctypeUI";
@@ -62,6 +66,10 @@ namespace UI.Studio
             m_listProperty = (GList)comp.GetChild("listProperty");
             m_list = (GList)comp.GetChild("list");
             m_btnBack = (GButton)comp.GetChild("btnBack");
+            m_valueBar = (GComponent)comp.GetChild("valueBar");
+            m_txtNum = (GTextField)comp.GetChild("txtNum");
+            m_txtTime = (GTextField)comp.GetChild("txtTime");
+            m_btnBuy = (GButton)comp.GetChild("btnBuy");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -69,6 +77,10 @@ namespace UI.Studio
             m_listProperty = null;
             m_list = null;
             m_btnBack = null;
+            m_valueBar = null;
+            m_txtNum = null;
+            m_txtTime = null;
+            m_btnBuy = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Studio/UI_StudioUI.cs

@@ -8,10 +8,10 @@ namespace UI.Studio
     {
         public GComponent target;
         public GButton m_btnBack;
-        public GComponent m_comMetal;
-        public GComponent m_comFabric;
-        public GComponent m_comProperty;
-        public GComponent m_comFiling;
+        public UI_ComEctype m_comMetal;
+        public UI_ComEctype m_comFabric;
+        public UI_ComEctype m_comProperty;
+        public UI_ComEctype m_comFiling;
         public const string URL = "ui://xz8kxrecrbxq0";
         public const string PACKAGE_NAME = "Studio";
         public const string RES_NAME = "StudioUI";
@@ -60,17 +60,21 @@ namespace UI.Studio
         private void Init(GComponent comp)
         {
             m_btnBack = (GButton)comp.GetChild("btnBack");
-            m_comMetal = (GComponent)comp.GetChild("comMetal");
-            m_comFabric = (GComponent)comp.GetChild("comFabric");
-            m_comProperty = (GComponent)comp.GetChild("comProperty");
-            m_comFiling = (GComponent)comp.GetChild("comFiling");
+            m_comMetal = (UI_ComEctype)UI_ComEctype.Create(comp.GetChild("comMetal"));
+            m_comFabric = (UI_ComEctype)UI_ComEctype.Create(comp.GetChild("comFabric"));
+            m_comProperty = (UI_ComEctype)UI_ComEctype.Create(comp.GetChild("comProperty"));
+            m_comFiling = (UI_ComEctype)UI_ComEctype.Create(comp.GetChild("comFiling"));
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_btnBack = null;
+            m_comMetal.Dispose();
             m_comMetal = null;
+            m_comFabric.Dispose();
             m_comFabric = null;
+            m_comProperty.Dispose();
             m_comProperty = null;
+            m_comFiling.Dispose();
             m_comFiling = null;
             if(disposeTarget && target != null)
             {

GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/SuitFosterView.cs

@@ -50,9 +50,8 @@ namespace GFGGame
             _ui.m_listMaterials.numItems = cfg.materialsArr.Length;
             int has = ItemDataManager.GetItemNum(cfg.costId);
             int need = cfg.costNum;
-            UI_ComConsumeCurrency comConsume = UI_ComConsumeCurrency.Proxy(_ui.m_ComConsume);
+            UI_ComCostCurrency comConsume = UI_ComCostCurrency.Proxy(_ui.m_ComConsume);
             comConsume.m_txtNeed.text = StringUtil.GetColorText(need.ToString(), has >= need ? "#FFF8EA" : "#C9F1A5");
-            comConsume.m_txtLine.text = "";
             if (_canFoster && has < need) _canFoster = false;
 
             _ui.m_listPropertyAdd.numItems = _propertyList.Count;

GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/SuitView.cs

@@ -296,11 +296,10 @@ namespace GFGGame
             _ui.m_listRenewMaterial.numItems = renewCfg.materialsArr.Length;
 
             _canRenew = true;
-            UI_ComConsumeCurrency comConsumeCurrency = UI_ComConsumeCurrency.Proxy(_ui.m_comRenewCost);
+            UI_ComCostCurrency comConsumeCurrency = UI_ComCostCurrency.Proxy(_ui.m_comRenewCost);
             int has = ItemDataManager.GetItemNum(renewCfg.costId);
             int need = renewCfg.costNum;
             comConsumeCurrency.m_txtNeed.text = StringUtil.GetColorText(need.ToString(), has >= need ? "#FFF8EA" : "#C9F1A5");
-            comConsumeCurrency.m_txtLine.text = "";
             if (_canRenew && has < need) _canRenew = false;
         }
         private void UpdateRenewFinish()

GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs

@@ -108,6 +108,7 @@ namespace GFGGame
             _ui.m_btnZhaiXing.target.onTouchBegin.Add(OnClickBtnZhaiXing);
             _ui.m_btnXiuFang.target.onTouchBegin.Add(OnClickBtnXiuFang);
             _ui.m_btnCiPai.target.onTouchBegin.Add(OnClickBtnCiPai);
+            _ui.m_btnStudio.target.onTouchBegin.Add(OnClickBtnStudio);
             _ui.m_headBar.target.onClick.Add(OnClickHeadBar);
 
             _btnStore.onClick.Add(OnClickBtnStore);
@@ -252,7 +253,10 @@ namespace GFGGame
             // ViewManager.Show<FunctionOpenView>(list);
         }
 
-
+        private void OnClickBtnStudio()
+        {
+            ViewManager.Show<StudioView>(null, new object[] { ViewName.MAINUI_VIEW, this.viewData });
+        }
 
         private void OnClickBtnStore()
         {

GameClient/Assets/Game/HotUpdate/Views/Studio/StudioBaseView.cs

@@ -1,5 +1,6 @@
 
 using System.Collections.Generic;
+using ET;
 using FairyGUI;
 using UI.Studio;
 
@@ -8,7 +9,10 @@ namespace GFGGame
     public class StudioBaseView : BaseWindow
     {
         protected UI_StudioEctypeUI _ui;
-        protected List<StudioCfg> studioCfgs;
+        private ValueBarController _valueBarController;
+
+        protected StudioCfg studioCfg;
+        protected List<StoryLevelCfg> storyLevelCfgs;
 
         public override void Dispose()
         {
@@ -23,23 +27,63 @@ namespace GFGGame
             this.viewCom = _ui.target;
             isfullScreen = true;
 
+            _valueBarController = new ValueBarController(_ui.m_valueBar);
+
             _ui.m_list.itemRenderer = ListItemRender;
+            _ui.m_list.onClickItem.Add(OnCliclListItem);
+            _ui.m_list.SetVirtual();
 
+            _ui.m_btnBuy.onClick.Add(OnCliclBtnBuy);
         }
 
         protected override void OnShown()
         {
             base.OnShown();
-
+            _valueBarController.OnShown();
+            UpdateView();
         }
 
         protected override void OnHide()
         {
             base.OnHide();
+            _valueBarController.OnHide();
+            studioCfg = null;
+            storyLevelCfgs = null;
+            Timers.inst.Remove(UpdateShowTime);
+        }
+        private void UpdateView()
+        {
+            _ui.m_txtNum.text = string.Format("剩余次数：{0}/{1}", 1, this.studioCfg.num);
+            Timers.inst.Add(1, 0, UpdateShowTime);
+        }
+        private void UpdateShowTime(object param)
+        {
+            _ui.m_txtTime.text = string.Format("{0}后刷新", TimeUtil.FormattingTime(TimeHelper.ServerNowSecs, GameGlobal.myNumericComponent.GetAsInt(NumericType.DailyResetSecs)));
         }
         private void ListItemRender(int index, GObject obj)
         {
+            UI_ListItem item = UI_ListItem.Proxy(obj);
+            // item.m_loaIcon.url=
+            bool isPass = StoryDataManager.CheckLevelPass(storyLevelCfgs[index].chapterId, storyLevelCfgs[index].level);
+            bool isRoleLv = GameGlobal.myNumericComponent.GetAsInt(NumericType.Lvl) >= storyLevelCfgs[index].roleLv;
 
+
+            item.m_grpLock.visible = !isPass || !isRoleLv;
+            string title = string.Format("{0}{1}", studioCfg.name, index + 1);
+            if (!isPass) title = string.Format("完成主线{0}-{1}解锁", storyLevelCfgs[index].chapterId, storyLevelCfgs[index].level);
+            if (!isRoleLv) title = string.Format("主角等级达到{}级解锁", storyLevelCfgs[index].level);
+            item.m_txtTitle.text = title;
+            item.target.data = storyLevelCfgs[index];
+        }
+        private void OnCliclListItem(EventContext context)
+        {
+            UI_ListItem item = UI_ListItem.Proxy(context.data as GObject);
+            StoryLevelCfg storyLevelCfgs = item.target.data as StoryLevelCfg;
+        }
+
+        private void OnCliclBtnBuy()
+        {
+            ViewManager.Show<StudioBuyNumView>(this.studioCfg);
         }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/Studio/StudioBuyNumView.cs

@@ -0,0 +1,43 @@
+
+using System.Collections.Generic;
+using FairyGUI;
+using UI.Studio;
+
+namespace GFGGame
+{
+
+    public class StudioBuyNumView : BaseWindow
+    {
+        private UI_StudioBuyNumUI _ui;
+        public override void Dispose()
+        {
+            base.Dispose();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            _ui = UI_StudioBuyNumUI.Create();
+            this.viewCom = _ui.target;
+            this.viewCom.Center();
+            this.modal = true;
+            viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
+        }
+
+        protected override void OnShown()
+        {
+            base.OnShown();
+
+        }
+
+        protected override void OnHide()
+        {
+            base.OnHide();
+        }
+
+        private void OnClickBtnBack()
+        {
+
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/Views/Studio/StudioBuyNumView.cs.meta

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

GameClient/Assets/Game/HotUpdate/Views/Studio/StudioFabricView.cs

@@ -1,4 +1,5 @@
 
+using System.Collections.Generic;
 using FairyGUI;
 using UI.Studio;
 
@@ -24,7 +25,9 @@ namespace GFGGame
         {
             base.OnShown();
             _ui.m_c1.selectedIndex = 0;
-            this.studioCfgs = StudioDataManager.Instance.GetStudioCfgListByViewName(typeof(StudioFabricView).FullName);
+            this.studioCfg = StudioDataManager.Instance.GetStudioCfgListByViewName(typeof(StudioFabricView).FullName)[0];
+            this.storyLevelCfgs = new List<StoryLevelCfg>();
+            _ui.m_list.numItems = this.storyLevelCfgs.Count;
         }
 
         protected override void OnHide()

GameClient/Assets/Game/HotUpdate/Views/Studio/StudioMetalView.cs

@@ -1,9 +1,11 @@
 
+using System.Collections.Generic;
 using FairyGUI;
 using UI.Studio;
 
 namespace GFGGame
 {
+    //金属副本
     public class StudioMetalView : StudioBaseView
     {
 
@@ -23,7 +25,9 @@ namespace GFGGame
         {
             base.OnShown();
             _ui.m_c1.selectedIndex = 0;
-            this.studioCfgs = StudioDataManager.Instance.GetStudioCfgListByViewName(typeof(StudioMetalView).FullName);
+            this.studioCfg = StudioDataManager.Instance.GetStudioCfgListByViewName(typeof(StudioMetalView).FullName)[0];
+            this.storyLevelCfgs = new List<StoryLevelCfg>();
+            _ui.m_list.numItems = this.storyLevelCfgs.Count;
 
         }
 

GameClient/Assets/Game/HotUpdate/Views/Studio/StudioPropertyView.cs

@@ -1,4 +1,5 @@
 
+using System.Collections.Generic;
 using FairyGUI;
 using UI.Studio;
 
@@ -6,7 +7,7 @@ namespace GFGGame
 {
     public class StudioPropertyView : StudioBaseView
     {
-
+        //书画副本
         public override void Dispose()
         {
             base.Dispose();
@@ -24,9 +25,9 @@ namespace GFGGame
         {
             base.OnShown();
             _ui.m_c1.selectedIndex = 1;
-            this.studioCfgs = StudioDataManager.Instance.GetStudioCfgListByViewName(typeof(StudioPropertyView).FullName);
 
-            _ui.m_listProperty.numItems = this.studioCfgs.Count;
+
+            _ui.m_listProperty.numItems = StudioDataManager.Instance.GetStudioCfgListByViewName(typeof(StudioPropertyView).FullName).Count;
         }
 
         protected override void OnHide()
@@ -41,14 +42,19 @@ namespace GFGGame
         }
         private void ListPropertyItemRender(int index, GObject obj)
         {
-            UI_ListPropertyItem item = UI_ListPropertyItem.Proxy(obj);
+            GButton item = obj.asButton;
 
-            item.target.data = this.studioCfgs[index];
+            item.data = StudioDataManager.Instance.GetStudioCfgListByViewName(typeof(StudioPropertyView).FullName)[index];
         }
         private void OnClickListProperty(EventContext context)
         {
-            UI_ListPropertyItem item = UI_ListPropertyItem.Proxy(context.data as GObject);
-            StudioCfg cfg = item.target.data as StudioCfg;
+            GButton item = (context.data as GObject).asButton;
+
+            // UI_ListPropertyItem item = UI_ListPropertyItem.Proxy(context.data as GObject);
+            this.studioCfg = item.data as StudioCfg;
+            this.storyLevelCfgs = new List<StoryLevelCfg>();
+            _ui.m_list.numItems = this.storyLevelCfgs.Count;
+
         }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/Studio/StudioView.cs

@@ -26,13 +26,21 @@ namespace GFGGame
             // EventAgent.AddEventListener(ConstMessage.MAINTAIN_SUIT, OnListenerFoster);
             // EventAgent.AddEventListener(ConstMessage.GET_MAINTAIN_SUIT_BONUS, OnListenerGetFosterReward);
             // EventAgent.AddEventListener(ConstMessage.MAKE_NEW_SUIT, OnListenerRenew);
-            // _ui.com
+            _ui.m_comMetal.target.onClick.Add(OnClickComMetal);
+            _ui.m_comFabric.target.onClick.Add(OnCliclComFabric);
+            _ui.m_comProperty.target.onClick.Add(OnComProperty);
+            _ui.m_comFiling.target.onClick.Add(OnClickComFilling);
         }
 
         protected override void OnShown()
         {
             base.OnShown();
-
+            int isopen = FunctionOpenDataManager.Instance.CheckIsFunOpenById(StudioCfgArray.Instance.GetCfg(1).funId) ? 1 : 0;
+            _ui.m_comMetal.m_c1.selectedIndex = isopen;
+            isopen = FunctionOpenDataManager.Instance.CheckIsFunOpenById(StudioCfgArray.Instance.GetCfg(2).funId) ? 1 : 0; ;
+            _ui.m_comFabric.m_c1.selectedIndex = isopen;
+            isopen = FunctionOpenDataManager.Instance.CheckIsFunOpenById(StudioCfgArray.Instance.GetCfg(3).funId) ? 1 : 0;
+            _ui.m_comFabric.m_c1.selectedIndex = isopen;
         }
 
         protected override void OnHide()
@@ -44,5 +52,22 @@ namespace GFGGame
         {
             ViewManager.GoBackFrom(typeof(StudioView).FullName);
         }
+
+        private void OnClickComMetal()
+        {
+            ViewManager.Show<StudioMetalView>(null, new object[] { typeof(StudioView).Name, this.viewData });
+        }
+        private void OnCliclComFabric()
+        {
+            ViewManager.Show<StudioFabricView>(null, new object[] { typeof(StudioView).Name, this.viewData });
+        }
+        private void OnComProperty()
+        {
+            ViewManager.Show<StudioPropertyView>(null, new object[] { typeof(StudioView).Name, this.viewData });
+        }
+        private void OnClickComFilling()
+        {
+
+        }
     }
 }