From 4fc44d31d9bf759e835778c906a4961efee94d10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E9=B9=8F?= Date: Thu, 11 Jan 2024 21:55:03 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=8D=8F=E8=AE=AE=EF=BC=8C=E5=9B=A0=E4=B8=BA=E5=9C=A8=E6=99=BA?= =?UTF-8?q?=E8=83=BD=E7=94=B5=E8=A7=86=E4=B8=8A=E6=B2=A1=E6=9C=89=E8=A7=A6?= =?UTF-8?q?=E6=91=B8=E5=B1=8F=EF=BC=8C=E6=97=A0=E6=B3=95=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E5=90=8C=E6=84=8F=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Game/Common/Materials/Game/SkyLayer.mat | 2 +- ...ceLogo3DObjectsRenderTexture.renderTexture | 1 + Assets/Scenes/Main.unity | 119 +- .../GlobalGameScriptErrDialog.prefab | 12 +- .../GlobalGameUserAgreementTipDialog.prefab | 1099 ----------------- ...obalGameUserAgreementTipDialog.prefab.meta | 7 - Assets/System/Scripts/Entry/GameEntry.cs | 46 +- .../GlobalGameUserAgreementTipDialog.cs | 38 - .../GlobalGameUserAgreementTipDialog.cs.meta | 11 - 9 files changed, 15 insertions(+), 1320 deletions(-) delete mode 100644 Assets/System/Prefabs/System/GlobalDialog/GlobalGameUserAgreementTipDialog.prefab delete mode 100644 Assets/System/Prefabs/System/GlobalDialog/GlobalGameUserAgreementTipDialog.prefab.meta delete mode 100644 Assets/System/Scripts/UI/CoreUI/GlobalGameUserAgreementTipDialog.cs delete mode 100644 Assets/System/Scripts/UI/CoreUI/GlobalGameUserAgreementTipDialog.cs.meta diff --git a/Assets/Game/Common/Materials/Game/SkyLayer.mat b/Assets/Game/Common/Materials/Game/SkyLayer.mat index f274dddc..b65eda57 100644 --- a/Assets/Game/Common/Materials/Game/SkyLayer.mat +++ b/Assets/Game/Common/Materials/Game/SkyLayer.mat @@ -57,7 +57,7 @@ Material: - _MainTex: m_Texture: {fileID: 2800000, guid: 550bc03f31e06d54e80a12103627045c, type: 3} m_Scale: {x: 2, y: 2} - m_Offset: {x: 0.26713884, y: 0.7892295} + m_Offset: {x: 0.33520412, y: 0.85729384} - _MetallicGlossMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} diff --git a/Assets/Game/Menu/Prefabs/Other/BallanceLogo3DObjectsRenderTexture.renderTexture b/Assets/Game/Menu/Prefabs/Other/BallanceLogo3DObjectsRenderTexture.renderTexture index a3751595..7555cf91 100644 --- a/Assets/Game/Menu/Prefabs/Other/BallanceLogo3DObjectsRenderTexture.renderTexture +++ b/Assets/Game/Menu/Prefabs/Other/BallanceLogo3DObjectsRenderTexture.renderTexture @@ -26,6 +26,7 @@ RenderTexture: m_UseDynamicScale: 0 m_BindMS: 0 m_EnableCompatibleFormat: 1 + m_EnableRandomWrite: 0 m_TextureSettings: serializedVersion: 2 m_FilterMode: 1 diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index 99544d6f..59c46599 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -253,7 +253,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1044484048878536426, guid: e7258cce79e72b543877bc49dd8b886f, type: 3} propertyPath: m_AnchoredPosition.x - value: -0.28485107 + value: -0.2849121 objectReference: {fileID: 0} - target: {fileID: 1044484048878536426, guid: e7258cce79e72b543877bc49dd8b886f, type: 3} propertyPath: m_AnchoredPosition.y @@ -373,7 +373,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4527334084443952431, guid: e7258cce79e72b543877bc49dd8b886f, type: 3} propertyPath: m_AnchoredPosition.y - value: -29.360992 + value: -29.360962 objectReference: {fileID: 0} - target: {fileID: 6910264099479711512, guid: e7258cce79e72b543877bc49dd8b886f, type: 3} propertyPath: m_AnchorMax.x @@ -401,117 +401,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8767b3dd7e38b3c49ad2d2de32bd65ea, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1001 &460441524 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 975125178} - m_Modifications: - - target: {fileID: 5053305768004548772, guid: 1875a4aab15f4aa4e93f733f6a08d76c, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 5053305768004548772, guid: 1875a4aab15f4aa4e93f733f6a08d76c, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 5053305768004548772, guid: 1875a4aab15f4aa4e93f733f6a08d76c, type: 3} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 5053305768004548772, guid: 1875a4aab15f4aa4e93f733f6a08d76c, type: 3} - propertyPath: m_AnchorMax.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5053305768004548772, guid: 1875a4aab15f4aa4e93f733f6a08d76c, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5053305768004548772, guid: 1875a4aab15f4aa4e93f733f6a08d76c, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5053305768004548772, guid: 1875a4aab15f4aa4e93f733f6a08d76c, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5053305768004548772, guid: 1875a4aab15f4aa4e93f733f6a08d76c, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5053305768004548772, guid: 1875a4aab15f4aa4e93f733f6a08d76c, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5053305768004548772, guid: 1875a4aab15f4aa4e93f733f6a08d76c, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5053305768004548772, guid: 1875a4aab15f4aa4e93f733f6a08d76c, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5053305768004548772, guid: 1875a4aab15f4aa4e93f733f6a08d76c, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5053305768004548772, guid: 1875a4aab15f4aa4e93f733f6a08d76c, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5053305768004548772, guid: 1875a4aab15f4aa4e93f733f6a08d76c, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 5053305768004548772, guid: 1875a4aab15f4aa4e93f733f6a08d76c, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 5053305768004548772, guid: 1875a4aab15f4aa4e93f733f6a08d76c, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 5053305768004548772, guid: 1875a4aab15f4aa4e93f733f6a08d76c, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5053305768004548772, guid: 1875a4aab15f4aa4e93f733f6a08d76c, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5053305768004548772, guid: 1875a4aab15f4aa4e93f733f6a08d76c, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5053305768004548772, guid: 1875a4aab15f4aa4e93f733f6a08d76c, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5053305768004548772, guid: 1875a4aab15f4aa4e93f733f6a08d76c, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5053305768004548773, guid: 1875a4aab15f4aa4e93f733f6a08d76c, type: 3} - propertyPath: m_Name - value: GlobalGameUserAgreementTipDialog - objectReference: {fileID: 0} - - target: {fileID: 5053305768004548773, guid: 1875a4aab15f4aa4e93f733f6a08d76c, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 1875a4aab15f4aa4e93f733f6a08d76c, type: 3} ---- !u!224 &460441525 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 5053305768004548772, guid: 1875a4aab15f4aa4e93f733f6a08d76c, type: 3} - m_PrefabInstance: {fileID: 460441524} - m_PrefabAsset: {fileID: 0} ---- !u!1 &460441526 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 5053305768004548773, guid: 1875a4aab15f4aa4e93f733f6a08d76c, type: 3} - m_PrefabInstance: {fileID: 460441524} - m_PrefabAsset: {fileID: 0} --- !u!1001 &504756837 PrefabInstance: m_ObjectHideFlags: 0 @@ -927,6 +816,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} m_Name: m_EditorClassIdentifier: + m_SendPointerHoverToParent: 1 m_HorizontalAxis: Horizontal m_VerticalAxis: Vertical m_SubmitButton: Submit @@ -1216,7 +1106,6 @@ RectTransform: - {fileID: 197972176} - {fileID: 1704897429} - {fileID: 200569453} - - {fileID: 460441525} m_Father: {fileID: 646464401} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1306,7 +1195,7 @@ MonoBehaviour: GameGlobalErrorUI: {fileID: 197972177} GameDebugBeginStats: {fileID: 0} GlobalGamePermissionTipDialog: {fileID: 1704897430} - GlobalGameUserAgreementTipDialog: {fileID: 460441526} + GlobalGameUserAgreementTipDialog: {fileID: 0} GlobalGameScriptErrDialog: {fileID: 200569454} GameGlobalIngameLoading: {fileID: 504756839} --- !u!4 &1269806398 diff --git a/Assets/System/Prefabs/System/GlobalDialog/GlobalGameScriptErrDialog.prefab b/Assets/System/Prefabs/System/GlobalDialog/GlobalGameScriptErrDialog.prefab index ab097bb3..a0724e8e 100644 --- a/Assets/System/Prefabs/System/GlobalDialog/GlobalGameScriptErrDialog.prefab +++ b/Assets/System/Prefabs/System/GlobalDialog/GlobalGameScriptErrDialog.prefab @@ -264,6 +264,10 @@ PrefabInstance: propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 223453340555927753, guid: 38d86cc1785d7774f87dab7495bf034d, type: 3} + propertyPath: m_Size + value: 0.9998703 + objectReference: {fileID: 0} - target: {fileID: 223453340555927753, guid: 38d86cc1785d7774f87dab7495bf034d, type: 3} propertyPath: m_Value value: 1 @@ -294,11 +298,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3510988253724056833, guid: 38d86cc1785d7774f87dab7495bf034d, type: 3} propertyPath: m_AnchoredPosition.x - value: -0.2848816 + value: -0.08459473 objectReference: {fileID: 0} - target: {fileID: 3510988253724056833, guid: 38d86cc1785d7774f87dab7495bf034d, type: 3} propertyPath: m_AnchoredPosition.y - value: -51.945236 + value: -110.4845 objectReference: {fileID: 0} - target: {fileID: 3835671058773838595, guid: 38d86cc1785d7774f87dab7495bf034d, type: 3} propertyPath: m_HorizontalScrollbarVisibility @@ -318,7 +322,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4298097191511808127, guid: 38d86cc1785d7774f87dab7495bf034d, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4363831668008329548, guid: 38d86cc1785d7774f87dab7495bf034d, type: 3} propertyPath: m_AnchorMax.y @@ -434,7 +438,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8905980744782028926, guid: 38d86cc1785d7774f87dab7495bf034d, type: 3} propertyPath: m_Size - value: 0.5 + value: 0.76282656 objectReference: {fileID: 0} - target: {fileID: 8905980744782028926, guid: 38d86cc1785d7774f87dab7495bf034d, type: 3} propertyPath: m_Value diff --git a/Assets/System/Prefabs/System/GlobalDialog/GlobalGameUserAgreementTipDialog.prefab b/Assets/System/Prefabs/System/GlobalDialog/GlobalGameUserAgreementTipDialog.prefab deleted file mode 100644 index 6ba153e1..00000000 --- a/Assets/System/Prefabs/System/GlobalDialog/GlobalGameUserAgreementTipDialog.prefab +++ /dev/null @@ -1,1099 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &5053305768004548773 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5053305768004548772} - - component: {fileID: 5053305768004548761} - - component: {fileID: 5053305768004548774} - - component: {fileID: 6182536676794116925} - m_Layer: 5 - m_Name: GlobalGameUserAgreementTipDialog - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &5053305768004548772 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5053305768004548773} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 5053305768146952625} - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5053305768004548761 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5053305768004548773} - m_CullTransparentMesh: 0 ---- !u!114 &5053305768004548774 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5053305768004548773} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.24764152, g: 0.2898795, b: 0.3301887, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!114 &6182536676794116925 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5053305768004548773} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: aaba92d8d35c6874c9013595f4ed257d, type: 3} - m_Name: - m_EditorClassIdentifier: - ButtonUserAgreementAllow: {fileID: 5053305769632768346} - ButtonUserAgreementDisallow: {fileID: 5053305769400405014} - CheckBoxAllowUserAgreement: {fileID: 894246958217984419} - LinkPrivacyPolicy: {fileID: 5053305768459031857} - LinkUserAgreement: {fileID: 5053305768299780409} ---- !u!1 &5053305768146952638 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5053305768146952625} - - component: {fileID: 5053305768146952627} - - component: {fileID: 5053305768146952624} - m_Layer: 5 - m_Name: Panel - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &5053305768146952625 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5053305768146952638} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 5053305769332311874} - - {fileID: 5053305769914321152} - - {fileID: 7379559237863694477} - - {fileID: 5053305769632768345} - - {fileID: 5053305769400405015} - - {fileID: 5053305768299780410} - - {fileID: 5053305768459031856} - m_Father: {fileID: 5053305768004548772} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -16.12968} - m_SizeDelta: {x: 324.871, y: 270.6747} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5053305768146952627 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5053305768146952638} - m_CullTransparentMesh: 0 ---- !u!114 &5053305768146952624 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5053305768146952638} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.87058824} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!1 &5053305768299780409 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5053305768299780410} - - component: {fileID: 5053305768299780411} - - component: {fileID: 7049765152126348485} - m_Layer: 5 - m_Name: LinkUserAgreement - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &5053305768299780410 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5053305768299780409} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 5053305768146952625} - m_RootOrder: 5 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0.0015182, y: -26.1} - m_SizeDelta: {x: 293.95, y: 20} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5053305768299780411 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5053305768299780409} - m_CullTransparentMesh: 0 ---- !u!114 &7049765152126348485 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5053305768299780409} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 01d6c0e7bae391c40a7009033c5ceb90, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.2216981, g: 0.7535088, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 14 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 10 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: global.LinkUserAgreement - m_ResourceKey: global.LinkUserAgreement - m_DefaultString: global.LinkUserAgreement - m_I18N: 1 ---- !u!1 &5053305768422915501 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5053305768422915500} - - component: {fileID: 5053305768422915502} - - component: {fileID: 1527533233775454720} - m_Layer: 5 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &5053305768422915500 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5053305768422915501} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 5053305769632768345} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -0.000011444092, y: 0} - m_SizeDelta: {x: 0.000022888, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5053305768422915502 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5053305768422915501} - m_CullTransparentMesh: 0 ---- !u!114 &1527533233775454720 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5053305768422915501} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 01d6c0e7bae391c40a7009033c5ceb90, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 14 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 10 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: global.Agree - m_ResourceKey: global.Agree - m_DefaultString: global.Agree - m_I18N: 1 ---- !u!1 &5053305768459031857 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5053305768459031856} - - component: {fileID: 5053305768459031858} - - component: {fileID: 1638130968430519475} - m_Layer: 5 - m_Name: LinkPrivacyPolicy - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &5053305768459031856 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5053305768459031857} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 5053305768146952625} - m_RootOrder: 6 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -0.0022046, y: -50.1} - m_SizeDelta: {x: 293.95, y: 20} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5053305768459031858 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5053305768459031857} - m_CullTransparentMesh: 0 ---- !u!114 &1638130968430519475 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5053305768459031857} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 01d6c0e7bae391c40a7009033c5ceb90, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.2216981, g: 0.7535088, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 14 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 10 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: global.PrivacyPolicy - m_ResourceKey: global.PrivacyPolicy - m_DefaultString: global.PrivacyPolicy - m_I18N: 1 ---- !u!1 &5053305768937478500 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5053305768937478503} - - component: {fileID: 5053305768937478489} - - component: {fileID: 834734272370899464} - m_Layer: 5 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &5053305768937478503 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5053305768937478500} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 5053305769400405015} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5053305768937478489 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5053305768937478500} - m_CullTransparentMesh: 0 ---- !u!114 &834734272370899464 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5053305768937478500} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 01d6c0e7bae391c40a7009033c5ceb90, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 14 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 10 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: global.Disagree - m_ResourceKey: global.Disagree - m_DefaultString: global.Disagree - m_I18N: 1 ---- !u!1 &5053305769332311875 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5053305769332311874} - - component: {fileID: 5053305769332311876} - - component: {fileID: 8356588390243699656} - m_Layer: 5 - m_Name: TextUserAgreementTitle - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &5053305769332311874 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5053305769332311875} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 5053305768146952625} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0.0032463, y: -26.8} - m_SizeDelta: {x: 293.95, y: 30} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5053305769332311876 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5053305769332311875} - m_CullTransparentMesh: 0 ---- !u!114 &8356588390243699656 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5053305769332311875} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 01d6c0e7bae391c40a7009033c5ceb90, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 16 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 1 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: global.UserAgreementTitle - m_ResourceKey: global.UserAgreementTitle - m_DefaultString: global.UserAgreementTitle - m_I18N: 1 ---- !u!1 &5053305769400405012 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5053305769400405015} - - component: {fileID: 5053305769400405000} - - component: {fileID: 5053305769400405001} - - component: {fileID: 5053305769400405014} - m_Layer: 5 - m_Name: ButtonUserAgreementDisallow - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &5053305769400405015 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5053305769400405012} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 5053305768937478503} - m_Father: {fileID: 5053305768146952625} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: -83.73614, y: 28.199997} - m_SizeDelta: {x: 126.4691, y: 32.1608} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5053305769400405000 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5053305769400405012} - m_CullTransparentMesh: 0 ---- !u!114 &5053305769400405001 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5053305769400405012} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.745283, g: 0.745283, b: 0.745283, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!114 &5053305769400405014 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5053305769400405012} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 5053305769400405001} - m_OnClick: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 0} - m_TargetAssemblyTypeName: - m_MethodName: QuitGame - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 1 ---- !u!1 &5053305769632768358 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5053305769632768345} - - component: {fileID: 5053305769632768347} - - component: {fileID: 5053305769632768344} - - component: {fileID: 5053305769632768346} - m_Layer: 5 - m_Name: ButtonUserAgreementAllow - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &5053305769632768345 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5053305769632768358} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 5053305768422915500} - m_Father: {fileID: 5053305768146952625} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 93.02852, y: 28.199997} - m_SizeDelta: {x: 107.8906, y: 32.1608} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5053305769632768347 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5053305769632768358} - m_CullTransparentMesh: 0 ---- !u!114 &5053305769632768344 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5053305769632768358} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0, g: 0.7264151, b: 0.3088961, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!114 &5053305769632768346 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5053305769632768358} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: -9209596457331486333, guid: 6311c36ddf6e5e443901e80c30b59b19, type: 3} - m_PressedSprite: {fileID: 2843758286862564216, guid: 6311c36ddf6e5e443901e80c30b59b19, type: 3} - m_SelectedSprite: {fileID: -9209596457331486333, guid: 6311c36ddf6e5e443901e80c30b59b19, type: 3} - m_DisabledSprite: {fileID: -8010207806092045782, guid: 6311c36ddf6e5e443901e80c30b59b19, type: 3} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 0 - m_TargetGraphic: {fileID: 5053305769632768344} - m_OnClick: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 0} - m_TargetAssemblyTypeName: - m_MethodName: ArgeedUserArgeement - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 1 ---- !u!1 &5053305769914321153 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5053305769914321152} - - component: {fileID: 5053305769914321154} - - component: {fileID: 6312170941955777622} - m_Layer: 5 - m_Name: TextUserAgreementMore - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &5053305769914321152 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5053305769914321153} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 5053305768146952625} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: -0.000014544, y: -102.38} - m_SizeDelta: {x: 293.9457, y: 98.118} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5053305769914321154 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5053305769914321153} - m_CullTransparentMesh: 0 ---- !u!114 &6312170941955777622 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5053305769914321153} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 01d6c0e7bae391c40a7009033c5ceb90, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.3584906, g: 0.3584906, b: 0.3584906, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 13 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 1 - m_MaxSize: 40 - m_Alignment: 1 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: global.AgreementMore - m_ResourceKey: global.AgreementMore - m_DefaultString: global.AgreementMore - m_I18N: 1 ---- !u!1001 &462062799227054495 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 5053305768146952625} - m_Modifications: - - target: {fileID: 720738067573870652, guid: 4f5f0df7282ad944e8674e115a3a2820, type: 3} - propertyPath: m_IsOn - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6917781562189187346, guid: 4f5f0df7282ad944e8674e115a3a2820, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6917781562189187346, guid: 4f5f0df7282ad944e8674e115a3a2820, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6917781562189187346, guid: 4f5f0df7282ad944e8674e115a3a2820, type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 6917781562189187346, guid: 4f5f0df7282ad944e8674e115a3a2820, type: 3} - propertyPath: m_AnchorMax.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6917781562189187346, guid: 4f5f0df7282ad944e8674e115a3a2820, type: 3} - propertyPath: m_AnchorMax.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6917781562189187346, guid: 4f5f0df7282ad944e8674e115a3a2820, type: 3} - propertyPath: m_AnchorMin.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6917781562189187346, guid: 4f5f0df7282ad944e8674e115a3a2820, type: 3} - propertyPath: m_AnchorMin.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6917781562189187346, guid: 4f5f0df7282ad944e8674e115a3a2820, type: 3} - propertyPath: m_SizeDelta.x - value: 295 - objectReference: {fileID: 0} - - target: {fileID: 6917781562189187346, guid: 4f5f0df7282ad944e8674e115a3a2820, type: 3} - propertyPath: m_SizeDelta.y - value: 16 - objectReference: {fileID: 0} - - target: {fileID: 6917781562189187346, guid: 4f5f0df7282ad944e8674e115a3a2820, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6917781562189187346, guid: 4f5f0df7282ad944e8674e115a3a2820, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6917781562189187346, guid: 4f5f0df7282ad944e8674e115a3a2820, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6917781562189187346, guid: 4f5f0df7282ad944e8674e115a3a2820, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6917781562189187346, guid: 4f5f0df7282ad944e8674e115a3a2820, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6917781562189187346, guid: 4f5f0df7282ad944e8674e115a3a2820, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6917781562189187346, guid: 4f5f0df7282ad944e8674e115a3a2820, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6917781562189187346, guid: 4f5f0df7282ad944e8674e115a3a2820, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6917781562189187346, guid: 4f5f0df7282ad944e8674e115a3a2820, type: 3} - propertyPath: m_AnchoredPosition.y - value: -73.3 - objectReference: {fileID: 0} - - target: {fileID: 6917781562189187346, guid: 4f5f0df7282ad944e8674e115a3a2820, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6917781562189187346, guid: 4f5f0df7282ad944e8674e115a3a2820, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6917781562189187346, guid: 4f5f0df7282ad944e8674e115a3a2820, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8193969246310834946, guid: 4f5f0df7282ad944e8674e115a3a2820, type: 3} - propertyPath: m_Text - value: global.AgreeUserAgreement - objectReference: {fileID: 0} - - target: {fileID: 8193969246310834946, guid: 4f5f0df7282ad944e8674e115a3a2820, type: 3} - propertyPath: m_Color.b - value: 0.3490566 - objectReference: {fileID: 0} - - target: {fileID: 8193969246310834946, guid: 4f5f0df7282ad944e8674e115a3a2820, type: 3} - propertyPath: m_Color.g - value: 0.3490566 - objectReference: {fileID: 0} - - target: {fileID: 8193969246310834946, guid: 4f5f0df7282ad944e8674e115a3a2820, type: 3} - propertyPath: m_Color.r - value: 0.3490566 - objectReference: {fileID: 0} - - target: {fileID: 8193969246310834946, guid: 4f5f0df7282ad944e8674e115a3a2820, type: 3} - propertyPath: m_ResourceKey - value: global.AgreeUserAgreement - objectReference: {fileID: 0} - - target: {fileID: 8193969246310834946, guid: 4f5f0df7282ad944e8674e115a3a2820, type: 3} - propertyPath: m_DefaultString - value: global.AgreeUserAgreement - objectReference: {fileID: 0} - - target: {fileID: 8193969246310834946, guid: 4f5f0df7282ad944e8674e115a3a2820, type: 3} - propertyPath: m_FontData.m_MinSize - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8193969246310834946, guid: 4f5f0df7282ad944e8674e115a3a2820, type: 3} - propertyPath: m_FontData.m_FontSize - value: 12 - objectReference: {fileID: 0} - - target: {fileID: 8193969246310834946, guid: 4f5f0df7282ad944e8674e115a3a2820, type: 3} - propertyPath: m_FontData.m_Alignment - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 9153488925147734778, guid: 4f5f0df7282ad944e8674e115a3a2820, type: 3} - propertyPath: m_Name - value: CheckBoxAllowUserAgreement - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 4f5f0df7282ad944e8674e115a3a2820, type: 3} ---- !u!114 &894246958217984419 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 720738067573870652, guid: 4f5f0df7282ad944e8674e115a3a2820, type: 3} - m_PrefabInstance: {fileID: 462062799227054495} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!224 &7379559237863694477 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 6917781562189187346, guid: 4f5f0df7282ad944e8674e115a3a2820, type: 3} - m_PrefabInstance: {fileID: 462062799227054495} - m_PrefabAsset: {fileID: 0} diff --git a/Assets/System/Prefabs/System/GlobalDialog/GlobalGameUserAgreementTipDialog.prefab.meta b/Assets/System/Prefabs/System/GlobalDialog/GlobalGameUserAgreementTipDialog.prefab.meta deleted file mode 100644 index dceffd3d..00000000 --- a/Assets/System/Prefabs/System/GlobalDialog/GlobalGameUserAgreementTipDialog.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 1875a4aab15f4aa4e93f733f6a08d76c -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/System/Scripts/Entry/GameEntry.cs b/Assets/System/Scripts/Entry/GameEntry.cs index 52887e5f..d76f5551 100644 --- a/Assets/System/Scripts/Entry/GameEntry.cs +++ b/Assets/System/Scripts/Entry/GameEntry.cs @@ -74,9 +74,6 @@ public class GameEntry : MonoBehaviour #if UNITY_ANDROID private bool GlobalGamePermissionTipDialogClosed = false; -#endif -#if UNITY_ANDROID || UNITY_IOS - private bool GlobalGameUserAgreementTipDialogClosed = false; #endif public GameObject GlobalGamePermissionTipDialog = null; public GameObject GlobalGameUserAgreementTipDialog = null; @@ -111,25 +108,6 @@ public static void Destroy() } #region 用户许可相关 - - -#if UNITY_ANDROID || UNITY_IOS - /// - /// 显示许可对话框 - /// - /// - private bool ShowUserArgeement() - { - if (PlayerPrefs.GetInt("UserAgreementAgreed", 0) == 0) - { - GlobalGameUserAgreementTipDialog.SetActive(true); - return true; - } else { - GlobalGameUserAgreementTipDialogClosed = true; - return false; - } - } -#endif /// /// 检查android权限是否申请 /// @@ -143,17 +121,6 @@ private bool TestAndroidPermission() return false; } - /// - /// 用户同意许可 - /// - public void ArgeedUserArgeement() - { - PlayerPrefs.SetInt("UserAgreementAgreed", 1); - -#if UNITY_ANDROID || UNITY_IOS - GlobalGameUserAgreementTipDialogClosed = true; -#endif - } /// /// 请求安卓权限 /// @@ -181,9 +148,7 @@ public void QuitGame() /// public void DisallowAndroidPermission() { -#if UNITY_ANDROID - GlobalGameUserAgreementTipDialogClosed = true; -#endif + } #endregion @@ -233,15 +198,6 @@ private IEnumerator InitMain() GameGlobalIngameLoading.SetActive(true); } #endif -#if UNITY_ANDROID || UNITY_IOS - if (ShowUserArgeement()) - { - GameGlobalIngameLoading.SetActive(false); - yield return new WaitUntil(() => GlobalGameUserAgreementTipDialogClosed); - GameGlobalIngameLoading.SetActive(true); - } -#endif - GameErrorChecker.SetGameErrorUI(GameGlobalErrorUI); GameSystemInit.FillStartParameters(this); diff --git a/Assets/System/Scripts/UI/CoreUI/GlobalGameUserAgreementTipDialog.cs b/Assets/System/Scripts/UI/CoreUI/GlobalGameUserAgreementTipDialog.cs deleted file mode 100644 index 922b8535..00000000 --- a/Assets/System/Scripts/UI/CoreUI/GlobalGameUserAgreementTipDialog.cs +++ /dev/null @@ -1,38 +0,0 @@ -using Ballance2.Config; -using Ballance2.Entry; -using Ballance2.Services.InputManager; -using UnityEngine; -using UnityEngine.UI; - -/* -* Copyright(c) 2022 mengyu -* -* 模块名： -* GlobalGameUserAgreementTipDialog.cs -* -* 用途： -* 全局开始时的用户协议的对话框逻辑。 -* -* 作者： -* mengyu -*/ - -public class GlobalGameUserAgreementTipDialog : MonoBehaviour { - public Button ButtonUserAgreementAllow = null; - public Button ButtonUserAgreementDisallow = null; - public Toggle CheckBoxAllowUserAgreement = null; - public GameObject LinkPrivacyPolicy = null; - public GameObject LinkUserAgreement = null; - - void Start() { - EventTriggerListener.Get(LinkPrivacyPolicy).onClick += (go) => Application.OpenURL(ConstStrings.BallancePrivacyPolicy); - EventTriggerListener.Get(LinkUserAgreement).onClick += (go) => Application.OpenURL(ConstStrings.BallanceUserAgreement); - CheckBoxAllowUserAgreement.onValueChanged.AddListener((v) => ButtonUserAgreementAllow.interactable = v); - ButtonUserAgreementAllow.onClick.AddListener(() => { - gameObject.SetActive(false); - GameEntry.Instance.ArgeedUserArgeement(); - }); - ButtonUserAgreementDisallow.onClick.AddListener(() => GameEntry.Instance.QuitGame()); - } - -} \ No newline at end of file diff --git a/Assets/System/Scripts/UI/CoreUI/GlobalGameUserAgreementTipDialog.cs.meta b/Assets/System/Scripts/UI/CoreUI/GlobalGameUserAgreementTipDialog.cs.meta deleted file mode 100644 index 3e057d82..00000000 --- a/Assets/System/Scripts/UI/CoreUI/GlobalGameUserAgreementTipDialog.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: aaba92d8d35c6874c9013595f4ed257d -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: From 206e1fa0cd829abb4a1af453dab200a8a82e1758 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E9=B9=8F?= Date: Fri, 12 Jan 2024 08:53:06 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E6=A3=80=E6=B5=8B=E5=88=B0=E4=B8=8D?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E8=A7=A6=E5=B1=8F=E6=93=8D=E4=BD=9C=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E6=89=8D=E9=94=80=E6=AF=81=E5=B1=8F=E5=B9=95=E9=94=AE?= =?UTF-8?q?=E7=9B=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Game/GamePlay/Scripts/BallManager.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Assets/Game/GamePlay/Scripts/BallManager.cs b/Assets/Game/GamePlay/Scripts/BallManager.cs index 775ba561..a34e8e89 100644 --- a/Assets/Game/GamePlay/Scripts/BallManager.cs +++ b/Assets/Game/GamePlay/Scripts/BallManager.cs @@ -190,8 +190,6 @@ private void _AxisListen(string asixName, float value) currentMovementType = KeyListener.MovementType.LeftStick; break; } - //检测到手柄操作，销毁屏幕键盘 - GamePlayUIControl.Instance.DestroyMobileKeyPad(); switch (asixName) { //控制左右 @@ -328,7 +326,9 @@ private void _InitKeys() keyListener.AddKeyListen(keyLeft, _LeftArrow_Key); keyListener.AddKeyListen(keyRight, _RightArrow_Key); keyListener.SetAxisListen(_AxisListen); - + //检测到不支持触屏操作时，销毁屏幕键盘 + if (!Input.touchSupported) + GamePlayUIControl.Instance.DestroyMobileKeyPad(); //测试按扭 if (GameManager.DebugMode) { From de4355395a2bb974b4c2935c49451b6dee923842 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E9=B9=8F?= Date: Fri, 12 Jan 2024 09:08:48 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E6=A3=80=E6=B5=8B=E5=88=B0=E4=B8=8D?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E8=A7=A6=E5=B1=8F=E6=93=8D=E4=BD=9C=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E6=89=8D=E9=9A=90=E8=97=8F=E5=B1=8F=E5=B9=95=E9=94=AE?= =?UTF-8?q?=E7=9B=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Game/GamePlay/Scripts/BallManager.cs | 4 +--- Assets/Game/GamePlay/Scripts/GamePlayManager.cs | 2 +- Assets/Game/Menu/Scripts/Game/GamePlayUIControl.cs | 6 +++--- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/Assets/Game/GamePlay/Scripts/BallManager.cs b/Assets/Game/GamePlay/Scripts/BallManager.cs index a34e8e89..2304953d 100644 --- a/Assets/Game/GamePlay/Scripts/BallManager.cs +++ b/Assets/Game/GamePlay/Scripts/BallManager.cs @@ -326,9 +326,7 @@ private void _InitKeys() keyListener.AddKeyListen(keyLeft, _LeftArrow_Key); keyListener.AddKeyListen(keyRight, _RightArrow_Key); keyListener.SetAxisListen(_AxisListen); - //检测到不支持触屏操作时，销毁屏幕键盘 - if (!Input.touchSupported) - GamePlayUIControl.Instance.DestroyMobileKeyPad(); + //测试按扭 if (GameManager.DebugMode) { diff --git a/Assets/Game/GamePlay/Scripts/GamePlayManager.cs b/Assets/Game/GamePlay/Scripts/GamePlayManager.cs index ccdc0913..25c8b8d1 100644 --- a/Assets/Game/GamePlay/Scripts/GamePlayManager.cs +++ b/Assets/Game/GamePlay/Scripts/GamePlayManager.cs @@ -138,7 +138,7 @@ protected override void OnDestroy() if (GameUIManager.Instance != null) foreach (var id in _EscKeyIds) GameUIManager.Instance.DeleteKeyListen(id); - GameManager.GameMediator.UnRegisterSingleEvent("CoreGamePlayManagerInitAndStart"); //取消注册全局事件 + GameManager.GameMediator?.UnRegisterSingleEvent("CoreGamePlayManagerInitAndStart"); //取消注册全局事件 this._DeleteEvents(); this._DeleteCommands(); //删除指令 } diff --git a/Assets/Game/Menu/Scripts/Game/GamePlayUIControl.cs b/Assets/Game/Menu/Scripts/Game/GamePlayUIControl.cs index 99a929ab..ee38d8bd 100644 --- a/Assets/Game/Menu/Scripts/Game/GamePlayUIControl.cs +++ b/Assets/Game/Menu/Scripts/Game/GamePlayUIControl.cs @@ -91,7 +91,7 @@ protected override void OnDestroy() this.DestroyMobileKeyPad(); } - internal void DestroyMobileKeyPad() { + private void DestroyMobileKeyPad() { //销毁键盘 if (_CurrentMobileKeyPad != null) { Destroy(_CurrentMobileKeyPad.gameObject); @@ -118,8 +118,8 @@ internal void ReBuildMobileKeyPad() { //创建键盘 _CurrentMobileKeyPad = GameUIManager.Instance.InitViewToCanvas(keyPad.prefab, "GameMobileKeypad", false); - - if (!_CurrentMobileKeyPadShow) + //当屏幕键盘不显示，或者当前设备不支持触摸操作时。取消激活屏幕键盘 + if (!_CurrentMobileKeyPadShow || !Input.touchSupported) _CurrentMobileKeyPad.gameObject.SetActive(false); } From a004874b0353dc209e58e2f81190e8d73bc0e2bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E9=B9=8F?= Date: Fri, 12 Jan 2024 09:27:47 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=95=B4=E7=90=86?= =?UTF-8?q?=EF=BC=8C=E5=8E=BB=E9=99=A4=E5=86=97=E4=BD=99=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Game/GamePlay/Scripts/BallManager.cs | 3 +- .../Game/GamePlay/Scripts/GamePlayManager.cs | 2 +- .../Services/InputManager/KeyListener.cs | 46 +------------------ 3 files changed, 5 insertions(+), 46 deletions(-) diff --git a/Assets/Game/GamePlay/Scripts/BallManager.cs b/Assets/Game/GamePlay/Scripts/BallManager.cs index 2304953d..98bb846f 100644 --- a/Assets/Game/GamePlay/Scripts/BallManager.cs +++ b/Assets/Game/GamePlay/Scripts/BallManager.cs @@ -322,7 +322,8 @@ private void _InitKeys() keyListener.AddKeyListen(keyUp, _Up_Key); keyListener.AddKeyListen(keyDown, _Down_Key); keyListener.AddKeyListen(keyUpCamera, _Space_Key); - keyListener.AddKeyListen(keyRoateCamera, keyRoateCamera2, _Shift_Key); + keyListener.AddKeyListen(keyRoateCamera, _Shift_Key); + keyListener.AddKeyListen(keyRoateCamera2, _Shift_Key); keyListener.AddKeyListen(keyLeft, _LeftArrow_Key); keyListener.AddKeyListen(keyRight, _RightArrow_Key); keyListener.SetAxisListen(_AxisListen); diff --git a/Assets/Game/GamePlay/Scripts/GamePlayManager.cs b/Assets/Game/GamePlay/Scripts/GamePlayManager.cs index 25c8b8d1..700c0dd3 100644 --- a/Assets/Game/GamePlay/Scripts/GamePlayManager.cs +++ b/Assets/Game/GamePlay/Scripts/GamePlayManager.cs @@ -461,7 +461,7 @@ private void _InitEvents() } private void _DeleteEvents() { - GameManager.GameMediator.UnRegisterEventEmitter("GamePlay"); + GameManager.GameMediator?.UnRegisterEventEmitter("GamePlay"); } #endregion diff --git a/Assets/System/Scripts/Services/InputManager/KeyListener.cs b/Assets/System/Scripts/Services/InputManager/KeyListener.cs index 49667a11..8b0016cf 100644 --- a/Assets/System/Scripts/Services/InputManager/KeyListener.cs +++ b/Assets/System/Scripts/Services/InputManager/KeyListener.cs @@ -73,11 +73,8 @@ public static KeyListener Get(GameObject go) private class KeyListenerItem { - public KeyCode key2; public KeyCode key; public bool downed = false; - public bool downed2 = false; - public bool has2key = false; public KeyDelegate callBack; public int id; } @@ -140,20 +137,6 @@ public void ReSendPressingKey() while (cur != null) { var item = cur.Value; - if (item.has2key) - { - if (item.downed2) - { - if (Input.GetKey(item.key2)) item.callBack(item.key2, true); - else - { - item.downed2 = false; - item.callBack(item.key2, false); - } - } - else - item.callBack(item.key2, false); - } if (item.downed) { if (Input.GetKey(item.key)) item.callBack(item.key, true); @@ -170,21 +153,18 @@ public void ReSendPressingKey() } /// - /// 添加侦听器侦听键，可以一次监听两个键。 + /// 添加侦听器侦听键 /// /// 键值。 - /// 键值2。 /// 回调函数。 /// 返回一个ID, 可使用 DeleteKeyListen 删除侦听器 - public int AddKeyListen(KeyCode key, KeyCode key2, KeyDelegate callBack) + public int AddKeyListen(KeyCode key, KeyDelegate callBack) { listenKeyId++; KeyListenerItem item = new KeyListenerItem(); item.callBack = callBack; item.key = key; - item.key2 = key2; - item.has2key = key2 != KeyCode.None; item.id = listenKeyId; //逆序遍历链表。添加按键至相同按键位置 @@ -212,14 +192,6 @@ public void SetAxisListen(AxisDelegate axisDelegate) this.axisDelegate = axisDelegate; } - /// - /// 添加侦听器侦听键。 - /// - /// 键值。 - /// 回调函数。 - /// 返回一个ID, 可使用 DeleteKeyListen 删除侦听器 - public int AddKeyListen(KeyCode key, KeyDelegate callBack) { return AddKeyListen(key, KeyCode.None, callBack); } - /// /// 删除指定侦听器。 /// @@ -292,20 +264,6 @@ private void Update() while (cur != null) { var item = cur.Value; - if (item.has2key) - { - if (Input.GetKeyDown(item.key2) && !item.downed) - { - item.downed2 = true; - item.callBack(item.key2, true); - } - if (Input.GetKeyUp(item.key2) && item.downed) - { - item.downed2 = false; - item.callBack(item.key2, false); - } - } - if (Input.GetKeyDown(item.key) && !item.downed) { if (!AllowMultipleKey && lastPressedKey == item.key) From ba7b0bad687440cd505e020f3a9c549c45f39bea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E9=B9=8F?= Date: Fri, 12 Jan 2024 11:31:17 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E6=9B=BF=E6=8D=A2=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E6=96=B0=E7=9A=84InputSystem=E4=B8=AD=E3=80=82=E3=80=82?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Game/GamePlay/Scripts/BallManager.cs | 13 +- .../Game/GamePlay/Scripts/GamePlayManager.cs | 27 +-- .../Scripts/Other/TutorialController.cs | 42 ++--- .../System/Scripts/Services/GameUIManager.cs | 9 +- .../Services/InputManager/KeyListener.cs | 164 +++++++++++++++--- Assets/System/Scripts/UI/Core/GameUIPage.cs | 3 +- 6 files changed, 176 insertions(+), 82 deletions(-) diff --git a/Assets/Game/GamePlay/Scripts/BallManager.cs b/Assets/Game/GamePlay/Scripts/BallManager.cs index 98bb846f..a64d383a 100644 --- a/Assets/Game/GamePlay/Scripts/BallManager.cs +++ b/Assets/Game/GamePlay/Scripts/BallManager.cs @@ -11,6 +11,7 @@ using BallancePhysics.Wapper; using UnityEngine; using UnityEngine.Animations; +using UnityEngine.InputSystem.LowLevel; using static Ballance2.Services.GameManager; namespace Ballance2.Game.GamePlay @@ -273,7 +274,7 @@ private void _AxisListen(string asixName, float value) return; camRotateLock = true; GameTimer.Delay(0.5F, () => camRotateLock = false); - + if (value > 0) { if (CanControllCamera) @@ -317,15 +318,15 @@ private void _InitKeys() keyListener = KeyListener.Get(gameObject); keyListener.DisableWhenUIFocused = false; keyListener.ClearKeyListen(); - keyListener.AddKeyListen(keyFront, _UpArrow_Key); - keyListener.AddKeyListen(keyBack, _DownArrow_Key); + keyListener.AddKeyListen(keyFront, _UpArrow_Key, GamepadButton.DpadUp); + keyListener.AddKeyListen(keyBack, _DownArrow_Key, GamepadButton.DpadDown); keyListener.AddKeyListen(keyUp, _Up_Key); keyListener.AddKeyListen(keyDown, _Down_Key); - keyListener.AddKeyListen(keyUpCamera, _Space_Key); + keyListener.AddKeyListen(keyUpCamera, _Space_Key); keyListener.AddKeyListen(keyRoateCamera, _Shift_Key); keyListener.AddKeyListen(keyRoateCamera2, _Shift_Key); - keyListener.AddKeyListen(keyLeft, _LeftArrow_Key); - keyListener.AddKeyListen(keyRight, _RightArrow_Key); + keyListener.AddKeyListen(keyLeft, _LeftArrow_Key, GamepadButton.DpadLeft); + keyListener.AddKeyListen(keyRight, _RightArrow_Key, GamepadButton.DpadRight); keyListener.SetAxisListen(_AxisListen); //测试按扭 diff --git a/Assets/Game/GamePlay/Scripts/GamePlayManager.cs b/Assets/Game/GamePlay/Scripts/GamePlayManager.cs index 700c0dd3..6dc426f5 100644 --- a/Assets/Game/GamePlay/Scripts/GamePlayManager.cs +++ b/Assets/Game/GamePlay/Scripts/GamePlayManager.cs @@ -1,10 +1,8 @@ -using System.Collections; using System.Collections.Generic; using Ballance2.Base; using Ballance2.Game.GamePlay.Balls; using Ballance2.Game.GamePlay.Other; using Ballance2.Game.GamePlay.Tranfo; -using Ballance2.Game.LevelBuilder; using Ballance2.Game.Utils; using Ballance2.Menu; using Ballance2.Package; @@ -13,6 +11,7 @@ using BallancePhysics.Wapper; using Newtonsoft.Json.Linq; using UnityEngine; +using UnityEngine.InputSystem.LowLevel; namespace Ballance2.Game.GamePlay { @@ -110,7 +109,7 @@ public LevelBuilder.LevelBuilder LevelBuilderRef private int _HideBalloonEndTimerID = 0; //Used by Tutorial internal bool _ShouldStartByCustom = false; - private int[] _EscKeyIds = new int[0]; + private int _EscKeyIds = 0; private void Awake() { @@ -136,8 +135,7 @@ protected override void OnDestroy() { Log.D(TAG, "Destroy"); if (GameUIManager.Instance != null) - foreach (var id in _EscKeyIds) - GameUIManager.Instance.DeleteKeyListen(id); + GameUIManager.Instance.DeleteKeyListen(_EscKeyIds); GameManager.GameMediator?.UnRegisterSingleEvent("CoreGamePlayManagerInitAndStart"); //取消注册全局事件 this._DeleteEvents(); this._DeleteCommands(); //删除指令 @@ -301,9 +299,8 @@ private void _InitSounds() } private void _InitKeyEvents() { - _EscKeyIds = new int[2]; //ESC键 - _EscKeyIds[0] = GameUIManager.Instance.ListenKey(KeyCode.Escape, (key, down) => + _EscKeyIds = GameUIManager.Instance.ListenKey(KeyCode.Escape, (key, down) => { if (down && this.CanEscPause @@ -315,21 +312,7 @@ private void _InitKeyEvents() else this.ResumeLevel(); } - }); - //手柄菜单键 - _EscKeyIds[1] = GameUIManager.Instance.ListenKey(KeyCode.Joystick1Button7, (key, down) => - { - if (down - && this.CanEscPause - && this._BallBirthed - && !this.CurrentLevelPass) - { - if (this._IsGamePlaying) - this.PauseLevel(true); - else - this.ResumeLevel(); - } - }); + }, GamepadButton.Start); } private void _InitSettings() { diff --git a/Assets/Game/GamePlay/Scripts/Other/TutorialController.cs b/Assets/Game/GamePlay/Scripts/Other/TutorialController.cs index dfb44560..e8b5c938 100644 --- a/Assets/Game/GamePlay/Scripts/Other/TutorialController.cs +++ b/Assets/Game/GamePlay/Scripts/Other/TutorialController.cs @@ -4,6 +4,7 @@ using Ballance2.Services.I18N; using UnityEngine; using UnityEngine.Animations; +using UnityEngine.InputSystem.LowLevel; using UnityEngine.UI; namespace Ballance2.Game.GamePlay.Other @@ -45,7 +46,7 @@ public class TutorialController : MonoBehaviour private bool _TutorialShouldDisablePointDown = false; private bool _TutorialBallFinded = false; private bool _TutorialCamFinded = false; - private int[] _TutorialCurrWaitkey; + private int _TutorialCurrWaitkey; private RectTransform _TutorialUI = null; private Text _TutorialUIText = null; private Image _TutorialUIBg = null; @@ -132,11 +133,10 @@ private void Start() GameTimer.Delay(1, () => { //删除按键 - foreach (var item in _TutorialCurrWaitkey) - if (item > 0) - { - GameUIManager.DeleteKeyListen(item); - } + if (_TutorialCurrWaitkey > 0) + { + GameUIManager.DeleteKeyListen(_TutorialCurrWaitkey); + } //重置恢复 GamePlayManager._ShouldStartByCustom = false; @@ -190,8 +190,8 @@ public void StartSeq() if (!_Tutorial) return; - int[] step1KeyReturn = new int[0]; - int[] step1KeyQ = new int[0]; + int step1KeyReturn = 0; + int step1KeyQ = 0; var funStepLock = false; var funQuitLock = false; @@ -202,8 +202,7 @@ public void StartSeq() funQuitLock = true; GameSoundManager.PlayFastVoice("core.sounds:Menu_click.wav", GameSoundType.Normal); //按 q 退出 - foreach (var item in step1KeyReturn) - GameUIManager.DeleteKeyListen(item); + GameUIManager.DeleteKeyListen(step1KeyReturn); HideTutorial(); //恢复球推动键 GamePlayManager.BallManager.KeyListener.IsListenKey = true; @@ -332,17 +331,14 @@ public void StartSeq() ShowTutorialText(); }); - _TutorialCurrWaitkey = new int[2]; - _TutorialCurrWaitkey[0] = GameUIManager.WaitKey(KeyCode.Return, true, funStep2); - _TutorialCurrWaitkey[1] = GameUIManager.WaitKey(KeyCode.JoystickButton0, true, funStep2); + _TutorialCurrWaitkey = GameUIManager.WaitKey(KeyCode.Return, true, funStep2, GamepadButton.A); }; GameManager.VoidDelegate commonTurHide = null; GameManager.VoidDelegate funSeq = () => { GameSoundManager.PlayFastVoice("core.sounds:Menu_click.wav", GameSoundType.Normal); _TutorialUIButtonQuit.gameObject.SetActive(false); - foreach (var item in step1KeyQ) - GameUIManager.DeleteKeyListen(item); + GameUIManager.DeleteKeyListen(step1KeyQ); //恢复球推动键 GamePlayManager.BallManager.KeyListener.IsListenKey = true; @@ -363,9 +359,7 @@ public void StartSeq() _TutorialStep = 2; ShowTutorialText(); - _TutorialCurrWaitkey = new int[2]; - _TutorialCurrWaitkey[0] = GameUIManager.WaitKey(KeyCode.Return, true, funStep1); - _TutorialCurrWaitkey[1] = GameUIManager.WaitKey(KeyCode.JoystickButton0, true, funStep1); + _TutorialCurrWaitkey = GameUIManager.WaitKey(KeyCode.Return, true, funStep1,GamepadButton.A); }); //-移动箭头至指定位置 @@ -378,9 +372,7 @@ public void StartSeq() GameManager.VoidDelegate commonTurReturn = () => { GamePlayManager.PauseLevel(false); - _TutorialCurrWaitkey = new int[2]; - _TutorialCurrWaitkey[0] = GameUIManager.WaitKey(KeyCode.Return, true, commonTurHide); - _TutorialCurrWaitkey[1] = GameUIManager.WaitKey(KeyCode.JoystickButton0, true, commonTurHide); + _TutorialCurrWaitkey = GameUIManager.WaitKey(KeyCode.Return, true, commonTurHide, GamepadButton.A); }; GameManager.VoidDelegate commonTurTipSound = () => { @@ -488,12 +480,8 @@ public void StartSeq() { ShowTutorialText(); //步骤1，按 q 退出，按回车继续 - step1KeyReturn = new int[2]; - step1KeyReturn[0] = GameUIManager.WaitKey(KeyCode.Return, true, () => funSeq()); - step1KeyReturn[1] = GameUIManager.WaitKey(KeyCode.JoystickButton0, true, () => funSeq()); - step1KeyQ = new int[2]; - step1KeyQ[0] = GameUIManager.WaitKey(KeyCode.Q, true, () => funQuit()); - step1KeyQ[1] = GameUIManager.WaitKey(KeyCode.JoystickButton1, true, () => funQuit()); + step1KeyReturn = GameUIManager.WaitKey(KeyCode.Return, true, () => funSeq(), GamepadButton.A); + step1KeyQ = GameUIManager.WaitKey(KeyCode.Q, true, () => funQuit(), GamepadButton.B); }); } diff --git a/Assets/System/Scripts/Services/GameUIManager.cs b/Assets/System/Scripts/Services/GameUIManager.cs index 39c7ab48..ae88a123 100644 --- a/Assets/System/Scripts/Services/GameUIManager.cs +++ b/Assets/System/Scripts/Services/GameUIManager.cs @@ -11,6 +11,7 @@ using System.Text; using UnityEngine; using UnityEngine.EventSystems; +using UnityEngine.InputSystem.LowLevel; using UnityEngine.UI; using static Ballance2.Services.GameManager; @@ -245,7 +246,7 @@ private void InitAllObects() /// 如果为true，则侦听按下事件，否则侦听松开事件 /// 回调 /// 返回一个ID, 可使用 DeleteKeyListen 删除侦听 - public int WaitKey(KeyCode code, bool pressedOrReleased, VoidDelegate callback) + public int WaitKey(KeyCode code, bool pressedOrReleased, VoidDelegate callback,params GamepadButton[] gamepadButtons) { int id = 0; id = keyListener.AddKeyListen(code, (key, down) => @@ -256,7 +257,7 @@ public int WaitKey(KeyCode code, bool pressedOrReleased, VoidDelegate callback) if(callback != null) callback(); } - }); + }, gamepadButtons); return id; } @@ -266,9 +267,9 @@ public int WaitKey(KeyCode code, bool pressedOrReleased, VoidDelegate callback) /// 键值 /// 回调函数 /// 返回一个ID, 可使用 DeleteKeyListen 删除侦听 - public int ListenKey(KeyCode key, KeyListener.KeyDelegate callBack) + public int ListenKey(KeyCode key, KeyListener.KeyDelegate callBack, params GamepadButton[] gamepadButtons) { - return keyListener.AddKeyListen(key, callBack); + return keyListener.AddKeyListen(key, callBack, gamepadButtons); } /// diff --git a/Assets/System/Scripts/Services/InputManager/KeyListener.cs b/Assets/System/Scripts/Services/InputManager/KeyListener.cs index 8b0016cf..66f3c63b 100644 --- a/Assets/System/Scripts/Services/InputManager/KeyListener.cs +++ b/Assets/System/Scripts/Services/InputManager/KeyListener.cs @@ -4,6 +4,7 @@ using UnityEngine.EventSystems; using UnityEngine.InputSystem; using UnityEngine.InputSystem.Controls; +using UnityEngine.InputSystem.LowLevel; /* * Copyright(c) 2021 mengyu @@ -43,8 +44,7 @@ public class KeyListener : MonoBehaviour private Gamepad currentGamepad; private Joystick currentJoystick; private DpadControl currentJoystickDpad; - private ButtonControl currentJoystickRightStickButton2; - private ButtonControl currentJoystickRightStickButton4; + private ButtonControl[] currentJoystickButtonControls; private AxisControl currentJoystickRightStickAxisY; /// @@ -77,6 +77,7 @@ private class KeyListenerItem public bool downed = false; public KeyDelegate callBack; public int id; + public GamepadButton[] gamepadButtons; } public enum MovementType @@ -121,13 +122,15 @@ public KeyListener() currentJoystick = Joystick.current; if (currentJoystick != null) { - currentJoystickDpad = currentJoystick.children.FirstOrDefault(t => t is DpadControl) as DpadControl; - currentJoystickRightStickAxisY = currentJoystick.children.FirstOrDefault(t => t.path.EndsWith("rz")) as AxisControl; - var buttonControls = currentJoystick.children.Where(t => t is ButtonControl).Cast().ToArray(); - currentJoystickRightStickButton2 = buttonControls.Skip(1).FirstOrDefault(); - currentJoystickRightStickButton4 = buttonControls.Skip(3).FirstOrDefault(); + var joystickChildren = currentJoystick.children; + currentJoystickDpad = joystickChildren.FirstOrDefault(t => t is DpadControl) as DpadControl; + currentJoystickRightStickAxisY = joystickChildren.FirstOrDefault(t => t.path.EndsWith("rz")) as AxisControl; + currentJoystickButtonControls = joystickChildren.Where(t => t is ButtonControl).Cast().ToArray(); + if (currentJoystickButtonControls.Length < 15) + currentJoystickButtonControls = currentJoystickButtonControls.Concat(new ButtonControl[15 - currentJoystickButtonControls.Length]).ToArray(); } } + /// /// 重新发送当前已按下的按键事件 /// @@ -139,7 +142,20 @@ public void ReSendPressingKey() var item = cur.Value; if (item.downed) { - if (Input.GetKey(item.key)) item.callBack(item.key, true); + var isKeydown = Input.GetKeyDown(item.key); + if (!isKeydown && item.gamepadButtons != null && item.gamepadButtons.Length > 0) + { + foreach (var button in item.gamepadButtons) + { + isKeydown = IsGamepadButtonPressed(button); + if (isKeydown) + break; + } + } + if (isKeydown) + { + item.callBack(item.key, true); + } else { item.downed = false; @@ -158,13 +174,14 @@ public void ReSendPressingKey() /// 键值。 /// 回调函数。 /// 返回一个ID, 可使用 DeleteKeyListen 删除侦听器 - public int AddKeyListen(KeyCode key, KeyDelegate callBack) + public int AddKeyListen(KeyCode key, KeyDelegate callBack, params GamepadButton[] gamepadButtons) { listenKeyId++; KeyListenerItem item = new KeyListenerItem(); item.callBack = callBack; item.key = key; + item.gamepadButtons = gamepadButtons; item.id = listenKeyId; //逆序遍历链表。添加按键至相同按键位置 @@ -223,6 +240,98 @@ public void ClearKeyListen() items.Clear(); } + private ButtonControl GetGamepadButtonControl(GamepadButton button) + { + if (currentGamepad != null) + { + switch (button) + { + case GamepadButton.LeftStick: + return currentGamepad.leftStickButton; + case GamepadButton.RightStick: + return currentGamepad.rightStickButton; + case GamepadButton.LeftShoulder: + return currentGamepad.leftShoulder; + case GamepadButton.RightShoulder: + return currentGamepad.leftShoulder; + case GamepadButton.LeftTrigger: + return currentGamepad.leftTrigger; + case GamepadButton.RightTrigger: + return currentGamepad.rightTrigger; + case GamepadButton.DpadUp: + return currentGamepad.dpad.up; + case GamepadButton.DpadDown: + return currentGamepad.dpad.down; + case GamepadButton.DpadLeft: + return currentGamepad.dpad.left; + case GamepadButton.DpadRight: + return currentGamepad.dpad.right; + case GamepadButton.North: + return currentGamepad.yButton; + case GamepadButton.South: + return currentGamepad.aButton; + case GamepadButton.West: + return currentGamepad.xButton; + case GamepadButton.East: + return currentGamepad.bButton; + case GamepadButton.Select: + return currentGamepad.selectButton; + case GamepadButton.Start: + return currentGamepad.startButton; + } + } + else if (currentJoystick != null) + { + if (currentJoystickButtonControls == null) + return null; + switch (button) + { + case GamepadButton.LeftStick: + return currentJoystickButtonControls[13]; + case GamepadButton.RightStick: + return currentJoystickButtonControls[14]; + case GamepadButton.LeftShoulder: + return currentJoystickButtonControls[6]; + case GamepadButton.RightShoulder: + return currentJoystickButtonControls[7]; + case GamepadButton.LeftTrigger: + return currentJoystickButtonControls[8]; + case GamepadButton.RightTrigger: + return currentJoystickButtonControls[9]; + case GamepadButton.DpadUp: + return currentJoystickDpad?.up; + case GamepadButton.DpadDown: + return currentJoystickDpad?.down; + case GamepadButton.DpadLeft: + return currentJoystickDpad?.left; + case GamepadButton.DpadRight: + return currentJoystickDpad?.right; + case GamepadButton.North: + return currentJoystickButtonControls[5]; + case GamepadButton.South: + return currentJoystickButtonControls[0]; + case GamepadButton.West: + return currentJoystickButtonControls[3]; + case GamepadButton.East: + return currentJoystickButtonControls[1]; + case GamepadButton.Select: + return currentJoystickButtonControls[10]; + case GamepadButton.Start: + return currentJoystickButtonControls[11]; + } + } + return null; + } + + private bool IsGamepadButtonPressed(GamepadButton button) + { + var buttonControl = GetGamepadButtonControl(button); + if (buttonControl == null) + return false; + Log.D(tag,buttonControl.displayName + ":" + buttonControl.isPressed); + return buttonControl.isPressed; + } + private void Update() { if (isListenKey) @@ -234,8 +343,6 @@ private void Update() { if (currentGamepad != null) { - axisDelegate(AxisName_Horizontal, currentGamepad.dpad.x.value); - axisDelegate(AxisName_Vertical, currentGamepad.dpad.y.value); axisDelegate(AxisName_LeftStickHorizontal, currentGamepad.leftStick.x.value); axisDelegate(AxisName_LeftStickVertical, currentGamepad.leftStick.y.value); axisDelegate(AxisName_RightStickHorizontal, currentGamepad.rightStick.x.value); @@ -245,15 +352,6 @@ private void Update() { axisDelegate(AxisName_LeftStickHorizontal, currentJoystick.stick.x.value); axisDelegate(AxisName_LeftStickVertical, currentJoystick.stick.y.value); - if (currentJoystickDpad != null) - { - axisDelegate(AxisName_Horizontal, currentJoystickDpad.x.value); - axisDelegate(AxisName_Vertical, currentJoystickDpad.y.value); - } - if (currentJoystickRightStickButton2 != null) - axisDelegate(AxisName_RightStickHorizontal, currentJoystickRightStickButton2.isPressed ? 1 : 0); - if (currentJoystickRightStickButton4 != null) - axisDelegate(AxisName_RightStickHorizontal, currentJoystickRightStickButton4.isPressed ? -1 : 0); if (currentJoystickRightStickAxisY != null) axisDelegate(AxisName_RightStickVertical, currentJoystickRightStickAxisY.value); } @@ -264,7 +362,29 @@ private void Update() while (cur != null) { var item = cur.Value; - if (Input.GetKeyDown(item.key) && !item.downed) + var isKeydown = Input.GetKeyDown(item.key); + var isKeyup = !isKeydown; + + if (!isKeydown && item.gamepadButtons != null && item.gamepadButtons.Length > 0) + { + foreach (var button in item.gamepadButtons) + { + isKeydown = IsGamepadButtonPressed(button); + if (isKeydown) + break; + } + } + if (isKeyup && item.gamepadButtons != null && item.gamepadButtons.Length > 0) + { + foreach (var button in item.gamepadButtons) + { + isKeyup = !IsGamepadButtonPressed(button); + if (!isKeyup) + break; + } + } + + if (isKeydown && !item.downed) { if (!AllowMultipleKey && lastPressedKey == item.key) { @@ -284,7 +404,7 @@ private void Update() lastPressedKey = item.key; } } - if (Input.GetKeyUp(item.key) && item.downed) + if (isKeyup && item.downed) { item.downed = false; item.callBack(item.key, false); diff --git a/Assets/System/Scripts/UI/Core/GameUIPage.cs b/Assets/System/Scripts/UI/Core/GameUIPage.cs index 2a20a5fa..8d0d1dfb 100644 --- a/Assets/System/Scripts/UI/Core/GameUIPage.cs +++ b/Assets/System/Scripts/UI/Core/GameUIPage.cs @@ -8,6 +8,7 @@ using Ballance2.UI.Utils; using System.Collections.Generic; using UnityEngine.EventSystems; +using UnityEngine.InputSystem.LowLevel; /* * Copyright(c) 2021 mengyu @@ -101,7 +102,7 @@ public void Show() escBackId = uIManager.WaitKey(KeyCode.Escape, false, () => { uIManager.BackPreviusPage(); - }); + },GamepadButton.B); } } From d6cb0bd43c966ee1eda7d1e1f03810b90f641e2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E9=B9=8F?= Date: Fri, 12 Jan 2024 12:07:35 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E6=9B=BF=E6=8D=A2=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E6=96=B0=E7=9A=84InputSystem?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Game/GamePlay/Scripts/BallManager.cs | 174 +++--------------- .../Services/InputManager/KeyListener.cs | 125 ++++++------- 2 files changed, 77 insertions(+), 222 deletions(-) diff --git a/Assets/Game/GamePlay/Scripts/BallManager.cs b/Assets/Game/GamePlay/Scripts/BallManager.cs index a64d383a..a49903a8 100644 --- a/Assets/Game/GamePlay/Scripts/BallManager.cs +++ b/Assets/Game/GamePlay/Scripts/BallManager.cs @@ -11,6 +11,7 @@ using BallancePhysics.Wapper; using UnityEngine; using UnityEngine.Animations; +using UnityEngine.InputSystem; using UnityEngine.InputSystem.LowLevel; using static Ballance2.Services.GameManager; @@ -22,10 +23,7 @@ namespace Ballance2.Game.GamePlay public class BallManager : MonoBehaviour { private const string TAG = "BallManager"; - //视角切换锁 - private bool camRotateLock = false; //上次移动球的类型 - private KeyListener.MovementType lastMovementType = KeyListener.MovementType.Keyboard; public BallLightningSphere _BallLightningSphere; public GameObject _BallWood; public GameObject _BallStone; @@ -177,141 +175,6 @@ private void _OnControlSettingsChanged() _InitKeys(); } - private void _AxisListen(string asixName, float value) - { - KeyListener.MovementType currentMovementType = KeyListener.MovementType.Keyboard; - switch (asixName) - { - case KeyListener.AxisName_Horizontal: - case KeyListener.AxisName_Vertical: - currentMovementType = KeyListener.MovementType.DPad; - break; - case KeyListener.AxisName_LeftStickHorizontal: - case KeyListener.AxisName_LeftStickVertical: - currentMovementType = KeyListener.MovementType.LeftStick; - break; - } - switch (asixName) - { - //控制左右 - case KeyListener.AxisName_Horizontal: - case KeyListener.AxisName_LeftStickHorizontal: - if (Math.Abs(value) < 0.3) - { - if (lastMovementType == currentMovementType) - { - if (KeyStateLeft || KeyStateRight) - { - KeyStateLeft = false; - KeyStateRight = false; - FlushBallPush(); - } - } - return; - } - lastMovementType = currentMovementType; - if (value > 0) - { - if (KeyStateLeft || !KeyStateRight) - { - KeyStateLeft = false; - KeyStateRight = true; - FlushBallPush(); - } - } - else - { - if (!KeyStateLeft || KeyStateRight) - { - KeyStateLeft = true; - KeyStateRight = false; - FlushBallPush(); - } - } - break; - //控制前后 - case KeyListener.AxisName_Vertical: - case KeyListener.AxisName_LeftStickVertical: - if (Math.Abs(value) < 0.3) - { - if (lastMovementType == currentMovementType) - { - if (KeyStateForward || KeyStateBack) - { - KeyStateForward = false; - KeyStateBack = false; - FlushBallPush(); - } - } - return; - } - lastMovementType = currentMovementType; - if (value > 0) - { - if (!KeyStateForward || KeyStateBack) - { - KeyStateForward = true; - KeyStateBack = false; - FlushBallPush(); - } - } - else - { - if (KeyStateForward || !KeyStateBack) - { - KeyStateForward = false; - KeyStateBack = true; - FlushBallPush(); - } - } - break; - //右摇杆左右切换摄像机视角 - case KeyListener.AxisName_RightStickHorizontal: - - if (Math.Abs(value) < 0.5) - return; - if (camRotateLock) - return; - camRotateLock = true; - GameTimer.Delay(0.5F, () => camRotateLock = false); - - if (value > 0) - { - if (CanControllCamera) - { - if (reverseRotation) - GamePlayManager.Instance.CamManager.RotateRight(); - else - GamePlayManager.Instance.CamManager.RotateLeft(); - } - } - else - { - if (CanControllCamera) - { - if (reverseRotation) - GamePlayManager.Instance.CamManager.RotateLeft(); - else - GamePlayManager.Instance.CamManager.RotateRight(); - } - } - break; - //右摇杆上下切换俯瞰视角 - case KeyListener.AxisName_RightStickVertical: - if (Math.Abs(value) < 0.5) - return; - if (camRotateLock) - return; - camRotateLock = true; - GameTimer.Delay(0.5F, () => camRotateLock = false); - if (CanControllCamera) - { - GamePlayManager.Instance.CamManager.RotateUp(!GamePlayManager.Instance.CamManager.CamIsSpaced); - } - break; - } - } - private void _InitKeys() { //初始化键盘侦听 @@ -320,14 +183,33 @@ private void _InitKeys() keyListener.ClearKeyListen(); keyListener.AddKeyListen(keyFront, _UpArrow_Key, GamepadButton.DpadUp); keyListener.AddKeyListen(keyBack, _DownArrow_Key, GamepadButton.DpadDown); - keyListener.AddKeyListen(keyUp, _Up_Key); - keyListener.AddKeyListen(keyDown, _Down_Key); - keyListener.AddKeyListen(keyUpCamera, _Space_Key); + keyListener.AddKeyListen(keyUp, _Up_Key, GamepadButton.LeftTrigger); + keyListener.AddKeyListen(keyDown, _Down_Key, GamepadButton.RightTrigger); + keyListener.AddKeyListen(keyUpCamera, _Space_Key, GamepadButton.Y); keyListener.AddKeyListen(keyRoateCamera, _Shift_Key); keyListener.AddKeyListen(keyRoateCamera2, _Shift_Key); + keyListener.AddKeyListen(KeyCode.PageUp, (key, down) => + { + if (down && CanControllCamera) + { + if (reverseRotation) + GamePlayManager.Instance.CamManager.RotateLeft(); + else + GamePlayManager.Instance.CamManager.RotateRight(); + } + }, GamepadButton.X); + keyListener.AddKeyListen(KeyCode.PageDown, (key, down) => + { + if (down && CanControllCamera) + { + if (reverseRotation) + GamePlayManager.Instance.CamManager.RotateRight(); + else + GamePlayManager.Instance.CamManager.RotateLeft(); + } + }, GamepadButton.B); keyListener.AddKeyListen(keyLeft, _LeftArrow_Key, GamepadButton.DpadLeft); keyListener.AddKeyListen(keyRight, _RightArrow_Key, GamepadButton.DpadRight); - keyListener.SetAxisListen(_AxisListen); //测试按扭 if (GameManager.DebugMode) @@ -1175,19 +1057,16 @@ public void FastMoveTo(Vector3 pos, float time, SmoothFly.CallbackDelegate callb private void _UpArrow_Key(KeyCode key, bool down) { - lastMovementType = KeyListener.MovementType.Keyboard; KeyStateForward = down; FlushBallPush(); } private void _DownArrow_Key(KeyCode key, bool down) { - lastMovementType = KeyListener.MovementType.Keyboard; KeyStateBack = down; FlushBallPush(); } private void _RightArrow_Key(KeyCode key, bool down) { - lastMovementType = KeyListener.MovementType.Keyboard; _RightPressed = down; if (down) { @@ -1213,7 +1092,6 @@ private void _RightArrow_Key(KeyCode key, bool down) } private void _LeftArrow_Key(KeyCode key, bool down) { - lastMovementType = KeyListener.MovementType.Keyboard; _LeftPressed = down; if (down) { @@ -1239,7 +1117,6 @@ private void _LeftArrow_Key(KeyCode key, bool down) } private void _Down_Key(KeyCode key, bool down) { - lastMovementType = KeyListener.MovementType.Keyboard; if (GameManager.DebugMode) { KeyStateDown = down; @@ -1248,7 +1125,6 @@ private void _Down_Key(KeyCode key, bool down) } private void _Up_Key(KeyCode key, bool down) { - lastMovementType = KeyListener.MovementType.Keyboard; if (GameManager.DebugMode) { KeyStateUp = down; @@ -1257,7 +1133,6 @@ private void _Up_Key(KeyCode key, bool down) } private void _Space_Key(KeyCode key, bool down) { - lastMovementType = KeyListener.MovementType.Keyboard; if (CanControllCamera) { GamePlayManager.Instance.CamManager.RotateUp(down); @@ -1265,7 +1140,6 @@ private void _Space_Key(KeyCode key, bool down) } private void _Shift_Key(KeyCode key, bool down) { - lastMovementType = KeyListener.MovementType.Keyboard; ShiftPressed = down; if (_LeftPressed) { diff --git a/Assets/System/Scripts/Services/InputManager/KeyListener.cs b/Assets/System/Scripts/Services/InputManager/KeyListener.cs index 66f3c63b..62a01a80 100644 --- a/Assets/System/Scripts/Services/InputManager/KeyListener.cs +++ b/Assets/System/Scripts/Services/InputManager/KeyListener.cs @@ -5,6 +5,7 @@ using UnityEngine.InputSystem; using UnityEngine.InputSystem.Controls; using UnityEngine.InputSystem.LowLevel; +using static UnityEditor.Progress; /* * Copyright(c) 2021 mengyu @@ -52,12 +53,7 @@ public class KeyListener : MonoBehaviour /// /// 是否按下 public delegate void KeyDelegate(KeyCode key, bool downed); - /// - /// 虚拟轴事件回调 - /// - /// 轴名称 - /// 轴值 - public delegate void AxisDelegate(string asisName, float value); + /// /// 从 指定 GameObject 创建键事件侦听器 @@ -80,27 +76,11 @@ private class KeyListenerItem public GamepadButton[] gamepadButtons; } - public enum MovementType - { - Keyboard, - LeftStick, - DPad - } - - public const string AxisName_Horizontal = "Horizontal"; - public const string AxisName_Vertical = "Vertical"; - public const string AxisName_LeftStickHorizontal = "LeftStickHorizontal"; - public const string AxisName_LeftStickVertical = "LeftStickVertical"; - public const string AxisName_RightStickHorizontal = "RightStickHorizontal"; - public const string AxisName_RightStickVertical = "RightStickVertical"; - private AxisDelegate axisDelegate = null; - private LinkedList items = new LinkedList(); [SerializeField] private bool isListenKey = true; private int listenKeyId = 0; - /// /// 是否开启监听 /// @@ -200,15 +180,6 @@ public int AddKeyListen(KeyCode key, KeyDelegate callBack, params GamepadButton[ return listenKeyId; } - /// - /// 设置侦听器侦听虚拟轴的值变化 - /// - /// - public void SetAxisListen(AxisDelegate axisDelegate) - { - this.axisDelegate = axisDelegate; - } - /// /// 删除指定侦听器。 /// @@ -307,7 +278,7 @@ private ButtonControl GetGamepadButtonControl(GamepadButton button) case GamepadButton.DpadRight: return currentJoystickDpad?.right; case GamepadButton.North: - return currentJoystickButtonControls[5]; + return currentJoystickButtonControls[4]; case GamepadButton.South: return currentJoystickButtonControls[0]; case GamepadButton.West: @@ -323,12 +294,58 @@ private ButtonControl GetGamepadButtonControl(GamepadButton button) return null; } + private bool IsKeyOrGamepadButtonsDown(KeyListenerItem item) + { + var isKeydown = false; + //先判断键盘 + isKeydown = Input.GetKeyDown(item.key); + if (isKeydown) + return isKeydown; + //再判断手柄按键 + if (item.gamepadButtons != null && item.gamepadButtons.Length > 0) + { + foreach (var button in item.gamepadButtons) + { + isKeydown = IsGamepadButtonPressed(button); + if (isKeydown) + break; + } + } + if (isKeydown) + return isKeydown; + //最后再判断左摇杆操作 + Vector2 leftStickValue = default; + if (currentGamepad != null) + { + leftStickValue = currentJoystick.stick.value; + } + else if (currentJoystick != null) + { + leftStickValue = currentJoystick.stick.value; + } + switch (item.key) + { + case KeyCode.LeftArrow: + isKeydown = leftStickValue.x < -0.4; + break; + case KeyCode.RightArrow: + isKeydown = leftStickValue.x > 0.4; + break; + case KeyCode.UpArrow: + isKeydown = leftStickValue.y > 0.4; + break; + case KeyCode.DownArrow: + isKeydown = leftStickValue.y < -0.4; + break; + } + return isKeydown; + } + private bool IsGamepadButtonPressed(GamepadButton button) { var buttonControl = GetGamepadButtonControl(button); if (buttonControl == null) return false; - Log.D(tag,buttonControl.displayName + ":" + buttonControl.isPressed); return buttonControl.isPressed; } @@ -339,50 +356,14 @@ private void Update() //排除GUI激活 if (DisableWhenUIFocused && (EventSystem.current.IsPointerOverGameObject() || GUIUtility.hotControl != 0)) return; - if (axisDelegate != null) - { - if (currentGamepad != null) - { - axisDelegate(AxisName_LeftStickHorizontal, currentGamepad.leftStick.x.value); - axisDelegate(AxisName_LeftStickVertical, currentGamepad.leftStick.y.value); - axisDelegate(AxisName_RightStickHorizontal, currentGamepad.rightStick.x.value); - axisDelegate(AxisName_RightStickVertical, currentGamepad.rightStick.y.value); - } - else if (currentJoystick != null) - { - axisDelegate(AxisName_LeftStickHorizontal, currentJoystick.stick.x.value); - axisDelegate(AxisName_LeftStickVertical, currentJoystick.stick.y.value); - if (currentJoystickRightStickAxisY != null) - axisDelegate(AxisName_RightStickVertical, currentJoystickRightStickAxisY.value); - } - } + //逆序遍历链表。后添加的按键事件最先处理 LinkedListNode cur = items.Last; KeyCode lastPressedKey = KeyCode.None; while (cur != null) { var item = cur.Value; - var isKeydown = Input.GetKeyDown(item.key); - var isKeyup = !isKeydown; - - if (!isKeydown && item.gamepadButtons != null && item.gamepadButtons.Length > 0) - { - foreach (var button in item.gamepadButtons) - { - isKeydown = IsGamepadButtonPressed(button); - if (isKeydown) - break; - } - } - if (isKeyup && item.gamepadButtons != null && item.gamepadButtons.Length > 0) - { - foreach (var button in item.gamepadButtons) - { - isKeyup = !IsGamepadButtonPressed(button); - if (!isKeyup) - break; - } - } + var isKeydown = IsKeyOrGamepadButtonsDown(item); if (isKeydown && !item.downed) { @@ -404,7 +385,7 @@ private void Update() lastPressedKey = item.key; } } - if (isKeyup && item.downed) + if (!isKeydown && item.downed) { item.downed = false; item.callBack(item.key, false); From 9891b2dea9742221d659d19c7a09ad98b981ad79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E9=B9=8F?= Date: Fri, 12 Jan 2024 15:00:09 +0800 Subject: [PATCH 07/11] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E7=9A=84Android=E6=9D=83=E9=99=90=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E7=AA=97=E5=8F=A3=E7=9B=B8=E5=85=B3=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Game/Common/Materials/Game/SkyLayer.mat | 2 +- Assets/Game/GamePlay/Scripts/BallManager.cs | 4 +- Assets/System/Scripts/Entry/GameEntry.cs | 48 ------------------- .../Services/InputManager/KeyListener.cs | 5 +- .../CoreUI/GlobalGamePermissionTipDialog.cs | 32 ------------- .../GlobalGamePermissionTipDialog.cs.meta | 11 ----- 6 files changed, 5 insertions(+), 97 deletions(-) delete mode 100644 Assets/System/Scripts/UI/CoreUI/GlobalGamePermissionTipDialog.cs delete mode 100644 Assets/System/Scripts/UI/CoreUI/GlobalGamePermissionTipDialog.cs.meta diff --git a/Assets/Game/Common/Materials/Game/SkyLayer.mat b/Assets/Game/Common/Materials/Game/SkyLayer.mat index b65eda57..bd73cf97 100644 --- a/Assets/Game/Common/Materials/Game/SkyLayer.mat +++ b/Assets/Game/Common/Materials/Game/SkyLayer.mat @@ -57,7 +57,7 @@ Material: - _MainTex: m_Texture: {fileID: 2800000, guid: 550bc03f31e06d54e80a12103627045c, type: 3} m_Scale: {x: 2, y: 2} - m_Offset: {x: 0.33520412, y: 0.85729384} + m_Offset: {x: 0.7124696, y: 0.2345556} - _MetallicGlossMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} diff --git a/Assets/Game/GamePlay/Scripts/BallManager.cs b/Assets/Game/GamePlay/Scripts/BallManager.cs index a49903a8..78f8f21e 100644 --- a/Assets/Game/GamePlay/Scripts/BallManager.cs +++ b/Assets/Game/GamePlay/Scripts/BallManager.cs @@ -197,7 +197,7 @@ private void _InitKeys() else GamePlayManager.Instance.CamManager.RotateRight(); } - }, GamepadButton.X); + }, GamepadButton.LeftShoulder); keyListener.AddKeyListen(KeyCode.PageDown, (key, down) => { if (down && CanControllCamera) @@ -207,7 +207,7 @@ private void _InitKeys() else GamePlayManager.Instance.CamManager.RotateLeft(); } - }, GamepadButton.B); + }, GamepadButton.RightShoulder); keyListener.AddKeyListen(keyLeft, _LeftArrow_Key, GamepadButton.DpadLeft); keyListener.AddKeyListen(keyRight, _RightArrow_Key, GamepadButton.DpadRight); diff --git a/Assets/System/Scripts/Entry/GameEntry.cs b/Assets/System/Scripts/Entry/GameEntry.cs index d76f5551..121154c9 100644 --- a/Assets/System/Scripts/Entry/GameEntry.cs +++ b/Assets/System/Scripts/Entry/GameEntry.cs @@ -72,11 +72,6 @@ public class GameEntry : MonoBehaviour public GameGlobalErrorUI GameGlobalErrorUI = null; public Text GameDebugBeginStats; -#if UNITY_ANDROID - private bool GlobalGamePermissionTipDialogClosed = false; -#endif - public GameObject GlobalGamePermissionTipDialog = null; - public GameObject GlobalGameUserAgreementTipDialog = null; public GlobalGameScriptErrDialog GlobalGameScriptErrDialog = null; public GameObject GameGlobalIngameLoading = null; @@ -107,30 +102,6 @@ public static void Destroy() UnityEngine.Object.Destroy(Instance.gameObject); } - #region 用户许可相关 - /// - /// 检查android权限是否申请 - /// - /// - private bool TestAndroidPermission() - { -#if UNITY_ANDROID - //if (!Permission.HasUserAuthorizedPermission(Permission.ExternalStorageWrite)) - // return true; -#endif - return false; - } - - /// - /// 请求安卓权限 - /// - public void RequestAndroidPermission() - { -#if UNITY_ANDROID - //Permission.RequestUserPermission(Permission.ExternalStorageWrite); - GlobalGamePermissionTipDialogClosed = true; -#endif - } /// /// 退出游戏 /// @@ -143,15 +114,6 @@ public void QuitGame() Application.Quit(); #endif } - /// - /// 不同意Android权限 - /// - public void DisallowAndroidPermission() - { - - } - - #endregion private void InitCommandLine() { @@ -188,16 +150,6 @@ private IEnumerator InitMain() GameSystem.RegSysHandler(GameSystemInit.GetSysHandler()); GameSystem.PreInit(); -#if UNITY_ANDROID - if (TestAndroidPermission()) - { - GlobalGamePermissionTipDialog.SetActive(true); - - GameGlobalIngameLoading.SetActive(false); - yield return new WaitUntil(() => GlobalGamePermissionTipDialogClosed); - GameGlobalIngameLoading.SetActive(true); - } -#endif GameErrorChecker.SetGameErrorUI(GameGlobalErrorUI); GameSystemInit.FillStartParameters(this); diff --git a/Assets/System/Scripts/Services/InputManager/KeyListener.cs b/Assets/System/Scripts/Services/InputManager/KeyListener.cs index 62a01a80..0cc96a57 100644 --- a/Assets/System/Scripts/Services/InputManager/KeyListener.cs +++ b/Assets/System/Scripts/Services/InputManager/KeyListener.cs @@ -5,7 +5,6 @@ using UnityEngine.InputSystem; using UnityEngine.InputSystem.Controls; using UnityEngine.InputSystem.LowLevel; -using static UnityEditor.Progress; /* * Copyright(c) 2021 mengyu @@ -224,7 +223,7 @@ private ButtonControl GetGamepadButtonControl(GamepadButton button) case GamepadButton.LeftShoulder: return currentGamepad.leftShoulder; case GamepadButton.RightShoulder: - return currentGamepad.leftShoulder; + return currentGamepad.rightShoulder; case GamepadButton.LeftTrigger: return currentGamepad.leftTrigger; case GamepadButton.RightTrigger: @@ -317,7 +316,7 @@ private bool IsKeyOrGamepadButtonsDown(KeyListenerItem item) Vector2 leftStickValue = default; if (currentGamepad != null) { - leftStickValue = currentJoystick.stick.value; + leftStickValue = currentGamepad.leftStick.value; } else if (currentJoystick != null) { diff --git a/Assets/System/Scripts/UI/CoreUI/GlobalGamePermissionTipDialog.cs b/Assets/System/Scripts/UI/CoreUI/GlobalGamePermissionTipDialog.cs deleted file mode 100644 index 82915f34..00000000 --- a/Assets/System/Scripts/UI/CoreUI/GlobalGamePermissionTipDialog.cs +++ /dev/null @@ -1,32 +0,0 @@ -using Ballance2.Entry; -using UnityEngine; -using UnityEngine.UI; - -/* -* Copyright(c) 2022 mengyu -* -* 模块名： -* GlobalGamePermissionTipDialog.cs -* -* 用途： -* 全局游戏开始时请求权限的对话框逻辑。 -* -* 作者： -* mengyu -*/ - -public class GlobalGamePermissionTipDialog : MonoBehaviour { - public Button ButtonAllow; - public Button ButtonDisallow; - - void Start() { - ButtonAllow.onClick.AddListener(() => { - gameObject.SetActive(false); - GameEntry.Instance.RequestAndroidPermission(); - }); - ButtonDisallow.onClick.AddListener(() => { - gameObject.SetActive(false); - GameEntry.Instance.DisallowAndroidPermission(); - }); - } -} \ No newline at end of file diff --git a/Assets/System/Scripts/UI/CoreUI/GlobalGamePermissionTipDialog.cs.meta b/Assets/System/Scripts/UI/CoreUI/GlobalGamePermissionTipDialog.cs.meta deleted file mode 100644 index 46667d70..00000000 --- a/Assets/System/Scripts/UI/CoreUI/GlobalGamePermissionTipDialog.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: b7540db637fdf7445b012ef3a21f2944 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: From 255de6b9a4c17917cb4085cfe4bec40729ff5e30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E9=B9=8F?= Date: Fri, 12 Jan 2024 15:02:01 +0800 Subject: [PATCH 08/11] =?UTF-8?q?EventSystem=E4=BD=BF=E7=94=A8=E6=96=B0Inp?= =?UTF-8?q?utSystem=E7=BB=84=E4=BB=B6=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Scenes/Main.unity | 59 +++++++++++++++++++++------------------- 1 file changed, 31 insertions(+), 28 deletions(-) diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index 59c46599..de248bd9 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -796,7 +796,7 @@ GameObject: m_Component: - component: {fileID: 911908060} - component: {fileID: 911908059} - - component: {fileID: 911908058} + - component: {fileID: 911908061} m_Layer: 0 m_Name: EventSystem m_TagString: Untagged @@ -804,26 +804,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &911908058 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 911908057} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} - m_Name: - m_EditorClassIdentifier: - m_SendPointerHoverToParent: 1 - m_HorizontalAxis: Horizontal - m_VerticalAxis: Vertical - m_SubmitButton: Submit - m_CancelButton: Cancel - m_InputActionsPerSecond: 10 - m_RepeatDelay: 0.5 - m_ForceModuleActive: 0 --- !u!114 &911908059 MonoBehaviour: m_ObjectHideFlags: 0 @@ -854,6 +834,36 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &911908061 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 911908057} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 01614664b831546d2ae94a42149d80ac, type: 3} + m_Name: + m_EditorClassIdentifier: + m_SendPointerHoverToParent: 1 + 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_DeselectOnBackgroundClick: 1 + m_PointerBehavior: 0 + m_CursorLockBehavior: 0 --- !u!1 &926100499 GameObject: m_ObjectHideFlags: 0 @@ -1194,8 +1204,6 @@ MonoBehaviour: GameCanvas: {fileID: 646464401} GameGlobalErrorUI: {fileID: 197972177} GameDebugBeginStats: {fileID: 0} - GlobalGamePermissionTipDialog: {fileID: 1704897430} - GlobalGameUserAgreementTipDialog: {fileID: 0} GlobalGameScriptErrDialog: {fileID: 200569454} GameGlobalIngameLoading: {fileID: 504756839} --- !u!4 &1269806398 @@ -1474,8 +1482,3 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 5108249358657281527, guid: a979be46c477d2147bdd0b1323628af3, type: 3} m_PrefabInstance: {fileID: 1704897428} m_PrefabAsset: {fileID: 0} ---- !u!1 &1704897430 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 5108249358657281523, guid: a979be46c477d2147bdd0b1323628af3, type: 3} - m_PrefabInstance: {fileID: 1704897428} - m_PrefabAsset: {fileID: 0} From 28053cf751e6e2b3edad2fa59a6394ca60f7b56a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E9=B9=8F?= Date: Fri, 12 Jan 2024 15:20:28 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E5=B1=8F=E5=B9=95=E9=94=AE=E7=9B=98?= =?UTF-8?q?=E5=A4=A7=E5=B0=8F=E7=9A=84=E8=8C=83=E5=9B=B4=E7=94=B160~150?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BA-150~150=E3=80=82=E8=BF=99=E6=A0=B7?= =?UTF-8?q?=E5=B0=B1=E5=8F=AF=E4=BB=A5=E9=9A=90=E8=97=8F=E5=B1=8F=E5=B9=95?= =?UTF-8?q?=E9=94=AE=E7=9B=98=E4=BA=86=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Game/Menu/Prefabs/Pages/PageSettingsControlsMobile.prefab | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/Game/Menu/Prefabs/Pages/PageSettingsControlsMobile.prefab b/Assets/Game/Menu/Prefabs/Pages/PageSettingsControlsMobile.prefab index 5dafe414..41da4e87 100644 --- a/Assets/Game/Menu/Prefabs/Pages/PageSettingsControlsMobile.prefab +++ b/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: 60 + value: -150 objectReference: {fileID: 0} - target: {fileID: 7033815402476303036, guid: 943dd3c0e7cff344b94a30d9844d13cb, type: 3} propertyPath: AppendText From 326e7a92316d29acb5979d4c58d9f1253fd33209 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E9=B9=8F?= Date: Fri, 12 Jan 2024 16:38:43 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9C=A8Android?= =?UTF-8?q?=E4=B8=8A=E6=B2=A1=E6=9C=89=E9=BB=98=E8=AE=A4=E9=80=89=E4=B8=AD?= =?UTF-8?q?=E8=8F=9C=E5=8D=95=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/System/Scripts/UI/Core/GameUIPage.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Assets/System/Scripts/UI/Core/GameUIPage.cs b/Assets/System/Scripts/UI/Core/GameUIPage.cs index 8d0d1dfb..c669ff53 100644 --- a/Assets/System/Scripts/UI/Core/GameUIPage.cs +++ b/Assets/System/Scripts/UI/Core/GameUIPage.cs @@ -85,7 +85,6 @@ public void Show() gameObject.SetActive(true); OnShow?.Invoke(LastOptions); -#if UNITY_EDITOR || UNITY_STANDALONE //选择默认按扭 if(defaultSelection != null) { //默认选择的时候不要播放声音 @@ -96,7 +95,7 @@ public void Show() if(sound != null) sound.enabled = true; } -#endif + if (CanEscBack) { escBackId = uIManager.WaitKey(KeyCode.Escape, false, () => From b63b4c3222ce3cc2483cfd45bc60f2772082abf1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E9=B9=8F?= Date: Fri, 12 Jan 2024 16:42:22 +0800 Subject: [PATCH 11/11] =?UTF-8?q?=E5=8F=91=E5=B8=83=E7=89=88=E6=9C=AC?= =?UTF-8?q?=EF=BC=9A1.0.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Game/GamePlay/Scripts/Preview/GamePreviewManager.cs | 3 ++- Assets/Game/Menu/Scripts/Game/WinScoreUIControl.cs | 5 +++-- Assets/System/Scripts/Config/GameConst.cs | 6 +++--- Assets/System/Scripts/UI/Core/GameUIPage.cs | 2 +- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/Assets/Game/GamePlay/Scripts/Preview/GamePreviewManager.cs b/Assets/Game/GamePlay/Scripts/Preview/GamePreviewManager.cs index 328027b3..05759f2f 100644 --- a/Assets/Game/GamePlay/Scripts/Preview/GamePreviewManager.cs +++ b/Assets/Game/GamePlay/Scripts/Preview/GamePreviewManager.cs @@ -5,6 +5,7 @@ using Ballance2.Services; using BallancePhysics.Wapper; using UnityEngine; +using UnityEngine.InputSystem.LowLevel; namespace Ballance2.Game.GamePlay { @@ -65,7 +66,7 @@ private void Awake() { else ResumeLevel(); } - }); + },GamepadButton.Start); return false; }); } diff --git a/Assets/Game/Menu/Scripts/Game/WinScoreUIControl.cs b/Assets/Game/Menu/Scripts/Game/WinScoreUIControl.cs index 977600e9..1f8a98ec 100644 --- a/Assets/Game/Menu/Scripts/Game/WinScoreUIControl.cs +++ b/Assets/Game/Menu/Scripts/Game/WinScoreUIControl.cs @@ -4,6 +4,7 @@ using Ballance2.Services.I18N; using System.Collections; using UnityEngine; +using UnityEngine.InputSystem.LowLevel; using UnityEngine.UI; namespace Ballance2.Menu @@ -115,8 +116,8 @@ private IEnumerator StartSeqInner() { Panel.SetActive(true); - EscKeyID = GameUIManager.Instance.WaitKey(KeyCode.Escape, false, Skip); - ReturnKeyID = GameUIManager.Instance.WaitKey(KeyCode.Return, false, Skip); + EscKeyID = GameUIManager.Instance.WaitKey(KeyCode.Escape, false, Skip, GamepadButton.B); + ReturnKeyID = GameUIManager.Instance.WaitKey(KeyCode.Return, false, Skip, GamepadButton.A); yield return new WaitForSeconds(1.7f); if (_Skip) diff --git a/Assets/System/Scripts/Config/GameConst.cs b/Assets/System/Scripts/Config/GameConst.cs index 110909ab..8d5846bf 100644 --- a/Assets/System/Scripts/Config/GameConst.cs +++ b/Assets/System/Scripts/Config/GameConst.cs @@ -21,15 +21,15 @@ public static class GameConst /// /// 游戏版本 /// - public const string GameVersion = "1.0.2"; + public const string GameVersion = "1.0.3"; /// /// 游戏编译版本 /// - public const int GameBulidVersion = 162; + public const int GameBulidVersion = 163; /// /// 游戏编译版本 /// - public const string GameBulidDate = "2023.04.20"; + public const string GameBulidDate = "2024.01.12"; #region Unity 环境静态常量 diff --git a/Assets/System/Scripts/UI/Core/GameUIPage.cs b/Assets/System/Scripts/UI/Core/GameUIPage.cs index c669ff53..0e99ddae 100644 --- a/Assets/System/Scripts/UI/Core/GameUIPage.cs +++ b/Assets/System/Scripts/UI/Core/GameUIPage.cs @@ -101,7 +101,7 @@ public void Show() escBackId = uIManager.WaitKey(KeyCode.Escape, false, () => { uIManager.BackPreviusPage(); - },GamepadButton.B); + }, GamepadButton.B); } }