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

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

@@ -55,6 +55,18 @@ namespace GFGGame
             UI_ComVipLv.ProxyEnd();
         }
 
+        private List<EffectUI> _effectUIs = new List<EffectUI>();
+        //清除商品item的特效
+        public void ClearItemEff()
+        {
+            for (int i = 0; i < _effectUIs.Count; i++)
+            {
+                EffectUIPool.Recycle(_effectUIs[i]);
+                _effectUIs[i] = null;
+            }
+            _effectUIs.Clear();
+        }
+
         //更新商品item
         public void UptadeItem(GObject obj, ShopCfg shopCfg)
         {
@@ -66,6 +78,11 @@ namespace GFGGame
             item.m_icon.url = ResPathUtil.GetIconPath(itemCfg);
 
             item.m_grpDiscount.visible = shopCfg.price < shopCfg.originalPrice;
+            if (item.m_grpDiscount.visible)
+            {
+                EffectUI _effectUI = EffectUIPool.CreateEffectUI(item.m_holderfEff, "ui_Small_parts", "store_Value");
+                _effectUIs.Add(_effectUI);
+            }
             item.m_txtDesc.text = shopCfg.price <= 0 ? "" : ShopDataManager.Instance.GetShopGoodsDiscount(shopCfg.id).ToString();
 
             item.m_txtEndTime.SetVar("value", ShopDataManager.Instance.GetEndTime(shopCfg.id)).FlushVars();

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

@@ -15,7 +15,7 @@ namespace GFGGame
 
         public int filingChapterId;//查阅建档当前副本Id
         public int npcFilingChapterId;//记录查阅建档工作室入口id，为与限时活动章节做区分。
-        public int luckyBoxFilingChapterId;//查阅建档这个章节是限时抽奖活动专属
+        private int luckyBoxFilingChapterId;//查阅建档这个章节是限时抽奖活动专属
 
         public int PorcelainTheme = 1;//瓷器修复当天主题
 
@@ -102,7 +102,17 @@ namespace GFGGame
             {
                 needStoryLevelId = storyLevelCfg.needStoryLevelId;
             }
-            bool isPass = InstanceZonesDataManager.CheckLevelPass(needStoryLevelId);
+
+            bool isPass;
+            if (needStoryLevelId == 0)
+            {
+                isPass = true;
+            }
+            else
+            {
+                isPass = InstanceZonesDataManager.CheckLevelPass(needStoryLevelId);
+            }
+            
             StoryLevelCfg needStoryLevelCfg = StoryLevelCfgArray.Instance.GetCfg(needStoryLevelId);
             if (!isPass && needStoryLevelCfg != null) content = string.Format("完成主线{0}-{1}解锁", needStoryLevelCfg.chapterId, needStoryLevelCfg.order);
 
@@ -210,7 +220,19 @@ namespace GFGGame
 
         public bool IsluckyBoxFilingChapter()
         {
-            return filingChapterId == luckyBoxFilingChapterId;
+            return filingChapterId == GetLuckyBoxActivityID();
+        }
+
+        public int GetLuckyBoxActivityID()
+        {
+            if (luckyBoxFilingChapterId == 0)
+            {
+                int activityId = ActivityDataManager.Instance.GetCurOpenActiveByType(ConstLimitTimeActivityType.ActLimitLuckyBox);
+
+                ActivityOpenCfg activityCfg = ActivityOpenCfgArray.Instance.GetCfg(activityId);
+                luckyBoxFilingChapterId = activityCfg.params3Arr != null ? activityCfg.params3Arr[0] : 0;
+            }
+            return luckyBoxFilingChapterId;
         }
 
     }

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityDay7/UI_ExpProcessItem.cs

@@ -14,6 +14,7 @@ namespace UI.ActivityDay7
         public GTextField m_Num;
         public GTextField m_Score;
         public GImage m_Get;
+        public GGraph m_holderfEff;
         public const string URL = "ui://kupdwln7bhmmi";
         public const string PACKAGE_NAME = "ActivityDay7";
         public const string RES_NAME = "ExpProcessItem";
@@ -68,6 +69,7 @@ namespace UI.ActivityDay7
             m_Num = (GTextField)comp.GetChild("Num");
             m_Score = (GTextField)comp.GetChild("Score");
             m_Get = (GImage)comp.GetChild("Get");
+            m_holderfEff = (GGraph)comp.GetChild("holderfEff");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -78,6 +80,7 @@ namespace UI.ActivityDay7
             m_Num = null;
             m_Score = null;
             m_Get = null;
