修改周中活动UI

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_ComBox.cs

@@ -12,12 +12,14 @@ namespace UI.LuckyBox
         public UI_Button3 m_btnPreview;
         public GTextField m_txtOwned;
         public GLoader m_imgActLuckyBox;
-        public UI_ComCost m_comCostOne;
-        public UI_ComCost m_comCostTen;
-        public UI_Button1 m_btnBuyOne;
-        public UI_Button2 m_btnBuyTen;
-        public GImage m_imgSpecial;
+        public UI_ComCost2 m_comCostOne;
+        public UI_ComCost2 m_comCostTen;
+        public GButton m_btnBuyOne;
+        public GButton m_btnBuyTen;
         public GTextField m_txtRemainTimes;
+        public GImage m_imgSpecial;
+        public GGraph m_holder;
+        public GGroup m_grpSpecial;
         public const string URL = "ui://drx9d1usnjmn2p";
         public const string PACKAGE_NAME = "LuckyBox";
         public const string RES_NAME = "ComBox";
@@ -70,12 +72,14 @@ namespace UI.LuckyBox
             m_btnPreview = (UI_Button3)UI_Button3.Create(comp.GetChild("btnPreview"));
             m_txtOwned = (GTextField)comp.GetChild("txtOwned");
             m_imgActLuckyBox = (GLoader)comp.GetChild("imgActLuckyBox");
-            m_comCostOne = (UI_ComCost)UI_ComCost.Create(comp.GetChild("comCostOne"));
-            m_comCostTen = (UI_ComCost)UI_ComCost.Create(comp.GetChild("comCostTen"));
-            m_btnBuyOne = (UI_Button1)UI_Button1.Create(comp.GetChild("btnBuyOne"));
-            m_btnBuyTen = (UI_Button2)UI_Button2.Create(comp.GetChild("btnBuyTen"));
-            m_imgSpecial = (GImage)comp.GetChild("imgSpecial");
+            m_comCostOne = (UI_ComCost2)UI_ComCost2.Create(comp.GetChild("comCostOne"));
+            m_comCostTen = (UI_ComCost2)UI_ComCost2.Create(comp.GetChild("comCostTen"));
+            m_btnBuyOne = (GButton)comp.GetChild("btnBuyOne");
+            m_btnBuyTen = (GButton)comp.GetChild("btnBuyTen");
             m_txtRemainTimes = (GTextField)comp.GetChild("txtRemainTimes");
+            m_imgSpecial = (GImage)comp.GetChild("imgSpecial");
+            m_holder = (GGraph)comp.GetChild("holder");
+            m_grpSpecial = (GGroup)comp.GetChild("grpSpecial");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -90,12 +94,12 @@ namespace UI.LuckyBox
             m_comCostOne = null;
             m_comCostTen.Dispose();
             m_comCostTen = null;
-            m_btnBuyOne.Dispose();
             m_btnBuyOne = null;
-            m_btnBuyTen.Dispose();
             m_btnBuyTen = null;
-            m_imgSpecial = null;
             m_txtRemainTimes = null;
+            m_imgSpecial = null;
+            m_holder = null;
+            m_grpSpecial = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_ComCost2.cs

