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

GameClient/Assets/Game/HotUpdate/Data/LuckyBoxDataManager.cs

@@ -74,7 +74,7 @@ namespace GFGGame
         {
             luckyBoxFreeTimeMillDic.Clear();
             int count = response.KsLuckyBoxId.Count;
-            for(var i = 0; i < count; i++)
+            for (var i = 0; i < count; i++)
             {
                 luckyBoxFreeTimeMillDic[response.KsLuckyBoxId[i]] = response.VsFreeTime[i];
             }
@@ -232,7 +232,11 @@ namespace GFGGame
             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(costId);
             int costNum = GetCostNum(boxId, times);
             long hasNum = ItemDataManager.GetItemNum(itemCfg.id);
-            if (hasNum >= costNum)
+            long freeTime = LuckyBoxDataManager.Instance.GetFreeTime(boxId);
+            if (freeTime > 0 && freeTime < TimeHelper.ServerNow() && times == LuckyBoxDataManager.ONCE_TIME) {
+                onSuccess();
+            }
+            else if (hasNum >= costNum)
             {
                 AlertUI.Show(string.Format("是否花费{0}个{1}摘星{2}次？", costNum, itemCfg.name, times)).SetLeftButton(true).SetRightButton(true, "确定", (object data) => { onSuccess(); });
             }

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Card/UI_ComConsume.cs

@@ -9,6 +9,7 @@ namespace UI.Card
         public GComponent target;
         public GLoader m_loaBg;
         public GLoader m_loaItem;
+        public GGraph m_holderTouch;
         public GButton m_btnMinus;
         public GTextField m_txtUseCount;
         public GTextField m_txtNum;
@@ -61,6 +62,7 @@ namespace UI.Card
         {
             m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_loaItem = (GLoader)comp.GetChild("loaItem");
+            m_holderTouch = (GGraph)comp.GetChild("holderTouch");
             m_btnMinus = (GButton)comp.GetChild("btnMinus");
             m_txtUseCount = (GTextField)comp.GetChild("txtUseCount");
             m_txtNum = (GTextField)comp.GetChild("txtNum");
@@ -69,6 +71,7 @@ namespace UI.Card
         {
             m_loaBg = null;
             m_loaItem = null;
+            m_holderTouch = null;
             m_btnMinus = null;
             m_txtUseCount = null;
             m_txtNum = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Card/UI_ComFosterBottom.cs

@@ -11,6 +11,7 @@ namespace UI.Card
         public Controller m_ctrlFullLv;
         public Controller m_ctrlTab;
         public Controller m_ctrlSkillCount;
+        public GGraph m_holderfBgEff;
         public GLoader m_loaRarity;
         public GTextField m_txtName0;
         public GTextField m_txtName1;
@@ -24,9 +25,11 @@ namespace UI.Card
         public GButton m_btnAll;
         public GButton m_btnClearAll;
         public GButton m_btnUpLv;
+        public GGraph m_holderflower;
         public GComponent m_ComLvConsumeGold;
         public GTextField m_txtCurExp;
         public GTextField m_txtMaxExp;
+        public GGraph m_holderbarLv;
         public GGroup m_grpLv;
         public GButton m_btnUpStar;
         public GComponent m_comStarCousumeGold;
@@ -97,6 +100,7 @@ namespace UI.Card
             m_ctrlFullLv = comp.GetController("ctrlFullLv");
             m_ctrlTab = comp.GetController("ctrlTab");
             m_ctrlSkillCount = comp.GetController("ctrlSkillCount");
+            m_holderfBgEff = (GGraph)comp.GetChild("holderfBgEff");
             m_loaRarity = (GLoader)comp.GetChild("loaRarity");
             m_txtName0 = (GTextField)comp.GetChild("txtName0");
             m_txtName1 = (GTextField)comp.GetChild("txtName1");
@@ -110,9 +114,11 @@ namespace UI.Card
             m_btnAll = (GButton)comp.GetChild("btnAll");
             m_btnClearAll = (GButton)comp.GetChild("btnClearAll");
             m_btnUpLv = (GButton)comp.GetChild("btnUpLv");
+            m_holderflower = (GGraph)comp.GetChild("holderflower");
             m_ComLvConsumeGold = (GComponent)comp.GetChild("ComLvConsumeGold");
             m_txtCurExp = (GTextField)comp.GetChild("txtCurExp");
             m_txtMaxExp = (GTextField)comp.GetChild("txtMaxExp");
+            m_holderbarLv = (GGraph)comp.GetChild("holderbarLv");
             m_grpLv = (GGroup)comp.GetChild("grpLv");
             m_btnUpStar = (GButton)comp.GetChild("btnUpStar");
             m_comStarCousumeGold = (GComponent)comp.GetChild("comStarCousumeGold");
@@ -139,6 +145,7 @@ namespace UI.Card
             m_ctrlFullLv = null;
             m_ctrlTab = null;
             m_ctrlSkillCount = null;
+            m_holderfBgEff = null;
             m_loaRarity = null;
             m_txtName0 = null;
             m_txtName1 = null;
@@ -152,9 +159,11 @@ namespace UI.Card
             m_btnAll = null;
             m_btnClearAll = null;
             m_btnUpLv = null;
+            m_holderflower = null;
             m_ComLvConsumeGold = null;
             m_txtCurExp = null;
             m_txtMaxExp = null;
+            m_holderbarLv = null;
             m_grpLv = null;
             m_btnUpStar = null;
             m_comStarCousumeGold = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_BuyCountUI.cs

@@ -14,7 +14,7 @@ namespace UI.CommonGame
         public GTextField m_txtName;
         public GButton m_btnPlus;
         public GButton m_btnMinus;
-        public GTextField m_txtCount;
+        public GTextInput m_txtCount;
         public GLoader m_iconPrice;
         public GTextField m_txtPrice;
         public GTextField m_txtBuyTips;
@@ -74,7 +74,7 @@ namespace UI.CommonGame
             m_txtName = (GTextField)comp.GetChild("txtName");
             m_btnPlus = (GButton)comp.GetChild("btnPlus");
             m_btnMinus = (GButton)comp.GetChild("btnMinus");
-            m_txtCount = (GTextField)comp.GetChild("txtCount");
+            m_txtCount = (GTextInput)comp.GetChild("txtCount");
             m_iconPrice = (GLoader)comp.GetChild("iconPrice");
             m_txtPrice = (GTextField)comp.GetChild("txtPrice");
             m_txtBuyTips = (GTextField)comp.GetChild("txtBuyTips");

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_RewardList.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComRewardList.cs

@@ -4,18 +4,18 @@ using FairyGUI;
 
 namespace UI.CommonGame
 {
-    public partial class UI_RewardList
+    public partial class UI_ComRewardList
     {
         public GComponent target;
         public GList m_listReward;
         public const string URL = "ui://eg2y0ldpgo1ltow";
         public const string PACKAGE_NAME = "CommonGame";
-        public const string RES_NAME = "RewardList";
-        private static UI_RewardList _proxy;
+        public const string RES_NAME = "ComRewardList";
+        private static UI_ComRewardList _proxy;
 
-        public static UI_RewardList Create(GObject gObject = null)
+        public static UI_ComRewardList Create(GObject gObject = null)
         {
-            var ui = new UI_RewardList();
+            var ui = new UI_ComRewardList();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -24,11 +24,11 @@ namespace UI.CommonGame
             return ui;
         }
 
-        public static UI_RewardList Proxy(GObject gObject = null)
+        public static UI_ComRewardList Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_RewardList();
+                _proxy = new UI_ComRewardList();
             }
             var ui = _proxy;
             if(gObject == null)

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_RewardList.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComRewardList.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 63092a1883009be4883d3047521d5a53
+guid: fd47d9a17d7050b47ae168cab2158195
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_RewardUI.cs

@@ -10,8 +10,9 @@ namespace UI.CommonGame
         public GGraph m_bg;
         public GGraph m_holderTitle;
         public GGroup m_downTipsText;
-        public UI_RewardList m_comList;
+        public UI_ComRewardList m_comList;
         public GGroup m_grp;
+        public Transition m_openViewAction;
         public const string URL = "ui://eg2y0ldpm9wm8q";
         public const string PACKAGE_NAME = "CommonGame";
         public const string RES_NAME = "RewardUI";
@@ -62,8 +63,9 @@ namespace UI.CommonGame
             m_bg = (GGraph)comp.GetChild("bg");
             m_holderTitle = (GGraph)comp.GetChild("holderTitle");
             m_downTipsText = (GGroup)comp.GetChild("downTipsText");
-            m_comList = (UI_RewardList)UI_RewardList.Create(comp.GetChild("comList"));
+            m_comList = (UI_ComRewardList)UI_ComRewardList.Create(comp.GetChild("comList"));
             m_grp = (GGroup)comp.GetChild("grp");
+            m_openViewAction = comp.GetTransition("openViewAction");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -73,6 +75,7 @@ namespace UI.CommonGame
             m_comList.Dispose();
             m_comList = null;
             m_grp = null;
+            m_openViewAction = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -14,15 +14,7 @@ namespace UI.LuckyBox
         public GGroup m_grpTitle;
         public GButton m_btnPreview;
         public GTextField m_txtOwned;
-        public UI_ComCost m_comCostOne;
-        public UI_ComCost 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 GTextField m_txtFreeTime;
+        public UI_comLuckBoxBtn m_comLuckBoxBtn;
         public const string URL = "ui://drx9d1usduuftcr";
         public const string PACKAGE_NAME = "LuckyBox";
         public const string RES_NAME = "ComBox1";
@@ -77,15 +69,7 @@ namespace UI.LuckyBox
             m_grpTitle = (GGroup)comp.GetChild("grpTitle");
             m_btnPreview = (GButton)comp.GetChild("btnPreview");
             m_txtOwned = (GTextField)comp.GetChild("txtOwned");
-            m_comCostOne = (UI_ComCost)UI_ComCost.Create(comp.GetChild("comCostOne"));
-            m_comCostTen = (UI_ComCost)UI_ComCost.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");
-            m_txtFreeTime = (GTextField)comp.GetChild("txtFreeTime");
+            m_comLuckBoxBtn = (UI_comLuckBoxBtn)UI_comLuckBoxBtn.Create(comp.GetChild("comLuckBoxBtn"));
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -97,17 +81,8 @@ namespace UI.LuckyBox
             m_grpTitle = null;
             m_btnPreview = null;
             m_txtOwned = null;
-            m_comCostOne.Dispose();
-            m_comCostOne = null;
-            m_comCostTen.Dispose();
-            m_comCostTen = null;
-            m_btnBuyOne = null;
-            m_btnBuyTen = null;
-            m_txtRemainTimes = null;
-            m_imgSpecial = null;
-            m_holder = null;
-            m_grpSpecial = null;
-            m_txtFreeTime = null;
+            m_comLuckBoxBtn.Dispose();
+            m_comLuckBoxBtn = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -0,0 +1,97 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.LuckyBox
+{
+    public partial class UI_comLuckBoxBtn
+    {
+        public GComponent target;
+        public UI_ComCost m_comCostOne;
+        public UI_ComCost 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 GTextField m_txtFreeTime;
+        public const string URL = "ui://drx9d1usdkohtf7";
+        public const string PACKAGE_NAME = "LuckyBox";
+        public const string RES_NAME = "comLuckBoxBtn";
+        private static UI_comLuckBoxBtn _proxy;
+
+        public static UI_comLuckBoxBtn Create(GObject gObject = null)
+        {
+            var ui = new UI_comLuckBoxBtn();
+            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_comLuckBoxBtn Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_comLuckBoxBtn();
+            }
+            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_comCostOne = (UI_ComCost)UI_ComCost.Create(comp.GetChild("comCostOne"));
+            m_comCostTen = (UI_ComCost)UI_ComCost.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");
+            m_txtFreeTime = (GTextField)comp.GetChild("txtFreeTime");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_comCostOne.Dispose();
+            m_comCostOne = null;
+            m_comCostTen.Dispose();
+            m_comCostTen = null;
+            m_btnBuyOne = null;
+            m_btnBuyTen = null;
+            m_txtRemainTimes = null;
+            m_imgSpecial = null;
+            m_holder = null;
+            m_grpSpecial = null;
+            m_txtFreeTime = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

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

@@ -1,6 +1,8 @@
+using System;
 using System.Collections.Generic;
 using ET;
 using GFGGame;
+using Hutool;
 
 
 namespace GFGGame
@@ -45,7 +47,16 @@ namespace GFGGame
                     ActivityDataManager.Instance.sevenDayLoginBonusStatus = response.BonusStatus;
                     int[][] rewards = DailyLoginCfgArray.Instance.GetCfg(response.BonusId).rewardsArr;
 
-                    BonusController.TryShowBonusList(rewards);
+                    BonusController.TryShowBonusList(rewards, onSuccess: () =>
+                    {
+                        //签到完成后，关闭获得物品页面后，自动每日签到，窗口让玩家手动关闭
+                        bool isGot = MathUtil.isBitSet(GameGlobal.myNumericComponent.GetAsLong(NumericType.SignDay),
+                            TimeUtil.GetCurDay());
+                        if (!isGot)
+                        {
+                            ViewManager.Show<DailySignView>(new object[] { 1 });
+                        }
+                    });
 
                     EventAgent.DispatchEvent(ConstMessage.RED_CHANGE);
                     return true;

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

@@ -18,7 +18,6 @@ namespace GFGGame
 
     public class LuckyBoxSProxy
     {
-
         //抽奖
         public static async ETTask<bool> ReqGetBonus(int luckyBoxId, int times, bool free = false)
         {
@@ -64,7 +63,7 @@ namespace GFGGame
             response = (S2C_GetLuckyBoxInfo)await MessageHelper.SendToServer(new C2S_GetLuckyBoxInfo() { });
             if(response != null)
             {
-                if(response.Error == ErrorCode.ERR_Success)
+                if (response.Error == ErrorCode.ERR_Success)
                 {
                     LuckyBoxDataManager.Instance.InitServerData(response);
                 }

GameClient/Assets/Game/HotUpdate/Views/Card/CardFosterView.cs

@@ -23,7 +23,12 @@ namespace GFGGame
         private List<CardStarCfg> _cardStarRewards = new List<CardStarCfg>();
         private int _selectTab = 0;
         private List<LongPressGesture> _listLongPress = new List<LongPressGesture>();
+        private List<GGraph> _listEffectHolder = new List<GGraph>();
         private EffectUI _effectUI1;
+        private EffectUI _effectUI3;
+        private EffectUI _effectUI4;
+        private EffectUI _effectUI5;
+        private EffectUI _effectUI6;
 
         private GObject _consumeSelectItem;//选中的材料item
         private int _consumeSelectIndex = 0;//0为减，1为加
@@ -47,6 +52,11 @@ namespace GFGGame
         private Vector2 comCardImgResTargetSize;
         public override void Dispose()
         {
+            EffectUIPool.Recycle(_effectUI3);
+            _effectUI3 = null;
+            EffectUIPool.Recycle(_effectUI4);
+            _effectUI4 = null;
+            
             for (int i = 0; i < _listLongPress.Count; i++)
             {
                 _listLongPress[i].Dispose();
@@ -108,10 +118,10 @@ namespace GFGGame
             _ui.m_loaListener.onClick.Add(OnClickComCard);
             _ui.m_comCard.target.onClick.Add(OnClickComCard);
 
-
+            _effectUI3 = EffectUIPool.CreateEffectUI(_ui.m_ComFosterBottom.m_holderflower, "ui_Activity", "SX_Top_TX");
+            _effectUI4 = EffectUIPool.CreateEffectUI(_ui.m_ComFosterBottom.m_holderfBgEff, "ui_Activity", "SX_Down_TX");
         }
 
-
         protected override void OnShown()
         {
             base.OnShown();
@@ -284,6 +294,9 @@ namespace GFGGame
             }
             _comFosterBottom.m_barLv.max = cardLvCfg.needExp;
             _comFosterBottom.m_barLv.value = _showExp;
+            EffectUIPool.Recycle(_effectUI6);
+            _effectUI6 = EffectUIPool.CreateEffectUI(_comFosterBottom.m_holderbarLv, "ui_Activity", "SX_JinDuTiao");
+
             int maxLv = CardRarityCfgArray.Instance.GetCfg(_cardData.itemCfg.rarity).maxCardLvl;
             _comFosterBottom.m_txtMaxLv.text = maxLv.ToString();
             _comFosterBottom.m_txtCurLv.text = _showLv.ToString();
@@ -310,9 +323,10 @@ namespace GFGGame
             listItem.m_txtUseCount.text = "0";
             listItem.target.data = index;
 
+            _listEffectHolder.Add(listItem.m_holderTouch);
+            
             if (listItem.m_btnMinus.data == null)
             {
-
                 listItem.m_btnMinus.onTouchBegin.Add(OnClickItemConsumsBegin);
                 listItem.m_btnMinus.onTouchEnd.Add(OnClickItemLvConsumsEnd);
             }
@@ -355,6 +369,9 @@ namespace GFGGame
             }
             OnTimedEvent(null);
             Timers.inst.Add(0.3f, 0, OnTimedEvent);
+
+            EffectUIPool.Recycle(_effectUI5);
+            _effectUI5 = EffectUIPool.CreateEffectUI(_listEffectHolder[index], "ui_Activity", "SX_DianJi");
         }
         private void OnTimedEvent(object param)
         {
@@ -938,7 +955,11 @@ namespace GFGGame
 
             EffectUIPool.Recycle(_effectUI1);
             _effectUI1 = null;
-
+            EffectUIPool.Recycle(_effectUI5);
+            _effectUI5 = null;
+            EffectUIPool.Recycle(_effectUI6);
+            _effectUI6 = null;
+            
             Timers.inst.Remove(CheckGuide);
             Timers.inst.Remove(OnTimedEvent);
             UI_ComCostCurrency.ProxyEnd();

GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/ClothingView.cs

@@ -378,7 +378,8 @@ namespace GFGGame
             SuitFosterListCfg cfg = SuitFosterListCfgArray.Instance.GetCfg(_suitId);
             if (data.maintainStep < cfg.renewOpenLv)
             {
-                PromptController.Instance.ShowFloatTextPrompt(string.Format("完成{0}开启焕新", SuitFosterDataManager.Instance.stepNames[cfg.renewOpenLv - 1]));
+                PromptController.Instance.ShowFloatTextPrompt("完成养护后开启焕新");
+                //PromptController.Instance.ShowFloatTextPrompt(string.Format("完成{0}开启焕新", SuitFosterDataManager.Instance.stepNames[cfg.renewOpenLv - 1]));
                 return;
             }
 

GameClient/Assets/Game/HotUpdate/Views/CommonGame/BuyCountView.cs

@@ -84,8 +84,9 @@ namespace GFGGame
             _ui.m_btnMinus.onTouchEnd.Add(() => { Timers.inst.Remove(OnTimedEvent); });
             _ui.m_btnSure.onClick.Add(OnClickBtnSure);
             _ui.m_btnCancel.onClick.Add(OnClickBtnCancel);
+            _ui.m_txtCount.onFocusOut.Add(OnChangedTxtCount);
         }
-
+        
         /// <summary>
         /// 
         /// </summary>
@@ -261,6 +262,25 @@ namespace GFGGame
             this.Hide();
         }
 
+        //监控输入
+        private void OnChangedTxtCount(EventContext context)
+        {
+            GTextInput sender = context.sender as GTextInput;
+            bool isNumeric = int.TryParse(sender.text, out var result);
+            if (!isNumeric)
+            {
+                sender.text = _minBuyCount.ToString();
+            }
+
+            if (Convert.ToInt32(sender.text) <= 0)
+            {
+                sender.text = _minBuyCount.ToString();
+            }
+            
+            _count = Math.Min(_maxCanBuy, Convert.ToInt32(sender.text));
+            UpdateCost();
+        }
+
         private void OnClickBtnCancel()
         {
             this.Hide();

GameClient/Assets/Game/HotUpdate/Views/CommonGame/RewardView.cs

@@ -78,8 +78,6 @@ namespace GFGGame
             _ui.m_comList.m_listReward.numItems = 0;
             counTime = 0;
             Timers.inst.Add(0.1f, 3, OnTimerUpdate, 1);
-            //邊框左上角特效
-            //_effectUI1 = EffectUIPool.CreateEffectUI(_ui.m_holderTitle, "ui_hd", "GXHD");
         }
 
         private void OnTimerUpdate(object param)

GameClient/Assets/Game/HotUpdate/Views/League/LeagueGiftView.cs

@@ -133,7 +133,7 @@ namespace GFGGame
             item.m_comItem.m_txtTime.visible = buyData.EndTime > 0;
             item.m_comItem.m_txtTime.text = string.Format("剩余{0}天", StringUtil.GetColorText(buyData.EndTime.ToString(), "#E45E29"));
             item.m_comItem.m_grpLock.visible = LeagueDataManager.Instance.HallLevel < buyData.GiftCfg.level;
-            item.m_comItem.m_txtLock.text = string.Format("宴客厅等级达到{0}级解锁", buyData.GiftCfg.level);
+            item.m_comItem.m_txtLock.text = string.Format("雅集建筑-宴客厅{0}级解锁", buyData.GiftCfg.level);
             ItemUtil.UpdateItemNeedNum(item.m_comItem.m_comCost, buyData.GiftCfg.consumeArr[0]);
 
             if (item.m_comItem.m_listGift.data == null)
@@ -208,7 +208,7 @@ namespace GFGGame
             }
             if (LeagueDataManager.Instance.HallLevel < buyData.GiftCfg.level)
             {
-                PromptController.Instance.ShowFloatTextPrompt("宴客厅等级不足");
+                PromptController.Instance.ShowFloatTextPrompt("雅集建筑-宴客厅等级不足");
                 return;
             }
             int needNum = buyData.GiftCfg.consumeArr[0][1];

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

@@ -128,12 +128,38 @@ namespace GFGGame
             _ui.m_listBg.scrollPane.decelerationRate = 0.8f;
             LuckyBoxDataManager.Instance.luckyBoxIndex = _curIndex;
 
-
             OnListBgScroll();
             updateBoxEffect();
-            UpdateFreeInfo();
 
             Timers.inst.AddUpdate(CheckGuide);
+
+            Timers.inst.Add(1f, 0, OnTimerUpdate, 1);
+        }
+
+        private void OnTimerUpdate(object param)
+        {
+            int boxId = LuckyBoxDataManager.Instance.luckyBoxIds[_curIndex];
+            long freeTime = LuckyBoxDataManager.Instance.GetFreeTime(boxId);
+            GObject obj = _ui.m_listBg.GetChildAt(_curIndex);
+            UI_ComBox1 comBox = UI_ComBox1.Proxy(obj);
+            if (freeTime > 0)
+            {
+                long timeDifference = freeTime - TimeHelper.ServerNow();
+                if (timeDifference> 0)
+                {
+                    comBox.m_comLuckBoxBtn.m_comCostOne.m_c1.selectedIndex = 0;
+                    comBox.m_comLuckBoxBtn.m_txtFreeTime.visible = true;
+                    string strFreeTime = TimeUtil.FormattingTimeTo_HHmmss(timeDifference);
+                    comBox.m_comLuckBoxBtn.m_txtFreeTime.text = string.Format("{0}后免费", strFreeTime);
+                }
+                else
+                {
+                    comBox.m_comLuckBoxBtn.m_comCostOne.m_c1.selectedIndex = 1;
+                    comBox.m_comLuckBoxBtn.m_txtFreeTime.visible = false;
+                }
+            }
+
+            UI_ComBox1.ProxyEnd();
         }
 
         private void RenderListBgItem(int index, GObject obj)
@@ -193,29 +219,30 @@ namespace GFGGame
 
             _lcukyBoxCtrl[LuckyBoxDataManager.Instance.currentBoxId].OnShown(LuckyBoxDataManager.Instance.currentBoxId);
 
-            comBox.m_imgSpecial.visible = boxId != LuckyBoxDataManager.BOX_ID_3;
-            GGraph holder = comBox.m_btnBuyTen.GetChild("holder").asGraph;
+            comBox.m_comLuckBoxBtn.m_imgSpecial.visible = boxId != LuckyBoxDataManager.BOX_ID_3;
+            GGraph holder = comBox.m_comLuckBoxBtn.m_btnBuyTen.GetChild("holder").asGraph;
             holder.visible = boxId != LuckyBoxDataManager.BOX_ID_3;
-            comBox.m_holder.visible = boxId != LuckyBoxDataManager.BOX_ID_3;
+            comBox.m_comLuckBoxBtn.m_holder.visible = boxId != LuckyBoxDataManager.BOX_ID_3;
 
             _effectUI1 = EffectUIPool.CreateEffectUI(holder, "ui_LuckyBox", "Button_Glow");
-            _effectUI2 = EffectUIPool.CreateEffectUI(comBox.m_holder, "ui_LuckyBox", "but_text_dc");
+            _effectUI2 = EffectUIPool.CreateEffectUI(comBox.m_comLuckBoxBtn.m_holder, "ui_LuckyBox", "but_text_dc");
+
+            comBox.m_comLuckBoxBtn.m_comCostOne.m_txtCost.text = cfg.costNum.ToString();
+            comBox.m_comLuckBoxBtn.m_comCostOne.m_loaCost.url = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(cfg.costID).res);
 
-            comBox.m_comCostOne.m_txtCost.text = cfg.costNum.ToString();
-            comBox.m_comCostOne.m_loaCost.url = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(cfg.costID).res);
-            comBox.m_comCostTen.m_txtCost.text = cfg.costNumTen.ToString();
-            comBox.m_comCostTen.m_loaCost.url = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(cfg.costID).res);
-            if (comBox.m_btnBuyOne.data == null)
+            comBox.m_comLuckBoxBtn.m_comCostTen.m_txtCost.text = cfg.costNumTen.ToString();
+            comBox.m_comLuckBoxBtn.m_comCostTen.m_loaCost.url = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(cfg.costID).res);
+            if (comBox.m_comLuckBoxBtn.m_btnBuyOne.data == null)
             {
-                comBox.m_btnBuyOne.onClick.Add(OnClickBtnBuyOne);
+                comBox.m_comLuckBoxBtn.m_btnBuyOne.onClick.Add(OnClickBtnBuyOne);
             }
-            comBox.m_btnBuyOne.data = boxId;
+            comBox.m_comLuckBoxBtn.m_btnBuyOne.data = boxId;
 
-            if (comBox.m_btnBuyTen.data == null)
+            if (comBox.m_comLuckBoxBtn.m_btnBuyTen.data == null)
             {
-                comBox.m_btnBuyTen.onClick.Add(OnClickBtnBuyTen);
+                comBox.m_comLuckBoxBtn.m_btnBuyTen.onClick.Add(OnClickBtnBuyTen);
             }
-            comBox.m_btnBuyTen.data = boxId;
+            comBox.m_comLuckBoxBtn.m_btnBuyTen.data = boxId;
 
             if (comBox.m_btnPreview.data == null)
             {
@@ -242,6 +269,7 @@ namespace GFGGame
             }
             UI_ComBox1.ProxyEnd();
             UpdateListItemData();
+            UpdateFreeInfo();
         }
         private void UpdateListItemData()
         {
@@ -253,7 +281,7 @@ namespace GFGGame
             comBox.m_txtOwned.SetVar("v1", "" + count).FlushVars();
             comBox.m_txtOwned.SetVar("v2", "" + totalCount).FlushVars();
             int boughtCount = GameGlobal.myNumericComponent.GetAsInt(cfg.numericType);
-            comBox.m_txtRemainTimes.text = string.Format("今日剩余次数：{0}", cfg.maxCount - boughtCount);
+            comBox.m_comLuckBoxBtn.m_txtRemainTimes.text = string.Format("今日剩余次数：{0}", cfg.maxCount - boughtCount);
             UI_ComBox1.ProxyEnd();
         }
 
