|
@@ -338,11 +338,11 @@ namespace GFGGame
|
|
if (!MainDataManager.Instance.CanSwipe) return;
|
|
if (!MainDataManager.Instance.CanSwipe) return;
|
|
if (!FunctionOpenDataManager.Instance.CheckIsFunOpenById(ConstFunctionId.MAIN_SECOND_VIEW, false)) return;
|
|
if (!FunctionOpenDataManager.Instance.CheckIsFunOpenById(ConstFunctionId.MAIN_SECOND_VIEW, false)) return;
|
|
|
|
|
|
- if (_ui.m_comListAd.m_listAd.numItems > 0//滚动广告区域不可切换页面
|
|
|
|
|
|
+ if (MainDataManager.Instance.ViewType == 0 && _ui.m_comListAd.m_listAd.numItems > 0//滚动广告区域不可切换页面
|
|
&& _startPos.x > _ui.m_comListAd.target.x && _startPos.x < (_ui.m_comListAd.target.x + _ui.m_comListAd.target.width)
|
|
&& _startPos.x > _ui.m_comListAd.target.x && _startPos.x < (_ui.m_comListAd.target.x + _ui.m_comListAd.target.width)
|
|
- && _startPos.y > _ui.m_comListAd.target.y && _startPos.y < (_ui.m_comListAd.target.y + _ui.m_comListAd.target.height)
|
|
|
|
- && _endPos.x < (_ui.m_comListAd.target.x + _ui.m_comListAd.target.width)
|
|
|
|
- && _endPos.y > _ui.m_comListAd.target.y && _endPos.y < (_ui.m_comListAd.target.y + _ui.m_comListAd.target.height)) return;
|
|
|
|
|
|
+ && _startPos.y > _ui.m_comListAd.target.y && _startPos.y < (_ui.m_comListAd.target.y + _ui.m_comListAd.target.height)) return;
|
|
|
|
+ // || _endPos.x < (_ui.m_comListAd.target.x + _ui.m_comListAd.target.width)
|
|
|
|
+ // && _endPos.y > _ui.m_comListAd.target.y && _endPos.y < (_ui.m_comListAd.target.y + _ui.m_comListAd.target.height))
|
|
|
|
|
|
SwipeGesture swipeture = (SwipeGesture)context.sender;
|
|
SwipeGesture swipeture = (SwipeGesture)context.sender;
|
|
if (MainDataManager.Instance.ViewType == 0 && swipeture.position.x < 0 &&
|
|
if (MainDataManager.Instance.ViewType == 0 && swipeture.position.x < 0 &&
|