@@ -0,0 +1,80 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.LuckyBox
+{
+    public partial class UI_ComCost2
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public GLoader m_loaCost;
+        public GTextField m_txtCost;
+        public GTextField m_txtFree;
+        public const string URL = "ui://drx9d1usgfkstqm";
+        public const string PACKAGE_NAME = "LuckyBox";
+        public const string RES_NAME = "ComCost2";
+        private static UI_ComCost2 _proxy;
+
+        public static UI_ComCost2 Create(GObject gObject = null)
+        {
+            var ui = new UI_ComCost2();
+            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_ComCost2 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComCost2();
+            }
+            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_loaCost = (GLoader)comp.GetChild("loaCost");
+            m_txtCost = (GTextField)comp.GetChild("txtCost");
+            m_txtFree = (GTextField)comp.GetChild("txtFree");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_loaCost = null;
+            m_txtCost = null;
+            m_txtFree = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_ComCost2.cs.meta

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

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

@@ -14,17 +14,16 @@ namespace UI.Studio
         public GButton m_btnChange;
         public GLoader m_btnChageLine;
         public GLoader m_loaBg;
-        public GTextField m_txtNum;
-        public GButton m_btnAdd;
-        public GGroup m_grpAdd;
+        public GTextField m_activityTitle;
         public GList m_list;
+        public GButton m_btnReward;
         public GButton m_btnSuit;
         public GTextField m_txtSuitName;
         public GTextField m_txtSuitProgress;
         public GLoader m_suitIcon;
-        public GButton m_btnReward;
         public GTextField m_activityTipText;
-        public GTextField m_activityTitle;
+        public GTextField m_txtNum;
+        public GButton m_btnAdd;
         public const string URL = "ui://xz8kxrecrqo41i";
         public const string PACKAGE_NAME = "Studio";
         public const string RES_NAME = "StudioFilingUI";
@@ -79,17 +78,16 @@ namespace UI.Studio
             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");
+            m_activityTitle = (GTextField)comp.GetChild("activityTitle");
             m_list = (GList)comp.GetChild("list");
+            m_btnReward = (GButton)comp.GetChild("btnReward");
             m_btnSuit = (GButton)comp.GetChild("btnSuit");
             m_txtSuitName = (GTextField)comp.GetChild("txtSuitName");
             m_txtSuitProgress = (GTextField)comp.GetChild("txtSuitProgress");
             m_suitIcon = (GLoader)comp.GetChild("suitIcon");
-            m_btnReward = (GButton)comp.GetChild("btnReward");
             m_activityTipText = (GTextField)comp.GetChild("activityTipText");
-            m_activityTitle = (GTextField)comp.GetChild("activityTitle");
+            m_txtNum = (GTextField)comp.GetChild("txtNum");
+            m_btnAdd = (GButton)comp.GetChild("btnAdd");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -100,17 +98,16 @@ namespace UI.Studio
             m_btnChange = null;
             m_btnChageLine = null;
             m_loaBg = null;
-            m_txtNum = null;
-            m_btnAdd = null;
-            m_grpAdd = null;
+            m_activityTitle = null;
             m_list = null;
+            m_btnReward = null;
             m_btnSuit = null;
             m_txtSuitName = null;
             m_txtSuitProgress = null;
             m_suitIcon = null;
-            m_btnReward = null;
             m_activityTipText = null;
-            m_activityTitle = null;
+            m_txtNum = null;
+            m_btnAdd = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/Utils/ResPathUtil.cs

@@ -194,9 +194,14 @@ namespace GFGGame
             return $"{TEXTURE_DIR_PATH}/LeagueIcon/{res}.{extName}";
         }
 
-        public static string GetStudioFilingPicPath(string res, string extName = "png")
+        public static string GetStudioChapterPicPath(string res, string extName = "png")
         {
             return $"{STUDIO_FILING_DIR_PATH}{"dangan_"}{res}.{extName}";
         }
+
+        public static string GetStudioFilingPicPath(string res, string extName = "png")
+        {
+            return $"{STUDIO_FILING_DIR_PATH}{res}.{extName}";
+        }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/ActivityAfuGift/ActivityAfuGiftView.cs

@@ -107,7 +107,7 @@ namespace GFGGame
         /// </summary>
         private void ProgressAutoLocate()
         {
-            _ui.m_panel.m_scrollPane.target.scrollPane.posX 
+            _ui.m_panel.m_scrollPane.target.scrollPane.posX
                 = (ActivityAfuGiftDataManager.Instance.GetIndexDay() - 1) * (_rewardListUI.GetChildAt(0).width + _rewardListUI.columnGap);
         }
 
@@ -179,7 +179,7 @@ namespace GFGGame
             // 已经到达的日期
             int passDay = ActivityAfuGiftDataManager.Instance.GetIndexDay();
             bool arrive = dayIndex <= passDay;
