添加阳春花蔓部分逻辑

补充阿福赠礼的主界面时间显示

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityThemeLuckyBox/UI_ActivityThemeLuckyBoxUI.cs

@@ -10,13 +10,15 @@ namespace UI.ActivityThemeLuckyBox
         public Controller m_c1;
         public GLoader m_loaBg;
         public GButton m_btnBack;
-        public GButton m_btnChapter;
-        public GButton m_btnTask;
-        public GButton m_btnShop;
+        public UI_Button1 m_btnChapter;
+        public UI_Button1 m_btnTask;
+        public UI_Button1 m_btnShop;
         public GTextField m_timeDesc;
         public GTextField m_txtTime;
         public GButton m_btnLuckyBox_old;
-        public GButton m_btnLuckyBox;
+        public UI_Button1 m_btnLuckyBox;
+        public GGraph m_bgEffectHolder;
+        public Transition m_In_1;
         public const string URL = "ui://ubfk2kobmbf1k";
         public const string PACKAGE_NAME = "ActivityThemeLuckyBox";
         public const string RES_NAME = "ActivityThemeLuckyBoxUI";
@@ -67,26 +69,34 @@ namespace UI.ActivityThemeLuckyBox
             m_c1 = comp.GetController("c1");
             m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_btnBack = (GButton)comp.GetChild("btnBack");
-            m_btnChapter = (GButton)comp.GetChild("btnChapter");
-            m_btnTask = (GButton)comp.GetChild("btnTask");
-            m_btnShop = (GButton)comp.GetChild("btnShop");
+            m_btnChapter = (UI_Button1)UI_Button1.Create(comp.GetChild("btnChapter"));
+            m_btnTask = (UI_Button1)UI_Button1.Create(comp.GetChild("btnTask"));
+            m_btnShop = (UI_Button1)UI_Button1.Create(comp.GetChild("btnShop"));
             m_timeDesc = (GTextField)comp.GetChild("timeDesc");
             m_txtTime = (GTextField)comp.GetChild("txtTime");
             m_btnLuckyBox_old = (GButton)comp.GetChild("btnLuckyBox_old");
-            m_btnLuckyBox = (GButton)comp.GetChild("btnLuckyBox");
+            m_btnLuckyBox = (UI_Button1)UI_Button1.Create(comp.GetChild("btnLuckyBox"));
+            m_bgEffectHolder = (GGraph)comp.GetChild("bgEffectHolder");
+            m_In_1 = comp.GetTransition("In_1");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
             m_loaBg = null;
             m_btnBack = null;
+            m_btnChapter.Dispose();
             m_btnChapter = null;
+            m_btnTask.Dispose();
             m_btnTask = null;
+            m_btnShop.Dispose();
             m_btnShop = null;
             m_timeDesc = null;
             m_txtTime = null;
             m_btnLuckyBox_old = null;
+            m_btnLuckyBox.Dispose();
             m_btnLuckyBox = null;
+            m_bgEffectHolder = null;
+            m_In_1 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityThemeLuckyBox/UI_Button1.cs

