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

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