瓷器修复

FGUIProject/assets/Studio/ComFabric.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1080,1920">
+  <displayList>
+    <image id="n26_f2bf" name="n26" src="kqhdz" fileName="images/gzsxian_2.png" xy="68,194">
+      <relation target="" sidePair="height-height"/>
+    </image>
+    <list id="n16_n3xh" name="list" xy="39,355" pivot="0.5,0" size="1002,1565" overflow="scroll" scrollBarFlags="2" lineGap="63" defaultItem="ui://xz8kxrecn3xha" align="center">
+      <relation target="" sidePair="bottomext-bottom"/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <text id="n21_n3xh" name="txtNum" xy="705,265" size="233,44" group="n23_fa5e" fontSize="32" color="#e2deb6" text="剩余次数：1/10"/>
+    <text id="n20_n3xh" name="txtTime" xy="472,265" size="198,44" group="n23_fa5e" fontSize="32" color="#979166" text="12小时候刷新"/>
+    <component id="n22_n3xh" name="btnBuy" src="hinb5s" fileName="components/ButtonPlus2.xml" pkg="eg2y0ldp" xy="976,251" group="n23_fa5e"/>
+    <group id="n23_fa5e" name="n23" xy="472,251" size="572,71" advanced="true"/>
+  </displayList>
+</component>

FGUIProject/assets/Studio/ComPorcelain.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1080,1920">
+  <displayList>
+    <loader id="n28_gbqo" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" fill="scaleMatchWidth">
+      <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
+    </loader>
+    <image id="n26_kqhd" name="n26" src="kqhdo" fileName="images/zpsxian_1.png" xy="-3,568"/>
+    <list id="n16_n3xh" name="list" xy="61,600" pivot="0.5,0" size="958,1320" layout="row" lineGap="20" colGap="-589" defaultItem="ui://xz8kxrecf2bf2x" align="center">
+      <relation target="" sidePair="bottomext-bottom"/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <text id="n21_n3xh" name="txtNum" xy="709,264" size="233,44" group="n23_fa5e" fontSize="32" color="#e2deb6" text="剩余次数：1/10"/>
+    <text id="n20_n3xh" name="txtTime" xy="476,264" size="198,44" group="n23_fa5e" fontSize="32" color="#979166" text="12小时候刷新"/>
+    <component id="n22_n3xh" name="btnBuy" src="hinb5s" fileName="components/ButtonPlus2.xml" pkg="eg2y0ldp" xy="980,250" group="n23_fa5e"/>
+    <group id="n23_fa5e" name="n23" xy="476,250" size="572,71" advanced="true"/>
+    <loader id="n29_f2bf" name="loaScore" xy="473,343" size="172,172" url="ui://xz8kxreckqhdu" autoSize="true"/>
+  </displayList>
+</component>

FGUIProject/assets/Studio/ComProperty.xml

@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1080,1920">
+  <controller name="c1" pages="0,,1,,2,,3," selected="0"/>
+  <displayList>
+    <image id="n25_kqhd" name="n25" src="kqhdz" fileName="images/gzsxian_2.png" xy="70,376">
+      <relation target="" sidePair="height-height"/>
+    </image>
+    <list id="n16_n3xh" name="list" xy="39,579" pivot="0.5,0" size="1002,1339" overflow="scroll" scrollBarFlags="2" lineGap="63" defaultItem="ui://xz8kxrecn3xha" align="center">
+      <relation target="" sidePair="bottomext-bottom"/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <text id="n21_n3xh" name="txtNum" xy="709,486" size="233,44" group="n23_fa5e" fontSize="32" color="#e2deb6" text="剩余次数：1/10"/>
+    <text id="n20_n3xh" name="txtTime" xy="476,486" size="198,44" group="n23_fa5e" fontSize="32" color="#979166" text="12小时候刷新"/>
+    <component id="n22_n3xh" name="btnBuy" src="hinb5s" fileName="components/ButtonPlus2.xml" pkg="eg2y0ldp" xy="980,472" group="n23_fa5e"/>
+    <group id="n23_fa5e" name="n23" xy="476,472" size="572,71" advanced="true">
+      <relation target="" sidePair="top-top"/>
+    </group>
+    <image id="n26_kqhd" name="n26" src="kqhdo" fileName="images/zpsxian_1.png" xy="0,264" size="1080,98"/>
+    <component id="n34_f2bf" name="btn0" src="n3xhn" fileName="components/ListPropertyItem.xml" xy="102,240" group="n38_f2bf">
+      <Button checked="true" icon="ui://xz8kxreckqhdq" selectedIcon="ui://xz8kxreckqhdu" controller="c1" page="0"/>
+      <property target="loaBg" propertyId="1" value="ui://xz8kxreckqhd12"/>
+    </component>
+    <component id="n35_f2bf" name="btn1" src="n3xhn" fileName="components/ListPropertyItem.xml" xy="336,240" group="n38_f2bf">
+      <Button icon="ui://xz8kxreckqhdr" selectedIcon="ui://xz8kxreckqhdv" controller="c1" page="1"/>
+      <property target="loaBg" propertyId="1" value="ui://xz8kxreckqhd13"/>
+    </component>
+    <component id="n36_f2bf" name="btn2" src="n3xhn" fileName="components/ListPropertyItem.xml" xy="570,240" group="n38_f2bf">
+      <Button icon="ui://xz8kxreckqhd10" selectedIcon="ui://xz8kxreckqhdw" controller="c1" page="2"/>
+      <property target="loaBg" propertyId="1" value="ui://xz8kxreckqhd14"/>
+    </component>
+    <component id="n37_f2bf" name="btn3" src="n3xhn" fileName="components/ListPropertyItem.xml" xy="804,240" group="n38_f2bf">
+      <Button icon="ui://xz8kxreckqhd11" selectedIcon="ui://xz8kxreckqhdx" controller="c1" page="3"/>
+      <property target="loaBg" propertyId="1" value="ui://xz8kxreckqhd15"/>
+    </component>
+    <group id="n38_f2bf" name="n38" xy="102,240" size="876,174" advanced="true" layout="hz" colGap="60"/>
+  </displayList>
+</component>

FGUIProject/assets/Studio/StudioEctypeUI.xml

@@ -1,43 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920">
-  <controller name="c1" pages="0,,1," selected="0"/>
   <displayList>
     <loader id="n28_gbqo" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" fill="scaleMatchWidth">
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
     </loader>
