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

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

@@ -131,6 +131,9 @@ namespace GFGGame
             _dataManager.difficulty = _selectedIndex;
             // UpdateView();
             OnClickBtnGo();
+
+            if (GuideDataManager.IsGuideFinish(ConstGuideId.FIELD) <= 0)
+                GuideController.TryCompleteGuide(ConstGuideId.FIELD, 1);
         }
         private void UpdateView()
         {
@@ -214,8 +217,7 @@ namespace GFGGame
         protected override void UpdateToCheckGuide(object param)
         {
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
-            GuideController.TryGuide(_ui.m_btn0.target, ConstGuideId.FIELD, 1, "开始考察吧。");
-            GuideController.TryCompleteGuide(ConstGuideId.FIELD, 1);
+            GuideController.TryGuide(_ui.m_btn0.target, ConstGuideId.FIELD, 1, "外出进行历史考察，会有意想不到的收获哦。");
         }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/Guide/GuideView.cs

@@ -111,7 +111,8 @@ namespace GFGGame
             GuideCfg cfg1 = GuideCfgArray.Instance.GetCfg(ConstGuideId.STUDIO_FILING);  //引导查阅建档
             GuideCfg cfg2 = GuideCfgArray.Instance.GetCfg(ConstGuideId.FIELD);  //田野调查
             GuideCfg cfg4 = GuideCfgArray.Instance.GetCfg(ConstGuideId.STUDIO_PROPERTY);   //书简修复
-            if (guideId == cfg.id && guideIndex == 2 || guideId == cfg1.id && guideIndex == 2 || guideId == cfg2.id && guideIndex == 1 || guideId == cfg4.id && guideIndex == 1)
+            GuideCfg cfg5 = GuideCfgArray.Instance.GetCfg(ConstGuideId.FREEDOM_DRESS);   //换装和拍照
+            if (guideId == cfg.id && guideIndex == 2 || guideId == cfg1.id && guideIndex == 2 || guideId == cfg2.id && guideIndex == 1 || guideId == cfg4.id && guideIndex == 1 || guideId == cfg5.id && guideIndex == 1)
             {
                 _ui.m_loaMask.visible = false;
                 MainDataManager.Instance.CanSwipe = true;