Fix hotkey setting related issue+0.6.3

yojohanshinwataikei · Jan 21, 2025 · f44010a · f44010a
1 parent 7bbefc2
commit f44010a
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 29 deletions.
diff --git a/Assets/Misc/BuildTimestamp.txt b/Assets/Misc/BuildTimestamp.txt
@@ -1 +1 @@
-638714103829347141
+638730675211903234
diff --git a/Assets/Misc/ChangeLog.txt b/Assets/Misc/ChangeLog.txt
@@ -1,3 +1,11 @@
+0.6.3
+
+- 修复 Arc 曲线编辑快捷键不工作的问题
+- 修复重置快捷键不工作的问题
+- 修复快捷键无法设置为组合键的问题
+
+---
+
 0.6.2
 
 - 修复物件参数编辑框中， 曲线类型编辑不生效的问题

diff --git a/Assets/Scripts/Compose/Input/AdeInputManager.cs b/Assets/Scripts/Compose/Input/AdeInputManager.cs
@@ -124,6 +124,17 @@ public void SetHotkeyRebindingButton(AdeHotkeyRebindingButton button)
 					.WithControlsExcluding("<Keyboard>/shiftKey")
 					.WithControlsExcluding("<Keyboard>/anyKey")
 					.WithControlsExcluding("<Keyboard>/escapeKey")
+					.WithControlsExcluding("<Keyboard>/leftAlt")
+					.WithControlsExcluding("<Keyboard>/leftCtrl")
+					.WithControlsExcluding("<Keyboard>/leftShift")
+					.WithControlsExcluding("<Keyboard>/rightAlt")
+					.WithControlsExcluding("<Keyboard>/rightCtrl")
+					.WithControlsExcluding("<Keyboard>/rightShift")
+					.WithControlsExcluding("<Keyboard>/alt")
+					.WithControlsExcluding("<Keyboard>/ctrl")
+					.WithControlsExcluding("<Keyboard>/shift")
+					.WithControlsExcluding("<Keyboard>/any")
+					.WithControlsExcluding("<Keyboard>/escape")
 					.WithControlsExcluding("<Pointer>")
 					.WithCancelingThrough(Keyboard.current.escapeKey)
 					.WithMatchingEventsBeingSuppressed(true)

diff --git a/Assets/UniversalRenderPipelineGlobalSettings.asset b/Assets/UniversalRenderPipelineGlobalSettings.asset
@@ -34,26 +34,26 @@ MonoBehaviour:
     m_SettingsList:
       m_List:
       - rid: 2640617957990858752
-      - rid: 455831180149784660
-      - rid: 455831180149784661
+      - rid: 2102403053407699209
+      - rid: 2102403053407699210
       - rid: 2640617957990858755
-      - rid: 455831180149784662
+      - rid: 2102403053407699211
       - rid: 2640617957990858757
       - rid: 2640617957990858758
       - rid: 2640617957990858759
       - rid: 2640617957990858760
-      - rid: 455831180149784663
+      - rid: 2102403053407699212
       - rid: 2640617957990858762
-      - rid: 455831180149784664
-      - rid: 455831180149784665
-      - rid: 455831180149784666
+      - rid: 2102403053407699213
+      - rid: 2102403053407699214
+      - rid: 2102403053407699215
       - rid: 2640617957990858766
-      - rid: 455831180149784667
-      - rid: 455831180149784668
+      - rid: 2102403053407699216
+      - rid: 2102403053407699217
       - rid: 2640617957990858769
       - rid: 2640617957990858770
-      - rid: 455831180149784669
-      - rid: 455831180149784670
+      - rid: 2102403053407699218
+      - rid: 2102403053407699219
     m_RuntimeSettings:
       m_List:
       - rid: 2640617957990858752
@@ -90,7 +90,7 @@ MonoBehaviour:
   references:
     version: 2
     RefIds:
-    - rid: 455831180149784660
+    - rid: 2102403053407699209
       type: {class: Renderer2DResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
       data:
         m_Version: 0
@@ -114,7 +114,7 @@ MonoBehaviour:
           type: 2}
         m_DefaultMaskMaterial: {fileID: 2100000, guid: 15d0c3709176029428a0da2f8cecf0b5,
           type: 2}
-    - rid: 455831180149784661
+    - rid: 2102403053407699210
       type: {class: UniversalRenderPipelineEditorShaders, ns: UnityEngine.Rendering.Universal,
         asm: Unity.RenderPipelines.Universal.Runtime}
       data:
@@ -136,15 +136,15 @@ MonoBehaviour:
           type: 3}
         m_DefaultSpeedTree9Shader: {fileID: -6465566751694194690, guid: cbd3e1cc4ae141c42a30e33b4d666a61,
           type: 3}
