Merge branch 'master' of http://10.108.64.190:3000/gfg/client

GameClient/Assets/Game/HotUpdate/Effect/EffectUI.cs

@@ -48,5 +48,10 @@ namespace GFGGame
                 _wrapper.Dispose();
             }
         }
+
+        public GameObject GetObj()
+        {
+            return _gameObject;
+        }
     }
 }

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CreateRole/UI_CreateRoleUI.cs

@@ -7,6 +7,7 @@ namespace UI.CreateRole
     public partial class UI_CreateRoleUI
     {
         public GComponent target;
+        public GLoader m_loaBg;
         public UI_EnvelopeModel m_envelopeModel;
         public const string URL = "ui://5al8chbdxt5s0";
         public const string PACKAGE_NAME = "CreateRole";
@@ -55,10 +56,12 @@ namespace UI.CreateRole
 
         private void Init(GComponent comp)
         {
+            m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_envelopeModel = (UI_EnvelopeModel)UI_EnvelopeModel.Create(comp.GetChild("envelopeModel"));
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_loaBg = null;
             m_envelopeModel.Dispose();
             m_envelopeModel = null;
             if(disposeTarget && target != null)

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CreateRole/UI_EnvelopeModel.cs

@@ -7,7 +7,6 @@ namespace UI.CreateRole
     public partial class UI_EnvelopeModel
     {
         public GComponent target;
-        public GLoader m_loaBg;
         public GGraph m_NiaoEffectHolder;
         public GButton m_btnSure;
         public GButton m_btnDice;
@@ -65,7 +64,6 @@ namespace UI.CreateRole
 
         private void Init(GComponent comp)
         {
-            m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_NiaoEffectHolder = (GGraph)comp.GetChild("NiaoEffectHolder");
             m_btnSure = (GButton)comp.GetChild("btnSure");
             m_btnDice = (GButton)comp.GetChild("btnDice");
@@ -79,7 +77,6 @@ namespace UI.CreateRole
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_loaBg = null;
             m_NiaoEffectHolder = null;
             m_btnSure = null;
             m_btnDice = null;

GameClient/Assets/Game/HotUpdate/ServerProxy/TaskSProxy.cs

@@ -93,7 +93,19 @@ namespace GFGGame
             //C2M_GetTaskBonus
             var response = (M2C_GetTaskBonus)await MessageHelper.SendToServer(new C2M_GetTaskBonus { Id = taskId });
             if (!(response is { Error: ErrorCode.ERR_Success })) return false;
-            TaskDataManager.Instance.UpdateTaskState(response.Id, response.Status);
+            if (response.NextTask != null) {
+                var taskInfo = new TaskInfo
+                {
+                    ID = response.NextTask.Id,
+                    State = response.NextTask.Status,
+                    Progress = response.NextTask.Progress
+                };
+                TaskDataManager.Instance.UpdateTaskInfo(response.NextTask.Id, taskInfo);
+                TaskDataManager.Instance.RemoveTaskInfo(response.Id);
+            }
+            else
+                TaskDataManager.Instance.UpdateTaskState(response.Id, response.Status);
+
             EventAgent.DispatchEvent(ConstMessage.NOTICE_BATCH_TASK_STATE_CHANGE, new List<int> { taskId });
             EventAgent.DispatchEvent(ConstMessage.RED_CHANGE);
             var taskCfg = TaskCfgArray.Instance.GetCfg(response.Id);

GameClient/Assets/Game/HotUpdate/Views/CreateRole/CreateRoleView.cs

@@ -4,6 +4,7 @@ using System;
 using System.Text.RegularExpressions;
 using ET;
 using System.Collections.Generic;
+using UnityEngine;
 
 namespace GFGGame
 {
@@ -48,7 +49,7 @@ namespace GFGGame
             this.clickBlankToClose = false;
             this.modal = true;
 
-            _ui.m_envelopeModel.m_loaBg.url = ResPathUtil.GetBgImgPath("bg_yaoqinghan");
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("bg_yaoqinghan");
             _ui.m_envelopeModel.m_btnSure.onClick.Add(OnClickBtnSure);
             _ui.m_envelopeModel.m_btnDice.onClick.Add(() =>
             {
@@ -63,7 +64,6 @@ namespace GFGGame
             {
                 case State.IN:
                     _effectUIDic.Add("FX_Flower", EffectUIPool.CreateEffectUI(_ui.m_envelopeModel.m_envelope.m_flowerEffectHolder, "ui_CreateRoleUI/Before_Open", "FX_Flower"));
-                    _effectUIDic.Add("FX_XINF", EffectUIPool.CreateEffectUI(_ui.m_envelopeModel.m_envelope.m_XINFEffectHolder, "ui_CreateRoleUI/Before_Open", "FX_XINF"));
                     _effectUIDic.Add("FX_LiuSu", EffectUIPool.CreateEffectUI(_ui.m_envelopeModel.m_envelope.m_LiuSuEffectHolder, "ui_CreateRoleUI/Before_Open", "FX_LiuSu"));
                     _effectUIDic.Add("FX_taril", EffectUIPool.CreateEffectUI(_ui.m_envelopeModel.m_trailEffectHolder, "ui_CreateRoleUI/Before_Open", "FX_taril"));
 
@@ -73,11 +73,13 @@ namespace GFGGame
                     });
                     break;
                 case State.IDLE:
+                    _effectUIDic.Add("FX_XINF", EffectUIPool.CreateEffectUI(_ui.m_envelopeModel.m_envelope.m_XINFEffectHolder, "ui_CreateRoleUI/Before_Open", "FX_XINF"));
                     _effectUIDic.Add("FX_player", EffectUIPool.CreateEffectUI(_ui.m_envelopeModel.m_envelope.m_playerClickTipEffectHolder, "ui_CreateRoleUI/Before_Open", "FX_player"));
                     _ui.m_envelopeModel.m_envelope.target.onClick.Add(OnClickBtnEnvelope);
                     _ui.m_envelopeModel.m_t_Idle.Play(-1, 0, null);
                     break;
                 case State.OPEN:
+                    //_effectUIDic["FX_player"].GetObj().GetComponentInChildren<Animator>().SetTrigger("Close");
                     EffectUIPool.Recycle(_effectUIDic["FX_player"]);
                     _effectUIDic.Remove("FX_player");
                     _effectUIDic.Add("FX_ShanZi", EffectUIPool.CreateEffectUI(_ui.m_envelopeModel.m_ShanZiEffectHolder, "ui_CreateRoleUI/After_Open", "FX_ShanZi"));

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

@@ -179,7 +179,11 @@ namespace GFGGame
         }
         private void ResetDailyData()
         {
-            ViewManager.Show<MainUIView>();
+            //ViewManager.Show<MainUIView>();
+            CheckFunOpen();
+            UpdateRedDot();
+            UpdateHead();
+            UpdateBtnFirstRecharge();
         }
 
         protected override void OnShown()