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

GameClient/Assets/Game/HotUpdate/Views/League/LeagueTeaPartyShowView.cs

@@ -114,7 +114,7 @@ namespace GFGGame
             ViewManager.Show<StoryDialogView>(new object[] { stroyStartID, false, new OnCompleteStoryDialogCall(OnCompletePriorStoryDialog), null, true }, true);
         }
 
-        private static void OnCompletePriorStoryDialog(bool isSkip, object param)
+        private static void OnCompletePriorStoryDialog(bool done, object param)
         {
             ViewManager.DeleteViewStackCountDown(null, 2);
             ViewManager.Show<LeagueTeaPartyOverView>();

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

@@ -115,7 +115,7 @@ namespace GFGGame
             ViewManager.Show<StoryDialogView>(new object[] { stroyStartID, false, new OnCompleteStoryDialogCall(OnCompletePriorStoryDialog),null,false }, true);
         }
 
-        private static void OnCompletePriorStoryDialog(bool isSkip, object param)
+        private static void OnCompletePriorStoryDialog(bool done, object param)
         {
             //ViewManager.Show<StoryChapterView>(MainStoryDataManager.currentChapterCfgId, ViewManager.GetGoBackDatas(typeof(StoryChapterView).FullName), true);
         }

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

@@ -177,8 +177,6 @@ namespace GFGGame
 
             _ui.m_btnAutoPlay.selected = _autoPlay;
             _ui.m_btnBack.visible = InstanceZonesDataManager.CheckLevelPass(100001001);
-            if (_storyStartID == "10151")
-                _ui.m_btnBack.visible = false;
 
             StoryDialogDataManager.Instance.Clear();
 
@@ -940,11 +938,11 @@ namespace GFGGame
             }
         }
 
-        private void Over(bool isSkip = true)
+        private void Over(bool done = true)
         {
             if (_onCompleteStoryDialogCall != null)
             {
-                _onCompleteStoryDialogCall(isSkip, _onCompleteStoryDialogCallParam);
+                _onCompleteStoryDialogCall(done, _onCompleteStoryDialogCallParam);
             }
             this.Hide();
         }

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

@@ -388,11 +388,13 @@ namespace GFGGame
                 ViewManager.Show<OpenServerActivityView>();
         }
 
-        private static void OnCompletePriorStoryDialog(bool isSkip, object param)
+        private static void OnCompletePriorStoryDialog(bool done, object param)
         {
-            PlayerPrefs.SetString("seeOpenServerActivityStory" + GameGlobal.userId, "1");
-            ViewManager.DeleteViewStackCountDown(null, 1);
-            ViewManager.Show<OpenServerActivityView>();
+            if (done) { 
+                PlayerPrefs.SetString("seeOpenServerActivityStory" + GameGlobal.userId, "1");
+                ViewManager.DeleteViewStackCountDown(null, 1);
+                ViewManager.Show<OpenServerActivityView>();
+            }
         }
 
         private void OnClickBtnWanShiLi()

GameClient/Assets/Game/HotUpdate/Views/MiniGame/TZFEGameVIew.cs

@@ -492,28 +492,28 @@ namespace GFGGame
         }
         private void OnClickEnd()
         {
-                touchSecond = Input.mousePosition;//记录拖动的位置
-                if ((touchSecond.x - touchFirst.x) < -80 && Math.Abs(touchSecond.x - touchFirst.x) > Math.Abs(touchSecond.y - touchFirst.y))
-                {
-                    //向左滑动
-                    Move(Map, Direction.left);
-                }
-                if ( (touchSecond.x - touchFirst.x) > 80 && Math.Abs(touchSecond.x - touchFirst.x) > Math.Abs(touchSecond.y - touchFirst.y))
-                {
-                    //向右滑动
-                    Move(Map, Direction.right);
-                }
-                if ((touchSecond.y - touchFirst.y) < -80 && Math.Abs(touchSecond.y - touchFirst.y) > Math.Abs(touchSecond.x - touchFirst.x))
-                {
-                    //向下滑动
-                    Move(Map, Direction.down);
-                }
-                if ((touchSecond.y - touchFirst.y) > 80 && Math.Abs(touchSecond.y - touchFirst.y) > Math.Abs(touchSecond.x - touchFirst.x))
-                {
-                    //向上滑动
-                    Move(Map, Direction.up);
-                }
-                touchFirst = touchSecond;
+            touchSecond = Input.mousePosition;//记录拖动的位置
+            if (touchSecond.x < touchFirst.x && Math.Abs(touchSecond.x - touchFirst.x) > Math.Abs(touchSecond.y - touchFirst.y))
+            {
+                //向左滑动
+                Move(Map, Direction.left);
+            }
+            if (touchSecond.x > touchFirst.x && Math.Abs(touchSecond.x - touchFirst.x) > Math.Abs(touchSecond.y - touchFirst.y))
+            {
+                //向右滑动
+                Move(Map, Direction.right);
+            }
+            if (touchSecond.y < touchFirst.y && Math.Abs(touchSecond.y - touchFirst.y) > Math.Abs(touchSecond.x - touchFirst.x))
+            {
+                //向下滑动
+                Move(Map, Direction.down);
+            }
+            if (touchSecond.y > touchFirst.y && Math.Abs(touchSecond.y - touchFirst.y) > Math.Abs(touchSecond.x - touchFirst.x))
+            {
+                //向上滑动
+                Move(Map, Direction.up);
+            }
+            touchFirst = touchSecond;
         }
 
         private void OnClickMergeTips()