@@ -0,0 +1,74 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityThemeLuckyBox
+{
+    public partial class UI_Button1
+    {
+        public GButton target;
+        public Controller m_effectPos;
+        public GGraph m_effectHolder;
+        public const string URL = "ui://ubfk2kobmbf1l";
+        public const string PACKAGE_NAME = "ActivityThemeLuckyBox";
+        public const string RES_NAME = "Button1";
+        private static UI_Button1 _proxy;
+
+        public static UI_Button1 Create(GObject gObject = null)
+        {
+            var ui = new UI_Button1();
+            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_Button1 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_Button1();
+            }
+            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_effectPos = comp.GetController("effectPos");
+            m_effectHolder = (GGraph)comp.GetChild("effectHolder");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_effectPos = null;
+            m_effectHolder = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityThemeLuckyBox/UI_Button1.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_BtnModle2.cs

@@ -8,6 +8,7 @@ namespace UI.Main
     {
         public GButton target;
         public Controller m_c1;
+        public Controller m_c2;
         public GTextField m_txtTime;
         public const string URL = "ui://mfvz4q8kt6j1ow";
         public const string PACKAGE_NAME = "Main";
@@ -57,11 +58,13 @@ namespace UI.Main
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
+            m_c2 = comp.GetController("c2");
             m_txtTime = (GTextField)comp.GetChild("txtTime");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
+            m_c2 = null;
             m_txtTime = null;
             if(disposeTarget && target != null)
             {

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComAllPerfect.cs

@@ -8,9 +8,9 @@ namespace UI.Main
     {
         public GComponent target;
         public Controller m_c1;
+        public GGraph m_holderSmokeIn;
         public GGraph m_holderLoop;
         public GGraph m_holder;
-        public GGraph m_holderSmokeIn;
         public GGraph m_holderSmokeOut;
         public GTextField m_txtCount;
         public GImage m_img3Second;
@@ -65,9 +65,9 @@ namespace UI.Main
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
+            m_holderSmokeIn = (GGraph)comp.GetChild("holderSmokeIn");
             m_holderLoop = (GGraph)comp.GetChild("holderLoop");
             m_holder = (GGraph)comp.GetChild("holder");
-            m_holderSmokeIn = (GGraph)comp.GetChild("holderSmokeIn");
             m_holderSmokeOut = (GGraph)comp.GetChild("holderSmokeOut");
             m_txtCount = (GTextField)comp.GetChild("txtCount");
             m_img3Second = (GImage)comp.GetChild("img3Second");
@@ -78,9 +78,9 @@ namespace UI.Main
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
+            m_holderSmokeIn = null;
             m_holderLoop = null;
             m_holder = null;
-            m_holderSmokeIn = null;
             m_holderSmokeOut = null;
             m_txtCount = null;
             m_img3Second = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_MainUI.cs

@@ -26,8 +26,8 @@ namespace UI.Main
         public UI_BtnModle1 m_btnDailyWelfare;
         public UI_BtnModle2 m_btnActivityDay7;
         public UI_BtnModle2 m_btnActivityLuckyBox;
+        public UI_BtnModle2 m_btnActivityAfuGift;
         public UI_BtnModle2 m_btnLimitedRechargeDBGift;
-        public UI_BtnModle1 m_btnActivityAfuGift;
         public UI_BtnModle m_btnFirstRecharge;
         public UI_BtnModle m_btnGiftBag1;
         public UI_BtnModle m_btnGiftBag2;
@@ -113,8 +113,8 @@ namespace UI.Main
             m_btnDailyWelfare = (UI_BtnModle1)UI_BtnModle1.Create(comp.GetChild("btnDailyWelfare"));
             m_btnActivityDay7 = (UI_BtnModle2)UI_BtnModle2.Create(comp.GetChild("btnActivityDay7"));
             m_btnActivityLuckyBox = (UI_BtnModle2)UI_BtnModle2.Create(comp.GetChild("btnActivityLuckyBox"));
+            m_btnActivityAfuGift = (UI_BtnModle2)UI_BtnModle2.Create(comp.GetChild("btnActivityAfuGift"));
             m_btnLimitedRechargeDBGift = (UI_BtnModle2)UI_BtnModle2.Create(comp.GetChild("btnLimitedRechargeDBGift"));
-            m_btnActivityAfuGift = (UI_BtnModle1)UI_BtnModle1.Create(comp.GetChild("btnActivityAfuGift"));
             m_btnFirstRecharge = (UI_BtnModle)UI_BtnModle.Create(comp.GetChild("btnFirstRecharge"));
             m_btnGiftBag1 = (UI_BtnModle)UI_BtnModle.Create(comp.GetChild("btnGiftBag1"));
             m_btnGiftBag2 = (UI_BtnModle)UI_BtnModle.Create(comp.GetChild("btnGiftBag2"));
@@ -168,10 +168,10 @@ namespace UI.Main
             m_btnActivityDay7 = null;
             m_btnActivityLuckyBox.Dispose();
             m_btnActivityLuckyBox = null;
-            m_btnLimitedRechargeDBGift.Dispose();
-            m_btnLimitedRechargeDBGift = null;
             m_btnActivityAfuGift.Dispose();
             m_btnActivityAfuGift = null;
+            m_btnLimitedRechargeDBGift.Dispose();
+            m_btnLimitedRechargeDBGift = null;
             m_btnFirstRecharge.Dispose();
             m_btnFirstRecharge = null;
             m_btnGiftBag1.Dispose();

GameClient/Assets/Game/HotUpdate/Views/ActivityThemeLuckyBox/ActivityThemeLuckyBoxView.cs

@@ -1,6 +1,7 @@
 
 using ET;
 using FairyGUI;
+using System.Collections.Generic;
 using UI.ActivityThemeLuckyBox;
 
 namespace GFGGame
@@ -10,6 +11,8 @@ namespace GFGGame
         private UI_ActivityThemeLuckyBoxUI _ui;
         private ActivityOpenCfg _activityCfg;
         private int _activityId;
+        private Dictionary<string, EffectUI> _effectUIDic = new Dictionary<string, EffectUI>();
+
         public override void Dispose()
         {
             if (_ui != null)
@@ -29,10 +32,11 @@ namespace GFGGame
             isfullScreen = true;
 
             _ui.m_btnBack.onClick.Add(OnBtnBackClick);
-            _ui.m_btnTask.onClick.Add(OnBtnTaskClick);
-            _ui.m_btnChapter.onClick.Add(OnBtnChapterClick);
-            _ui.m_btnLuckyBox.onClick.Add(OnBtnLuckyBoxClick);
-            _ui.m_btnShop.onClick.Add(OnBtnShopClick);
+            _ui.m_btnTask.target.onClick.Add(OnBtnTaskClick);
+            _ui.m_btnChapter.target.onClick.Add(OnBtnChapterClick);
+            _ui.m_btnLuckyBox.target.onClick.Add(OnBtnLuckyBoxClick);
+            _ui.m_btnShop.target.onClick.Add(OnBtnShopClick);
+
         }
 
         protected override void AddEventListener()
@@ -54,16 +58,34 @@ namespace GFGGame
 
             // ½çÃæ¸ù¾ÝID¸Ä±ä
             _ui.m_c1.SetSelectedPage(_activityId.ToString());
-            
+            _ui.target.GetTransition("In_" + _activityId.ToString())?.Play();
+            if(_activityId == 1)
+            {
+                // Effect
+                _effectUIDic.Add("All_tx", EffectUIPool.CreateEffectUI(_ui.m_bgEffectHolder, "ui_Activity/New_CK_Flower", "All_tx"));
+                _effectUIDic.Add("L", EffectUIPool.CreateEffectUI(_ui.m_btnLuckyBox.m_effectHolder, "ui_Activity/New_CK_Flower", "L"));
+                _effectUIDic.Add("R", EffectUIPool.CreateEffectUI(_ui.m_btnChapter.m_effectHolder, "ui_Activity/New_CK_Flower", "R"));
+            }
+
             _activityCfg = ActivityOpenCfgArray.Instance.GetCfg(_activityId);
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath(_activityCfg.res); 
             UpdateRedDot();
+            UpdateTime();
             Timers.inst.Add(1, 0, UpdateTime);
         }
+
         protected override void OnHide()
         {
             base.OnHide();
             Timers.inst.Remove(UpdateTime);
+
+            // Clear Effect
+            foreach (var v in _effectUIDic)
+            {
+                EffectUIPool.Recycle(v.Value);
+            }
+
+            _effectUIDic.Clear();
         }
         protected override void RemoveEventListener()
         {
@@ -111,8 +133,10 @@ namespace GFGGame
         }
         private void UpdateRedDot()
         {
-            RedDotController.Instance.SetComRedDot(_ui.m_btnLuckyBox, RedDotDataManager.Instance.GetMeiRiTeHuiRed() || RedDotDataManager.Instance.GetActLuckyBoxRewardRed(ConstLimitTimeActivityType.ActLimitLuckyBox) || RedDotDataManager.Instance.GetGiftBagRewardRed(), "", -36, 39);
-            RedDotController.Instance.SetComRedDot(_ui.m_btnTask, RedDotDataManager.Instance.GetActLuckyBoxTaskdRed());
+            RedDotController.Instance.SetComRedDot(_ui.m_btnLuckyBox.target
+                , RedDotDataManager.Instance.GetMeiRiTeHuiRed() || RedDotDataManager.Instance.GetActLuckyBoxRewardRed(ConstLimitTimeActivityType.ActLimitLuckyBox) 
+                || RedDotDataManager.Instance.GetGiftBagRewardRed(), "", -36, 39);
+            RedDotController.Instance.SetComRedDot(_ui.m_btnTask.target, RedDotDataManager.Instance.GetActLuckyBoxTaskdRed());
         }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs

@@ -768,8 +768,8 @@ namespace GFGGame
             ShowExitAlert();
 
             int actLuckyBoxId = ActivityDataManager.Instance.GetCurOpenActiveByType(ConstLimitTimeActivityType.ActLimitLuckyBox);
-            //_ui.m_btnActivityLuckyBox.target.visible = actLuckyBoxId > 0;
-            _ui.m_btnActivityLuckyBox.target.visible = false;
+            _ui.m_btnActivityLuckyBox.target.visible = actLuckyBoxId > 0;
+            //_ui.m_btnActivityLuckyBox.target.visible = false;
             if (actLuckyBoxId > 0)
             {
                 if (actLuckyBoxId != ActivityDataManager.Instance.lastActLuckyBoxId)
@@ -836,6 +836,21 @@ namespace GFGGame
                 long time = LimitedRechargeDBGiftDataManager.Instance.GetEndTime() - TimeHelper.ServerNow();
                 _ui.m_btnLimitedRechargeDBGift.m_txtTime.text = time > TimeUtil.SECOND_PER_DAY * 1000 ? TimeUtil.FormattingTimeTo_DDHHmm(time) : TimeUtil.FormattingTimeTo_HHmmss(time);
             }
+
+            if (_ui.m_btnActivityAfuGift.target.visible)
+            {
+                var activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfoOneByType(ActivityType.AFZL);
+                if(activityInfo == null)
+                {
+                    _ui.m_btnActivityAfuGift.target.visible = false;
+                }
+                else
+                {
+                    long time = activityInfo.EndTime - TimeHelper.ServerNow();
+                    _ui.m_btnActivityAfuGift.m_txtTime.text = time > TimeUtil.SECOND_PER_DAY * 1000 ? TimeUtil.FormattingTimeTo_DDHHmm(time) : TimeUtil.FormattingTimeTo_HHmmss(time);
+                }
+
+            }
         }
 
         private void ShowExitAlert()
@@ -1026,7 +1041,7 @@ namespace GFGGame
             // 阿福赠礼
             if (_ui.m_btnActivityAfuGift.target.visible)
             {
-                RedDotController.Instance.SetComRedDot(_ui.m_btnActivityAfuGift.target, ActivityAfuGiftDataManager.Instance.HaveCanGetReward(), "", -24, 2);
+                RedDotController.Instance.SetComRedDot(_ui.m_btnActivityAfuGift.target, ActivityAfuGiftDataManager.Instance.HaveCanGetReward(), "", -43, 2);
             }
             
         }

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

@@ -0,0 +1,96 @@
+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

@@ -0,0 +1,96 @@
+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: