工作室修改UI

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

@@ -173,6 +173,12 @@ namespace GFGGame
 
         }
 
+        public List<int> GetFilingRewardList(int id)
+        {
+            StudioData studioData = GetStudioDataById(id);
+            return studioData.RewardsStatus;
+        }
+
 
     }
 }

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

@@ -8,7 +8,7 @@ namespace UI.Studio
     {
         public GComponent target;
         public Controller m_c1;
-        public GLoader m_icon;
+        public GTextField m_name;
         public GImage m_img;
         public const string URL = "ui://xz8kxrecrbxq5";
         public const string PACKAGE_NAME = "Studio";
@@ -58,13 +58,13 @@ namespace UI.Studio
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
-            m_icon = (GLoader)comp.GetChild("icon");
+            m_name = (GTextField)comp.GetChild("name");
             m_img = (GImage)comp.GetChild("img");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
-            m_icon = null;
+            m_name = null;
             m_img = null;
             if(disposeTarget && target != null)
             {

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

@@ -8,14 +8,17 @@ namespace UI.Studio
     {
         public GComponent target;
         public Controller m_c1;
+        public GLoader m_bg0;
+        public GLoader m_bg1;
         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 GLoader m_btnChageLine;
+        public GTextField m_txtTime;
+        public GButton m_btn0;
+        public GButton m_btn1;
+        public GButton m_btn2;
+        public GButton m_btn3;
         public const string URL = "ui://xz8kxrecf2bf2z";
         public const string PACKAGE_NAME = "Studio";
         public const string RES_NAME = "ComProperty";
@@ -64,29 +67,31 @@ namespace UI.Studio
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
+            m_bg0 = (GLoader)comp.GetChild("bg0");
+            m_bg1 = (GLoader)comp.GetChild("bg1");
             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"));
+            m_btnChageLine = (GLoader)comp.GetChild("btnChageLine");
+            m_txtTime = (GTextField)comp.GetChild("txtTime");
+            m_btn0 = (GButton)comp.GetChild("btn0");
+            m_btn1 = (GButton)comp.GetChild("btn1");
+            m_btn2 = (GButton)comp.GetChild("btn2");
+            m_btn3 = (GButton)comp.GetChild("btn3");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
+            m_bg0 = null;
+            m_bg1 = null;
             m_list = null;
             m_txtNum = null;
-            m_txtTime = null;
             m_btnBuy = null;
-            m_btn0.Dispose();
+            m_btnChageLine = null;
+            m_txtTime = null;
             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)
             {

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

@@ -12,6 +12,7 @@ namespace UI.Studio
         public GTextField m_txtName;
         public GGroup m_grpName;
         public GImage m_imgLock;
+        public Transition m_ToLeft;
         public const string URL = "ui://xz8kxrechbio1u";
         public const string PACKAGE_NAME = "Studio";
         public const string RES_NAME = "ListNpcItem";
@@ -64,6 +65,7 @@ namespace UI.Studio
             m_txtName = (GTextField)comp.GetChild("txtName");
             m_grpName = (GGroup)comp.GetChild("grpName");
             m_imgLock = (GImage)comp.GetChild("imgLock");
+            m_ToLeft = comp.GetTransition("ToLeft");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -73,6 +75,7 @@ namespace UI.Studio
             m_txtName = null;
             m_grpName = null;
             m_imgLock = null;
+            m_ToLeft = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -1,71 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-
-namespace UI.Studio
-{
-    public partial class UI_ListPropertyItem
-    {
-        public GButton target;
-        public GLoader m_loaBg;
-        public const string URL = "ui://xz8kxrecn3xhn";
-        public const string PACKAGE_NAME = "Studio";
-        public const string RES_NAME = "ListPropertyItem";
-        private static UI_ListPropertyItem _proxy;
-
-        public static UI_ListPropertyItem Create(GObject gObject = null)
-        {
-            var ui = new UI_ListPropertyItem();
-            if(gObject == null)
-            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
-            else
-            	ui.target =  (GButton)gObject;
-            ui.Init(ui.target);
-            return ui;
-        }
-
-        public static UI_ListPropertyItem Proxy(GObject gObject = null)
-        {
-            if(_proxy == null)
-            {
-                _proxy = new UI_ListPropertyItem();
-            }
-            var ui = _proxy;
-            if(gObject == null)
-            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
-            else
-            	ui.target =  (GButton)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");
-        }
-        public void Dispose(bool disposeTarget = false)
-        {
-            m_loaBg = null;
-            if(disposeTarget && target != null)
-            {
-                target.RemoveFromParent();
-                target.Dispose();
-            }
-            target = null;
-        }
-    }
-}

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

@@ -7,6 +7,7 @@ namespace UI.Studio
     public partial class UI_ListRewardItem
     {
         public GComponent target;
+        public GImage m_canGet;
         public GTextField m_txtDesc;
         public GList m_listReward;
         public const string URL = "ui://xz8kxrecrqo41p";
@@ -56,11 +57,13 @@ namespace UI.Studio
 
         private void Init(GComponent comp)
         {
+            m_canGet = (GImage)comp.GetChild("canGet");
             m_txtDesc = (GTextField)comp.GetChild("txtDesc");
             m_listReward = (GList)comp.GetChild("listReward");
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_canGet = null;
             m_txtDesc = null;
             m_listReward = null;
             if(disposeTarget && target != null)

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Studio/UI_PropertyItem.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_PropertyItem
+    {
+        public GComponent target;
+        public Controller m_star;
+        public GImage m_bg;
+        public GLoader m_loaIcon;
+        public GImage m_lock;
+        public GImage m_imgLock;
+        public GTextField m_txtTitle;
+        public GLoader m_loaBg;
+        public Transition m_test;
+        public const string URL = "ui://xz8kxrecpj8w4j";
+        public const string PACKAGE_NAME = "Studio";
+        public const string RES_NAME = "PropertyItem";
+        private static UI_PropertyItem _proxy;
+
+        public static UI_PropertyItem Create(GObject gObject = null)
+        {
+            var ui = new UI_PropertyItem();
+            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_PropertyItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_PropertyItem();
+            }
+            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_bg = (GImage)comp.GetChild("bg");
+            m_loaIcon = (GLoader)comp.GetChild("loaIcon");
+            m_lock = (GImage)comp.GetChild("lock");
+            m_imgLock = (GImage)comp.GetChild("imgLock");
+            m_txtTitle = (GTextField)comp.GetChild("txtTitle");
+            m_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_test = comp.GetTransition("test");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_star = null;
+            m_bg = null;
+            m_loaIcon = null;
+            m_lock = null;
+            m_imgLock = null;
+            m_txtTitle = null;
+            m_loaBg = null;
+            m_test = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 19cb10eac624157459540ca424f9fb7e
+guid: 354aba8614c5deb489b7100d9fe72d4f
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

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

@@ -8,7 +8,7 @@ namespace UI.Studio
     {
         public GComponent target;
         public Controller m_c1;
-        public GComponent m_loaBg;
+        public GLoader m_loaBg;
         public GTextField m_txtTitle;
         public GTextField m_txtTips;
         public GTextField m_txtNum0;
@@ -17,6 +17,7 @@ namespace UI.Studio
         public GButton m_btnExchange;
         public GComponent m_comCostCurrent;
         public GButton m_btnBuy;
+        public GButton m_btnBack;
         public const string URL = "ui://xz8kxrecn3xhh";
         public const string PACKAGE_NAME = "Studio";
         public const string RES_NAME = "StudioBuyNumUI";
@@ -65,7 +66,7 @@ namespace UI.Studio
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
-            m_loaBg = (GComponent)comp.GetChild("loaBg");
+            m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_txtTitle = (GTextField)comp.GetChild("txtTitle");
             m_txtTips = (GTextField)comp.GetChild("txtTips");
             m_txtNum0 = (GTextField)comp.GetChild("txtNum0");
@@ -74,6 +75,7 @@ namespace UI.Studio
             m_btnExchange = (GButton)comp.GetChild("btnExchange");
             m_comCostCurrent = (GComponent)comp.GetChild("comCostCurrent");
             m_btnBuy = (GButton)comp.GetChild("btnBuy");
+            m_btnBack = (GButton)comp.GetChild("btnBack");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -87,6 +89,7 @@ namespace UI.Studio
             m_btnExchange = null;
             m_comCostCurrent = null;
             m_btnBuy = null;
+            m_btnBack = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -7,9 +7,11 @@ namespace UI.Studio
     public partial class UI_StudioFilingRewardUI
     {
         public GComponent target;
+        public GLoader m_bg;
         public GTextField m_txtScore;
         public GList m_list;
         public GButton m_btnGet;
+        public GButton m_btnBack;
         public const string URL = "ui://xz8kxrecrqo41k";
         public const string PACKAGE_NAME = "Studio";
         public const string RES_NAME = "StudioFilingRewardUI";
@@ -57,15 +59,19 @@ namespace UI.Studio
 
         private void Init(GComponent comp)
         {
+            m_bg = (GLoader)comp.GetChild("bg");
             m_txtScore = (GTextField)comp.GetChild("txtScore");
             m_list = (GList)comp.GetChild("list");
             m_btnGet = (GButton)comp.GetChild("btnGet");
+            m_btnBack = (GButton)comp.GetChild("btnBack");
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_bg = null;
             m_txtScore = null;
             m_list = null;
             m_btnGet = null;
+            m_btnBack = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -7,10 +7,12 @@ namespace UI.Studio
     public partial class UI_StudioFilingUI
     {
         public GComponent target;
-        public GLoader m_loaBg;
+        public GLoader m_Bg;
         public GComponent m_comValueBar;
         public GButton m_btnBack;
         public GButton m_btnChange;
+        public GLoader m_btnChageLine;
+        public GLoader m_loaBg;
         public GTextField m_txtNum;
         public GButton m_btnAdd;
         public GGroup m_grpAdd;
@@ -67,10 +69,12 @@ namespace UI.Studio
 
         private void Init(GComponent comp)
         {
-            m_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_Bg = (GLoader)comp.GetChild("Bg");
             m_comValueBar = (GComponent)comp.GetChild("comValueBar");
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_btnChange = (GButton)comp.GetChild("btnChange");
+            m_btnChageLine = (GLoader)comp.GetChild("btnChageLine");
+            m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_txtNum = (GTextField)comp.GetChild("txtNum");
             m_btnAdd = (GButton)comp.GetChild("btnAdd");
             m_grpAdd = (GGroup)comp.GetChild("grpAdd");
@@ -83,10 +87,12 @@ namespace UI.Studio
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_loaBg = null;
+            m_Bg = null;
             m_comValueBar = null;
             m_btnBack = null;
             m_btnChange = null;
+            m_btnChageLine = null;
+            m_loaBg = null;
             m_txtNum = null;
             m_btnAdd = null;
             m_grpAdd = null;

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

@@ -61,7 +61,7 @@ namespace GFGGame
             base.AddEventListener();
             EventAgent.AddEventListener(ConstMessage.NOTICE_LIMIT_CHANGED, OnLimitChanged);
         }
-        public void AddChildCom(GComponent com)
+        public void AddChildCom(GComponent com,bool isNeedRender = true)
         {
             _ui.target.AddChildAt(com, 1);
 
@@ -69,8 +69,10 @@ namespace GFGGame
             _txtNum = com.GetChild("txtNum").asTextField;
             _txtTime = com.GetChild("txtTime").asTextField;
             _btnBuy = com.GetChild("btnBuy").asButton;
-
-            list.itemRenderer = ListItemRender;
+           if (isNeedRender)
+            {
+                list.itemRenderer = ListItemRender;
+            }
             _btnBuy.onClick.Add(OnCliclBtnBuy);
         }
         protected override void OnShown()

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

@@ -40,6 +40,7 @@ namespace GFGGame
 
             _ui.m_btnExchange.onClick.Add(() => { OnClickBtnBuy(BUY_TYPE_0); });
             _ui.m_btnBuy.onClick.Add(() => { OnClickBtnBuy(BUY_TYPE_1); });
+            _ui.m_btnBack.onClick.Add(this.Hide);
 
         }
         protected override void AddEventListener()
@@ -63,6 +64,7 @@ namespace GFGGame
             _ui.m_c1.selectedIndex = 0;
             _ui.m_txtNum1.visible = false;
             _ui.m_txtNum0.text = string.Format("(今天已兑换{0}/{1}次)", _limitData.BuyTimes, _limitCfg.buyNum);
+            _ui.m_loaBg.url = ResPathUtil.GetCommonGameResPath("ty_tc_s");
 
             List<MonthlyCardPrivilegeCfg> privilegeCfgs = MonthlyCardPrivilegeCfgArray.Instance.GetCfgsByparamsType(1);
             for (int i = 0; i < privilegeCfgs.Count; i++)

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

@@ -3,6 +3,7 @@ using FairyGUI;
 using UI.CommonGame;
 using UI.Studio;
 using UnityEngine;
+using System.Collections.Generic;
 using UI_ListRewardItem = UI.Studio.UI_ListRewardItem;
 
 namespace GFGGame
@@ -10,6 +11,7 @@ namespace GFGGame
     public class StudioFilingRewardView : BaseWindow
     {
         private UI_StudioFilingRewardUI _ui;
+        private List<int> rewardList;
 
         public override void Dispose()
         {
@@ -33,6 +35,7 @@ namespace GFGGame
 
             _ui.m_list.itemRenderer = RenderListItem;
             _ui.m_btnGet.onClick.Add(OnBtnGetClcik);
+            _ui.m_btnBack.onClick.Add(this.Hide);
         }
         protected override void AddEventListener()
         {
@@ -43,7 +46,8 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-            _ui.m_txtScore.text = string.Format("本章评分:{0}", StudioDataManager.Instance.GetStudioDataById(StudioDataManager.Instance.filingChapterId).ChapterScore);
+            _ui.m_bg.url = ResPathUtil.GetCommonGameResPath("ty_tc_s");
+            _ui.m_txtScore.text = string.Format("本章评分: {0}", StudioDataManager.Instance.GetStudioDataById(StudioDataManager.Instance.filingChapterId).ChapterScore);
             UpdateView();
         }
 
@@ -68,6 +72,20 @@ namespace GFGGame
             FilingRewardCfg cfg = FilingRewardCfgArray.Instance.GetCfgsByid(StudioDataManager.Instance.filingChapterId)[index];
             UI_ListRewardItem item = UI_ListRewardItem.Proxy(obj);
             item.m_txtDesc.text = string.Format("总评分达到{0}", cfg.score);
+
+            rewardList = StudioDataManager.Instance.GetFilingRewardList(StudioDataManager.Instance.filingChapterId);
+            if (index < rewardList.Count && rewardList[index] == ConstBonusStatus.CAN_GET)
+            {
+                item.m_canGet.visible = true;
+            }
+            else if (index < rewardList.Count && rewardList[index] == ConstBonusStatus.CAN_NOT_GET)
+            {
+                item.m_canGet.visible = false;
+            }
+            else
+            {
+                item.m_canGet.visible = false;
+            }
             item.m_listReward.data = index;
             item.m_listReward.itemRenderer = RenderListRewardItem;
             item.m_listReward.numItems = cfg.itemsArr.Length;

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

@@ -39,6 +39,9 @@ namespace GFGGame
             isfullScreen = true;
             _valueBarController = new ValueBarController(_ui.m_comValueBar);
 
+            _ui.m_Bg.url = ResPathUtil.GetBgImgPath("bg_fhl");
+            _ui.m_btnChageLine.url = ResPathUtil.GetCommonGameResPath("zsx_fl");
+
             _ui.m_list.itemRenderer = RenderListItem;
 
             _ui.m_btnBack.onClick.Add(GoBackFrom);
@@ -138,11 +141,11 @@ namespace GFGGame
             item.m_txtName.text = _storyLevelCfgs[index].name;
             bool isFight = string.IsNullOrEmpty(_storyLevelCfgs[index].storyStartID);
             string resBg = isFight ? "cyjd_di_1" : "cyjd_di_2";
-            item.m_loaBg.url = string.Format("ui://Studio/{0}", resBg);
+            //item.m_loaBg.url = string.Format("ui://Studio/{0}", resBg);
 
             if (isFight)
             {
-                item.m_loaBg.url = "ui://Studio/cyjd_di_1";
+                //item.m_loaBg.url = "ui://Studio/cyjd_di_1";
                 item.m_loaIcon.visible = false;
                 item.m_loaItem.visible = true;
                 StoryFightCfg storyFightCfg = StoryFightCfgArray.Instance.GetCfg(_storyLevelCfgs[index].fightID);
@@ -157,7 +160,7 @@ namespace GFGGame
             }
             else
             {
-                item.m_loaBg.url = "ui://Studio/cyjd_di_2";
+                //item.m_loaBg.url = "ui://Studio/cyjd_di_2";
                 item.m_loaItem.visible = false;
                 item.m_loaIcon.visible = true;
                 item.m_loaIcon.url = string.Format("ui://Studio/{0}", _studioCfg.res);
@@ -272,17 +275,6 @@ namespace GFGGame
         {
             _ui.m_list.GetChildAt(itemIndex).visible = true;
             UI_ListLevelItem item = UI_ListLevelItem.Proxy(_ui.m_list.GetChildAt(itemIndex));
-            Vector3 position = item.target.position;
-            if (itemIndex % 2 == 0)
-            {
-                //item.m_ToLeft.Play();
-            }
-            else
-            {
-                position.x = 200;
-                item.target.position = position;
-                //item.m_ToRight.Play();
-            }
             item.m_Left.Play();
             itemIndex++;
             UI_ListLevelItem.ProxyEnd();

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

@@ -9,7 +9,10 @@ namespace GFGGame
     public class StudioPropertyView : StudioBaseView
     {
         // private GList _listProperty;
-
+        private GComponent com;
+        private GLoader _bg0;
+        private GLoader _bg1;
+        private GLoader _btnChageLine;
         private Controller _croProperty;
         private int _propertySelectIndex = 0;
         private int firstOpenProperty = -1;//第一个开放的副本（打开界面时，如未选择副本，则默认选中第一个开启的副本）
@@ -25,15 +28,26 @@ namespace GFGGame
             _ui.m_btnBack.onClick.Add(OnClickBtnBack);
             // _ui.m_listProperty.itemRenderer = ListPropertyItemRender;
             // _ui.m_listProperty.onClickItem.Add(OnClickListProperty);
+            com = UIPackage.CreateObject(UI_StudioUI.PACKAGE_NAME, "ComProperty").asCom;
+            //AddChildCom(com, false);
+            //list.itemRenderer = ListItemRender;
+            _croProperty = com.GetController("c1");
+
+            _bg0 = com.GetChild("bg0").asLoader;
+            _bg1 = com.GetChild("bg1").asLoader;
+            _btnChageLine = com.GetChild("btnChageLine").asLoader;
         }
 
         protected override void OnShown()
         {
-            GComponent com = UIPackage.CreateObject(UI_StudioUI.PACKAGE_NAME, "ComProperty").asCom;
-            this.AddChildCom(com);
-            _croProperty = com.GetController("c1");
+            AddChildCom(com, false);
+            list.itemRenderer = ListItemRender;
             _croProperty.onChanged.Add(OnControllerChange);
 
+            _bg0.url = ResPathUtil.GetBgImgPath("bg_fhl");
+            _bg1.url = "ui://Studio/lm_db_chang_2";
+            _btnChageLine.url = ResPathUtil.GetCommonGameResPath("zsx_fl");
+            
             _propertySelectIndex = this.viewData == null ? 0 : (int)this.viewData;
 
             StudioDataManager.Instance.VIEW_NAME = typeof(StudioPropertyView).FullName;
@@ -58,8 +72,10 @@ namespace GFGGame
             list.ScrollToView(curIndex);
 
             Timers.inst.AddUpdate(CheckGuide);
-            base.OnShown();
 
+            
+            base.OnShown();
+            _ui.m_loaBg.visible = false;
         }
 
         protected override void OnHide()
@@ -125,5 +141,30 @@ namespace GFGGame
             GuideController.TryCompleteGuideIndex(ConstGuideId.STUDIO_PROPERTY, 6);
             GuideController.TryCompleteGuide(ConstGuideId.STUDIO_PROPERTY, 6);
         }
+        protected override void ListItemRender(int index, GObject obj)
+        {
+            UI_PropertyItem item = UI_PropertyItem.Proxy(obj);
+            StudioDataManager.Instance.IsCanFight(storyLevelCfgs, index, out bool canFight, out string content);
+
+            ItemData itemData = StoryBonusDataCache.GetBonusData(storyLevelCfgs[index].id).bonusBase[0];
+            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(itemData.id);
+            item.m_loaIcon.url = ResPathUtil.GetIconPath(itemCfg);
+            item.m_star.selectedIndex = InstanceZonesDataManager.GetStarCountHistory(storyLevelCfgs[index].id);
+            item.m_imgLock.visible = canFight ? false : true;
+            item.m_lock.visible = canFight ? false : true;
+            item.m_txtTitle.text = canFight ? storyLevelCfgs[index].name : content;
+            if (canFight) curIndex = index;
+            if (item.m_loaIcon.data == null)
+            {
+                item.m_loaIcon.onClick.Add(OnLoaItemClick);
+            }
+            item.m_loaIcon.data = index;
+            if (item.m_loaBg.data == null)
+            {
+                item.m_loaBg.onClick.Add(OnCliclListItem);
+            }
+            item.m_loaBg.data = index;
+            UI_PropertyItem.ProxyEnd();
+        }
     }
 }

GameClient/Assets/ResIn/UI/Studio/Studio_atlas0_3!a.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 6d10296cca273b44ca26f55011c3b064
+guid: 895ffd5a0537c3b4a8688dbe83f7ec1c
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

GameClient/Assets/ResIn/UI/Studio/Studio_atlas0_3.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 814cf7c198e170c4b8edca875d5a6754
+guid: ddcb539da2982954ab1d65d2f9387f6b
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}