Browse Source

工作室UI修改

zhangyuqian 1 year ago
parent
commit
801d2502ba
27 changed files with 79 additions and 137 deletions
  1. 1 1
      GameClient/Assets/Game/HotUpdate/Data/StudioDataManager.cs
  2. 6 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ListLevelItem.cs
  3. 8 2
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Studio/UI_ComFabric.cs
  4. 12 3
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Studio/UI_ComPorcelain.cs
  5. 9 3
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Studio/UI_ComProperty.cs
  6. 3 3
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Studio/UI_ListItem.cs
  7. 3 3
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Studio/UI_ListPorcelainItem.cs
  8. 0 92
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Studio/UI_PropertyItem.cs
  9. 0 11
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Studio/UI_PropertyItem.cs.meta
  10. 16 2
      GameClient/Assets/Game/HotUpdate/Views/Studio/StudioBaseView.cs
  11. 2 2
      GameClient/Assets/Game/HotUpdate/Views/Studio/StudioFabricView.cs
  12. 9 5
      GameClient/Assets/Game/HotUpdate/Views/Studio/StudioFilingView.cs
  13. 2 2
      GameClient/Assets/Game/HotUpdate/Views/Studio/StudioMetalView.cs
  14. 2 2
      GameClient/Assets/Game/HotUpdate/Views/Studio/StudioPorcelainView.cs
  15. 6 6
      GameClient/Assets/Game/HotUpdate/Views/Studio/StudioPropertyView.cs
  16. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0!a.png
  17. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0.png
  18. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_1!a.png
  19. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_1.png
  20. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_2!a.png
  21. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_2.png
  22. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_fui.bytes
  23. BIN
      GameClient/Assets/ResIn/UI/Studio/Studio_atlas0!a.png
  24. BIN
      GameClient/Assets/ResIn/UI/Studio/Studio_atlas0.png
  25. BIN
      GameClient/Assets/ResIn/UI/Studio/Studio_atlas0_1!a.png
  26. BIN
      GameClient/Assets/ResIn/UI/Studio/Studio_atlas0_1.png
  27. BIN
      GameClient/Assets/ResIn/UI/Studio/Studio_fui.bytes

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Data/StudioDataManager.cs

@@ -81,7 +81,7 @@ namespace GFGGame
             }
             content = "";
             if (!isRoleLv) content = string.Format("主角等级达到{0}级解锁", storyLevelCfg.needRoleLv);
-            if (!isLastPast) content = string.Format("需通关{0}", storyLevelCfgs[index - 1].name);
+            if (!isLastPast) content = "需通关前置关卡";
             StoryLevelCfg needStoryLevelCfg = StoryLevelCfgArray.Instance.GetCfg(storyLevelCfg.needStoryLevelId);
             if (!isPass) content = string.Format("完成主线{0}-{1}解锁", needStoryLevelCfg.chapterId, needStoryLevelCfg.order);
             canFight = isPass && isRoleLv && isLastPast;

+ 6 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ListLevelItem.cs