+            m_holderfEff = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -17,6 +17,7 @@ namespace UI.CommonGame
         public UI_Button22 m_ComeBt;
         public UI_Button22 m_GetRewardBt1;
         public GProgressBar m_taskBar;
+        public GGraph m_holderfTaskEff;
         public const string URL = "ui://eg2y0ldplh8v5";
         public const string PACKAGE_NAME = "CommonGame";
         public const string RES_NAME = "TaskListItem";
@@ -74,6 +75,7 @@ namespace UI.CommonGame
             m_ComeBt = (UI_Button22)UI_Button22.Create(comp.GetChild("ComeBt"));
             m_GetRewardBt1 = (UI_Button22)UI_Button22.Create(comp.GetChild("GetRewardBt1"));
             m_taskBar = (GProgressBar)comp.GetChild("taskBar");
+            m_holderfTaskEff = (GGraph)comp.GetChild("holderfTaskEff");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -90,6 +92,7 @@ namespace UI.CommonGame
             m_GetRewardBt1.Dispose();
             m_GetRewardBt1 = null;
             m_taskBar = null;
+            m_holderfTaskEff = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -7,6 +7,7 @@ namespace UI.Main
     public partial class UI_ListCardItem
     {
         public GButton target;
+        public Controller m_starNumType;
         public UI_ComCardMask m_comCardMask;
         public GLoader m_loaBorder;
         public GLoader m_loaMainScore;
@@ -64,6 +65,7 @@ namespace UI.Main
 
         private void Init(GComponent comp)
         {
+            m_starNumType = comp.GetController("starNumType");
             m_comCardMask = (UI_ComCardMask)UI_ComCardMask.Create(comp.GetChild("comCardMask"));
             m_loaBorder = (GLoader)comp.GetChild("loaBorder");
             m_loaMainScore = (GLoader)comp.GetChild("loaMainScore");
@@ -77,6 +79,7 @@ namespace UI.Main
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_starNumType = null;
             m_comCardMask.Dispose();
             m_comCardMask = null;
             m_loaBorder = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_ListGiftItem.cs

@@ -10,6 +10,7 @@ namespace UI.Store
         public Controller m_c1;
         public Controller m_c2;
         public GImage m_imgDouble;
+        public GGraph m_holderfEff;
         public GTextField m_txtDesc;
         public GGroup m_grpDiscount;
         public GLoader m_icon;
@@ -68,6 +69,7 @@ namespace UI.Store
             m_c1 = comp.GetController("c1");
             m_c2 = comp.GetController("c2");
             m_imgDouble = (GImage)comp.GetChild("imgDouble");
+            m_holderfEff = (GGraph)comp.GetChild("holderfEff");
             m_txtDesc = (GTextField)comp.GetChild("txtDesc");
             m_grpDiscount = (GGroup)comp.GetChild("grpDiscount");
             m_icon = (GLoader)comp.GetChild("icon");
@@ -82,6 +84,7 @@ namespace UI.Store
             m_c1 = null;
             m_c2 = null;
             m_imgDouble = null;
+            m_holderfEff = null;
             m_txtDesc = null;
             m_grpDiscount = null;
             m_icon = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_ListShopItem.cs

@@ -10,6 +10,7 @@ namespace UI.Store
         public Controller m_c1;
         public Controller m_c2;
         public GImage m_imgDouble;
+        public GGraph m_holderfEff;
         public GTextField m_txtDesc;
         public GGroup m_grpDiscount;
         public GLoader m_icon;
@@ -68,6 +69,7 @@ namespace UI.Store
             m_c1 = comp.GetController("c1");
             m_c2 = comp.GetController("c2");
             m_imgDouble = (GImage)comp.GetChild("imgDouble");
+            m_holderfEff = (GGraph)comp.GetChild("holderfEff");
             m_txtDesc = (GTextField)comp.GetChild("txtDesc");
             m_grpDiscount = (GGroup)comp.GetChild("grpDiscount");
             m_icon = (GLoader)comp.GetChild("icon");
@@ -82,6 +84,7 @@ namespace UI.Store
             m_c1 = null;
             m_c2 = null;
             m_imgDouble = null;
+            m_holderfEff = null;
             m_txtDesc = null;
             m_grpDiscount = null;
             m_icon = null;

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

@@ -50,7 +50,7 @@ namespace GFGGame
                         if(filingCfg.suitId != 0)
                         {
                             SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(filingCfg.suitId);
-                            if (suitCfg.syntheticStoryLevelId == levelCfgId && levelCfgId != StudioDataManager.Instance.luckyBoxFilingChapterId)
+                            if (suitCfg.syntheticStoryLevelId == levelCfgId && levelCfgId != StudioDataManager.Instance.GetLuckyBoxActivityID())
                             {
                                 PromptController.Instance.ShowFloatTextPrompt(string.Format("已解锁{0}套装制作", suitCfg.name));
                             }

GameClient/Assets/Game/HotUpdate/Utils/LogUtil.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: e4874d5f9fe01d64a9bcf802332afffa
+guid: 071beb906244dcd4ab7b6f3b20ef365b
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

GameClient/Assets/Game/HotUpdate/Views/ActivityDay7/ActivityDay7View.cs

@@ -21,7 +21,9 @@ namespace GFGGame
 
         //选中的天数index 天数=index+1
         private int onClickDayIndex;
-
+        private List<EffectUI> _effectUIs = new List<EffectUI>();
+        private List<EffectUI> _effectTaskUIs = new List<EffectUI>();
+        
         public override void Dispose()
         {
             if (_ui != null)
@@ -70,6 +72,8 @@ namespace GFGGame
         public override void Hide()
         {
             Timers.inst.Remove(UpdateTime);
+            ClearScoreItemEff();
+            ClearTaskItemEff();
             base.Hide();
         }
 
@@ -166,6 +170,7 @@ namespace GFGGame
 
         private void SetTasks()
         {
+            ClearTaskItemEff();
             var activity7DaysTaskCfg = Activity7DaysTaskCfgArray.Instance.GetCfg(onClickDayIndex + 1);
             var taskIdArr = activity7DaysTaskCfg.taskIdArr;
             //排序根据领取状态
@@ -203,6 +208,10 @@ namespace GFGGame
             {
                 item.m_listTaskReward.itemRenderer = ListTaskRewardItemRender;
             }
+            if (item.m_c1.selectedIndex == 1){
+                EffectUI _effectUI = EffectUIPool.CreateEffectUI(item.m_holderfTaskEff, "ui_Small_parts", "store_button_public");
+                _effectTaskUIs.Add(_effectUI);
+            }
             item.m_listTaskReward.data = TaskDataManager.Instance.GetReward(taskCfg);
             item.m_listTaskReward.numItems = TaskDataManager.Instance.GetReward(taskCfg).Length;
             RedDotController.Instance.SetComRedDot(item.m_GetRewardBt.target, item.m_c1.selectedIndex == 1);
@@ -234,6 +243,7 @@ namespace GFGGame
         //设置积分列表
         private void SetScoreList()
         {
+            ClearScoreItemEff();
             //7日活动配置
             activity7DaysCfgs = Activity7DaysCfgArray.Instance.dataArray;
             var maxCfg = activity7DaysCfgs[activity7DaysCfgs.Length - 1];
@@ -242,6 +252,7 @@ namespace GFGGame
             var pos = _ui.m_StartIndex.position;
             var endX = _ui.m_EndIndex.position.x;
             _ui.m_ExpProcess.max = maxScore;
+            var score = ActivityDay7DataManager.Instance.GetScore();
             //循环设置UI
             foreach (var cfg in activity7DaysCfgs)
             {
@@ -259,6 +270,10 @@ namespace GFGGame
                 item.m_loaIcon.url = string.IsNullOrEmpty(itemCfg.res) ? "" : ResPathUtil.GetIconPath(itemCfg);
                 item.m_Num.text = cfgBonusArr[0][1].ToString();
                 item.m_c1.selectedIndex = cfg.id == maxCfgID ? 1 : 0;
+                //if (item.m_c2.selectedIndex == 0 && score >= cfgScore) { 
+                //    var _effectUI = EffectUIPool.CreateEffectUI(item.m_holderfEff, "ui_Small_parts", "store_NotClaimed_circle");
+                //    _effectUIs.Add(_effectUI);
+                //}
                 item.target.data = cfg;
                 item.target.onClick.Add(OnClickReward);
                 UI_ExpProcess.ProxyEnd();
@@ -266,6 +281,26 @@ namespace GFGGame
             FreshGetStatus();
         }
 
+        public void ClearScoreItemEff()
+        {
+            for (int i = 0; i < _effectUIs.Count; i++)
+            {
+                EffectUIPool.Recycle(_effectUIs[i]);
+                _effectUIs[i] = null;
+            }
+            _effectUIs.Clear();
+        }
+
+        public void ClearTaskItemEff()
+        {
+            for (int i = 0; i < _effectTaskUIs.Count; i++)
+            {
+                EffectUIPool.Recycle(_effectTaskUIs[i]);
+                _effectTaskUIs[i] = null;
+            }
+            _effectTaskUIs.Clear();
+        }
+        
         //设置天数列表
         private void SetDayList()
         {
@@ -286,7 +321,7 @@ namespace GFGGame
                 item.m_c2.selectedIndex = state ? 1 : 0;
                 RedDotController.Instance.SetComRedDot(item.target,
                     ActivityDay7DataManager.Instance.CheckActivityDay7RewardCanGet(cfgID),"",-90);
-                UI_ExpProcessItem.ProxyEnd();   
+                UI_ExpProcessItem.ProxyEnd();
             });
         }
 

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

@@ -62,7 +62,6 @@ namespace GFGGame
             _ui.target.GetTransition("In_" + _activityId.ToString())?.Play();
             _activityCfg = ActivityOpenCfgArray.Instance.GetCfg(_activityId);
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath(_activityCfg.res);
-            StudioDataManager.Instance.luckyBoxFilingChapterId = _activityCfg.params3Arr != null ? _activityCfg.params3Arr[0] : 0;
 
             UpdateEffect();
             UpdateRedDot();
@@ -99,7 +98,7 @@ namespace GFGGame
         }
         private void OnBtnChapterClick()
         {
-            ViewManager.Show<StudioFilingView>(StudioDataManager.Instance.luckyBoxFilingChapterId, new object[] { typeof(ActivityThemeLuckyBoxView).FullName, this.viewData });
+            ViewManager.Show<StudioFilingView>(StudioDataManager.Instance.GetLuckyBoxActivityID(), new object[] { typeof(ActivityThemeLuckyBoxView).FullName, this.viewData });
         }
         private void OnBtnLuckyBoxClick()
         {

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

@@ -225,7 +225,14 @@ namespace GFGGame
                         if (studioCfg.funId == typeof(StudioFilingView).Name)
                         {
                             StudioDataManager.Instance.filingChapterId = studioCfg.id;
-                            ViewManager.Show<StudioFilingView>(null, _fromViewDatas);
+                            if (StudioDataManager.Instance.IsluckyBoxFilingChapter())
+                            {
+                                ViewManager.Show<StudioFilingView>(studioCfg.id, _fromViewDatas);
+                            }
+                            else
+                            {
+                                ViewManager.Show<StudioFilingView>(null, _fromViewDatas);
+                            }
                             MainStoryDataManager.currentLevelCfgId = levelCfg.id;
                             InstanceZonesController.ShowLevelView(levelCfg.id, StudioDataManager.Instance.OnFinishFilingStoryLevel, _itemId, _needCount);
                             isJump = true;

GameClient/Assets/Game/HotUpdate/Views/DressUp/DressUpFightView.cs

@@ -303,7 +303,7 @@ namespace GFGGame
             {
                 if (StudioDataManager.Instance.IsluckyBoxFilingChapter())
                 {
-                    ViewManager.Show<StudioFilingView>(StudioDataManager.Instance.luckyBoxFilingChapterId, ViewManager.GetGoBackDatas(typeof(StudioFilingView).FullName));
+                    ViewManager.Show<StudioFilingView>(StudioDataManager.Instance.GetLuckyBoxActivityID(), ViewManager.GetGoBackDatas(typeof(StudioFilingView).FullName));
                 }
                 else
                 {

GameClient/Assets/Game/HotUpdate/Views/Field/FieldView.cs

@@ -126,7 +126,7 @@ namespace GFGGame
             //     return;
             // }
             _selectedIndex = _ui.m_c1.selectedIndex;
-            _curCfg = FieldCfgArray.Instance.dataArray[_selectedIndex]; ;
+            _curCfg = FieldCfgArray.Instance.dataArray[_selectedIndex];
             _dataManager.chapterId = _curCfg.id;
             _dataManager.difficulty = _selectedIndex;
             // UpdateView();

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

@@ -324,7 +324,7 @@ namespace GFGGame
                 // TimeUtil.FormattingTime(curTime, endTime, out int num, out string str);
                 long time = endTime - curTime;
                 string strTime = time > TimeUtil.SECOND_PER_DAY * 100 ? TimeUtil.FormattingTimeTo_DDHHmm(time) : TimeUtil.FormattingTimeTo_HHmmss(time);
-                comBox.m_txtTime.text = string.Format("活动时间:剩余{0}", strTime);
+                comBox.m_txtTime.text = string.Format("概率提升:剩余{0}", strTime);
                 //comBox.m_loaTitle.url = "ui://LuckyBox/zx_title_1";
             }
             else
@@ -456,7 +456,7 @@ namespace GFGGame
 
                 long time = endTime - curTime;
                 string strTime = time > TimeUtil.SECOND_PER_DAY * 100 ? TimeUtil.FormattingTimeTo_DDHHmm(time) : TimeUtil.FormattingTimeTo_HHmmss(time);
-                textField.asTextField.text = string.Format("活动时间:剩余{0}", strTime);
+                textField.asTextField.text = string.Format("概率提升:剩余{0}", strTime);
             }
             else if(LuckyBoxDataManager.Instance.currentBoxId == LuckyBoxDataManager.BOX_ID_2)
             {

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

@@ -198,6 +198,7 @@ namespace GFGGame
             // UI_ComStar comStar = UI_ComStar.Proxy(item.m_comStar);
 
             int starLevelDodge = cardData.star / 5;
+            item.m_starNumType.selectedIndex = cardData.itemCfg.starDescArr.Length - 1;
             for (int i = 0; i < 4; i++)
             {
                 UI_ComDodgeStar dodgeStar = UI_ComDodgeStar.Proxy(item.target.GetChild("dodgeStar" + i));

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

@@ -106,7 +106,7 @@ namespace GFGGame
                 }
                 else
                 {
-                    if (levelCfg.type == ConstInstanceZonesType.Studio && levelCfg.chapterId != StudioDataManager.Instance.luckyBoxFilingChapterId)
+                    if (levelCfg.type == ConstInstanceZonesType.Studio && levelCfg.chapterId != StudioDataManager.Instance.GetLuckyBoxActivityID())
                     {
                         var studioCfg = StudioCfgArray.Instance.GetCfg(levelCfg.chapterId);
                         ViewManager.Show<StudioBuyNumView>(studioCfg.limit);
@@ -145,7 +145,7 @@ namespace GFGGame
                 }
                 else
                 {
-                    if (levelCfg.type == ConstInstanceZonesType.Studio && levelCfg.chapterId != StudioDataManager.Instance.luckyBoxFilingChapterId)
+                    if (levelCfg.type == ConstInstanceZonesType.Studio && levelCfg.chapterId != StudioDataManager.Instance.GetLuckyBoxActivityID())
                     {
                         var studioCfg = StudioCfgArray.Instance.GetCfg(levelCfg.chapterId);
                         ViewManager.Show<StudioBuyNumView>(studioCfg.limit);

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

@@ -59,6 +59,7 @@ namespace GFGGame
         protected override void OnHide()
         {
             base.OnHide();
+            ShopViewManager.Instance.ClearItemEff();
             _valueBarController.OnHide();
         }
         protected override void RemoveEventListener()

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

@@ -59,6 +59,7 @@ namespace GFGGame
         protected override void OnHide()
         {
             base.OnHide();
+            ShopViewManager.Instance.ClearItemEff();
             _valueBarController.OnHide();
         }
         protected override void RemoveEventListener()

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

@@ -60,6 +60,7 @@ namespace GFGGame
         protected override void OnHide()
         {
             base.OnHide();
+            ShopViewManager.Instance.ClearItemEff();
             _valueBarController.OnHide();
         }
         protected override void RemoveEventListener()

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

@@ -65,15 +65,15 @@ namespace GFGGame
             _valueBarController.OnShown();
             UpdateView();
             UpdateRedDot();
-
         }
 
-
         protected override void OnHide()
         {
             base.OnHide();
+            ShopViewManager.Instance.ClearItemEff();
             _valueBarController.OnHide();
         }
+
         protected override void RemoveEventListener()
         {
             base.RemoveEventListener();

GameClient/Assets/Game/HotUpdate/Views/Studio/StudioFilingView.cs

@@ -230,7 +230,7 @@ namespace GFGGame
                 PromptController.Instance.ShowFloatTextPrompt(string.Format("需通关{0}关卡解锁", cfg.name));
                 return;
             }
-            if (_viewData == StudioDataManager.Instance.luckyBoxFilingChapterId)
+            if (_viewData == StudioDataManager.Instance.GetLuckyBoxActivityID())
             {
                 int _activityId = ActivityDataManager.Instance.GetCurOpenActiveByType(ConstLimitTimeActivityType.ActLimitLuckyBox);
                 ActivityOpenCfg _activityCfg = ActivityOpenCfgArray.Instance.GetCfg(_activityId);