Merge remote-tracking branch 'remotes/origin/master' into dev

GameClient/Assets/Editor/Excel/Scanner/ItemApproachScanner.cs

@@ -458,6 +458,8 @@ namespace GFGEditor
                 {
 
                 }
+                StudioCfg _studioCfg = StudioCfgArray.Instance.GetCfgsByfunId(typeof(StudioPorcelainView).Name)[StudioDataManager.Instance.PorcelainTheme - 1];
+
                 chapterCfg = StoryChapterCfgArray.Instance.GetCfg(cfg.chapterId);
                 studioCfg = StudioCfgArray.Instance.GetCfg(cfg.chapterId);
                 fieldCfg = FieldCfgArray.Instance.GetCfg(cfg.chapterId);
@@ -465,6 +467,16 @@ namespace GFGEditor
                 if (chapterCfg != null || studioCfg != null || fieldCfg != null)
                 {
                     bool result = CheckItemInBonus(itemId, cfg);
+                    if (studioCfg != null)
+                    {
+                        if (cfg.type == 2 && cfg.subType == 4)
+                        {
+                            if (_studioCfg.id != cfg.chapterId)
+                            {
+                                continue;
+                            }
+                        }
+                    }
                     if (result)
                     {
                         string approach = "JU_QING_GUAN_QIA=" + cfg.id;

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

@@ -280,7 +280,7 @@ namespace GFGGame
 
         //招财进宝活动
         public List<int> ActivityZCJBList = new List<int>();
-        public int activityZCJBId = 61001;
+        public int activityZCJBId = 61101;
         public bool CheckZCJBRed()
         {
             ItemData numItem;
@@ -315,10 +315,10 @@ namespace GFGGame
         public Dictionary<int,int> NewYearLoginInfoDic = new Dictionary<int, int>();
         public bool CanGetNewYearLoginRed()
         {
-            foreach (var a in NewYearLoginInfoDic)
-            {
-                if (a.Value == 1) return true;
-            }
+            //foreach (var a in NewYearLoginInfoDic)
+            //{
+            //    if (a.Value == 1) return true;
+            //}
             return false;
         }
 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MiniGame/UI_GameStartUI.cs

@@ -27,6 +27,7 @@ namespace UI.MiniGame
         public GLoader m_tipsTwo;
         public GLoader m_needIcon2;
         public GTextField m_needNum2;
+        public GTextField m_descText;
         public const string URL = "ui://wgkh30qjlw8c21";
         public const string PACKAGE_NAME = "MiniGame";
         public const string RES_NAME = "GameStartUI";
@@ -94,6 +95,7 @@ namespace UI.MiniGame
             m_tipsTwo = (GLoader)comp.GetChild("tipsTwo");
             m_needIcon2 = (GLoader)comp.GetChild("needIcon2");
             m_needNum2 = (GTextField)comp.GetChild("needNum2");
+            m_descText = (GTextField)comp.GetChild("descText");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -118,6 +120,7 @@ namespace UI.MiniGame
             m_tipsTwo = null;
             m_needIcon2 = null;
             m_needNum2 = null;
+            m_descText = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -172,7 +172,42 @@ namespace GFGGame
         {
             ClearTaskItemEff();
             var activity7DaysTaskCfg = Activity7DaysTaskCfgArray.Instance.GetCfg(onClickDayIndex + 1);
-            var taskIdArr = activity7DaysTaskCfg.taskIdArr;
+            var taskIdArr = new int[activity7DaysTaskCfg.taskIdArr.Length];
+            Array.Copy(activity7DaysTaskCfg.taskIdArr, taskIdArr, activity7DaysTaskCfg.taskIdArr.Length);
+            //田野调查和新增任务特殊处理
+            long time = GameGlobal.zoneScene.GetComponent<RoleInfosComponent>().GetCurrentRole().CreateTime;
+            long setTime = 1721768400000;
+            for (int i= 0;i<taskIdArr.Length; i++)
+            {
+                if(taskIdArr[i] == 2039)
+                {
+                    TaskCfg taskCfg = TaskCfgArray.Instance.GetCfg(taskIdArr[i]);
+                    if (taskCfg.jumpId == "FieldView")
+                    {
+                        if (time > setTime)
+                        {
+                            for (int j = i; i < taskIdArr.Length - 1; i++)
+                            {
+                                taskIdArr[j] = taskIdArr[j + 1];
+                            }
+                            Array.Resize(ref taskIdArr, taskIdArr.Length - 1);
+                            break;
+                        }
+                    }
+                }
+                else if(taskIdArr[i] == 2057)
+                {
+                    if (time < setTime)
+                    {
+                        for (int j = i; i < taskIdArr.Length - 1; i++)
+                        {
+                            taskIdArr[j] = taskIdArr[j + 1];
+                        }
+                        Array.Resize(ref taskIdArr, taskIdArr.Length - 1);
+                        break;
+                    }
+                }
+            }
             //排序根据领取状态
             var taskCfgs = TaskDataManager.Instance.GetTaskCfgs(taskIdArr);
             _ui.m_comTaskList.m_TaskList.data = taskCfgs;

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

@@ -50,7 +50,7 @@ namespace GFGGame
             ReqInfo();
             //_ui.m_time.visible = false;
             RedDotController.Instance.SetComRedDot(_ui.m_rewardBTn, ActivityDataManager.Instance.CheckZCJBRed(),"",-30);
-            EventAgent.AddEventListener(ConstMessage.RED_CHANGE, SetRed);
+            
         }
         protected override void OnHide()
         {
@@ -59,12 +59,14 @@ namespace GFGGame
         protected override void AddEventListener()
         {
             base.AddEventListener();
-            EventAgent.RemoveEventListener(ConstMessage.ITEM_CHANGED, SetRed);
+            EventAgent.AddEventListener(ConstMessage.RED_CHANGE, SetRed);
+            EventAgent.AddEventListener(ConstMessage.ITEM_CHANGED, SetRed);
         }
 
         protected override void RemoveEventListener()
         {
             base.RemoveEventListener();
+            EventAgent.RemoveEventListener(ConstMessage.RED_CHANGE, SetRed);
             EventAgent.RemoveEventListener(ConstMessage.ITEM_CHANGED, SetRed);
         }
         private void SetRed()

GameClient/Assets/Game/HotUpdate/Views/ClothingUpgarde/ClothingUpgradeView.cs

@@ -199,7 +199,7 @@ namespace GFGGame
         {
             int id = (int)(eventContext.sender as GObject).data;
             object[] sourceDatas = new object[]
-                  { id, new object[] { typeof(BagView).FullName, this.viewData } };
+                  { id, new object[] { typeof(ClothingUpgradeView).FullName, this.viewData } };
             GoodsItemTipsController.ShowItemTips(id, sourceDatas);
         }
         private async void OnClickUpgrade()

GameClient/Assets/Game/HotUpdate/Views/Common/Controller/LuckyBoxController.cs

@@ -230,12 +230,22 @@ namespace GFGGame
         private void ShowModel()
         {
             ChangeModelAlphaAnim(_index, 0, 1);
+            Transform obj = _dressUpObjUIs[_index].sceneObject.transform.Find("Role");
+            if(obj != null)
+            {
+                obj.gameObject.SetActive(true);
+            }    
         }
 
         private void HideModel()
         {
             InitModel(_index);
             ChangeModelAlphaAnim(_index, 1, 0);
+            Transform obj = _dressUpObjUIs[_index].sceneObject.transform.Find("Role");
+            if(obj != null)
+            {
+                obj.gameObject.SetActive(false);
+            }
         }
 
         private void ChangeComResLayer()

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

@@ -38,7 +38,7 @@ namespace GFGGame
             float height = width * tex.height / tex.width;
             _ui.m_imgRes.SetSize(width, height);
             _ui.m_imgBorder.SetSize(width, height + 12);
-            _ui.m_btnShare.visible = false;
+            _ui.m_share.visible = false;
             Timers.inst.AddUpdate(CheckGuide);
         }
 

GameClient/Assets/Game/HotUpdate/Views/FieldGuide/SuitGuideDetailView.cs

@@ -15,7 +15,7 @@ namespace GFGGame
         private int _suitTypeId;
         private Dictionary<int, EffectUI> _effectUIDic = new Dictionary<int, EffectUI>();
         private int index = 0;
-        private Dictionary<int, string> IdToImageDic = new Dictionary<int, string> {[201024] = "changxiawuj",[201025] = "xiangfengmr" };
+        private Dictionary<int, string> IdToImageDic = new Dictionary<int, string> {[201024] = "changxiawuj",[201025] = "xiangfengmr",[202027] = "qiannianws",[202025] = "jiaohuass" };
         public override void Dispose()
         {
             foreach (var v in _effectUIDic)

GameClient/Assets/Game/HotUpdate/Views/FieldGuide/SuitGuideView.cs

@@ -199,6 +199,7 @@ namespace GFGGame
             int haveCount = SuitUtil.GetSuitIdList(false, true, _menuTypeAllDataDic[_ui.m_c1.selectedIndex + 1][index], 0).Count;
             int totalCount = SuitUtil.GetSuitIdList(true, true, _menuTypeAllDataDic[_ui.m_c1.selectedIndex + 1][index], 0).Count;
             item.m_progressNum.SetVar("value", haveCount.ToString()).SetVar("max", totalCount.ToString()).FlushVars();
+            item.m_icon.url = ResPathUtil.GetChapterGuideIconPath(string.Format("gushi{0}",(index+1)));
             UI_SuitStoryItem.ProxyEnd();
         }
 

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

@@ -168,6 +168,7 @@ namespace GFGGame
             EventAgent.AddEventListener(ConstMessage.AFTER_DATA_INITED, OnAfterDataInited);
             EventAgent.AddEventListener(ConstMessage.NEW_YEAR_RED_ENVELOPE_INFO, RefreshBtnNewYearRedEnvelope);
             EventAgent.AddEventListener(ConstMessage.ACTIVITY_RED_CHANGE, UpdateActivityRedDot);
+            EventAgent.AddEventListener(ConstMessage.STORY_LEVEL_CHANGE, UpdateNewPlayerReward); 
         }
 
         protected override void RemoveEventListener()
@@ -183,6 +184,7 @@ namespace GFGGame
             EventAgent.RemoveEventListener(ConstMessage.NEW_YEAR_RED_ENVELOPE_INFO, RefreshBtnNewYearRedEnvelope);
             EventAgent.RemoveEventListener(ConstMessage.ACTIVITY_RED_CHANGE, UpdateActivityRedDot);
             EventAgent.RemoveEventListener(ConstMessage.RESET_DAILY_DATA, ResetDailyData);
+            EventAgent.RemoveEventListener(ConstMessage.STORY_LEVEL_CHANGE, UpdateNewPlayerReward);
         }
 
         protected override void OnShown()
@@ -1212,6 +1214,10 @@ namespace GFGGame
                     break;
             }
         }
+        private void UpdateNewPlayerReward(EventContext context)
+        {
+            ActivitySProxy.ReqGetNewPlayerBonusStatus().Coroutine();
+        }
 
         private void CheckProbabilityUp()
         {

GameClient/Assets/Game/HotUpdate/Views/OpenServerActivity/OpenServerActivityView.cs

@@ -67,6 +67,7 @@ namespace GFGGame
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("Tx_bg");
             RefreshTimeText();
             UpdateRedDot();
+            _ui.m_buttonNewYearLogin.visible = false;
             //RefreshButtonNewYearLogin();
             Timers.inst.Add(1, 0, UpdateTime);
             Timers.inst.Add(0.2f, 1, ShowEffTime);