@@ -8,6 +8,7 @@ namespace UI.CommonGame
     {
         public GComponent target;
         public Controller m_c1;
+        public Controller m_c2;
         public GLoader m_loaBg;
         public GLoader m_loaIcon;
         public GLoader m_loaItem;
@@ -16,6 +17,7 @@ namespace UI.CommonGame
         public GImage m_imgLockBg;
         public GImage m_imgLock;
         public GGroup m_grpLock;
+        public GGroup m_flow;
         public GGroup m_Panel;
         public Transition m_ToLeft;
         public Transition m_ToRight;
@@ -68,6 +70,7 @@ namespace UI.CommonGame
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
+            m_c2 = comp.GetController("c2");
             m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_loaIcon = (GLoader)comp.GetChild("loaIcon");
             m_loaItem = (GLoader)comp.GetChild("loaItem");
@@ -76,6 +79,7 @@ namespace UI.CommonGame
             m_imgLockBg = (GImage)comp.GetChild("imgLockBg");
             m_imgLock = (GImage)comp.GetChild("imgLock");
             m_grpLock = (GGroup)comp.GetChild("grpLock");
+            m_flow = (GGroup)comp.GetChild("flow");
             m_Panel = (GGroup)comp.GetChild("Panel");
             m_ToLeft = comp.GetTransition("ToLeft");
             m_ToRight = comp.GetTransition("ToRight");
@@ -84,6 +88,7 @@ namespace UI.CommonGame
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
+            m_c2 = null;
             m_loaBg = null;
             m_loaIcon = null;
             m_loaItem = null;
@@ -93,6 +98,7 @@ namespace UI.CommonGame
             m_imgLockBg = null;
             m_imgLock = null;
             m_grpLock = null;
+            m_flow = null;
             m_Panel = null;
             m_ToLeft = null;
             m_ToRight = null;

+ 8 - 2
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Studio/UI_ComFabric.cs

@@ -13,7 +13,9 @@ namespace UI.Studio
         public GTextField m_txtNum;
         public GTextField m_txtTime;
         public GButton m_btnBuy;
-        public GTextField m_Name;
+        public GLoader m_Name;
+        public GLoader m_icon;
+        public GGroup m_iconBtn;
         public const string URL = "ui://xz8kxrecf2bf30";
         public const string PACKAGE_NAME = "Studio";
         public const string RES_NAME = "ComFabric";
@@ -67,7 +69,9 @@ namespace UI.Studio
             m_txtNum = (GTextField)comp.GetChild("txtNum");
             m_txtTime = (GTextField)comp.GetChild("txtTime");
             m_btnBuy = (GButton)comp.GetChild("btnBuy");
-            m_Name = (GTextField)comp.GetChild("Name");
+            m_Name = (GLoader)comp.GetChild("Name");
+            m_icon = (GLoader)comp.GetChild("icon");
+            m_iconBtn = (GGroup)comp.GetChild("iconBtn");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -78,6 +82,8 @@ namespace UI.Studio
             m_txtTime = null;
             m_btnBuy = null;
             m_Name = null;
+            m_icon = null;
+            m_iconBtn = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 12 - 3
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Studio/UI_ComPorcelain.cs

@@ -10,10 +10,13 @@ namespace UI.Studio
         public GLoader m_loaBg;
         public GLoader m_btnChageLine;
         public GList m_list;
+        public GTextField m_loaName;
         public GTextField m_txtTime;
+        public GLoader m_titleIcon;
         public GTextField m_txtNum;
         public GButton m_btnBuy;
-        public GTextField m_loaName;
+        public GLoader m_icon;
+        public GGroup m_iconBtn;
         public const string URL = "ui://xz8kxrecf2bf2w";
         public const string PACKAGE_NAME = "Studio";
         public const string RES_NAME = "ComPorcelain";
@@ -64,20 +67,26 @@ namespace UI.Studio
             m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_btnChageLine = (GLoader)comp.GetChild("btnChageLine");
             m_list = (GList)comp.GetChild("list");
+            m_loaName = (GTextField)comp.GetChild("loaName");
             m_txtTime = (GTextField)comp.GetChild("txtTime");
+            m_titleIcon = (GLoader)comp.GetChild("titleIcon");
             m_txtNum = (GTextField)comp.GetChild("txtNum");
             m_btnBuy = (GButton)comp.GetChild("btnBuy");
-            m_loaName = (GTextField)comp.GetChild("loaName");
+            m_icon = (GLoader)comp.GetChild("icon");
+            m_iconBtn = (GGroup)comp.GetChild("iconBtn");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_loaBg = null;
             m_btnChageLine = null;
             m_list = null;
+            m_loaName = null;
             m_txtTime = null;
+            m_titleIcon = null;
             m_txtNum = null;
             m_btnBuy = null;
-            m_loaName = null;
+            m_icon = null;
+            m_iconBtn = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 9 - 3
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Studio/UI_ComProperty.cs

@@ -12,12 +12,14 @@ namespace UI.Studio
         public GList m_list;
         public GTextField m_txtNum;
         public GButton m_btnBuy;
-        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 GLoader m_btnChageLine;
+        public GLoader m_icon;
+        public GGroup m_iconBtn;
         public const string URL = "ui://xz8kxrecf2bf2z";
         public const string PACKAGE_NAME = "Studio";
         public const string RES_NAME = "ComProperty";
@@ -70,12 +72,14 @@ namespace UI.Studio
             m_list = (GList)comp.GetChild("list");
             m_txtNum = (GTextField)comp.GetChild("txtNum");
             m_btnBuy = (GButton)comp.GetChild("btnBuy");
-            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");
+            m_btnChageLine = (GLoader)comp.GetChild("btnChageLine");
+            m_icon = (GLoader)comp.GetChild("icon");
+            m_iconBtn = (GGroup)comp.GetChild("iconBtn");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -84,12 +88,14 @@ namespace UI.Studio
             m_list = null;
             m_txtNum = null;
             m_btnBuy = null;
-            m_btnChageLine = null;
             m_txtTime = null;
             m_btn0 = null;
             m_btn1 = null;
             m_btn2 = null;
             m_btn3 = null;
+            m_btnChageLine = null;
+            m_icon = null;
+            m_iconBtn = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 3 - 3
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Studio/UI_ListItem.cs

@@ -10,9 +10,9 @@ namespace UI.Studio
         public Controller m_star;
         public GLoader m_loaBg;
         public GLoader m_loaIcon;
-        public GImage m_imgLock;
         public GTextField m_txtTitle;
         public GImage m_imgLockBg;
+        public GImage m_imgLock;
         public Transition m_test;
         public const string URL = "ui://xz8kxrecn3xha";
         public const string PACKAGE_NAME = "Studio";
@@ -64,9 +64,9 @@ namespace UI.Studio
             m_star = comp.GetController("star");
             m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_loaIcon = (GLoader)comp.GetChild("loaIcon");
-            m_imgLock = (GImage)comp.GetChild("imgLock");
             m_txtTitle = (GTextField)comp.GetChild("txtTitle");
             m_imgLockBg = (GImage)comp.GetChild("imgLockBg");
+            m_imgLock = (GImage)comp.GetChild("imgLock");
             m_test = comp.GetTransition("test");
         }
         public void Dispose(bool disposeTarget = false)
