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

GameClient/Assets/Game/HotUpdate/Views/Friend/FriendView.cs

@@ -246,7 +246,9 @@ namespace GFGGame
             int selectedIndex = 0;
             if (_ui.m_list.numItems > 0)
             {
+                if (_ui.m_list.selectedIndex < 0) return;
                 _ui.m_list.ScrollToView(_ui.m_list.selectedIndex);
+
                 int childIndex = _ui.m_list.ItemIndexToChildIndex(_ui.m_list.selectedIndex);
                 if (childIndex < 0) return;
                 GButton item = _ui.m_list.GetChildAt(childIndex).asButton.GetChild("btnSend").asButton;

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

@@ -341,7 +341,7 @@ namespace GFGGame
         protected override void UpdateToCheckGuide(object param)
         {
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
-            GuideController.TryGuide(_ui.m_listChapter, ConstGuideId.ENTER_CHAPTER, 4, "", 0, true, _ui.target.height / 2);
+            //GuideController.TryGuide(_ui.m_listChapter, ConstGuideId.ENTER_CHAPTER, 4, "", 0, true, _ui.target.height / 2);
             GuideController.TryGuide(_ui.m_listChapter, ConstGuideId.ENTER_CHAPTER_1, 3, "", 0, true, _ui.target.height / 2);
             GuideController.TryGuide(_ui.m_listChapter, ConstGuideId.ENTER_CHAPTER_2, 3, "", 1, true, _ui.target.height / 2);
             //GuideController.TryGuide(_ui.m_listChapter, ConstGuideId.ENTER_CHAPTER_3, 2, "", 1, true, _ui.target.height / 2);

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

@@ -504,8 +504,8 @@ namespace GFGGame
             GComponent unPasslevelCom = _unPasslevelItem == null ? null : _unPasslevelItem.asCom;
             bool isGuide0 = GuideController.TryGuide(unPasslevelCom, ConstGuideId.START_FIGHT, 1, "尝试换上一套衣服吧。");
             bool isGuide1 = GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.FREEDOM_DRESS, 1, "获得的服饰随时可以查看和试穿。");
-            bool isGuide2 = GuideController.TryGuide(unPasslevelCom, ConstGuideId.ENTER_CHAPTER, 5, "来继续我们的旅程吧。");
-            GuideController.TryCompleteGuide(ConstGuideId.ENTER_CHAPTER, 5);
+            bool isGuide2 = GuideController.TryGuide(unPasslevelCom, ConstGuideId.ENTER_CHAPTER, 4, "来继续我们的旅程吧。");
+            GuideController.TryCompleteGuide(ConstGuideId.ENTER_CHAPTER, 4);
             bool isGuide3 = GuideController.TryGuide(unPasslevelCom, ConstGuideId.ENTER_CHAPTER_1, 4, "来继续我们的旅程吧。");
             GuideController.TryCompleteGuide(ConstGuideId.ENTER_CHAPTER_1, 4);
 
@@ -537,8 +537,8 @@ namespace GFGGame
         {
             base.TryCompleteGuide();
             // GuideCfg cfg = GuideCfgArray.Instance.GetCfg(ConstGuideId.ENTER_CHAPTER);
-            GuideController.TryCompleteGuideIndex(ConstGuideId.ENTER_CHAPTER, 5);
-            GuideController.TryCompleteGuide(ConstGuideId.ENTER_CHAPTER, 5);
+            GuideController.TryCompleteGuideIndex(ConstGuideId.ENTER_CHAPTER, 4);
+            GuideController.TryCompleteGuide(ConstGuideId.ENTER_CHAPTER, 4);
             // GuideCfg cfg1 = GuideCfgArray.Instance.GetCfg(ConstGuideId.ENTER_CHAPTER_1);
             GuideController.TryCompleteGuideIndex(ConstGuideId.ENTER_CHAPTER_1, 4);
             GuideController.TryCompleteGuide(ConstGuideId.ENTER_CHAPTER_1, 4);

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

@@ -936,7 +936,7 @@ namespace GFGGame
             }
             //海之市
             if (redPointUpdateFrame == 17)
-                RedDotController.Instance.SetComRedDot(_ui.m_btnHaiZhiShi.target, RedDotDataManager.Instance.GetFieldRed());
+                RedDotController.Instance.SetComRedDot(_ui.m_btnHaiZhiShi.target, RedDotDataManager.Instance.GetFieldRed(), "", 13, -12);
 
             redPointUpdateFrame++;
             if(redPointUpdateFrame > 17)