huangxiaoyue 1 жил өмнө
parent
commit
1bfd59365a

+ 12 - 27
GameClient/Assets/Game/HotUpdate/Views/Card/CardFosterView.cs

@@ -130,9 +130,9 @@ namespace GFGGame
             //_ui.m_comCard.target.onClick.Add(OnClickComCard);
             //_ui.m_comCard.target.onClick.Add(OnClickComCard);
 
 
             _ui.m_comImgCard.target.onTouchBegin.Add(onTouchCardBegin);
             _ui.m_comImgCard.target.onTouchBegin.Add(onTouchCardBegin);
-            _ui.m_comImgCard.target.onTouchEnd.Add(onTouchImgCardEnd);
+            _ui.m_comImgCard.target.onTouchEnd.Add(onTouchCardEnd);
             _ui.m_loaListener1.onTouchBegin.Add(onTouchCardBegin);
             _ui.m_loaListener1.onTouchBegin.Add(onTouchCardBegin);
-            _ui.m_loaListener1.onTouchEnd.Add(onTouchImgCardEnd);
+            _ui.m_loaListener1.onTouchEnd.Add(onTouchCardEnd);
             _ui.m_loaListener.onTouchBegin.Add(onTouchCardBegin);
             _ui.m_loaListener.onTouchBegin.Add(onTouchCardBegin);
             _ui.m_loaListener.onTouchEnd.Add(onTouchCardEnd);
             _ui.m_loaListener.onTouchEnd.Add(onTouchCardEnd);
             _ui.m_comCard.target.onTouchBegin.Add(onTouchCardBegin);
             _ui.m_comCard.target.onTouchBegin.Add(onTouchCardBegin);
@@ -1018,42 +1018,27 @@ namespace GFGGame
             float diffValueX = touchBeginX - inputEvent.x;
             float diffValueX = touchBeginX - inputEvent.x;
             if (diffValueX > 20 && showCard == false)
             if (diffValueX > 20 && showCard == false)
             {
             {
-                if (nowIndex < cardList.Count - 1) { 
+                if (nowIndex < cardList.Count - 1)
+                {
                     OnClickBtnRight();
                     OnClickBtnRight();
                     RefLeftAndRight();
                     RefLeftAndRight();
                 }
                 }
             }
             }
-            else if (diffValueX < - 20 && showCard == false)
+            else if (diffValueX < -20 && showCard == false)
             {
             {
-                if (nowIndex > 0) { 
+                if (nowIndex > 0)
+                {
                     OnClickBtnLeft();
                     OnClickBtnLeft();
                     RefLeftAndRight();
                     RefLeftAndRight();
                 }
                 }
             }
             }
-            else if (diffValueX <= 20 && diffValueX >= - 20)
-                OnClickComCard();
-        }
-
-        private void onTouchImgCardEnd(EventContext context)
-        {
-            InputEvent inputEvent = (InputEvent)context.data;
-            float diffValueX = touchBeginX - inputEvent.x;
-            if (diffValueX > 20 && showCard == false)
+            else if (diffValueX <= 20 && diffValueX >= -20)
             {
             {
-                if (nowIndex < cardList.Count - 1) { 
-                    OnClickBtnRight();
-                    RefLeftAndRight();
-                }
-            }
-            else if (diffValueX < - 20 && showCard == false)
-            {
-                if (nowIndex > 0) { 
-                    OnClickBtnLeft();
-                    RefLeftAndRight();
-                }
+                if(_ui.m_c1.selectedIndex == 1)
+                    OnClickComCard();
+                else
+                    OnClickLoaCard();
             }
             }
-            else if(diffValueX <= 20 && diffValueX >= - 20)
-                OnClickLoaCard();
         }
         }
 
 
         private void OnClickLoaCard()
         private void OnClickLoaCard()