@@ -298,7 +326,10 @@ namespace GFGGame
             GObject obj = context.sender as GObject;
             int boxId = (int)obj.data;
             LuckyBoxCfg luckyBoxCfg = LuckyBoxCfgArray.Instance.GetCfg(boxId);
+            long freeTime = LuckyBoxDataManager.Instance.GetFreeTime(boxId);
+
             int boughtCount = GameGlobal.myNumericComponent.GetAsInt(luckyBoxCfg.numericType);
+
             if (boughtCount + LuckyBoxDataManager.ONCE_TIME > luckyBoxCfg.maxCount)
             {
                 PromptController.Instance.ShowFloatTextPrompt("抽奖次数不足");
@@ -306,7 +337,12 @@ namespace GFGGame
             }
             LuckyBoxDataManager.Instance.CheckItemEnough(boxId, LuckyBoxDataManager.ONCE_TIME, async () =>
              {
-                 bool result = await LuckyBoxSProxy.ReqGetBonus(boxId, LuckyBoxDataManager.ONCE_TIME);
+                 bool result = false;
+                 if (freeTime > 0 && freeTime < TimeHelper.ServerNow())
+                    result = await LuckyBoxSProxy.ReqGetBonus(boxId, LuckyBoxDataManager.ONCE_TIME, true);
+                 else
+                    result = await LuckyBoxSProxy.ReqGetBonus(boxId, LuckyBoxDataManager.ONCE_TIME);
+
                  if (result)
                  {
                      ViewManager.Show<LuckyBoxStarView>(null, new object[] { ViewName.LUCKY_BOX_VIEW, boxId });
@@ -355,6 +391,7 @@ namespace GFGGame
                 _lcukyBoxCtrl[key].OnHide();
             }
 
+            Timers.inst.Remove(OnTimerUpdate);
             Timers.inst.Remove(CheckTime);
             // Timers.inst.Remove(UpdateBg);
             Timers.inst.Remove(CheckGuide);
@@ -418,7 +455,29 @@ namespace GFGGame
 
         private void UpdateFreeInfo()
         {
-
+            int boxId = LuckyBoxDataManager.Instance.luckyBoxIds[_curIndex];
+            LuckyBoxCfg cfg = LuckyBoxCfgArray.Instance.GetCfg(boxId);
+            long freeTime = LuckyBoxDataManager.Instance.GetFreeTime(boxId);
+            GObject obj = _ui.m_listBg.GetChildAt(_curIndex);
+            UI_ComBox1 comBox = UI_ComBox1.Proxy(obj);
+            if (freeTime > 0)
+            {
+                if (freeTime > TimeHelper.ServerNow())
+                {
+                    comBox.m_comLuckBoxBtn.m_comCostOne.m_c1.selectedIndex = 0;
+                    comBox.m_comLuckBoxBtn.m_txtFreeTime.visible = true;
+                }
+                else
+                {
+                    comBox.m_comLuckBoxBtn.m_comCostOne.m_c1.selectedIndex = 1;
+                    comBox.m_comLuckBoxBtn.m_txtFreeTime.visible = false;
+                }
+            }
+            else
+            {
+                comBox.m_comLuckBoxBtn.m_comCostOne.m_c1.selectedIndex = 0;
+                comBox.m_comLuckBoxBtn.m_txtFreeTime.visible = false;
+            }
         }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/Mail/MailView.cs

@@ -82,7 +82,6 @@ namespace GFGGame
             base.OnShown();
             mailDataMgr.CurPage = 0;
             UpdateNormal();
-            _ui.m_openViewAction.Play();
         }
         private void UpdateNormal()
         {

GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryCardChoose.cs

@@ -67,35 +67,41 @@ namespace GFGGame
 
             _comSelected = UIPackage.CreateObject(UI_MainUI.PACKAGE_NAME, "ComCardSelect").asCom;
             //_effectUI1 = EffectUIPool.CreateEffectUI(_comSelected.GetChild("holder").asGraph, "ui_fight_new", "kp_Select");
-
         }
 
         protected override void OnShown()
         {
             base.OnShown();
-            _scoreType = (int)viewData;
+
+            _scoreType = (int)this.viewData;
             ArenaDataManager dataManager = ArenaDataManager.Instance;
-            //其他主题带的cardIds
-            var otherThemeCardIds = new HashSet<int>();
-            for (int i = 0; i < dataManager.DressupList.Count; i++)
+
+            cardList = CardDataManager.GetCardListByRarity(0);
+            //是从竞技场进来的话，去掉已经在其他主题装配的cardList
+            if (InstanceZonesDataManager.FightScene == ConstInstanceZonesType.Arena)
             {
-                if (dataManager.SelectThemeIndex == i)
+                //其他主题带的cardIds
+                var otherThemeCardIds = new HashSet<int>();
+                for (int i = 0; i < dataManager.DressupList.Count; i++)
                 {
-                    continue;
+                    if (dataManager.SelectThemeIndex == i)
+                    {
+                        continue;
+                    }
+
+                    otherThemeCardIds.Add(dataManager.DressupList[i].cardId);
                 }
 
-                otherThemeCardIds.Add(dataManager.DressupList[i].cardId);
+                //去掉已经在其他主题装配的cardList
+                cardList = cardList.Where(a => !otherThemeCardIds.Contains(a.id)).ToList();
             }
 
-            cardList = CardDataManager.GetCardListByRarity(0);
-            //去掉已经在其他主题装配的cardList
-            cardList = cardList.Where(a => !otherThemeCardIds.Contains(a.id)).ToList();
-
             float dressListAllAcore =
                 FightDataManager.Instance.GetDressListAllScore(MyDressUpHelper.dressUpObj.itemList, _scoreType);
             cardList = FightDataManager.Instance.SortCardList(cardList, dressListAllAcore, _scoreType);
             _ui.m_listCard.numItems = cardList.Count;
             _ui.m_listCard.selectedIndex = 0;
+
             if (InstanceZonesDataManager.FightScene == ConstInstanceZonesType.Arena)
             {
                 _cardId = dataManager.DressupList[dataManager.SelectThemeIndex].cardId;

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

@@ -215,12 +215,7 @@ namespace GFGGame
                 {
                     ViewManager.Show<SevenDayLoginView>();
                 }
-                //每日签到每天首次登录时自动弹出，并且自动签到，窗口让玩家手动关闭
-                bool isGot = MathUtil.isBitSet(GameGlobal.myNumericComponent.GetAsLong(NumericType.SignDay), TimeUtil.GetCurDay());
-                if (!isGot)
-                {
-                    ViewManager.Show<DailySignView>(new object[] { 1 });
-                }
+                
                 GameGlobal.lastLoginTime = GameGlobal.myNumericComponent.GetAsInt(NumericType.OnlineTimeSecs);
             }