@@ -74,9 +74,9 @@ namespace UI.Studio
             m_star = null;
             m_loaBg = null;
             m_loaIcon = null;
-            m_imgLock = null;
             m_txtTitle = null;
             m_imgLockBg = null;
+            m_imgLock = null;
             m_test = null;
             if(disposeTarget && target != null)
             {

+ 3 - 3
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Studio/UI_ListPorcelainItem.cs

@@ -13,8 +13,8 @@ namespace UI.Studio
         public GTextField m_txtName;
         public GLoader m_loaIcon;
         public GLoader m_loaBg;
-        public GImage m_imgLockBg;
         public GImage m_imgLock;
+        public GImage m_imgLockBg;
         public Transition m_test;
         public const string URL = "ui://xz8kxrecf2bf2x";
         public const string PACKAGE_NAME = "Studio";
@@ -69,8 +69,8 @@ namespace UI.Studio
             m_txtName = (GTextField)comp.GetChild("txtName");
             m_loaIcon = (GLoader)comp.GetChild("loaIcon");
             m_loaBg = (GLoader)comp.GetChild("loaBg");
-            m_imgLockBg = (GImage)comp.GetChild("imgLockBg");
             m_imgLock = (GImage)comp.GetChild("imgLock");
+            m_imgLockBg = (GImage)comp.GetChild("imgLockBg");
             m_test = comp.GetTransition("test");
         }
         public void Dispose(bool disposeTarget = false)
@@ -81,8 +81,8 @@ namespace UI.Studio
             m_txtName = null;
             m_loaIcon = null;
             m_loaBg = null;
-            m_imgLockBg = null;
             m_imgLock = null;
