From 5e72eb8d52db2a6706f2f63b1cf14c46183c8c52 Mon Sep 17 00:00:00 2001 From: uc deploy Date: Sun, 22 Dec 2019 22:13:00 +0800 Subject: [PATCH] [IceSlide] add mouse config --- .../Assets/Scenes/Main_IceSlideV2.unity | 454 ++++++++++-------- .../Assets/Script/SystemConfig.cs | 18 + .../Assets/Script/SystemConfig.cs.meta | 11 + .../Assets/Script/TouchArea.cs | 16 +- 4 files changed, 291 insertions(+), 208 deletions(-) create mode 100644 04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Script/SystemConfig.cs create mode 100644 04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Script/SystemConfig.cs.meta diff --git a/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Scenes/Main_IceSlideV2.unity b/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Scenes/Main_IceSlideV2.unity index 34563ae..e4c0d99 100644 --- a/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Scenes/Main_IceSlideV2.unity +++ b/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Scenes/Main_IceSlideV2.unity @@ -192,6 +192,86 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4224728} m_CullTransparentMesh: 0 +--- !u!28 &26720473 +Texture2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_ImageContentsHash: + serializedVersion: 2 + Hash: 00000000000000000000000000000000 + m_ForcedFallbackFormat: 4 + m_DownscaleFallback: 0 + serializedVersion: 2 + m_Width: 2 + m_Height: 2 + m_CompleteImageSize: 16 + m_TextureFormat: 5 + m_MipCount: 1 + m_IsReadable: 1 + m_StreamingMipmaps: 0 + m_StreamingMipmapsPriority: 0 + m_AlphaIsTransparency: 0 + m_ImageCount: 1 + m_TextureDimension: 2 + m_TextureSettings: + serializedVersion: 2 + m_FilterMode: 1 + m_Aniso: 1 + m_MipBias: 0 + m_WrapU: 0 + m_WrapV: 0 + m_WrapW: 0 + m_LightmapFormat: 0 + m_ColorSpace: 1 + image data: 16 + _typelessdata: 00000000000000000000000000000000 + m_StreamData: + offset: 0 + size: 0 + path: +--- !u!28 &106052240 +Texture2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_ImageContentsHash: + serializedVersion: 2 + Hash: 00000000000000000000000000000000 + m_ForcedFallbackFormat: 4 + m_DownscaleFallback: 0 + serializedVersion: 2 + m_Width: 2 + m_Height: 2 + m_CompleteImageSize: 16 + m_TextureFormat: 5 + m_MipCount: 1 + m_IsReadable: 1 + m_StreamingMipmaps: 0 + m_StreamingMipmapsPriority: 0 + m_AlphaIsTransparency: 0 + m_ImageCount: 1 + m_TextureDimension: 2 + m_TextureSettings: + serializedVersion: 2 + m_FilterMode: 1 + m_Aniso: 1 + m_MipBias: 0 + m_WrapU: 0 + m_WrapV: 0 + m_WrapW: 0 + m_LightmapFormat: 0 + m_ColorSpace: 1 + image data: 16 + _typelessdata: 00000000000000000000000000000000 + m_StreamData: + offset: 0 + size: 0 + path: --- !u!1 &124282309 GameObject: m_ObjectHideFlags: 0 @@ -5213,7 +5293,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Texture: {fileID: 2087562404} + m_Texture: {fileID: 26720473} m_UVRect: serializedVersion: 2 x: 0 @@ -15997,6 +16077,46 @@ MonoBehaviour: m_Calls: [] m_TypeName: TouchArea+OnPointerExitEvent, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null +--- !u!28 &593259074 +Texture2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_ImageContentsHash: + serializedVersion: 2 + Hash: 00000000000000000000000000000000 + m_ForcedFallbackFormat: 4 + m_DownscaleFallback: 0 + serializedVersion: 2 + m_Width: 2 + m_Height: 2 + m_CompleteImageSize: 16 + m_TextureFormat: 5 + m_MipCount: 1 + m_IsReadable: 1 + m_StreamingMipmaps: 0 + m_StreamingMipmapsPriority: 0 + m_AlphaIsTransparency: 0 + m_ImageCount: 1 + m_TextureDimension: 2 + m_TextureSettings: + serializedVersion: 2 + m_FilterMode: 1 + m_Aniso: 1 + m_MipBias: 0 + m_WrapU: 0 + m_WrapV: 0 + m_WrapW: 0 + m_LightmapFormat: 0 + m_ColorSpace: 1 + image data: 16 + _typelessdata: 00000000000000000000000000000000 + m_StreamData: + offset: 0 + size: 0 + path: --- !u!1 &612500324 GameObject: m_ObjectHideFlags: 0 @@ -21633,7 +21753,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Texture: {fileID: 1471250782} + m_Texture: {fileID: 2014479871} m_UVRect: serializedVersion: 2 x: 0 @@ -22345,6 +22465,46 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!28 &998806426 +Texture2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_ImageContentsHash: + serializedVersion: 2 + Hash: 00000000000000000000000000000000 + m_ForcedFallbackFormat: 4 + m_DownscaleFallback: 0 + serializedVersion: 2 + m_Width: 2 + m_Height: 2 + m_CompleteImageSize: 16 + m_TextureFormat: 5 + m_MipCount: 1 + m_IsReadable: 1 + m_StreamingMipmaps: 0 + m_StreamingMipmapsPriority: 0 + m_AlphaIsTransparency: 0 + m_ImageCount: 1 + m_TextureDimension: 2 + m_TextureSettings: + serializedVersion: 2 + m_FilterMode: 1 + m_Aniso: 1 + m_MipBias: 0 + m_WrapU: 0 + m_WrapV: 0 + m_WrapW: 0 + m_LightmapFormat: 0 + m_ColorSpace: 1 + image data: 16 + _typelessdata: 00000000000000000000000000000000 + m_StreamData: + offset: 0 + size: 0 + path: --- !u!1001 &1008297175 PrefabInstance: m_ObjectHideFlags: 0 @@ -22407,46 +22567,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1f68bf7cec2600e49a46d2f0554453c8, type: 3} ---- !u!28 &1077889789 -Texture2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_ImageContentsHash: - serializedVersion: 2 - Hash: 00000000000000000000000000000000 - m_ForcedFallbackFormat: 4 - m_DownscaleFallback: 0 - serializedVersion: 2 - m_Width: 2 - m_Height: 2 - m_CompleteImageSize: 16 - m_TextureFormat: 5 - m_MipCount: 1 - m_IsReadable: 1 - m_StreamingMipmaps: 0 - m_StreamingMipmapsPriority: 0 - m_AlphaIsTransparency: 0 - m_ImageCount: 1 - m_TextureDimension: 2 - m_TextureSettings: - serializedVersion: 2 - m_FilterMode: 1 - m_Aniso: 1 - m_MipBias: 0 - m_WrapU: 0 - m_WrapV: 0 - m_WrapW: 0 - m_LightmapFormat: 0 - m_ColorSpace: 1 - image data: 16 - _typelessdata: 00000000000000000000000000000000 - m_StreamData: - offset: 0 - size: 0 - path: --- !u!1 &1084066362 GameObject: m_ObjectHideFlags: 0 @@ -22615,7 +22735,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Texture: {fileID: 1077889789} + m_Texture: {fileID: 593259074} m_UVRect: serializedVersion: 2 x: 0 @@ -22944,46 +23064,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!28 &1284061233 -Texture2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_ImageContentsHash: - serializedVersion: 2 - Hash: 00000000000000000000000000000000 - m_ForcedFallbackFormat: 4 - m_DownscaleFallback: 0 - serializedVersion: 2 - m_Width: 2 - m_Height: 2 - m_CompleteImageSize: 16 - m_TextureFormat: 5 - m_MipCount: 1 - m_IsReadable: 1 - m_StreamingMipmaps: 0 - m_StreamingMipmapsPriority: 0 - m_AlphaIsTransparency: 0 - m_ImageCount: 1 - m_TextureDimension: 2 - m_TextureSettings: - serializedVersion: 2 - m_FilterMode: 1 - m_Aniso: 1 - m_MipBias: 0 - m_WrapU: 0 - m_WrapV: 0 - m_WrapW: 0 - m_LightmapFormat: 0 - m_ColorSpace: 1 - image data: 16 - _typelessdata: 00000000000000000000000000000000 - m_StreamData: - offset: 0 - size: 0 - path: --- !u!1 &1290975428 GameObject: m_ObjectHideFlags: 0 @@ -27860,6 +27940,50 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 vectorLabel1_3: W +--- !u!1 &1366442276 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1366442278} + - component: {fileID: 1366442277} + m_Layer: 0 + m_Name: SytemConfig + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1366442277 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1366442276} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e92877fdd13500346b9be002ab88890f, type: 3} + m_Name: + m_EditorClassIdentifier: + UseMouse: 0 +--- !u!4 &1366442278 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1366442276} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 23.768824, y: -10.28636, z: 90.919525} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 10 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1369086349 GameObject: m_ObjectHideFlags: 0 @@ -27980,7 +28104,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Texture: {fileID: 1657439072} + m_Texture: {fileID: 998806426} m_UVRect: serializedVersion: 2 x: 0 @@ -28212,46 +28336,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1459780327} m_CullTransparentMesh: 0 ---- !u!28 &1471250782 -Texture2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_ImageContentsHash: - serializedVersion: 2 - Hash: 00000000000000000000000000000000 - m_ForcedFallbackFormat: 4 - m_DownscaleFallback: 0 - serializedVersion: 2 - m_Width: 2 - m_Height: 2 - m_CompleteImageSize: 16 - m_TextureFormat: 5 - m_MipCount: 1 - m_IsReadable: 1 - m_StreamingMipmaps: 0 - m_StreamingMipmapsPriority: 0 - m_AlphaIsTransparency: 0 - m_ImageCount: 1 - m_TextureDimension: 2 - m_TextureSettings: - serializedVersion: 2 - m_FilterMode: 1 - m_Aniso: 1 - m_MipBias: 0 - m_WrapU: 0 - m_WrapV: 0 - m_WrapW: 0 - m_LightmapFormat: 0 - m_ColorSpace: 1 - image data: 16 - _typelessdata: 00000000000000000000000000000000 - m_StreamData: - offset: 0 - size: 0 - path: --- !u!1 &1482923420 GameObject: m_ObjectHideFlags: 0 @@ -33450,46 +33534,6 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 vectorLabel1_3: W ---- !u!28 &1657439072 -Texture2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_ImageContentsHash: - serializedVersion: 2 - Hash: 00000000000000000000000000000000 - m_ForcedFallbackFormat: 4 - m_DownscaleFallback: 0 - serializedVersion: 2 - m_Width: 2 - m_Height: 2 - m_CompleteImageSize: 16 - m_TextureFormat: 5 - m_MipCount: 1 - m_IsReadable: 1 - m_StreamingMipmaps: 0 - m_StreamingMipmapsPriority: 0 - m_AlphaIsTransparency: 0 - m_ImageCount: 1 - m_TextureDimension: 2 - m_TextureSettings: - serializedVersion: 2 - m_FilterMode: 1 - m_Aniso: 1 - m_MipBias: 0 - m_WrapU: 0 - m_WrapV: 0 - m_WrapW: 0 - m_LightmapFormat: 0 - m_ColorSpace: 1 - image data: 16 - _typelessdata: 00000000000000000000000000000000 - m_StreamData: - offset: 0 - size: 0 - path: --- !u!1 &1670462219 GameObject: m_ObjectHideFlags: 0 @@ -34289,7 +34333,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Texture: {fileID: 1284061233} + m_Texture: {fileID: 106052240} m_UVRect: serializedVersion: 2 x: 0 @@ -34377,6 +34421,46 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1999590984} m_CullTransparentMesh: 0 +--- !u!28 &2014479871 +Texture2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_ImageContentsHash: + serializedVersion: 2 + Hash: 00000000000000000000000000000000 + m_ForcedFallbackFormat: 4 + m_DownscaleFallback: 0 + serializedVersion: 2 + m_Width: 2 + m_Height: 2 + m_CompleteImageSize: 16 + m_TextureFormat: 5 + m_MipCount: 1 + m_IsReadable: 1 + m_StreamingMipmaps: 0 + m_StreamingMipmapsPriority: 0 + m_AlphaIsTransparency: 0 + m_ImageCount: 1 + m_TextureDimension: 2 + m_TextureSettings: + serializedVersion: 2 + m_FilterMode: 1 + m_Aniso: 1 + m_MipBias: 0 + m_WrapU: 0 + m_WrapV: 0 + m_WrapW: 0 + m_LightmapFormat: 0 + m_ColorSpace: 1 + image data: 16 + _typelessdata: 00000000000000000000000000000000 + m_StreamData: + offset: 0 + size: 0 + path: --- !u!1 &2025760255 GameObject: m_ObjectHideFlags: 0 @@ -34646,46 +34730,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2063636334} m_CullTransparentMesh: 0 ---- !u!28 &2087562404 -Texture2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_ImageContentsHash: - serializedVersion: 2 - Hash: 00000000000000000000000000000000 - m_ForcedFallbackFormat: 4 - m_DownscaleFallback: 0 - serializedVersion: 2 - m_Width: 2 - m_Height: 2 - m_CompleteImageSize: 16 - m_TextureFormat: 5 - m_MipCount: 1 - m_IsReadable: 1 - m_StreamingMipmaps: 0 - m_StreamingMipmapsPriority: 0 - m_AlphaIsTransparency: 0 - m_ImageCount: 1 - m_TextureDimension: 2 - m_TextureSettings: - serializedVersion: 2 - m_FilterMode: 1 - m_Aniso: 1 - m_MipBias: 0 - m_WrapU: 0 - m_WrapV: 0 - m_WrapW: 0 - m_LightmapFormat: 0 - m_ColorSpace: 1 - image data: 16 - _typelessdata: 00000000000000000000000000000000 - m_StreamData: - offset: 0 - size: 0 - path: --- !u!1 &2114361731 GameObject: m_ObjectHideFlags: 0 diff --git a/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Script/SystemConfig.cs b/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Script/SystemConfig.cs new file mode 100644 index 0000000..b1d0658 --- /dev/null +++ b/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Script/SystemConfig.cs @@ -0,0 +1,18 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class SystemConfig : MonoBehaviour +{ + + public static SystemConfig Instance; + + [AutoUI] public bool UseMouse; + + // Start is called before the first frame update + void Awake() + { + Instance = this; + } + +} diff --git a/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Script/SystemConfig.cs.meta b/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Script/SystemConfig.cs.meta new file mode 100644 index 0000000..45de770 --- /dev/null +++ b/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Script/SystemConfig.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: e92877fdd13500346b9be002ab88890f +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Script/TouchArea.cs b/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Script/TouchArea.cs index 061744d..e0eb71f 100644 --- a/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Script/TouchArea.cs +++ b/04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Script/TouchArea.cs @@ -63,17 +63,19 @@ public class TouchArea : MonoBehaviour, IPointerDownHandler, IDragHandler, IPoin { if (RayNoHit != null) RayNoHit.Invoke(null); - foreach (PointerEventData pointerdata in inputmodule.GetPointerDatas.Values) + foreach (PointerEventData eventData in inputmodule.GetPointerDatas.Values) { + if (SystemConfig.Instance.UseMouse == false && eventData.pointerId <= 0) + continue; List raycastResult = new List(); - EventSystem.current.RaycastAll(pointerdata, raycastResult); + EventSystem.current.RaycastAll(eventData, raycastResult); if(raycastResult.Count != 0) { foreach(RaycastResult result in raycastResult) { if(result.gameObject == gameObject) { - RayHit.Invoke(pointerdata); + RayHit.Invoke(eventData); } } } @@ -83,6 +85,8 @@ public class TouchArea : MonoBehaviour, IPointerDownHandler, IDragHandler, IPoin public void OnPointerDown(PointerEventData eventData) { + if (SystemConfig.Instance.UseMouse == false && eventData.pointerId <= 0) + return; if (PointerDown == null) return; if (skip_on_mouse_only(eventData)) @@ -109,6 +113,8 @@ public class TouchArea : MonoBehaviour, IPointerDownHandler, IDragHandler, IPoin public void OnPointerExit(PointerEventData eventData) { + if (SystemConfig.Instance.UseMouse == false && eventData.pointerId <= 0) + return; if (PointerExit == null) return; if (skip_on_mouse_only(eventData)) @@ -118,6 +124,8 @@ public class TouchArea : MonoBehaviour, IPointerDownHandler, IDragHandler, IPoin public void OnPointerEnter(PointerEventData eventData) { + if (SystemConfig.Instance.UseMouse == false && eventData.pointerId <= 0) + return; if (PointerEnter == null) return; if (skip_on_mouse_only(eventData)) @@ -127,6 +135,8 @@ public class TouchArea : MonoBehaviour, IPointerDownHandler, IDragHandler, IPoin public void OnPointerClick(PointerEventData eventData) { + if (SystemConfig.Instance.UseMouse == false && eventData.pointerId <= 0) + return; if (PointerClick == null) return; if (skip_on_mouse_only(eventData))