zhaoyang 2 жил өмнө
parent
commit
e467bd49de

BIN
FGUIProject/assets/CommonGame/imagesExport/kp_kuang_3.png


BIN
FGUIProject/assets/CommonGame/imagesExport/kp_kuang_4.png


+ 2 - 2
FGUIProject/assets/CommonGame/package.xml

@@ -365,8 +365,8 @@
     <component id="e050tob" name="Component2.xml" path="/componentsBg/"/>
     <component id="e050tob" name="Component2.xml" path="/componentsBg/"/>
     <image id="94m19v" name="kp_kuang_1.png" path="/imagesExport/" exported="true" scale="9grid" scale9grid="40,110,51,220"/>
     <image id="94m19v" name="kp_kuang_1.png" path="/imagesExport/" exported="true" scale="9grid" scale9grid="40,110,51,220"/>
     <image id="94m19u" name="kp_kuang_2.png" path="/imagesExport/" exported="true" scale="9grid" scale9grid="39,110,61,220"/>
     <image id="94m19u" name="kp_kuang_2.png" path="/imagesExport/" exported="true" scale="9grid" scale9grid="39,110,61,220"/>
-    <image id="94m19t" name="kp_kuang_3.png" path="/imagesExport/" exported="true" scale="9grid" scale9grid="38,110,53,220"/>
-    <image id="94m19w" name="kp_kuang_4.png" path="/imagesExport/" exported="true" scale="9grid" scale9grid="44,110,54,220"/>
+    <image id="94m19t" name="kp_kuang_4.png" path="/imagesExport/" exported="true" scale="9grid" scale9grid="38,110,53,220"/>
+    <image id="94m19w" name="kp_kuang_3.png" path="/imagesExport/" exported="true" scale="9grid" scale9grid="44,110,54,220"/>
     <image id="ofwutoc" name="card_jn_db.png" path="/imagesNew/" exported="true"/>
     <image id="ofwutoc" name="card_jn_db.png" path="/imagesNew/" exported="true"/>
     <image id="jcej4p" name="jjcdi_jjcdi.png" path="/imagesNew/" exported="true"/>
     <image id="jcej4p" name="jjcdi_jjcdi.png" path="/imagesNew/" exported="true"/>
     <image id="jcej4o" name="jjcdi_jjxian.png" path="/imagesNew/" exported="true"/>
     <image id="jcej4o" name="jjcdi_jjxian.png" path="/imagesNew/" exported="true"/>

+ 19 - 19
GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs

@@ -168,11 +168,11 @@ namespace GFGGame
             _ui.m_comListAd.m_listAd.scrollPane.onScrollEnd.Add(OnListAdScrollEnd);
             _ui.m_comListAd.m_listAd.scrollPane.onScrollEnd.Add(OnListAdScrollEnd);
             _ui.m_comListAd.m_listAd.scrollPane.decelerationRate = 0.8f;
             _ui.m_comListAd.m_listAd.scrollPane.decelerationRate = 0.8f;
 
 
-            swipeGesture = new SwipeGesture(_ui.target);
-            swipeGesture.onAction.Add(OnSwipe);
-            swipeGesture.onBegin.Add(OnSwipeBegin);
-            swipeGesture.onEnd.Add(OnSwipeEnd);
-            swipeGesture.actionDistance = swipeDistance;
+            // swipeGesture = new SwipeGesture(_ui.target);
+            // swipeGesture.onAction.Add(OnSwipe);
+            // swipeGesture.onBegin.Add(OnSwipeBegin);
+            // swipeGesture.onEnd.Add(OnSwipeEnd);
+            // swipeGesture.actionDistance = swipeDistance;
             _ui.m_list.ResizeToFit();
             _ui.m_list.ResizeToFit();
             _ui.m_btnChange.target.onClick.Add(OnBtnChangClick);
             _ui.m_btnChange.target.onClick.Add(OnBtnChangClick);
             _ui.m_btnChange.m_c1.selectedIndex = 1;
             _ui.m_btnChange.m_c1.selectedIndex = 1;
@@ -1094,24 +1094,24 @@ namespace GFGGame
                 GuideController.TryGuide(_ui.m_loaRight.target, ConstGuideId.ARENA_OPEN, 2, "新玩法-飞花令开启了哦", -1, false);
                 GuideController.TryGuide(_ui.m_loaRight.target, ConstGuideId.ARENA_OPEN, 2, "新玩法-飞花令开启了哦", -1, false);
 
 
 
 
-                bool isStudioMetalGuide = GuideController.TryGuide(null, ConstGuideId.STUDIO_PORCELAIN, 2, "向左滑动界面。", -1,
+                bool isStudioMetalGuide = GuideController.TryGuide(_ui.m_loaRight.target, ConstGuideId.STUDIO_PORCELAIN, 2, "进入副本", -1,
                     false, _ui.target.height - 700);
                     false, _ui.target.height - 700);
-                bool isStudioFilingGuide = GuideController.TryGuide(null, ConstGuideId.STUDIO_FILING, 2, "向左滑动界面。", -1,
+                bool isStudioFilingGuide = GuideController.TryGuide(_ui.m_loaRight.target, ConstGuideId.STUDIO_FILING, 2, "进入副本", -1,
                     false, _ui.target.height - 700);
                     false, _ui.target.height - 700);
-                bool isFieldGuide = GuideController.TryGuide(null, ConstGuideId.FIELD, 1, "向左滑动界面。", -1, false, _ui.target.height - 700);
+                bool isFieldGuide = GuideController.TryGuide(_ui.m_loaRight.target, ConstGuideId.FIELD, 1, "进入副本", -1, false, _ui.target.height - 700);
 
 
-                bool isStudioPropertyGuide = GuideController.TryGuide(null, ConstGuideId.STUDIO_PROPERTY, 1, "向左滑动界面。", -1, false, _ui.target.height - 700);
+                bool isStudioPropertyGuide = GuideController.TryGuide(_ui.m_loaRight.target, ConstGuideId.STUDIO_PROPERTY, 1, "进入副本", -1, false, _ui.target.height - 700);
 
 
-
-                if (isStudioMetalGuide || isStudioFilingGuide || isFieldGuide || isStudioPropertyGuide)
-                {
-                    _ui.m_loaGuidestudio.visible = true;
-                    MainDataManager.Instance.CanSwipe = true;
-                }
-                else
-                {
-                    _ui.m_loaGuidestudio.visible = false;
-                }
+                _ui.m_loaGuidestudio.visible = false;
+                // if (isStudioMetalGuide || isStudioFilingGuide || isFieldGuide || isStudioPropertyGuide)
+                // {
+                //     _ui.m_loaGuidestudio.visible = true;
+                //     MainDataManager.Instance.CanSwipe = true;
+                // }
+                // else
+                // {
+                //     _ui.m_loaGuidestudio.visible = false;
+                // }
             }
             }
             if (MainDataManager.Instance.ViewType == 1)
             if (MainDataManager.Instance.ViewType == 1)
             {
             {

BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_fui.bytes