工作室剩余UI替换

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

@@ -7,10 +7,13 @@ namespace UI.Studio
     public partial class UI_ComFabric
     {
         public GComponent target;
+        public GLoader m_loaBg;
+        public GLoader m_btnChageLine;
         public GList m_list;
         public GTextField m_txtNum;
         public GTextField m_txtTime;
         public GButton m_btnBuy;
+        public GTextField m_Name;
         public const string URL = "ui://xz8kxrecf2bf30";
         public const string PACKAGE_NAME = "Studio";
         public const string RES_NAME = "ComFabric";
@@ -58,17 +61,23 @@ namespace UI.Studio
 
         private void Init(GComponent comp)
         {
+            m_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_btnChageLine = (GLoader)comp.GetChild("btnChageLine");
             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_Name = (GTextField)comp.GetChild("Name");
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_loaBg = null;
+            m_btnChageLine = null;
             m_list = null;
             m_txtNum = null;
             m_txtTime = null;
             m_btnBuy = null;
+            m_Name = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -8,11 +8,12 @@ namespace UI.Studio
     {
         public GComponent target;
         public GLoader m_loaBg;
+        public GLoader m_btnChageLine;
         public GList m_list;
         public GTextField m_txtTime;
         public GTextField m_txtNum;
         public GButton m_btnBuy;
-        public GLoader m_loaScore;
+        public GTextField m_loaName;
         public const string URL = "ui://xz8kxrecf2bf2w";
         public const string PACKAGE_NAME = "Studio";
         public const string RES_NAME = "ComPorcelain";
@@ -61,20 +62,22 @@ namespace UI.Studio
         private void Init(GComponent comp)
         {
             m_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_btnChageLine = (GLoader)comp.GetChild("btnChageLine");
             m_list = (GList)comp.GetChild("list");
             m_txtTime = (GTextField)comp.GetChild("txtTime");
             m_txtNum = (GTextField)comp.GetChild("txtNum");
             m_btnBuy = (GButton)comp.GetChild("btnBuy");
-            m_loaScore = (GLoader)comp.GetChild("loaScore");
+            m_loaName = (GTextField)comp.GetChild("loaName");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_loaBg = null;
+            m_btnChageLine = null;
             m_list = null;
             m_txtTime = null;
             m_txtNum = null;
             m_btnBuy = null;
-            m_loaScore = null;
+            m_loaName = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -12,6 +12,7 @@ namespace UI.Studio
         public GLoader m_loaIcon;
         public GImage m_imgLock;
         public GTextField m_txtTitle;
+        public GImage m_imgLockBg;
         public Transition m_test;
         public const string URL = "ui://xz8kxrecn3xha";
         public const string PACKAGE_NAME = "Studio";
@@ -65,6 +66,7 @@ namespace UI.Studio
             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_test = comp.GetTransition("test");
         }
         public void Dispose(bool disposeTarget = false)
@@ -74,6 +76,7 @@ namespace UI.Studio
             m_loaIcon = null;
             m_imgLock = null;
             m_txtTitle = null;
+            m_imgLockBg = null;
             m_test = null;
             if(disposeTarget && target != null)
             {

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

@@ -13,6 +13,7 @@ namespace UI.Studio
         public GLoader m_loaName;
         public GTextField m_txtName;
         public GLoader m_loaIcon;
+        public GImage m_imgLockBg;
         public GImage m_imgLock;
         public Transition m_test;
         public const string URL = "ui://xz8kxrecf2bf2x";
@@ -68,6 +69,7 @@ namespace UI.Studio
             m_loaName = (GLoader)comp.GetChild("loaName");
             m_txtName = (GTextField)comp.GetChild("txtName");
             m_loaIcon = (GLoader)comp.GetChild("loaIcon");
+            m_imgLockBg = (GImage)comp.GetChild("imgLockBg");
             m_imgLock = (GImage)comp.GetChild("imgLock");
             m_test = comp.GetTransition("test");
         }
@@ -79,6 +81,7 @@ namespace UI.Studio
             m_loaName = null;
             m_txtName = null;
             m_loaIcon = null;
+            m_imgLockBg = null;
             m_imgLock = null;
             m_test = null;
             if(disposeTarget && target != null)

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

@@ -80,7 +80,7 @@ namespace GFGGame
             base.OnShown();
             _valueBarController.OnShown();
             // _valueBarController.Controller(1);
-            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("gzs_bjbj");
+            //_ui.m_loaBg.url = ResPathUtil.GetBgImgPath("gzs_bjbj");
 
             //add by zyq
             UpdateItem();
@@ -146,6 +146,10 @@ namespace GFGGame
             item.m_loaIcon.url = 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;
             if (canFight) curIndex = index;
             if (item.m_loaIcon.data == null)

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

@@ -33,6 +33,10 @@ namespace GFGGame
             list.ScrollToView(curIndex);
             base.OnShown();
 
+            com.GetChild("loaBg").asLoader.url = ResPathUtil.GetBgImgPath("bg_fhl");
+            com.GetChild("Name").asTextField.text = "织物修复";
+            com.GetChild("btnChageLine").asLoader.url = ResPathUtil.GetCommonGameResPath("zsx_fl");
+            com.height = _ui.target.height;
 
         }
 

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

@@ -33,7 +33,12 @@ 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("btnChageLine").asLoader.url = ResPathUtil.GetCommonGameResPath("zsx_fl");
+
             base.OnShown();
+            com.height = _ui.target.height;
         }
 
         protected override void OnHide()

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

@@ -9,6 +9,7 @@ namespace GFGGame
     public class StudioPorcelainView : StudioBaseView
     {
         private GComponent _comPorcelain;
+        private string[] porcelainTheme = new string[]{"风","花","雪","月"};
         public override void Dispose()
         {
             base.Dispose();
@@ -30,16 +31,18 @@ namespace GFGGame
         {
             _comPorcelain = UIPackage.CreateObject(UI_StudioUI.PACKAGE_NAME, "ComPorcelain").asCom;
             AddChildCom(_comPorcelain);
-            _comPorcelain.GetChild("loaBg").asLoader.url = ResPathUtil.GetBgImgPath("hz_bjbj");
+            _comPorcelain.GetChild("loaBg").asLoader.url = ResPathUtil.GetBgImgPath("bg_fhl");
 
             StudioDataManager.Instance.VIEW_NAME = typeof(StudioPorcelainView).FullName;
             this._studioCfg = StudioCfgArray.Instance.GetCfgsByfunId(typeof(StudioPorcelainView).Name)[StudioDataManager.Instance.PorcelainTheme - 1];
             this.storyLevelCfgs = StoryLevelCfgArray.Instance.GetCfgsBytypeAndsubTypeAndchapterId(this._studioCfg.type, this._studioCfg.subType, this._studioCfg.id);
 
-            _comPorcelain.GetChild("loaScore").asLoader.url = string.Format("ui://Studio/cqxf_zdqh_{0}", StudioDataManager.Instance.PorcelainTheme);
+            //_comPorcelain.GetChild("loaScore").asLoader.url = string.Format("ui://Studio/cqxf_zdqh_{0}", StudioDataManager.Instance.PorcelainTheme);
             list.numItems = this.storyLevelCfgs.Count;
             list.ScrollToView(curIndex);
 
+            _comPorcelain.GetChild("btnChageLine").asLoader.url = ResPathUtil.GetCommonGameResPath("zsx_fl");
+            _comPorcelain.GetChild("loaName").asTextField.text = porcelainTheme[StudioDataManager.Instance.PorcelainTheme-1];
             base.OnShown();
             _comPorcelain.height = _ui.target.height;
 

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

@@ -1,96 +0,0 @@
-fileFormatVersion: 2
-guid: 7dab36fb97997d94bb3e31e835455519
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 11
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 1
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 1
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 1
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-  spritePackingTag: 
-  pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

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

@@ -1,96 +0,0 @@
-fileFormatVersion: 2
-guid: 13d3743513874c547be3c2c8a28534e4
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 11
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 1
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 1
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 1
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-  spritePackingTag: 
-  pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: