添加元宵活动协议、特效

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityGetYuanXiao/UI_ActivityGetYuanXiaoEntryUI.cs

@@ -19,7 +19,8 @@ namespace UI.ActivityGetYuanXiao
         public GGraph m_titleTextEffect;
         public GComponent m_valueBar;
         public GButton m_btnBack;
-        public GButton m_btnStart;
+        public GGraph m_btnStart;
+        public Transition m_t0;
         public const string URL = "ui://tguohf7uqkvg4";
         public const string PACKAGE_NAME = "ActivityGetYuanXiao";
         public const string RES_NAME = "ActivityGetYuanXiaoEntryUI";
@@ -79,7 +80,8 @@ namespace UI.ActivityGetYuanXiao
             m_titleTextEffect = (GGraph)comp.GetChild("titleTextEffect");
             m_valueBar = (GComponent)comp.GetChild("valueBar");
             m_btnBack = (GButton)comp.GetChild("btnBack");
-            m_btnStart = (GButton)comp.GetChild("btnStart");
+            m_btnStart = (GGraph)comp.GetChild("btnStart");
+            m_t0 = comp.GetTransition("t0");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -96,6 +98,7 @@ namespace UI.ActivityGetYuanXiao
             m_valueBar = null;
             m_btnBack = null;
             m_btnStart = null;
+            m_t0 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityGetYuanXiao/UI_ActivityGetYuanXiaoFailUI.cs

