Merge pull request #22 from aaasoft/main

发布版本1.0.4

Author: aaasoft

Assets/Game/GamePlay/Scripts/BallManager.cs

@@ -11,7 +11,6 @@
 using BallancePhysics.Wapper;
 using UnityEngine;
 using UnityEngine.Animations;
-using UnityEngine.InputSystem;
 using UnityEngine.InputSystem.LowLevel;
 using static Ballance2.Services.GameManager;
 

Assets/Game/GamePlay/Scripts/GamePlayManager.cs

@@ -312,7 +312,7 @@ private void _InitKeyEvents()
                     else
                         this.ResumeLevel();
                 }
-            }, GamepadButton.Start);
+            }, GamepadButton.Select, GamepadButton.Start);
         }
         private void _InitSettings()
         {

Assets/Game/GamePlay/Scripts/Preview/GamePreviewManager.cs

@@ -66,7 +66,7 @@ private void Awake() {
             else
               ResumeLevel();
           }
-        },GamepadButton.Start);
+        },GamepadButton.Select,GamepadButton.Start);
         return false;
       });
     }

Assets/Game/Menu/Prefabs/Pages/PageSettingsControlsMobile.prefab

@@ -1189,7 +1189,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7033815402476303036, guid: 943dd3c0e7cff344b94a30d9844d13cb, type: 3}
       propertyPath: MinValue
-      value: -150
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 7033815402476303036, guid: 943dd3c0e7cff344b94a30d9844d13cb, type: 3}
       propertyPath: AppendText

Assets/Game/Menu/Scripts/Game/GamePlayUIControl.cs

@@ -36,20 +36,26 @@ public class GamePlayUIControl : GameSingletonBehavior<GamePlayUIControl>
     private void Start() {
       _ScoreBoardActive.gameObject.SetActive(false);
 
-      //手机端还需要创建键盘
-      #if (UNITY_ANDROID || UNITY_IOS)
-      _CurrentMobileKeyPadShow = true;
-      ReBuildMobileKeyPad();
-      GamePlayManager.Instance.EventBeforeStart.On((evt) => {
-        _CurrentMobileKeyPadShow = true;
-        if (_CurrentMobileKeyPad != null)
-          _CurrentMobileKeyPad.gameObject.SetActive(true);
-      });
-      GamePlayManager.Instance.EventQuit.On((evt) => {
-        _CurrentMobileKeyPadShow = false;
-        if (_CurrentMobileKeyPad != null)
-          _CurrentMobileKeyPad.gameObject.SetActive(false);
-      });
+        //手机端还需要创建键盘
+        #if (UNITY_ANDROID || UNITY_IOS)
+        //当前设备存在触摸屏时，才允许显示屏幕键盘
+        if (UnityEngine.InputSystem.Touchscreen.current != null)
+        {
+            _CurrentMobileKeyPadShow = true;
+            ReBuildMobileKeyPad();
+            GamePlayManager.Instance.EventBeforeStart.On((evt) =>
+            {
+                _CurrentMobileKeyPadShow = true;
+                if (_CurrentMobileKeyPad != null)
+                    _CurrentMobileKeyPad.gameObject.SetActive(true);
+            });
+            GamePlayManager.Instance.EventQuit.On((evt) =>
+            {
+                _CurrentMobileKeyPadShow = false;
+                if (_CurrentMobileKeyPad != null)
+                    _CurrentMobileKeyPad.gameObject.SetActive(false);
+            });
+        }
       #endif
 
       //创建调试信息
@@ -118,8 +124,8 @@ internal void ReBuildMobileKeyPad() {
 
       //创建键盘
       _CurrentMobileKeyPad = GameUIManager.Instance.InitViewToCanvas(keyPad.prefab, "GameMobileKeypad", false);
-      //当屏幕键盘不显示，或者当前设备不支持触摸操作时。取消激活屏幕键盘
-      if (!_CurrentMobileKeyPadShow || !Input.touchSupported)
+      //当屏幕键盘不显示
+      if (!_CurrentMobileKeyPadShow)
         _CurrentMobileKeyPad.gameObject.SetActive(false);
     }
 

Assets/Scenes/Main.unity

@@ -850,17 +850,17 @@ MonoBehaviour:
   m_MoveRepeatDelay: 0.5
   m_MoveRepeatRate: 0.1
   m_XRTrackingOrigin: {fileID: 0}
-  m_ActionsAsset: {fileID: -944628639613478452, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
-  m_PointAction: {fileID: -1654692200621890270, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
-  m_MoveAction: {fileID: -8784545083839296357, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
-  m_SubmitAction: {fileID: 392368643174621059, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
-  m_CancelAction: {fileID: 7727032971491509709, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
-  m_LeftClickAction: {fileID: 3001919216989983466, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
-  m_MiddleClickAction: {fileID: -2185481485913320682, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
-  m_RightClickAction: {fileID: -4090225696740746782, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
-  m_ScrollWheelAction: {fileID: 6240969308177333660, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
-  m_TrackedDevicePositionAction: {fileID: 6564999863303420839, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
-  m_TrackedDeviceOrientationAction: {fileID: 7970375526676320489, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
+  m_ActionsAsset: {fileID: -944628639613478452, guid: 5587d74f8c754e94ab9bdfdcbb410507, type: 3}
+  m_PointAction: {fileID: -1654692200621890270, guid: 5587d74f8c754e94ab9bdfdcbb410507, type: 3}
+  m_MoveAction: {fileID: -8784545083839296357, guid: 5587d74f8c754e94ab9bdfdcbb410507, type: 3}
+  m_SubmitAction: {fileID: 392368643174621059, guid: 5587d74f8c754e94ab9bdfdcbb410507, type: 3}
+  m_CancelAction: {fileID: 7727032971491509709, guid: 5587d74f8c754e94ab9bdfdcbb410507, type: 3}
+  m_LeftClickAction: {fileID: 3001919216989983466, guid: 5587d74f8c754e94ab9bdfdcbb410507, type: 3}
+  m_MiddleClickAction: {fileID: -2185481485913320682, guid: 5587d74f8c754e94ab9bdfdcbb410507, type: 3}
+  m_RightClickAction: {fileID: -4090225696740746782, guid: 5587d74f8c754e94ab9bdfdcbb410507, type: 3}
+  m_ScrollWheelAction: {fileID: 6240969308177333660, guid: 5587d74f8c754e94ab9bdfdcbb410507, type: 3}
+  m_TrackedDevicePositionAction: {fileID: 6564999863303420839, guid: 5587d74f8c754e94ab9bdfdcbb410507, type: 3}
+  m_TrackedDeviceOrientationAction: {fileID: 7970375526676320489, guid: 5587d74f8c754e94ab9bdfdcbb410507, type: 3}
   m_DeselectOnBackgroundClick: 1
   m_PointerBehavior: 0
   m_CursorLockBehavior: 0