-    <image id="n25_kqhd" name="n25" src="kqhdz" fileName="images/gzsxian_2.png" xy="61,162">
-      <relation target="" sidePair="height-height"/>
-    </image>
-    <image id="n26_kqhd" name="n26" src="kqhdo" fileName="images/zpsxian_1.png" xy="0,258">
-      <gearDisplay controller="c1" pages="1"/>
-      <relation target="n17_n3xh" sidePair="top-top"/>
-    </image>
-    <list id="n17_n3xh" name="listProperty" xy="94,235" size="892,174" layout="row" colGap="60" defaultItem="ui://xz8kxrecn3xhn" align="center" vAlign="middle">
-      <gearDisplay controller="c1" pages="1"/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-    </list>
-    <list id="n16_n3xh" name="list" xy="39,320" pivot="0.5,0" size="1002,1600" overflow="scroll" scrollBarFlags="2" lineGap="63" defaultItem="ui://xz8kxrecn3xha" align="center">
-      <gearXY controller="c1" pages="0,1" values="39,320|39,516"/>
-      <gearSize controller="c1" pages="0,1" values="1002,1600,1,1|1002,1406,1,1"/>
-      <relation target="" sidePair="bottomext-bottom"/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <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="0,95" controller="c1,1"/>
-    <text id="n21_n3xh" name="txtNum" xy="709,264" size="243,44" group="n23_fa5e" fontSize="32" color="#e2deb6" text="剩余次数：1/10"/>
-    <text id="n20_n3xh" name="txtTime" xy="476,264" size="204,44" group="n23_fa5e" fontSize="32" color="#979166" text="12小时候刷新"/>
-    <component id="n22_n3xh" name="btnBuy" src="hinb5s" fileName="components/ButtonPlus2.xml" pkg="eg2y0ldp" xy="980,250" group="n23_fa5e"/>
-    <group id="n23_fa5e" name="n23" xy="476,250" size="572,71" advanced="true">
-      <gearXY controller="c1" pages="0" values="476,250" default="476,446"/>
-    </group>
   </displayList>
 </component>

FGUIProject/assets/Studio/StudioUI.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1080,1920">
+<component size="1080,1920" designImage="ui://xz8kxrecf2bf2v" designImageOffsetY="-240">
   <displayList>
     <loader id="n8_gbqo" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" fill="scaleMatchWidth">
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
@@ -7,11 +7,11 @@
     <component id="n1_rbxq" name="btnBack" src="uyuxtj5" fileName="components/ButtonBack.xml" pkg="eg2y0ldp" xy="35,80">
       <Button icon="ui://xz8kxrecysx92u"/>
     </component>
-    <component id="n2_rbxq" name="comMetal" src="rbxq5" fileName="components/ComEctype.xml" xy="340,1014">
+    <component id="n2_rbxq" name="comMetal" src="rbxq5" fileName="components/ComEctype.xml" xy="297,1003">
       <relation target="" sidePair="left-left,bottom-middle"/>
       <property target="icon" propertyId="1" value="ui://xz8kxreces2q1e"/>
     </component>
-    <component id="n3_rbxq" name="comFabric" src="rbxq5" fileName="components/ComEctype.xml" xy="128,450">
+    <component id="n3_rbxq" name="comFabric" src="rbxq5" fileName="components/ComEctype.xml" xy="102,458">
       <relation target="" sidePair="left-left,bottom-middle"/>
       <property target="icon" propertyId="1" value="ui://xz8kxreces2q1g"/>
     </component>
@@ -19,7 +19,11 @@
       <relation target="" sidePair="right-right,bottom-middle"/>
       <property target="icon" propertyId="1" value="ui://xz8kxreces2q1f"/>
     </component>
-    <component id="n5_rbxq" name="comFiling" src="rbxq5" fileName="components/ComEctype.xml" xy="777,1261">
+    <component id="n5_rbxq" name="comFiling" src="rbxq5" fileName="components/ComEctype.xml" xy="885,1145">
+      <relation target="" sidePair="right-right,bottom-middle"/>
+      <property target="icon" propertyId="1" value="ui://xz8kxreces2q1d"/>
+    </component>
+    <component id="n9_f2bf" name="comPorcelain" src="rbxq5" fileName="components/ComEctype.xml" xy="534,1328">
       <relation target="" sidePair="right-right,bottom-middle"/>
       <property target="icon" propertyId="1" value="ui://xz8kxreces2q1d"/>
     </component>

FGUIProject/assets/Studio/components/ListPorcelainItem.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="183,991" restrictSize="850,0,0,0">
+  <controller name="star" pages="0,,1,,2,,3," selected="3"/>
+  <displayList>
+    <image id="n22_f2bf" name="n22" src="kqhds" fileName="images/gzsdi_1.png" xy="-420,425" pivot="0.5,0.5" rotation="90"/>
+    <loader id="n19_wono" name="loaBg" xy="177,143" size="850,183" rotation="90" align="right" vAlign="middle" fillMethod="hz"/>
+    <text id="n10_rbxq" name="txtTitle" xy="55,285" size="72,420" fontSize="46" color="#877d53" align="center" vAlign="middle" autoSize="none" text="完成主线1-10解锁"/>
+    <image id="n18_kqhd" name="n18" src="kqhdt" fileName="images/gzsdi_2.png" xy="22,775" group="n20_f2bf"/>
+    <loader id="n6_rbxq" name="loaIcon" xy="30,783" size="120,120" group="n20_f2bf" url="ui://xz8kxrecrbxq3" fill="scale"/>
+    <image id="n17_kqhd" name="imgLock" src="kqhdy" fileName="images/gzssuo.png" xy="24,777" group="n20_f2bf"/>
+    <group id="n20_f2bf" name="n20" xy="22,775" size="136,136"/>
+    <image id="n23_f2bf" name="n23" src="j48o95" fileName="imagesExport/zx_jq_djtubiao_1.png" pkg="mfvz4q8k" xy="16,721" group="n26_f2bf">
+      <gearDisplay controller="star" pages="1,2,3"/>
+    </image>
+    <image id="n24_f2bf" name="n24" src="j48o95" fileName="imagesExport/zx_jq_djtubiao_1.png" pkg="mfvz4q8k" xy="71,722" group="n26_f2bf">
+      <gearDisplay controller="star" pages="2,3"/>
+    </image>
+    <image id="n25_f2bf" name="n25" src="j48o95" fileName="imagesExport/zx_jq_djtubiao_1.png" pkg="mfvz4q8k" xy="126,723" group="n26_f2bf">
+      <gearDisplay controller="star" pages="3"/>
+    </image>
+    <group id="n26_f2bf" name="n26" xy="16,721" size="151,47" advanced="true" layout="hz" colGap="14"/>
+  </displayList>
+</component>

