Merge branch 'master' of http://192.168.2.10:3000/GFG/Client into yuqian

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;

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/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);
         }