+            m_imgLockBg = null;
             m_test = null;
             if(disposeTarget && target != null)
             {

+ 0 - 92
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Studio/UI_PropertyItem.cs

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

+ 0 - 11
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Studio/UI_PropertyItem.cs.meta

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

+ 16 - 2
GameClient/Assets/Game/HotUpdate/Views/Studio/StudioBaseView.cs

@@ -14,11 +14,13 @@ namespace GFGGame
         private GTextField _txtTime;
         private GTextField _txtNum;
         private GButton _btnBuy;
+        private GLoader _icon;
         private int _time = 0;
 
         protected StudioCfg _studioCfg;
         protected List<StoryLevelCfg> storyLevelCfgs;
         protected int curIndex = 0;
+        protected List<string> indexString = new List<string>{"gzs_fb_wz_yi","gzs_fb_wz_er","gzs_fb_wz_san","gzs_fb_wz_si","gzs_fb_wz_wu"};
 
         public override void Dispose()
         {
@@ -70,11 +72,13 @@ namespace GFGGame
             _txtNum = com.GetChild("txtNum").asTextField;
             _txtTime = com.GetChild("txtTime").asTextField;
             _btnBuy = com.GetChild("btnBuy").asButton;
+            _icon = com.GetChild("icon").asLoader;
            if (isNeedRender)
             {
                 list.itemRenderer = ListItemRender;
             }
             _btnBuy.onClick.Add(OnCliclBtnBuy);
+            _icon.onClick.Add(OnIconBtnClick);
         }
         protected override void OnShown()
         {
@@ -124,6 +128,9 @@ namespace GFGGame
             var limitData = RoleLimitDataManager.GetLimitData(this._studioCfg.limit);
             _txtNum.text = string.Format("剩余次数:{0}/{1}", limitData.TotalPlayMax - limitData.PlayTimes,
                 limitData.MaxStorageCount);
+            ItemData itemData = StoryBonusDataCache.GetBonusData(storyLevelCfgs[0].id).bonusBase[0];
+            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(itemData.id);
+            _icon.url = ResPathUtil.GetIconPath(itemCfg);
         }
 
         private void UpdateView(int limitId)
@@ -144,14 +151,14 @@ namespace GFGGame
 
             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_loaIcon.url = string.Format("ui://Studio/{0}",indexString[index]);//ResPathUtil.GetIconPath(itemCfg);
             item.m_star.selectedIndex = InstanceZonesDataManager.GetStarCountHistory(storyLevelCfgs[index].id);
             item.m_imgLock.visible = canFight ? false : true;
             if (item.m_imgLockBg != null)
             {
                 item.m_imgLockBg.visible = canFight ? false : true;
             }
-            item.m_txtTitle.text = canFight ? storyLevelCfgs[index].name : content;
+            item.m_txtTitle.text = storyLevelCfgs[index].name;//: content;
             if (canFight) curIndex = index;
             if (item.m_loaIcon.data == null)
             {
@@ -189,6 +196,13 @@ namespace GFGGame
             GoodsItemTipsController.ShowItemTips(itemCfg.id);
         }
 
+        public void OnIconBtnClick()
+        {
+            ItemData itemData = StoryBonusDataCache.GetBonusData(storyLevelCfgs[0].id).bonusBase[0];
+            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(itemData.id);
+            GoodsItemTipsController.ShowItemTips(itemCfg.id);
+        }
+
         private void OnCliclBtnBuy()
         {
             ViewManager.Show<StudioBuyNumView>(this._studioCfg.limit);

+ 2 - 2
GameClient/Assets/Game/HotUpdate/Views/Studio/StudioFabricView.cs

@@ -33,8 +33,8 @@ namespace GFGGame
             list.ScrollToView(curIndex);
             base.OnShown();
 
-            com.GetChild("loaBg").asLoader.url = ResPathUtil.GetBgImgPath("bg_fhl");
-            com.GetChild("Name").asTextField.text = "织物修复";
+            com.GetChild("loaBg").asLoader.url = ResPathUtil.GetBgImgPath("gzs_fb_bg");
+            com.GetChild("Name").asLoader.url = "ui://Studio/gzs_fb_bt_zwxf";
             com.GetChild("btnChageLine").asLoader.url = ResPathUtil.GetCommonGameResPath("zsx_fl");
             com.height = _ui.target.height;
 

+ 9 - 5
GameClient/Assets/Game/HotUpdate/Views/Studio/StudioFilingView.cs

@@ -15,6 +15,7 @@ namespace GFGGame
         private List<StoryLevelCfg> _storyLevelCfgs;
         private int _viewData = 0;
         private int itemIndex = 0;
+        private List<string> nameString = new List<string> { "壹", "贰", "叁", "肆", "伍" };
 
         public override void Dispose()
         {
@@ -41,7 +42,7 @@ namespace GFGGame
             isReturnView = true;
             _valueBarController = new ValueBarController(_ui.m_comValueBar);
 
-            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("bg_fhl");
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("gzs_fb_bg");
             _ui.m_btnChageLine.url = ResPathUtil.GetCommonGameResPath("zsx_fl");
 
             _ui.m_list.itemRenderer = RenderListItem;
@@ -116,7 +117,7 @@ namespace GFGGame
             var limitCfg = LimitCfgArray.Instance.GetCfg(this._studioCfg.limit);
             _ui.m_btnAdd.visible = limitCfg.itemID > 0;
             _ui.m_role.url = ResPathUtil.GetStudioFilingPicPath(_studioCfg.res); //ResPathUtil.GetBgImgPath(_studioCfg.res);
-            _ui.m_btnChange.title = _studioCfg.name;
+            _ui.m_btnChange.icon = "ui://Studio/gzs_" + _studioCfg.res;
             _ui.m_txtNum.text = string.Format("剩余次数:{0}/{1}", limitData.TotalPlayMax - limitData.PlayTimes, limitData.MaxStorageCount);
 
             _ui.m_type.SetSelectedIndex(0);
@@ -139,7 +140,7 @@ namespace GFGGame
             // int _index = _storyLevelCfgs.Count - index - 1;
             UI_ListLevelItem item = UI_ListLevelItem.Proxy(obj);
             //item.m_c1.selectedIndex = index % 2 == 0 ? 0 : 1;
-            item.m_txtName.text = _storyLevelCfgs[index].name;
+            item.m_txtName.text = _storyLevelCfgs[index].name + "-" + nameString[index];
             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);
@@ -147,6 +148,7 @@ namespace GFGGame
             if (isFight)
             {
                 //item.m_loaBg.url = "ui://Studio/cyjd_di_1";
+                item.m_flow.visible = true;
                 item.m_loaIcon.visible = false;
                 item.m_loaItem.visible = true;
                 StoryFightCfg storyFightCfg = StoryFightCfgArray.Instance.GetCfg(_storyLevelCfgs[index].fightID);
@@ -162,12 +164,14 @@ namespace GFGGame
             else
             {
                 //item.m_loaBg.url = "ui://Studio/cyjd_di_2";
+                item.m_flow.visible = false;
                 item.m_loaItem.visible = false;
                 item.m_loaIcon.visible = true;
                 item.m_loaIcon.url = string.Format("ui://Studio/{0}", _studioCfg.res);
             }
             item.m_grpLock.visible = index > 0 && !InstanceZonesDataManager.CheckLevelPass(_storyLevelCfgs[index - 1].id);
-            item.m_comFlower.m_c1.selectedIndex = InstanceZonesDataManager.GetStarCountHistory(_storyLevelCfgs[index].id);
+            item.m_comFlower.m_c1.selectedIndex = 0;//InstanceZonesDataManager.GetStarCountHistory(_storyLevelCfgs[index].id);
+            item.m_c2.selectedIndex = InstanceZonesDataManager.GetStarCountHistory(_storyLevelCfgs[index].id);
             if (item.m_loaBg.data == null)
             {
                 item.m_loaBg.onClick.Add(OnListItemClick);
@@ -239,7 +243,7 @@ namespace GFGGame
         private void UpdateRedDot()
         {
             RedDotController.Instance.SetComRedDot(_ui.m_btnReward, StudioDataManager.Instance.GetFilingRewardState(StudioDataManager.Instance.filingChapterId));
-            RedDotController.Instance.SetComRedDot(_ui.m_btnChange, RedDotDataManager.Instance.GetStudioFilingRed(false));
+            RedDotController.Instance.SetComRedDot(_ui.m_btnChange, RedDotDataManager.Instance.GetStudioFilingRed(false),"",-27);
         }
 
         private void CheckGuide(object param)

+ 2 - 2
GameClient/Assets/Game/HotUpdate/Views/Studio/StudioMetalView.cs

@@ -33,8 +33,8 @@ namespace GFGGame
             list.numItems = this.storyLevelCfgs.Count;
             list.ScrollToView(curIndex);
 
-            com.GetChild("loaBg").asLoader.url = ResPathUtil.GetBgImgPath("bg_fhl");
-            com.GetChild("Name").asTextField.text = "金属修复";
+            com.GetChild("loaBg").asLoader.url = ResPathUtil.GetBgImgPath("gzs_fb_bg");
+            com.GetChild("Name").asLoader.url = "ui://Studio/gzs_fb_bt_jsxf";
             com.GetChild("btnChageLine").asLoader.url = ResPathUtil.GetCommonGameResPath("zsx_fl");
 
             base.OnShown();

+ 2 - 2
GameClient/Assets/Game/HotUpdate/Views/Studio/StudioPorcelainView.cs

@@ -31,7 +31,7 @@ namespace GFGGame
         {
             _comPorcelain = UIPackage.CreateObject(UI_StudioUI.PACKAGE_NAME, "ComPorcelain").asCom;
             AddChildCom(_comPorcelain);
-            _comPorcelain.GetChild("loaBg").asLoader.url = ResPathUtil.GetBgImgPath("bg_fhl");
+            _comPorcelain.GetChild("loaBg").asLoader.url = ResPathUtil.GetBgImgPath("gzs_fb_bg");
 
             StudioDataManager.Instance.VIEW_NAME = typeof(StudioPorcelainView).FullName;
             this._studioCfg = StudioCfgArray.Instance.GetCfgsByfunId(typeof(StudioPorcelainView).Name)[StudioDataManager.Instance.PorcelainTheme - 1];
@@ -59,7 +59,7 @@ namespace GFGGame
             base.ListItemRender(index, obj);
             UI_ListPorcelainItem item = UI_ListPorcelainItem.Proxy(obj);
             // item.m_loaName.url = string.Format("ui://Studio/cwxf_zidi_{0}", index + 1);
-            item.m_txtName.text = string.Format("书简修复-{0}", index + 1);
+            item.m_txtName.text = "书简修复";
             UI_ListPorcelainItem.ProxyEnd();
         }
         private void OnClickBtnBack()

+ 6 - 6
GameClient/Assets/Game/HotUpdate/Views/Studio/StudioPropertyView.cs

@@ -44,7 +44,7 @@ namespace GFGGame
             list.itemRenderer = ListItemRender;
             _croProperty.onChanged.Add(OnControllerChange);
 
-            _bg0.url = ResPathUtil.GetBgImgPath("bg_fhl");
+            _bg0.url = ResPathUtil.GetBgImgPath("gzs_fb_bg");
             //_bg1.url = "ui://Studio/lm_db_chang_2";
             _btnChageLine.url = ResPathUtil.GetCommonGameResPath("zsx_fl");
             
@@ -144,16 +144,16 @@ namespace GFGGame
         }
         protected override void ListItemRender(int index, GObject obj)
         {
-            UI_PropertyItem item = UI_PropertyItem.Proxy(obj);
+            UI_ListPorcelainItem item = UI_ListPorcelainItem.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_loaIcon.url = string.Format("ui://Studio/{0}", indexString[index]);//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;
+            item.m_imgLockBg.visible = canFight ? false : true;
+            item.m_txtName.text = storyLevelCfgs[index].name;
             if (canFight) curIndex = index;
             if (item.m_loaIcon.data == null)
             {
@@ -165,7 +165,7 @@ namespace GFGGame
                 item.m_loaBg.onClick.Add(OnCliclListItem);
             }
             item.m_loaBg.data = index;
-            UI_PropertyItem.ProxyEnd();
+            UI_ListPorcelainItem.ProxyEnd();
         }
     }
 }

BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0!a.png


BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0.png


BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_1!a.png


BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_1.png


BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_2!a.png


BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_2.png


BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_fui.bytes


BIN
GameClient/Assets/ResIn/UI/Studio/Studio_atlas0!a.png


BIN
GameClient/Assets/ResIn/UI/Studio/Studio_atlas0.png


BIN
GameClient/Assets/ResIn/UI/Studio/Studio_atlas0_1!a.png


BIN
GameClient/Assets/ResIn/UI/Studio/Studio_atlas0_1.png


BIN
GameClient/Assets/ResIn/UI/Studio/Studio_fui.bytes