FGUIProject/assets/Studio/components/ListPropertyItem.xml

@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="174,174" extention="Button">
-  <controller name="button" pages="0,up,1,down" selected="1"/>
+  <controller name="button" pages="0,up,1,down" selected="0"/>
   <displayList>
-    <loader id="n8_kqhd" name="icon0" xy="1,1" size="172,172" url="ui://xz8kxreckqhdu" autoSize="true">
-      <gearDisplay controller="button" pages="1"/>
-    </loader>
-    <loader id="n9_kqhd" name="icon1" xy="1,0" size="172,173" url="ui://xz8kxreckqhdq" autoSize="true">
-      <gearDisplay controller="button" pages="0"/>
-    </loader>
-    <loader id="n10_kqhd" name="icon2" xy="0,0" size="174,174" url="ui://xz8kxreckqhd12" autoSize="true"/>
+    <loader id="n12_f2bf" name="loaBg" xy="0,0" size="174,174" url="ui://xz8kxreckqhd12" autoSize="true"/>
+    <loader id="n11_f2bf" name="icon" xy="0,0" size="174,174" url="ui://xz8kxreckqhd12" autoSize="true"/>
   </displayList>
   <Button mode="Radio"/>
+  <customProperty target="loaBg" propertyId="1"/>
 </component>

FGUIProject/assets/Studio/package.xml

@@ -73,6 +73,11 @@
     <image id="wono2s" name="xingcijing.png" path="/imgExpot/" exported="true"/>
     <image id="wono2t" name="yizugongzhu.png" path="/imgExpot/" exported="true"/>
     <image id="ysx92u" name="gzs_gzs.png" path="/images/"/>
+    <image id="f2bf2v" name="ejzjm_bj.png" path="/images/"/>
+    <component id="f2bf2w" name="ComPorcelain.xml" path="/" exported="true"/>
+    <component id="f2bf2x" name="ListPorcelainItem.xml" path="/components/"/>
+    <component id="f2bf2z" name="ComProperty.xml" path="/" exported="true"/>
+    <component id="f2bf30" name="ComFabric.xml" path="/" exported="true"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\Studio" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

GameClient/Assets/Game/HotUpdate/Data/ScoreSystemData.cs