-    - rid: 455831180149784662
+    - rid: 2102403053407699211
       type: {class: URPShaderStrippingSetting, ns: UnityEngine.Rendering.Universal,
         asm: Unity.RenderPipelines.Universal.Runtime}
       data:
         m_Version: 0
         m_StripUnusedPostProcessingVariants: 0
         m_StripUnusedVariants: 1
         m_StripScreenCoordOverrideVariants: 1
-    - rid: 455831180149784663
+    - rid: 2102403053407699212
       type: {class: UniversalRenderPipelineEditorMaterials, ns: UnityEngine.Rendering.Universal,
         asm: Unity.RenderPipelines.Universal.Runtime}
       data:
@@ -158,7 +158,7 @@ MonoBehaviour:
           type: 2}
         m_DefaultDecalMaterial: {fileID: 2100000, guid: 31d0dcc6f2dd4e4408d18036a2c93862,
           type: 2}
-    - rid: 455831180149784664
+    - rid: 2102403053407699213
       type: {class: GPUResidentDrawerResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.GPUDriven.Runtime}
       data:
         m_Version: 0
@@ -180,7 +180,7 @@ MonoBehaviour:
           type: 3}
         m_DebugOccluderPS: {fileID: 4800000, guid: b3c92426a88625841ab15ca6a7917248,
           type: 3}
-    - rid: 455831180149784665
+    - rid: 2102403053407699214
       type: {class: ProbeVolumeRuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
       data:
         m_Version: 1
@@ -190,7 +190,7 @@ MonoBehaviour:
           type: 3}
         probeVolumeUploadDataL2CS: {fileID: 7200000, guid: 6196f34ed825db14b81fb3eb0ea8d931,
           type: 3}
-    - rid: 455831180149784666
+    - rid: 2102403053407699215
       type: {class: ProbeVolumeDebugResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
       data:
         m_Version: 1
@@ -206,12 +206,12 @@ MonoBehaviour:
           type: 3}
         numbersDisplayTex: {fileID: 2800000, guid: 73fe53b428c5b3440b7e87ee830b608a,
           type: 3}
-    - rid: 455831180149784667
+    - rid: 2102403053407699216
       type: {class: ProbeVolumeGlobalSettings, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
       data:
         m_Version: 1
         m_ProbeVolumeDisableStreamingAssets: 0
-    - rid: 455831180149784668
+    - rid: 2102403053407699217
       type: {class: ProbeVolumeBakingResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
       data:
         m_Version: 1
@@ -233,14 +233,14 @@ MonoBehaviour:
           type: 3}
         renderingLayerRT: {fileID: -5126288278712620388, guid: 94a070d33e408384bafc1dea4a565df9,
           type: 3}
-    - rid: 455831180149784669
+    - rid: 2102403053407699218
       type: {class: IncludeAdditionalRPAssets, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
       data:
         m_version: 0
         m_IncludeReferencedInScenes: 0
         m_IncludeAssetsByLabel: 0
         m_LabelToInclude: 
-    - rid: 455831180149784670
+    - rid: 2102403053407699219
       type: {class: STP/RuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
       data:
         m_setupCS: {fileID: 7200000, guid: 33be2e9a5506b2843bdb2bdff9cad5e1, type: 3}

diff --git a/Assets/_Scenes/ArcEditor.unity b/Assets/_Scenes/ArcEditor.unity
@@ -13067,7 +13067,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   EventSystem: {fileID: 409941036}
-  Dialog: {fileID: 0}
+  Dialog: {fileID: 718584905}
 --- !u!114 &409941040
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -40448,7 +40448,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u5207\u6362Arc\u7C7B\u578B"
+  m_Text: "\u5207\u6362Arc\u66F2\u7EBF\u7C7B\u578B"
 --- !u!222 &1148112017
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -53846,7 +53846,7 @@ GameObject:
   - component: {fileID: 1487112878}
   - component: {fileID: 1487112881}
   m_Layer: 10
-  m_Name: ClickToCreateArcType
+  m_Name: ClickToCreateArcCurveType
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -53978,7 +53978,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 5e988a27ee9f62b498b0909ef22441ee, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  HotkeyName: Click To Create Arc Type
+  HotkeyName: Click To Create Arc Curve Type
   Text: {fileID: 926126051}
 --- !u!1 &1487420587
 GameObject:
@@ -67610,7 +67610,7 @@ GameObject:
   - component: {fileID: 1862864743}
   - component: {fileID: 1862864744}
   m_Layer: 10
-  m_Name: ClickToCreateArcType
+  m_Name: ClickToCreateArcCurveType
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0

diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
@@ -142,7 +142,7 @@ PlayerSettings:
   loadStoreDebugModeEnabled: 0
   visionOSBundleVersion: 1.0
   tvOSBundleVersion: 1.0
-  bundleVersion: 0.6.2
+  bundleVersion: 0.6.3
   preloadedAssets:
   - {fileID: 4800000, guid: bb26ede1beb997943a7d6295fbf075d4, type: 3}
   - {fileID: 4800000, guid: 1e340182228616b4ca7dad1e80f4d319, type: 3}