@@ -7,8 +7,11 @@ namespace UI.ActivityGetYuanXiao
     public partial class UI_ActivityGetYuanXiaoFailUI
     {
         public GComponent target;
+        public GGraph m_titleEffect;
+        public GGraph m_starEffect;
         public GButton m_btnExit;
         public GButton m_btnRetry;
+        public Transition m_t0;
         public const string URL = "ui://tguohf7uhmj625";
         public const string PACKAGE_NAME = "ActivityGetYuanXiao";
         public const string RES_NAME = "ActivityGetYuanXiaoFailUI";
@@ -56,13 +59,19 @@ namespace UI.ActivityGetYuanXiao
 
         private void Init(GComponent comp)
         {
+            m_titleEffect = (GGraph)comp.GetChild("titleEffect");
+            m_starEffect = (GGraph)comp.GetChild("starEffect");
             m_btnExit = (GButton)comp.GetChild("btnExit");
             m_btnRetry = (GButton)comp.GetChild("btnRetry");
+            m_t0 = comp.GetTransition("t0");
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_titleEffect = null;
+            m_starEffect = null;
             m_btnExit = null;
             m_btnRetry = null;
+            m_t0 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityGetYuanXiao/UI_ActivityGetYuanXiaoSuccessUI.cs

@@ -10,6 +10,9 @@ namespace UI.ActivityGetYuanXiao
         public GButton m_btnExit;
         public GButton m_btnRetry;
         public GList m_listReward;
+        public GGraph m_starEffect;
+        public GGraph m_titleEffect;
+        public Transition m_t0;
         public const string URL = "ui://tguohf7uhmj62c";
         public const string PACKAGE_NAME = "ActivityGetYuanXiao";
         public const string RES_NAME = "ActivityGetYuanXiaoSuccessUI";
@@ -60,12 +63,18 @@ namespace UI.ActivityGetYuanXiao
             m_btnExit = (GButton)comp.GetChild("btnExit");
             m_btnRetry = (GButton)comp.GetChild("btnRetry");
             m_listReward = (GList)comp.GetChild("listReward");
+            m_starEffect = (GGraph)comp.GetChild("starEffect");
+            m_titleEffect = (GGraph)comp.GetChild("titleEffect");
+            m_t0 = comp.GetTransition("t0");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_btnExit = null;
             m_btnRetry = null;
             m_listReward = null;
+            m_starEffect = null;
+            m_titleEffect = null;
+            m_t0 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityGetYuanXiao/UI_ActivityGetYuanXiaoUI.cs

@@ -9,6 +9,7 @@ namespace UI.ActivityGetYuanXiao
         public GComponent target;
         public Controller m_c1;
         public GLoader m_loaBg;
+        public GGraph m_bgEffect;
         public UI_catchers m_catcher;
         public UI_YuanXiaoParent m_YuanXiaoParent;
         public GGraph m_end0;
@@ -22,7 +23,7 @@ namespace UI.ActivityGetYuanXiao
         public GGraph m_start3;
         public GTextField m_progress;
         public GTextField m_targetScore;
-        public Transition m_start;
+        public GGraph m_startEffect;
         public const string URL = "ui://tguohf7ux0ey0";
         public const string PACKAGE_NAME = "ActivityGetYuanXiao";
         public const string RES_NAME = "ActivityGetYuanXiaoUI";
@@ -72,6 +73,7 @@ namespace UI.ActivityGetYuanXiao
         {
             m_c1 = comp.GetController("c1");
             m_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_bgEffect = (GGraph)comp.GetChild("bgEffect");
             m_catcher = (UI_catchers)UI_catchers.Create(comp.GetChild("catcher"));
             m_YuanXiaoParent = (UI_YuanXiaoParent)UI_YuanXiaoParent.Create(comp.GetChild("YuanXiaoParent"));
             m_end0 = (GGraph)comp.GetChild("end0");
@@ -85,12 +87,13 @@ namespace UI.ActivityGetYuanXiao
             m_start3 = (GGraph)comp.GetChild("start3");
             m_progress = (GTextField)comp.GetChild("progress");
             m_targetScore = (GTextField)comp.GetChild("targetScore");
-            m_start = comp.GetTransition("start");
+            m_startEffect = (GGraph)comp.GetChild("startEffect");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
             m_loaBg = null;
+            m_bgEffect = null;
             m_catcher.Dispose();
             m_catcher = null;
             m_YuanXiaoParent.Dispose();
@@ -106,7 +109,7 @@ namespace UI.ActivityGetYuanXiao
             m_start3 = null;
             m_progress = null;
             m_targetScore = null;
-            m_start = null;
+            m_startEffect = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityGetYuanXiao/UI_catchers.cs

@@ -11,6 +11,7 @@ namespace UI.ActivityGetYuanXiao
         public GGraph m_catcher;
         public GLoader m_catcherImg;
         public GLoader m_catcherImg2;
+        public GGraph m_getEffect;
         public UI_flyScore m_flyscore;
         public GGroup m_catchers;
         public const string URL = "ui://tguohf7uqkvg1a";
@@ -64,6 +65,7 @@ namespace UI.ActivityGetYuanXiao
             m_catcher = (GGraph)comp.GetChild("catcher");
             m_catcherImg = (GLoader)comp.GetChild("catcherImg");
             m_catcherImg2 = (GLoader)comp.GetChild("catcherImg2");
+            m_getEffect = (GGraph)comp.GetChild("getEffect");
             m_flyscore = (UI_flyScore)UI_flyScore.Create(comp.GetChild("flyscore"));
             m_catchers = (GGroup)comp.GetChild("catchers");
         }
@@ -73,6 +75,7 @@ namespace UI.ActivityGetYuanXiao
             m_catcher = null;
             m_catcherImg = null;
             m_catcherImg2 = null;
+            m_getEffect = null;
             m_flyscore.Dispose();
             m_flyscore = null;
             m_catchers = null;

GameClient/Assets/Game/HotUpdate/Views/ActivityGetYuanXiao/ActivityGetYuanXiaoEntryView.cs

@@ -3,6 +3,7 @@ using UnityEngine;
 using UI.ActivityGetYuanXiao;
 using FairyGUI;
 using System.Collections.Generic;
+using System.Threading.Tasks;
 
 namespace GFGGame
 {
@@ -12,6 +13,7 @@ namespace GFGGame
         private ValueBarController _valueBarController;
         private Dictionary<string, EffectUI> _effectUIDic = new Dictionary<string, EffectUI>();
 
+
         public override void Dispose()
         {
             // Clear Effect
@@ -61,11 +63,18 @@ namespace GFGGame
 
         }
 
-        protected override void OnShown()
+        protected async override void OnShown()
         {
             base.OnShown();
             _valueBarController.OnShown();
             _valueBarController.UpdateList(new List<int>() { PickUpGameArray.Instance.dataArray[0].comsumePassArr[0][0] });
+
+            //var result = await MiniGameProxy.ReqGetActivityGameInfos(5004);
+            //if (!isShowing || !result)
+            //{
+            //    return;
+            //}
+
             _ui.m_list.numItems = PickUpGameArray.Instance.dataArray.Length;
             _ui.m_list.selectedIndex = 0;
 
@@ -97,6 +106,8 @@ namespace GFGGame
             level.m_iconLevel.url = string.Format("ui://ActivityGetYuanXiao/yx_xg_{0}", index % 4 + 1);
             level.m_num.text = pickUpGame.comsumePassArr[0][1].ToString();
             level.m_c1.selectedIndex = 0;
+
+            //level.m_c1.selectedIndex = MiniGameDateManager.Instance.gameinfoList[index].IsUnlock ? 0 : 1;
             UI_level.ProxyEnd();
         }
 
@@ -111,6 +122,17 @@ namespace GFGGame
 
         private void OnBtnStartClick()
         {
+            //if (!MiniGameDateManager.Instance.gameinfoList[_ui.m_list.selectedIndex].IsUnlock)
+            //{
+            //    PromptController.Instance.ShowFloatTextPrompt("关卡未解锁");
+            //    return;
+            //}
+            //if (MiniGameDateManager.Instance.gameinfoList[_ui.m_list.selectedIndex].IsCleared)
+            //{
+            //    PromptController.Instance.ShowFloatTextPrompt("关卡已通过");
+            //    return;
+            //}
+
             PickUpGame cfg = PickUpGameArray.Instance.dataArray[_ui.m_list.selectedIndex];
             ViewManager.Show<ActivityGetYuanXiaoTargetView>(cfg);
         }
@@ -138,7 +160,12 @@ namespace GFGGame
 
         private void OnBtnTaskClick()
         {
-            ViewManager.Show<ActivityGetYuanXiaoTaskView>();
+            int activityID = ActivityDataManager.Instance.GetCurOpenActiveByType(12);
+            if (activityID == 0)
+            {
+                return;
+            }
+            ViewManager.Show<ActivityGetYuanXiaoTaskView>(activityID);
         }
 
     }

GameClient/Assets/Game/HotUpdate/Views/ActivityGetYuanXiao/ActivityGetYuanXiaoFailView.cs

@@ -1,14 +1,23 @@
 using System.Collections;
 using UnityEngine;
 using UI.ActivityGetYuanXiao;
+using System.Collections.Generic;
 
 namespace GFGGame
 {
     public class ActivityGetYuanXiaoFailView : BaseWindow
     {
         private UI_ActivityGetYuanXiaoFailUI _ui;
+        private Dictionary<string, EffectUI> _effectUIDic = new Dictionary<string, EffectUI>();
+
         public override void Dispose()
         {
+            // Clear Effect
+            foreach (var v in _effectUIDic)
+            {
+                EffectUIPool.Recycle(v.Value);
+            }
+
             if (_ui != null)
             {
                 _ui.Dispose();
@@ -31,6 +40,9 @@ namespace GFGGame
 
             _ui.m_btnExit.onClick.Add(OnClickBtnExit);
             _ui.m_btnRetry.onClick.Add(OnClickBtnTryAgain);
+
+            _effectUIDic.Add("YXJ_Quad_star", EffectUIPool.CreateEffectUI(_ui.m_starEffect, "ui_Activity", "YXJ_Quad_star"));
+            _effectUIDic.Add("YXJ_QuadText_Lose", EffectUIPool.CreateEffectUI(_ui.m_titleEffect, "ui_Activity", "YXJ_QuadText_Lose"));
         }
 
         private void OnClickBtnExit()

GameClient/Assets/Game/HotUpdate/Views/ActivityGetYuanXiao/ActivityGetYuanXiaoSuccessView.cs

@@ -11,7 +11,8 @@ namespace GFGGame
         private UI_ActivityGetYuanXiaoSuccessUI _ui;
         private PickUpGame _cfg;
         private List<ItemData> itemDatas;
-        
+        private Dictionary<string, EffectUI> _effectUIDic = new Dictionary<string, EffectUI>();
+
         protected override void OnInit()
         {
             base.OnInit();
@@ -25,10 +26,20 @@ namespace GFGGame
 
             _ui.m_listReward.itemRenderer = RenderListRewardItem;
             _ui.m_btnExit.onClick.Add(OnClickBtnExit);
+
+            _effectUIDic.Add("YXJ_Quad_star", EffectUIPool.CreateEffectUI(_ui.m_starEffect, "ui_Activity", "YXJ_Quad_star"));
+            _effectUIDic.Add("YXJ_QuadText_win", EffectUIPool.CreateEffectUI(_ui.m_titleEffect, "ui_Activity", "YXJ_QuadText_win"));
+
         }
 
         public override void Dispose()
         {
+            // Clear Effect
+            foreach (var v in _effectUIDic)
+            {
+                EffectUIPool.Recycle(v.Value);
+            }
+
             if (_ui != null)
             {
                 _ui.Dispose();
@@ -41,7 +52,6 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-
             _cfg = (PickUpGame)viewData;
             _ui.m_btnRetry.visible = (_cfg.isAgain != 0);
 

GameClient/Assets/Game/HotUpdate/Views/ActivityGetYuanXiao/ActivityGetYuanXiaoTaskView.cs

@@ -9,6 +9,7 @@ namespace GFGGame
     public class ActivityGetYuanXiaoTaskView : BaseWindow
     {
         private UI_ActivityGetYuanXiaoTaskUI _ui;
+        private int _activityID;
 
         public override void Dispose()
         {
@@ -38,6 +39,7 @@ namespace GFGGame
         {
             base.OnShown();
 
+            _activityID = (int)viewData;
             _ui.m_itemList.numItems = PickUpGameArray.Instance.dataArray.Length;
             _ui.m_itemList.scrollPane.ScrollTop();
         }
@@ -60,8 +62,21 @@ namespace GFGGame
                 }
                 (obj.data as ItemView).SetData(reward);
             }
+            item.m_c1.selectedIndex = MiniGameDateManager.Instance.gameinfoList[index].FirstPassRewardStatus;
+            if(item.m_btnGet.data == null)
+            {
+                item.m_btnGet.data = PickUpGameArray.Instance.dataArray[index];
+                item.m_btnGet.onClick.Add(OnClickBtnGet);
+            }
             UI_taskItem.ProxyEnd();
         }
 
+        private async void OnClickBtnGet(EventContext context)
+        {
+            GObject obj = (GObject)context.sender;
+            PickUpGame pickUpGame = (PickUpGame)obj.data;
+            var result = await MiniGameProxy.ReqGetFirstPassReward(pickUpGame.id, pickUpGame.type, _activityID);
+            if (!result) return;
+        }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/ActivityGetYuanXiao/ActivityGetYuanXiaoView.cs

@@ -3,6 +3,7 @@ using UnityEngine;
 using UI.ActivityGetYuanXiao;
 using FairyGUI;
 using System.Collections.Generic;
+using System.Threading.Tasks;
 
 namespace GFGGame
 {
@@ -19,10 +20,16 @@ namespace GFGGame
         private bool _firstIn = true;
         private bool _gamePause = false;
         private float _timer;
-
+        private Dictionary<string, EffectUI> _effectUIDic = new Dictionary<string, EffectUI>();
 
         public override void Dispose()
         {
+            // Clear Effect
+            foreach (var v in _effectUIDic)
+            {
+                EffectUIPool.Recycle(v.Value);
+            }
+
             if (_ui != null)
             {
                 _ui.Dispose();
@@ -42,6 +49,10 @@ namespace GFGGame
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("hd_yx_bg_2");
             _ui.m_collectList.itemRenderer = CollectListRenderer;
             _ui.m_btnBack.onClick.Add(OnBtnBack);
+            _effectUIDic.Add("YXJ_Catch", EffectUIPool.CreateEffectUI(_ui.m_catcher.m_getEffect, "ui_Activity", "YXJ_Catch"));
+            _effectUIDic.Add("YXJ_text_start", EffectUIPool.CreateEffectUI(_ui.m_startEffect, "ui_Activity", "YXJ_text_start"));
+            _effectUIDic.Add("YXJ_gameing_bg_tx", EffectUIPool.CreateEffectUI(_ui.m_bgEffect, "ui_Activity", "YXJ_gameing_bg_tx"));
+
         }
 
         protected override void OnShown()
@@ -204,6 +215,9 @@ namespace GFGGame
                 UpdateScore();
             }
             ShowFlyScore(item.GetScore());
+            _ui.m_catcher.m_getEffect.visible = false;
+            _ui.m_catcher.m_getEffect.visible = true;
+
         }
 
         private void ShowFlyScore(int score)
@@ -232,14 +246,14 @@ namespace GFGGame
             Timers.inst.AddUpdate(UpdateGame);
         }
 
-        private void PlayStartAnim()
+        private async void PlayStartAnim()
         {
             GRoot.inst.touchable = false;
-            _ui.m_start.Play(() =>
-            {
-                GRoot.inst.touchable = true;
-                StartGame();
-            });
+            _ui.m_startEffect.visible = false;
+            _ui.m_startEffect.visible = true;
+            await Task.Delay(820);
+            GRoot.inst.touchable = true;
+            StartGame();
         }
 
         private void UpdateTime(object param)
@@ -305,6 +319,8 @@ namespace GFGGame
 
         private void InitView()
         {
+            _ui.m_startEffect.visible = false;
+            _ui.m_catcher.m_getEffect.visible = false;
             _ui.m_catcher.m_flyscore.target.visible = false;
             _ui.m_catcher.m_c2.selectedIndex = _cfg.id > PickUpGameArray.Instance.dataArray[0].id ? 1 : 0;
             _ui.m_time.text = TimeUtil.FormattingTimeTo_mmss(_countTime * 1000);
@@ -387,6 +403,7 @@ namespace GFGGame
 
         private void ResetGame()
         {
+            HideGameView();
             ShowGameView();
         }