@@ -129,7 +129,7 @@ namespace GFGGame
         {
 
             //部件评分=部件基础分*部件系数
-            //点击评分=（部件基础分+（+人物基础分+卡牌属性分数）*点击系数）*2.22   (新点击公式，防止点击优秀却因为未穿衣服结果是0分)
+            //点击评分=（部件基础分+（人物基础分+卡牌属性分数）*点击系数）*2.22   (新点击公式，防止点击优秀却因为未穿衣服结果是0分)
             //卡牌评分=总属性*技能配表百分比
             double partScore = GetPartItemScore(partId);
             double clickScore = ScoreSystemData.Instance.GetPartItemClickScore(partId, clickType);
@@ -161,7 +161,7 @@ namespace GFGGame
         }
         private double GetPartItemClickScore(int partId, int clickState)
         {
-            //点击评分=（部件基础分+（+人物基础分+卡牌属性分数）*点击系数）*2.22
+            //点击评分=（部件基础分+（人物基础分+卡牌属性分数）*点击系数）*2.22
             double clickCoefficient = 0;
             switch (clickState)
             {

GameClient/Assets/Game/HotUpdate/Data/StudioDataManager.cs

@@ -9,12 +9,14 @@ namespace GFGGame
     public class StudioDataManager : SingletonBase<StudioDataManager>
     {
         private Dictionary<int, StudioData> _StudioInfoById = new Dictionary<int, StudioData>();
-        public int TYPE_SELECT_INDEX = 0;//界面类型0无属性选择，1有属性选择
+        // public int TYPE_SELECT_INDEX = 0;//界面类型0无属性选择，1有属性选择
         public int PROPERTY_SELECT_INDEX = 0;//属性类型
         public string VIEW_NAME = "";//界面名称
 
         public int filingChapterId;//查阅建档副本Id
 
+        public int theme = 1;//瓷器修复当天主题
+
         public List<StudioCfg> FilingDatas
         {
             get
@@ -66,11 +68,7 @@ namespace GFGGame
             }
             else
             {
-                int totalPlayTimes = 0;
-                // if (type == ConstInstanceZonesType.Studio)
-                // {
-                totalPlayTimes = StudioCfgArray.Instance.GetCfg(id).num;
-                // }
+                int totalPlayTimes = StudioCfgArray.Instance.GetCfg(id).num;
                 StudioData studioData = new StudioData() { ChapterId = id, BuyTimes = 0, PlayTimes = 0, TotalPlayTimes = totalPlayTimes };
                 RspStudioInfos(studioData);
                 return studioData;
@@ -136,12 +134,11 @@ namespace GFGGame
 
         public void OnFinishStudioStoryLevel(int levelCfgId, bool firstPass, bool success)
         {
-            ViewManager.Show(VIEW_NAME, new object[] { TYPE_SELECT_INDEX, PROPERTY_SELECT_INDEX }, ViewManager.GetGoBackDatas(VIEW_NAME));
+            ViewManager.Show(VIEW_NAME, PROPERTY_SELECT_INDEX, ViewManager.GetGoBackDatas(VIEW_NAME));
         }
         public void OnFinishFilingStoryLevel(int levelCfgId, bool firstPass, bool success)
         {
             ViewManager.Show<StudioFilingView>(MainStoryDataManager.currentChapterCfgId, ViewManager.GetGoBackDatas(typeof(StudioFilingView).FullName), true);
-
         }
 
         public float GetAdditionBySuitId(int suitId)

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Studio/UI_ComFabric.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_ComFabric
+    {
+        public GComponent target;
+        public GList m_list;
+        public GTextField m_txtNum;
+        public GTextField m_txtTime;
+        public GButton m_btnBuy;
+        public const string URL = "ui://xz8kxrecf2bf30";
+        public const string PACKAGE_NAME = "Studio";
+        public const string RES_NAME = "ComFabric";
+        private static UI_ComFabric _proxy;
+
+        public static UI_ComFabric Create(GObject gObject = null)
+        {
+            var ui = new UI_ComFabric();
+            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_ComFabric Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComFabric();
+            }
+            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_list = (GList)comp.GetChild("list");
+            m_txtNum = (GTextField)comp.GetChild("txtNum");
+            m_txtTime = (GTextField)comp.GetChild("txtTime");
+            m_btnBuy = (GButton)comp.GetChild("btnBuy");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_list = null;
+            m_txtNum = null;
+            m_txtTime = null;
+            m_btnBuy = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

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

@@ -0,0 +1,86 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Studio
+{
+    public partial class UI_ComPorcelain
+    {
+        public GComponent target;
+        public GLoader m_loaBg;
+        public GList m_list;
+        public GTextField m_txtNum;
+        public GTextField m_txtTime;
+        public GButton m_btnBuy;
+        public GLoader m_loaScore;
+        public const string URL = "ui://xz8kxrecf2bf2w";
+        public const string PACKAGE_NAME = "Studio";
+        public const string RES_NAME = "ComPorcelain";
+        private static UI_ComPorcelain _proxy;
+
+        public static UI_ComPorcelain Create(GObject gObject = null)
+        {
+            var ui = new UI_ComPorcelain();
+            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_ComPorcelain Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComPorcelain();
+            }
+            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_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_list = (GList)comp.GetChild("list");
+            m_txtNum = (GTextField)comp.GetChild("txtNum");
+            m_txtTime = (GTextField)comp.GetChild("txtTime");
+            m_btnBuy = (GButton)comp.GetChild("btnBuy");
+            m_loaScore = (GLoader)comp.GetChild("loaScore");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaBg = null;
+            m_list = null;
+            m_txtNum = null;
+            m_txtTime = null;
+            m_btnBuy = null;
+            m_loaScore = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

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

@@ -0,0 +1,99 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Studio
+{
+    public partial class UI_ComProperty
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public GList m_list;
+        public GTextField m_txtNum;
+        public GTextField m_txtTime;
+        public GButton m_btnBuy;
+        public UI_ListPropertyItem m_btn0;
+        public UI_ListPropertyItem m_btn1;
+        public UI_ListPropertyItem m_btn2;
+        public UI_ListPropertyItem m_btn3;
+        public const string URL = "ui://xz8kxrecf2bf2z";
+        public const string PACKAGE_NAME = "Studio";
+        public const string RES_NAME = "ComProperty";
+        private static UI_ComProperty _proxy;
+
+        public static UI_ComProperty Create(GObject gObject = null)
+        {
+            var ui = new UI_ComProperty();
+            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_ComProperty Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComProperty();
+            }
+            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_list = (GList)comp.GetChild("list");
+            m_txtNum = (GTextField)comp.GetChild("txtNum");
+            m_txtTime = (GTextField)comp.GetChild("txtTime");
+            m_btnBuy = (GButton)comp.GetChild("btnBuy");
+            m_btn0 = (UI_ListPropertyItem)UI_ListPropertyItem.Create(comp.GetChild("btn0"));
+            m_btn1 = (UI_ListPropertyItem)UI_ListPropertyItem.Create(comp.GetChild("btn1"));
+            m_btn2 = (UI_ListPropertyItem)UI_ListPropertyItem.Create(comp.GetChild("btn2"));
+            m_btn3 = (UI_ListPropertyItem)UI_ListPropertyItem.Create(comp.GetChild("btn3"));
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_list = null;
+            m_txtNum = null;
+            m_txtTime = null;
+            m_btnBuy = null;
+            m_btn0.Dispose();
+            m_btn0 = null;
+            m_btn1.Dispose();
+            m_btn1 = null;
+            m_btn2.Dispose();
+            m_btn2 = null;
+            m_btn3.Dispose();
+            m_btn3 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

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

@@ -0,0 +1,83 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Studio
+{
+    public partial class UI_ListPorcelainItem
+    {
+        public GComponent target;
+        public Controller m_star;
+        public GLoader m_loaBg;
+        public GTextField m_txtTitle;
+        public GLoader m_loaIcon;
+        public GImage m_imgLock;
+        public const string URL = "ui://xz8kxrecf2bf2x";
+        public const string PACKAGE_NAME = "Studio";
+        public const string RES_NAME = "ListPorcelainItem";
+        private static UI_ListPorcelainItem _proxy;
+
+        public static UI_ListPorcelainItem Create(GObject gObject = null)
+        {
+            var ui = new UI_ListPorcelainItem();
+            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_ListPorcelainItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ListPorcelainItem();
+            }
+            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_star = comp.GetController("star");
+            m_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_txtTitle = (GTextField)comp.GetChild("txtTitle");
+            m_loaIcon = (GLoader)comp.GetChild("loaIcon");
+            m_imgLock = (GImage)comp.GetChild("imgLock");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_star = null;
+            m_loaBg = null;
+            m_txtTitle = null;
+            m_loaIcon = null;
+            m_imgLock = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

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

@@ -7,9 +7,7 @@ namespace UI.Studio
     public partial class UI_ListPropertyItem
     {
         public GButton target;
-        public GLoader m_icon0;
-        public GLoader m_icon1;
-        public GLoader m_icon2;
+        public GLoader m_loaBg;
         public const string URL = "ui://xz8kxrecn3xhn";
         public const string PACKAGE_NAME = "Studio";
         public const string RES_NAME = "ListPropertyItem";
@@ -57,15 +55,11 @@ namespace UI.Studio
 
         private void Init(GComponent comp)
         {
-            m_icon0 = (GLoader)comp.GetChild("icon0");
-            m_icon1 = (GLoader)comp.GetChild("icon1");
-            m_icon2 = (GLoader)comp.GetChild("icon2");
+            m_loaBg = (GLoader)comp.GetChild("loaBg");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_icon0 = null;
-            m_icon1 = null;
-            m_icon2 = null;
+            m_loaBg = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -7,15 +7,9 @@ namespace UI.Studio
     public partial class UI_StudioEctypeUI
     {
         public GComponent target;
-        public Controller m_c1;
         public GLoader m_loaBg;
-        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";
@@ -63,27 +57,15 @@ namespace UI.Studio
 
         private void Init(GComponent comp)
         {
-            m_c1 = comp.GetController("c1");
             m_loaBg = (GLoader)comp.GetChild("loaBg");
-            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)
         {
-            m_c1 = null;
             m_loaBg = null;
-            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

@@ -13,6 +13,7 @@ namespace UI.Studio
         public UI_ComEctype m_comFabric;
         public UI_ComEctype m_comProperty;
         public UI_ComEctype m_comFiling;
+        public UI_ComEctype m_comPorcelain;
         public const string URL = "ui://xz8kxrecrbxq0";
         public const string PACKAGE_NAME = "Studio";
         public const string RES_NAME = "StudioUI";
@@ -66,6 +67,7 @@ namespace UI.Studio
             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"));
+            m_comPorcelain = (UI_ComEctype)UI_ComEctype.Create(comp.GetChild("comPorcelain"));
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -79,6 +81,8 @@ namespace UI.Studio
             m_comProperty = null;
             m_comFiling.Dispose();
             m_comFiling = null;
+            m_comPorcelain.Dispose();
+            m_comPorcelain = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/Views/CommonGame/ApproachView.cs

@@ -213,8 +213,6 @@ namespace GFGGame
                         }
                         else
                         {
-                            int type = studioCfg.funId == typeof(StudioPropertyView).Name ? 1 : 0;
-                            StudioDataManager.Instance.TYPE_SELECT_INDEX = type;
                             StudioDataManager.Instance.PROPERTY_SELECT_INDEX = 0;
                             if (studioCfg.funId == typeof(StudioPropertyView).Name)
                             {
@@ -230,7 +228,7 @@ namespace GFGGame
                             }
                             string viewName = "GFGGame." + studioCfg.funId;
 
-                            ViewManager.Show(viewName, new object[] { type, 0 }, _fromeViewDatas);
+                            ViewManager.Show(viewName, StudioDataManager.Instance.PROPERTY_SELECT_INDEX, _fromeViewDatas);
                             StudioDataManager.Instance.VIEW_NAME = viewName;
                             InstanceZonesController.ShowLevelView(levelCfgId, StudioDataManager.Instance.OnFinishStudioStoryLevel, _itemId, _needCount);
                             isJump = true;

GameClient/Assets/Game/HotUpdate/Views/DressUp/DressUpFightView.cs

@@ -226,7 +226,7 @@ namespace GFGGame
             {
                 if (_levelCfg.type == ConstInstanceZonesType.Studio && _levelCfg.subType != ConstInstanceZonesSubType.Hard3)
                 {
-                    ViewManager.Show(StudioDataManager.Instance.VIEW_NAME, new object[] { StudioDataManager.Instance.TYPE_SELECT_INDEX, StudioDataManager.Instance.PROPERTY_SELECT_INDEX }, ViewManager.GetGoBackDatas(StudioDataManager.Instance.VIEW_NAME));
+                    ViewManager.Show(StudioDataManager.Instance.VIEW_NAME, StudioDataManager.Instance.PROPERTY_SELECT_INDEX, ViewManager.GetGoBackDatas(StudioDataManager.Instance.VIEW_NAME));
                 }
                 else if (_levelCfg.type == ConstInstanceZonesType.Studio && _levelCfg.subType == ConstInstanceZonesSubType.Hard3)
                 {

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

@@ -12,6 +12,11 @@ namespace GFGGame
         protected UI_StudioEctypeUI _ui;
         private ValueBarController _valueBarController;
 
+        public GList list;
+        private GTextField _txtTime;
+        private GTextField _txtNum;
+        private GButton _btnBuy;
+
         protected StudioCfg studioCfg;
         protected List<StoryLevelCfg> storyLevelCfgs;
         protected StudioData studioData;
@@ -44,11 +49,11 @@ namespace GFGGame
 
             _valueBarController = new ValueBarController(_ui.m_valueBar);
 
-            _ui.m_list.itemRenderer = ListItemRender;
-            // _ui.m_list.onClickItem.Add(OnCliclListItem);
-            _ui.m_list.SetVirtual();
+            // _ui.m_list.itemRenderer = ListItemRender;
+            // // _ui.m_list.onClickItem.Add(OnCliclListItem);
+            // _ui.m_list.SetVirtual();
 
-            _ui.m_btnBuy.onClick.Add(OnCliclBtnBuy);
+            // _ui.m_btnBuy.onClick.Add(OnCliclBtnBuy);
 
 
 
@@ -59,6 +64,17 @@ namespace GFGGame
             EventAgent.AddEventListener(ConstMessage.BUY_STUDIO_PLAY_TIMES, UpdateView);
             EventAgent.AddEventListener(ConstMessage.NOTICE_STUDIO_PLAY_TIMES, UpdateView);
         }
+        public void AddChildCom(GComponent com)
+        {
+            _ui.target.AddChildAt(com, 1);
+            list = com.GetChild("list").asList;
+            _txtNum = com.GetChild("txtNum").asTextField;
+            _txtTime = com.GetChild("txtTime").asTextField;
+            _btnBuy = com.GetChild("btnBuy").asButton;
+
+            list.itemRenderer = ListItemRender;
+            _btnBuy.onClick.Add(OnCliclBtnBuy);
+        }
         protected override void OnShown()
         {
             base.OnShown();
@@ -73,6 +89,7 @@ namespace GFGGame
 
         protected override void OnHide()
         {
+            _ui.target.RemoveChildAt(1);
             base.OnHide();
             _valueBarController.OnHide();
             studioCfg = null;
@@ -90,15 +107,15 @@ namespace GFGGame
         protected void UpdateView()
         {
             studioData = StudioDataManager.Instance.GetStudioDataById(this.studioCfg.id);
-            _ui.m_txtNum.text = string.Format("剩余次数：{0}/{1}", this.studioData.TotalPlayTimes - this.studioData.PlayTimes, studioCfg.num);
+            _txtNum.text = string.Format("剩余次数：{0}/{1}", this.studioData.TotalPlayTimes - this.studioData.PlayTimes, studioCfg.num);
         }
         private void UpdateShowTime(object param)
         {
             long curTime = TimeHelper.ServerNow();
             long endTime = GameGlobal.myNumericComponent.GetAsInt(NumericType.DailyResetSecs);
-            _ui.m_txtTime.text = string.Format("{0}后刷新", TimeUtil.FormattingTime(curTime, endTime * 1000));
+            _txtTime.text = string.Format("{0}后刷新", TimeUtil.FormattingTime(curTime, endTime * 1000));
         }
-        private void ListItemRender(int index, GObject obj)
+        protected virtual void ListItemRender(int index, GObject obj)
         {
             UI_ListItem item = UI_ListItem.Proxy(obj);
             StudioDataManager.Instance.IsCanFight(storyLevelCfgs, index, out bool canFight, out string content);
@@ -122,7 +139,7 @@ namespace GFGGame
             item.m_loaBg.data = index;
             UI_ListItem.ProxyEnd();
         }
-        private void OnCliclListItem(EventContext context)
+        public void OnCliclListItem(EventContext context)
         {
             GObject obj = context.sender as GObject;
             int index = (int)obj.data;
@@ -133,11 +150,11 @@ namespace GFGGame
                 PromptController.Instance.ShowFloatTextPrompt(content);
                 return;
             }
-            StudioDataManager.Instance.PROPERTY_SELECT_INDEX = _ui.m_listProperty.selectedIndex;
-            StudioDataManager.Instance.TYPE_SELECT_INDEX = _ui.m_c1.selectedIndex;
+            // StudioDataManager.Instance.PROPERTY_SELECT_INDEX = _ui.m_listProperty.selectedIndex;
+            // StudioDataManager.Instance.TYPE_SELECT_INDEX = _ui.m_c1.selectedIndex;
             InstanceZonesController.ShowLevelView(storyLevelCfg.id, StudioDataManager.Instance.OnFinishStudioStoryLevel);
         }
-        private void OnLoaItemClick(EventContext context)
+        public void OnLoaItemClick(EventContext context)
         {
             GObject obj = context.sender as GObject;
             int index = (int)obj.data;

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

@@ -24,15 +24,15 @@ namespace GFGGame
 
         protected override void OnShown()
         {
-            _ui.m_c1.selectedIndex = this.viewData == null ? 0 : (int)(this.viewData as object[])[0];
-            StudioDataManager.Instance.TYPE_SELECT_INDEX = _ui.m_c1.selectedIndex;
-            StudioDataManager.Instance.PROPERTY_SELECT_INDEX = 0;
+            GComponent com = UIPackage.CreateObject(UI_StudioUI.PACKAGE_NAME, "ComFabric").asCom;
+            AddChildCom(com);
+
             StudioDataManager.Instance.VIEW_NAME = typeof(StudioFabricView).FullName;
             this.studioCfg = StudioCfgArray.Instance.GetCfgsByfunId(typeof(StudioFabricView).Name)[0];
             this.studioData = StudioDataManager.Instance.GetStudioDataById(this.studioCfg.id);
             this.storyLevelCfgs = StoryLevelCfgArray.Instance.GetCfgsBytypeAndsubTypeAndchapterId(this.studioCfg.type, this.studioCfg.subType, this.studioCfg.id);
-            _ui.m_list.numItems = this.storyLevelCfgs.Count;
-            _ui.m_list.ScrollToView(curIndex);
+            list.numItems = this.storyLevelCfgs.Count;
+            list.ScrollToView(curIndex);
 
             base.OnShown();
 

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

@@ -23,17 +23,16 @@ namespace GFGGame
 
         protected override void OnShown()
         {
+            GComponent com = UIPackage.CreateObject(UI_StudioUI.PACKAGE_NAME, "ComFabric").asCom;
+            AddChildCom(com);
 
-            _ui.m_c1.selectedIndex = this.viewData == null ? 0 : (int)(this.viewData as object[])[0];
-            StudioDataManager.Instance.TYPE_SELECT_INDEX = _ui.m_c1.selectedIndex;
-            StudioDataManager.Instance.PROPERTY_SELECT_INDEX = 0;
             StudioDataManager.Instance.VIEW_NAME = typeof(StudioMetalView).FullName;
 
             this.studioCfg = StudioCfgArray.Instance.GetCfgsByfunId(typeof(StudioMetalView).Name)[0];
             this.studioData = StudioDataManager.Instance.GetStudioDataById(this.studioCfg.id);
             this.storyLevelCfgs = StoryLevelCfgArray.Instance.GetCfgsBytypeAndsubTypeAndchapterId(this.studioCfg.type, this.studioCfg.subType, this.studioCfg.id);
-            _ui.m_list.numItems = this.storyLevelCfgs.Count;
-            _ui.m_list.ScrollToView(curIndex);
+            list.numItems = this.storyLevelCfgs.Count;
+            list.ScrollToView(curIndex);
 
             base.OnShown();
         }

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

@@ -0,0 +1,55 @@
+
+using System.Collections.Generic;
+using FairyGUI;
+using UI.Studio;
+
+namespace GFGGame
+{
+    //瓷器副本
+    public class StudioPorcelainView : StudioBaseView
+    {
+
+        public override void Dispose()
+        {
+            base.Dispose();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_StudioEctypeUI.PACKAGE_NAME;
+            // _ui = UI_StudioPorcelainUI.Create();
+            // this.viewCom = _ui.target;
+            // isfullScreen = true;
+
+            _ui.m_btnBack.onClick.Add(OnClickBtnBack);
+
+        }
+
+        protected override void OnShown()
+        {
+            GComponent com = UIPackage.CreateObject(UI_StudioUI.PACKAGE_NAME, "ComPorcelain").asCom;
+            AddChildCom(com);
+
+            StudioDataManager.Instance.VIEW_NAME = typeof(StudioPorcelainView).FullName;
+            this.studioCfg = StudioCfgArray.Instance.GetCfgsByfunId(typeof(StudioPorcelainView).Name)[StudioDataManager.Instance.theme - 1];
+            this.studioData = StudioDataManager.Instance.GetStudioDataById(this.studioCfg.id);
+            this.storyLevelCfgs = StoryLevelCfgArray.Instance.GetCfgsBytypeAndsubTypeAndchapterId(this.studioCfg.type, this.studioCfg.subType, this.studioCfg.id);
+            list.numItems = this.storyLevelCfgs.Count;
+            list.ScrollToView(curIndex);
+
+            base.OnShown();
+
+        }
+
+        protected override void OnHide()
+        {
+            base.OnHide();
+        }
+
+        private void OnClickBtnBack()
+        {
+            ViewManager.GoBackFrom(typeof(StudioPorcelainView).FullName);
+        }
+    }
+}

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

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

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

@@ -8,6 +8,9 @@ namespace GFGGame
 {
     public class StudioPropertyView : StudioBaseView
     {
+        // private GList _listProperty;
+
+        private Controller _croProperty;
         private int _propertySelectIndex = 0;
         private int _typeSelectIndex = 0;
         private int firstOpenProperty = -1;//第一个开放的副本（打开界面时，如未选择副本，则默认选中第一个开启的副本）
@@ -21,30 +24,40 @@ namespace GFGGame
         {
             base.OnInit();
             _ui.m_btnBack.onClick.Add(OnClickBtnBack);
-            _ui.m_listProperty.itemRenderer = ListPropertyItemRender;
-            _ui.m_listProperty.onClickItem.Add(OnClickListProperty);
+            // _ui.m_listProperty.itemRenderer = ListPropertyItemRender;
+            // _ui.m_listProperty.onClickItem.Add(OnClickListProperty);
         }
 
         protected override void OnShown()
         {
-            firstOpenProperty = -1;
-            _typeSelectIndex = this.viewData == null ? 1 : (int)(this.viewData as object[])[0];
-            _propertySelectIndex = this.viewData == null ? 0 : (int)(this.viewData as object[])[1];
-            _ui.m_c1.selectedIndex = _typeSelectIndex;
+            GComponent com = UIPackage.CreateObject(UI_StudioUI.PACKAGE_NAME, "ComProperty").asCom;
+            this.AddChildCom(com);
+            _croProperty = com.GetController("c1");
+            _croProperty.onChanged.Add(OnControllerChange);
+
+            _propertySelectIndex = this.viewData == null ? 0 : (int)this.viewData;
 
             StudioDataManager.Instance.VIEW_NAME = typeof(StudioPropertyView).FullName;
             List<StudioCfg> studioCfgs = StudioCfgArray.Instance.GetCfgsByfunId(typeof(StudioPropertyView).Name);
+            firstOpenProperty = -1;
+            for (int i = 0; i < studioCfgs.Count; i++)
+            {
+                GButton btn = com.GetChild("btn" + i).asButton;
+                bool isOpen = TimeUtil.CheckDayOfWeek(studioCfgs[i].timeArr) ? true : false;
+                btn.GetChild("icon").visible = isOpen;
+                if (firstOpenProperty < 0 && isOpen) firstOpenProperty = i;
+            }
 
-            _ui.m_listProperty.numItems = studioCfgs.Count;
             _propertySelectIndex = TimeUtil.CheckDayOfWeek(studioCfgs[_propertySelectIndex].timeArr) ? _propertySelectIndex : firstOpenProperty;
-            _ui.m_listProperty.selectedIndex = _propertySelectIndex;
+            _croProperty.selectedIndex = _propertySelectIndex;
+            StudioDataManager.Instance.PROPERTY_SELECT_INDEX = _propertySelectIndex;
 
-            this.studioCfg = studioCfgs[_ui.m_listProperty.selectedIndex];
+            this.studioCfg = studioCfgs[_propertySelectIndex];
             this.studioData = StudioDataManager.Instance.GetStudioDataById(this.studioCfg.id);
             this.storyLevelCfgs = StoryLevelCfgArray.Instance.GetCfgsBytypeAndsubTypeAndchapterId(this.studioCfg.type, this.studioCfg.subType, this.studioCfg.id);
 
-            _ui.m_list.numItems = this.storyLevelCfgs.Count;
-            _ui.m_list.ScrollToView(curIndex);
+            list.numItems = this.storyLevelCfgs.Count;
+            list.ScrollToView(curIndex);
 
             base.OnShown();
 
@@ -60,27 +73,55 @@ namespace GFGGame
         {
             ViewManager.GoBackFrom(typeof(StudioPropertyView).FullName);
         }
-        private void ListPropertyItemRender(int index, GObject obj)
-        {
-            List<StudioCfg> studioCfgs = StudioCfgArray.Instance.GetCfgsByfunId(typeof(StudioPropertyView).Name);
-            GButton item = obj.asButton;
-            item.GetChild("icon0").asLoader.url = string.Format("ui://Studio/gzsltb_{0}", index + 1);
-            item.GetChild("icon1").asLoader.url = string.Format("ui://Studio/gzsatb_{0}", index + 1);
-            item.GetChild("icon2").asLoader.url = string.Format("ui://Studio/gzswtb_{0}", index + 1);
-            item.GetChild("icon2").asLoader.visible = TimeUtil.CheckDayOfWeek(studioCfgs[index].timeArr) ? false : true;
-            if (firstOpenProperty < 0 && TimeUtil.CheckDayOfWeek(studioCfgs[index].timeArr)) firstOpenProperty = index;
-            item.data = index;
-        }
-        private void OnClickListProperty(EventContext context)
-        {
+        // private void ListPropertyItemRender(int index, GObject obj)
+        // {
+        //     List<StudioCfg> studioCfgs = StudioCfgArray.Instance.GetCfgsByfunId(typeof(StudioPropertyView).Name);
+        //     GButton item = obj.asButton;
+        //     item.GetChild("icon0").asLoader.url = string.Format("ui://Studio/gzsltb_{0}", index + 1);
+        //     item.GetChild("icon1").asLoader.url = string.Format("ui://Studio/gzsatb_{0}", index + 1);
+        //     item.GetChild("icon2").asLoader.url = string.Format("ui://Studio/gzswtb_{0}", index + 1);
+        //     item.GetChild("icon2").asLoader.visible = TimeUtil.CheckDayOfWeek(studioCfgs[index].timeArr) ? false : true;
+        //     if (firstOpenProperty < 0 && TimeUtil.CheckDayOfWeek(studioCfgs[index].timeArr)) firstOpenProperty = index;
+        //     item.data = index;
+        // }
+        // private void OnClickListProperty(EventContext context)
+        // {
+
+        //     GButton item = (context.data as GObject).asButton;
+        //     int index = (int)item.data;
+        //     List<StudioCfg> studioCfgs = StudioCfgArray.Instance.GetCfgsByfunId(typeof(StudioPropertyView).Name);
+        //     StudioCfg studioCfg = studioCfgs[index];
+        //     if (!TimeUtil.CheckDayOfWeek(studioCfg.timeArr))
+        //     {
+        //         _listProperty.selectedIndex = _propertySelectIndex;
+        //         string str = "";
+        //         for (int i = 0; i < studioCfg.timeArr.Length; i++)
+        //         {
+        //             str += NumberUtil.GetChiniseNumberWeekText(studioCfg.timeArr[i]);
+        //             if (i == studioCfg.timeArr.Length - 1) break;
+        //             str += "、";
+        //         }
+        //         PromptController.Instance.ShowFloatTextPrompt(string.Format("周{0}开放", str));
+        //         return;
+        //     }
+        //     _propertySelectIndex = index;
+        //     this.studioCfg = studioCfg;
+        //     this.studioData = StudioDataManager.Instance.GetStudioDataById(this.studioCfg.id);
+        //     this.storyLevelCfgs = StoryLevelCfgArray.Instance.GetCfgsBytypeAndsubTypeAndchapterId(this.studioCfg.type, this.studioCfg.subType, this.studioCfg.id);
+        //     list.numItems = this.storyLevelCfgs.Count;
+        //     list.ScrollToView(curIndex);
+        //     UpdateView();
+        //     StudioDataManager.Instance.PROPERTY_SELECT_INDEX = _listProperty.selectedIndex;
 
-            GButton item = (context.data as GObject).asButton;
-            int index = (int)item.data;
+        // }
+
+        private void OnControllerChange()
+        {
+            // int index = _croProperty.selectedIndex;
             List<StudioCfg> studioCfgs = StudioCfgArray.Instance.GetCfgsByfunId(typeof(StudioPropertyView).Name);
-            StudioCfg studioCfg = studioCfgs[index];
+            StudioCfg studioCfg = studioCfgs[_croProperty.selectedIndex];
             if (!TimeUtil.CheckDayOfWeek(studioCfg.timeArr))
             {
-                _ui.m_listProperty.selectedIndex = _propertySelectIndex;
                 string str = "";
                 for (int i = 0; i < studioCfg.timeArr.Length; i++)
                 {
@@ -89,17 +130,17 @@ namespace GFGGame
                     str += "、";
                 }
                 PromptController.Instance.ShowFloatTextPrompt(string.Format("周{0}开放", str));
+                _croProperty.selectedIndex = _croProperty.previsousIndex;
                 return;
             }
-            _propertySelectIndex = index;
+            // _propertySelectIndex = index;
             this.studioCfg = studioCfg;
             this.studioData = StudioDataManager.Instance.GetStudioDataById(this.studioCfg.id);
             this.storyLevelCfgs = StoryLevelCfgArray.Instance.GetCfgsBytypeAndsubTypeAndchapterId(this.studioCfg.type, this.studioCfg.subType, this.studioCfg.id);
-            _ui.m_list.numItems = this.storyLevelCfgs.Count;
-            _ui.m_list.ScrollToView(curIndex);
+            list.numItems = this.storyLevelCfgs.Count;
+            list.ScrollToView(curIndex);
             UpdateView();
-            StudioDataManager.Instance.PROPERTY_SELECT_INDEX = _ui.m_listProperty.selectedIndex;
-
+            StudioDataManager.Instance.PROPERTY_SELECT_INDEX = _croProperty.selectedIndex;
         }
     }
 }

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

@@ -35,6 +35,7 @@ namespace GFGGame
             _ui.m_comFabric.target.onClick.Add(OnCliclComFabric);
             _ui.m_comProperty.target.onClick.Add(OnComProperty);
             _ui.m_comFiling.target.onClick.Add(OnClickComFilling);
+            _ui.m_comPorcelain.target.onClick.Add(OnComPorceLain);
         }
         protected override void AddEventListener()
         {
@@ -53,6 +54,8 @@ namespace GFGGame
             _ui.m_comProperty.m_c1.selectedIndex = isopen;
             isopen = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(StudioFilingView).FullName, false) ? 1 : 0;
             _ui.m_comFiling.m_c1.selectedIndex = isopen;
+            isopen = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(StudioPorcelainView).FullName, false) ? 1 : 0;
+            _ui.m_comPorcelain.m_c1.selectedIndex = isopen;
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("ejzjm_bj");
             UpdateRedDot();
             Timers.inst.AddUpdate(CheckGuide);
@@ -80,7 +83,7 @@ namespace GFGGame
             LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.JIN_SHU_XIU_FU, 1);
 
             if (!FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(StudioMetalView).FullName, true)) return;
-            ViewManager.Show<StudioMetalView>(new object[] { 0, 0 }, new object[] { typeof(StudioView).FullName, this.viewData });
+            ViewManager.Show<StudioMetalView>(null, new object[] { typeof(StudioView).FullName, this.viewData });
             this.Hide();
         }
         private void OnCliclComFabric()
@@ -88,7 +91,7 @@ namespace GFGGame
             LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.ZHI_WU_XIU_FU, 1);
 
             if (!FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(StudioFabricView).FullName, true)) return;
-            ViewManager.Show<StudioFabricView>(new object[] { 0, 0 }, new object[] { typeof(StudioView).FullName, this.viewData });
+            ViewManager.Show<StudioFabricView>(null, new object[] { typeof(StudioView).FullName, this.viewData });
             this.Hide();
 
         }
@@ -97,7 +100,17 @@ namespace GFGGame
             LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.SHU_HUA_XIU_FU, 1);
 
             if (!FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(StudioPropertyView).FullName, true)) return;
-            ViewManager.Show<StudioPropertyView>(new object[] { 1, 0 }, new object[] { typeof(StudioView).FullName, this.viewData });
+            ViewManager.Show<StudioPropertyView>(null, new object[] { typeof(StudioView).FullName, this.viewData });
+            this.Hide();
+
+        }
+
+        private void OnComPorceLain()
+        {
+            // LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.SHU_HUA_XIU_FU, 1);
+
+            if (!FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(StudioPorcelainView).FullName, true)) return;
+            ViewManager.Show<StudioPorcelainView>(null, new object[] { typeof(StudioView).FullName, this.viewData });
             this.Hide();
 
         }