-            
+
             // 显示锁/遮罩
             if (isVip)
             {
@@ -281,11 +281,19 @@ namespace GFGGame
 
             if (!ActivityAfuGiftDataManager.Instance.GetIsBuy())
             {
-                // 跳转充值画面
-                ReqShopBuy(990005).Coroutine();
+                var activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfoOneByType(ActivityType.AFZL);
+                if (activityInfo != null)
+                {
+                    var cfg = ActivityOpenCfgArray.Instance.GetCfg(activityInfo.ActivityId);
+                    if (cfg.paramsArr != null && cfg.paramsArr.Length > 0)
+                    {
+                        int id = cfg.paramsArr[0];
+                        // 跳转充值画面
+                        ReqShopBuy(id).Coroutine();
+                    }
+                }
                 return;
             }
-
             ActivityAfuGiftProxy.ReqGetAllReward().Coroutine();
         }
 
@@ -316,7 +324,7 @@ namespace GFGGame
             if (ActivityAfuGiftDataManager.Instance.GetIsBuy())
             {
                 // 0-普通 1-变灰
-                 _ui.m_btnGetState.SetSelectedIndex(ActivityAfuGiftDataManager.Instance.HaveCanGetReward() ? 0 : 1);
+                _ui.m_btnGetState.SetSelectedIndex(ActivityAfuGiftDataManager.Instance.HaveCanGetReward() ? 0 : 1);
             }
             // 没有充值，保持常亮
             else

GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxActivityView.cs

@@ -120,17 +120,17 @@ namespace GFGGame
             comBox.m_comCostTen.m_txtCost.text = _luckyBoxCfg.costNumTen.ToString();
             comBox.m_comCostTen.m_loaCost.url = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(_luckyBoxCfg.costID).res);
 
-            if (comBox.m_btnBuyOne.target.data == null)
+            if (comBox.m_btnBuyOne.data == null)
             {
-                comBox.m_btnBuyOne.target.onClick.Add(OnClickBtnBuyOne);
+                comBox.m_btnBuyOne.onClick.Add(OnClickBtnBuyOne);
             }
-            comBox.m_btnBuyOne.target.data = _luckyBoxCfg.id;
+            comBox.m_btnBuyOne.data = _luckyBoxCfg.id;
 
-            if (comBox.m_btnBuyTen.target.data == null)
+            if (comBox.m_btnBuyTen.data == null)
             {
-                comBox.m_btnBuyTen.target.onClick.Add(OnClickBtnBuyTen);
+                comBox.m_btnBuyTen.onClick.Add(OnClickBtnBuyTen);
             }
-            comBox.m_btnBuyTen.target.data = _luckyBoxCfg.id;
+            comBox.m_btnBuyTen.data = _luckyBoxCfg.id;
             if (comBox.m_btnPreview.target.data == null)
             {
                 comBox.m_btnPreview.target.onClick.Add(OnClickBtnPreview);

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

@@ -76,7 +76,7 @@ namespace GFGGame
             UI_ListNpcItem item = UI_ListNpcItem.Proxy(obj);
             bool isPass = InstanceZonesDataManager.CheckLevelPass(cfg.storyLevelId);
             item.m_ComIcon.m_loaIcon.url = ResPathUtil.GetNpcPicSPath(cfg.res);// isPass ? ResPathUtil.GetNpcPicSPath(cfg.res) : ResPathUtil.GetNpcPicSPath(cfg.inRes);
-            item.m_ComIcon.m_loaIcon.url = ResPathUtil.GetStudioFilingPicPath(cfg.res);
+            item.m_ComIcon.m_loaIcon.url = ResPathUtil.GetStudioChapterPicPath(cfg.res);
             item.m_imgLock.visible = !isPass;
             item.m_txtName.text = cfg.name;
             item.m_grpName.visible = isPass;

GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_7!a.png.meta

@@ -1,96 +0,0 @@
-fileFormatVersion: 2
-guid: 0f994053564f4304abc0e5b4edeecf34
-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/LuckyBox/LuckyBox_atlas0_7.png.meta

@@ -1,96 +0,0 @@
-fileFormatVersion: 2
-guid: abdfd110fa08ce9438e2383b2f50e0fa
-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: