每日签到补签，引导补充提交

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_DailySignRechargeTipsUI.cs

@@ -0,0 +1,83 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.DailyWelfare
+{
+    public partial class UI_DailySignRechargeTipsUI
+    {
+        public GComponent target;
+        public GTextField m_txtTitle;
+        public GTextField m_txtTips;
+        public GComponent m_comCostItem;
+        public GButton m_btnConfirm;
+        public GButton m_btnCancel;
+        public const string URL = "ui://t8nwuj7ihtuj93b";
+        public const string PACKAGE_NAME = "DailyWelfare";
+        public const string RES_NAME = "DailySignRechargeTipsUI";
+        private static UI_DailySignRechargeTipsUI _proxy;
+
+        public static UI_DailySignRechargeTipsUI Create(GObject gObject = null)
+        {
+            var ui = new UI_DailySignRechargeTipsUI();
+            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_DailySignRechargeTipsUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_DailySignRechargeTipsUI();
+            }
+            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_txtTitle = (GTextField)comp.GetChild("txtTitle");
+            m_txtTips = (GTextField)comp.GetChild("txtTips");
+            m_comCostItem = (GComponent)comp.GetChild("comCostItem");
+            m_btnConfirm = (GButton)comp.GetChild("btnConfirm");
+            m_btnCancel = (GButton)comp.GetChild("btnCancel");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_txtTitle = null;
+            m_txtTips = null;
+            m_comCostItem = null;
+            m_btnConfirm = null;
+            m_btnCancel = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_DailySignRechargeTipsUI.cs.meta

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

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

@@ -24,10 +24,10 @@ namespace GFGGame
             return false;
         }
         //补签
-        public static async ETTask<bool> ReqReSign(int day)
+        public static async ETTask<bool> ReqReSign(int day, int type)
         {
             S2C_ReSign response = null;
-            response = (S2C_ReSign)await MessageHelper.SendToServer(new C2S_ReSign() { Day = day });
+            response = (S2C_ReSign)await MessageHelper.SendToServer(new C2S_ReSign() { Day = day ,ConsumeType = type});
             if (response != null)
             {
                 if (response.Error == ErrorCode.ERR_Success)

GameClient/Assets/Game/HotUpdate/Views/ActivityMainTips/ActivityMainTipsView.cs

@@ -42,16 +42,18 @@ namespace GFGGame
                 activitydata = AdCfgArray.Instance.dataArray;
             }
             _ui.m_t4.Play();
-            if (GameGlobal.myNumericComponent.GetAsInt(NumericType.IsPropYchmActivity) == 0)
-            {
-                ActivityDataManager.Instance.todayActivityTips = GameGlobal.myNumericComponent.GetAsInt(NumericType.IsPropYchmActivity);
-                _ui.m_notTips.url = "ui://ActivityMain/ts_jrbzts";
-                _ui.m_tipImg.visible = false;
-            }
             UpdateInfo();
         }
         protected async override void OnHide()
         {
+            if (_ui.m_tipImg.visible)
+            {
+                ActivityDataManager.Instance.todayActivityTips = 1;
+            }
+            else
+            {
+                ActivityDataManager.Instance.todayActivityTips = 0;
+            } 
             bool result;
             result = await ActivitySProxy.ReqActivityTips(NumericType.IsPropYchmActivity, ActivityDataManager.Instance.todayActivityTips);
             base.OnHide();

GameClient/Assets/Game/HotUpdate/Views/ClothingSynthetic/ClothingSyntheticView.cs

@@ -203,7 +203,7 @@ namespace GFGGame
                 _selectedItemId = 0;
                 UpdateClothingList(true);
                 LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.FU_ZHUANG_HE_CHENG, 2);
-
+                Timers.inst.AddUpdate(CheckGuide);
                 // 发送服装合成成功事件
                 EventAgent.DispatchEvent(ConstMessage.CLOTHING_SYNTHETIC_SUCCESS);
                 EventAgent.DispatchEvent(ConstMessage.STUDIO_FILING_UPDATE);
@@ -493,15 +493,19 @@ namespace GFGGame
             GuideController.TryGuide(_ui.m_btnBack, ConstGuideId.CLOTHING_SYNTHETIC, 6, "获得新衣服啦，继续通关主线剧情吧。");
 
             GuideController.TryGuide(_ui.m_cardSyntheticBtn, ConstGuideId.CARD_HECHENG, 1, "领取卡牌。");
-            GuideController.TryGuide(_ui.m_cardSyntheticBtn, ConstGuideId.CARD_HECHENG, 2, "进行卡牌合成");
-            GuideController.TryCompleteGuideIndex(ConstGuideId.CARD_HECHENG, 2);
-            GuideController.TryCompleteGuide(ConstGuideId.CARD_HECHENG, 2);
+            GuideController.TryGuide(null, ConstGuideId.CARD_HECHENG, 2, "获得卡牌后可进行技能书合成！", -1, true, _ui.target.height - 600);
+            GuideController.TryGuide(_ui.m_cardSyntheticBtn, ConstGuideId.CARD_HECHENG, 3, "进入卡牌合成");
         }
-
-        /// <summary>
-        /// 按照屏幕尺寸 更新遮罩的高度
-        /// </summary>
-        /// <returns></returns>
+        protected override void TryCompleteGuide()
+        {
+            base.TryCompleteGuide();
+            GuideController.TryCompleteGuideIndex(ConstGuideId.CARD_HECHENG, 3);
+            GuideController.TryCompleteGuide(ConstGuideId.CARD_HECHENG, 3);
+        }
+            /// <summary>
+            /// 按照屏幕尺寸 更新遮罩的高度
+            /// </summary>
+            /// <returns></returns>
         private async Task UpdateMaskHeight()
         {
             await Task.Delay(5);

GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/DailySignView.cs

@@ -295,19 +295,7 @@ namespace GFGGame
 
             if (day < _day)
             {
-                int[] cost = GlobalCfgArray.globalCfg.dailySignConsumeArr[0];
-                AlertUI.Show(string.Format("是否确定花费{0}{1}补签？", cost[1], ItemCfgArray.Instance.GetCfg(cost[0]).name))
-                    .SetLeftButton(true, "否").SetRightButton(true, "是", async (object param) =>
-                    {
-                        if (!ItemUtil.CheckItemEnough(cost[0], cost[1]))
-                        {
-                            long has = ItemDataManager.GetItemNum(cost[0]);
-                            ItemUtil.BuyCurrency(cost[0], cost[1] - has);
-                            return;
-                        }
-
-                        result = await DailyWelfareSProxy.ReqReSign(day);
-                    });
+                ViewManager.Show<ReDailySignTipsView>(day);
             }
             else
             {

GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/ReDailySignTipsView.cs

@@ -0,0 +1,111 @@
+using ET;
+using FairyGUI;
+using UI.DailyWelfare;
+using System;
+using System.Collections.Generic;
+using ET;
+
+namespace GFGGame
+{
+    //改弹窗只用与每日签到补签
+    //public delegate void TipsCallback();
+    class ReDailySignTipsView : BaseWindow
+    {
+        private UI_DailySignRechargeTipsUI _ui;
+        //private TipsCallback m_leftButtonCallback = null;
+        //private TipsCallback m_rightButtonCallback = null;
+        private int itemId = 0;
+        private string showTipsText = "";
+        private long hasNum;
+        private int type;
+        private int day = 1;
+        public override void Dispose()
+        {
+
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+            base.Dispose();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_DailySignRechargeTipsUI.PACKAGE_NAME;
+            _ui = UI_DailySignRechargeTipsUI.Create();
+            this.viewCom = _ui.target;
+            this.modal = true;
+            this.viewCom.Center();
+            viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
+
+            _ui.m_btnConfirm.onClick.Add(OnClickBtnConfirm);
+            _ui.m_btnCancel.onClick.Add(OnClickBtnCancel);
+            //_ui.m_btnCancel.onClick.Add(() =>
+            //{
+            //    this.Hide();
+            //    m_leftButtonCallback?.Invoke();
+            //});
+            //_ui.m_btnConfirm.onClick.Add(() =>
+            //{
+            //    this.Hide();
+            //    m_rightButtonCallback?.Invoke();
+            //});
+        }
+        protected override void OnShown()
+        {
+            base.OnShown();
+            day = (int)this.viewData;
+            UpdateView();
+        }
+        private void UpdateView()
+        {
+            CheckItemId();
+        }
+        protected override void OnHide()
+        {
+            //m_leftButtonCallback = null;
+            //m_rightButtonCallback = null;
+            base.OnHide();
+        }
+        private void CheckItemId()
+        {
+            int[][] SecondCost = GlobalCfgArray.globalCfg.dailySignConsumeArr;
+            int[][] FirstCost = GlobalCfgArray.globalCfg.SecDailySignConsumeArr;
+            int needNum = 1;
+            hasNum = ItemDataManager.GetItemNum(FirstCost[0][0]);
+            if(hasNum >= FirstCost[0][1])
+            {
+                _ui.m_txtTips.text = string.Format("是否确定花费{0}{1}补签？", FirstCost[0][1], ItemCfgArray.Instance.GetCfg(FirstCost[0][0]).name);
+                type = 1;
+                itemId = FirstCost[0][0];
+                needNum = FirstCost[0][1];
+            }
+            else
+            {
+                type = 0;
+                itemId = SecondCost[0][0];
+                needNum = SecondCost[0][1];
+                hasNum = ItemDataManager.GetItemNum(SecondCost[0][0]);
+                _ui.m_txtTips.text = string.Format("{0}不足，是否确定花费{1}{2}补签？", ItemCfgArray.Instance.GetCfg(SecondCost[0][0]).name, SecondCost[0][1], ItemCfgArray.Instance.GetCfg(SecondCost[0][0]).name);
+            }
+            ItemUtil.UpdateItemNumAndNeedNum(_ui.m_comCostItem, itemId, needNum, true);
+        }
+        private void OnClickBtnCancel()
+        {
+            this.Hide();
+        }
+        private async void OnClickBtnConfirm()
+        {
+            if (!ItemUtil.CheckItemEnough(itemId, (int)hasNum) && itemId == 1000005)
+            {
+                long has = ItemDataManager.GetItemNum((int)hasNum);
+                ItemUtil.BuyCurrency(itemId, (int)hasNum - has);
+                return;
+            }
+           bool result = await DailyWelfareSProxy.ReqReSign(day,type);
+           this.Hide();
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/ReDailySignTipsView.cs.meta

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

GameClient/Assets/Game/HotUpdate/Views/Store/StoreMonthView.cs

@@ -66,7 +66,7 @@ namespace GFGGame
             _valueBarController.OnShown();
             UpdateView();
             UpdateRedDot();
-            Timers.inst.AddUpdate(CheckGuide);
+            //Timers.inst.AddUpdate(CheckGuide);
         }
 
         protected override void OnHide()
@@ -74,7 +74,7 @@ namespace GFGGame
             base.OnHide();
             ShopViewManager.Instance.ClearItemEff();
             _valueBarController.OnHide();
-            Timers.inst.Remove(CheckGuide);
+            //Timers.inst.Remove(CheckGuide);
         }
 
         protected override void RemoveEventListener()