From 592d3a36dd64d20e2e87743ace18b2aa5cd15787 Mon Sep 17 00:00:00 2001 From: Ding Yuntian <1491671119@qq.com> Date: Sun, 19 Jul 2026 17:23:55 +0800 Subject: [PATCH] =?UTF-8?q?art:=20=E9=9F=B3=E9=87=8F=E6=9D=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Feature_MainUI/Art/音频Slider.png | 3 + .../Feature_MainUI/Art/音频Slider.png.meta | 276 ++++++++++++++++++ .../Prefabs/TerminalSettingPanel.prefab | 184 ++++++++---- .../Prefabs/TerminalSettingPanelMini.prefab | 174 +++++++++-- Assets/Scripts/Game Loop/GameManager.cs | 6 +- 5 files changed, 568 insertions(+), 75 deletions(-) create mode 100644 Assets/GameContent/Feature_MainUI/Art/音频Slider.png create mode 100644 Assets/GameContent/Feature_MainUI/Art/音频Slider.png.meta diff --git a/Assets/GameContent/Feature_MainUI/Art/音频Slider.png b/Assets/GameContent/Feature_MainUI/Art/音频Slider.png new file mode 100644 index 000000000..3a27c9f3b --- /dev/null +++ b/Assets/GameContent/Feature_MainUI/Art/音频Slider.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e9a5c6f78f8851ef81f58818de38d92900f0be188c4b1250c0ef38904e3a9ae1 +size 599 diff --git a/Assets/GameContent/Feature_MainUI/Art/音频Slider.png.meta b/Assets/GameContent/Feature_MainUI/Art/音频Slider.png.meta new file mode 100644 index 000000000..cd7ed0747 --- /dev/null +++ b/Assets/GameContent/Feature_MainUI/Art/音频Slider.png.meta @@ -0,0 +1,276 @@ +fileFormatVersion: 2 +guid: cd4e429b23020584fa3adc443d1f5723 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 40 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 512 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: "\u97F3\u9891\u6ED1\u5757" + rect: + serializedVersion: 2 + x: 1 + y: 87 + width: 8 + height: 12 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: ee5d91267a945b24f8e9a85699f181c6 + internalID: -60672557 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: "\u97F3\u9891\u906E\u7F69" + rect: + serializedVersion: 2 + x: 18 + y: 86 + width: 196 + height: 14 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 684810d1afcf5df448906091ce5cf72d + internalID: 1775711820 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: "\u97F3\u9891\u5916\u6846" + rect: + serializedVersion: 2 + x: 0 + y: 64 + width: 198 + height: 16 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 1, y: 1, z: 1, w: 1} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 5d237b8607661e64f96cd3882ad1a469 + internalID: -282505560 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: "\u97F3\u9891\u5E95\u56FE" + rect: + serializedVersion: 2 + x: 0 + y: 40 + width: 320 + height: 20 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 213, y: 2, z: 5, w: 2} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 5dcbee86728105b4ebd924435c99b5f8 + internalID: 891910533 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: "\u97F3\u9891Slider_0" + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 400 + height: 24 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: ce046c96893a6cb43b537739013f089b + internalID: 948299243 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: + "\u97F3\u9891Slider_0": 948299243 + "\u97F3\u9891\u5916\u6846": -282505560 + "\u97F3\u9891\u5E95\u56FE": 891910533 + "\u97F3\u9891\u6ED1\u5757": -60672557 + "\u97F3\u9891\u906E\u7F69": 1775711820 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameContent/Feature_MainUI/Prefabs/TerminalSettingPanel.prefab b/Assets/GameContent/Feature_MainUI/Prefabs/TerminalSettingPanel.prefab index 2e7790cb8..2989e8751 100644 --- a/Assets/GameContent/Feature_MainUI/Prefabs/TerminalSettingPanel.prefab +++ b/Assets/GameContent/Feature_MainUI/Prefabs/TerminalSettingPanel.prefab @@ -18,7 +18,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &7841453849035343617 RectTransform: m_ObjectHideFlags: 0 @@ -197,7 +197,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -511, y: 352} - m_SizeDelta: {x: 233.33, y: 70} + m_SizeDelta: {x: 0, y: 70} m_Pivot: {x: 0, y: 0.5} --- !u!222 &8216863522337051433 CanvasRenderer: @@ -360,35 +360,35 @@ PrefabInstance: m_Modifications: - target: {fileID: 27177156846382951, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 27177156846382951, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 27177156846382951, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3} propertyPath: m_AnchoredPosition.x - value: 335 + value: 0 objectReference: {fileID: 0} - target: {fileID: 27177156846382951, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3} propertyPath: m_AnchoredPosition.y - value: -50 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2806314693394340526, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2806314693394340526, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2806314693394340526, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3} propertyPath: m_AnchoredPosition.x - value: 445 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2806314693394340526, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3} propertyPath: m_AnchoredPosition.y - value: -50 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5654956763089875896, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3} propertyPath: m_Name @@ -408,7 +408,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5824597425683931436, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5824597425683931436, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3} propertyPath: m_AnchorMin.x @@ -416,7 +416,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5824597425683931436, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5824597425683931436, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3} propertyPath: m_SizeDelta.x @@ -456,11 +456,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5824597425683931436, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3} propertyPath: m_AnchoredPosition.x - value: 500 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5824597425683931436, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3} propertyPath: m_AnchoredPosition.y - value: -150 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5824597425683931436, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -646,35 +646,35 @@ PrefabInstance: m_Modifications: - target: {fileID: 27177156846382951, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 27177156846382951, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 27177156846382951, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3} propertyPath: m_AnchoredPosition.x - value: 335 + value: 0 objectReference: {fileID: 0} - target: {fileID: 27177156846382951, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3} propertyPath: m_AnchoredPosition.y - value: -50 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2806314693394340526, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2806314693394340526, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2806314693394340526, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3} propertyPath: m_AnchoredPosition.x - value: 445 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2806314693394340526, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3} propertyPath: m_AnchoredPosition.y - value: -50 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5654956763089875896, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3} propertyPath: m_Name @@ -694,7 +694,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5824597425683931436, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5824597425683931436, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3} propertyPath: m_AnchorMin.x @@ -702,7 +702,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5824597425683931436, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5824597425683931436, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3} propertyPath: m_SizeDelta.x @@ -742,11 +742,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5824597425683931436, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3} propertyPath: m_AnchoredPosition.x - value: 500 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5824597425683931436, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3} propertyPath: m_AnchoredPosition.y - value: -210 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5824597425683931436, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -791,35 +791,35 @@ PrefabInstance: m_Modifications: - target: {fileID: 27177156846382951, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 27177156846382951, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 27177156846382951, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3} propertyPath: m_AnchoredPosition.x - value: 335 + value: 0 objectReference: {fileID: 0} - target: {fileID: 27177156846382951, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3} propertyPath: m_AnchoredPosition.y - value: -50 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2806314693394340526, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2806314693394340526, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2806314693394340526, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3} propertyPath: m_AnchoredPosition.x - value: 445 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2806314693394340526, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3} propertyPath: m_AnchoredPosition.y - value: -50 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5654956763089875896, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3} propertyPath: m_Name @@ -839,7 +839,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5824597425683931436, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5824597425683931436, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3} propertyPath: m_AnchorMin.x @@ -847,7 +847,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5824597425683931436, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5824597425683931436, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3} propertyPath: m_SizeDelta.x @@ -887,11 +887,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5824597425683931436, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3} propertyPath: m_AnchoredPosition.x - value: 500 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5824597425683931436, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3} propertyPath: m_AnchoredPosition.y - value: -90 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5824597425683931436, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -1230,7 +1230,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 305064715333190683, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 305064715333190683, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} propertyPath: m_AnchorMin.x @@ -1238,7 +1238,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 305064715333190683, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 305064715333190683, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} propertyPath: m_SizeDelta.x @@ -1278,11 +1278,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 305064715333190683, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} propertyPath: m_AnchoredPosition.x - value: 500 + value: 0 objectReference: {fileID: 0} - target: {fileID: 305064715333190683, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} propertyPath: m_AnchoredPosition.y - value: -30 + value: 0 objectReference: {fileID: 0} - target: {fileID: 305064715333190683, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -1296,65 +1296,137 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 1048584740274864082, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} + propertyPath: m_Color.a + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1163567057521848681, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1163567057521848681, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1163567057521848681, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} + propertyPath: m_SizeDelta.x + value: 360 objectReference: {fileID: 0} - target: {fileID: 1163567057521848681, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} propertyPath: m_AnchoredPosition.x - value: 335 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1163567057521848681, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} propertyPath: m_AnchoredPosition.y - value: -30 + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1425762017047074178, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} + propertyPath: m_AnchorMax.x + value: 0 objectReference: {fileID: 0} - target: {fileID: 1425762017047074178, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2580959752204425430, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} + propertyPath: m_AnchorMax.x + value: 0 objectReference: {fileID: 0} - target: {fileID: 2580959752204425430, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2580959752204425430, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} + propertyPath: m_AnchorMin.x + value: 0 objectReference: {fileID: 0} - target: {fileID: 2949357837247552342, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} propertyPath: m_Name value: Volume Slider Item objectReference: {fileID: 0} - - target: {fileID: 5952270497693892333, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} + - target: {fileID: 3553234827604121308, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} + propertyPath: m_Value + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3553234827604121308, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} + propertyPath: m_Transition + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3553234827604121308, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} + propertyPath: m_Colors.m_ColorMultiplier + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4316814271319446306, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} propertyPath: m_AnchorMax.y value: 1 objectReference: {fileID: 0} + - target: {fileID: 4316814271319446306, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4316814271319446306, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4316814271319446306, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4367193049947482690, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: -282505560, guid: cd4e429b23020584fa3adc443d1f5723, type: 3} + - target: {fileID: 4746590736449079525, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: -60672557, guid: cd4e429b23020584fa3adc443d1f5723, type: 3} + - target: {fileID: 5811921145249754562, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} + propertyPath: m_Type + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5811921145249754562, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 948299243, guid: cd4e429b23020584fa3adc443d1f5723, type: 3} + - target: {fileID: 5811921145249754562, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} + propertyPath: m_Color.a + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5952270497693892333, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5952270497693892333, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5952270497693892333, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} propertyPath: m_AnchoredPosition.x - value: 435 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5952270497693892333, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} propertyPath: m_AnchoredPosition.y - value: -30 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6732691262169134867, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6732691262169134867, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6732691262169134867, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} propertyPath: m_AnchoredPosition.x - value: 735 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6732691262169134867, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} propertyPath: m_AnchoredPosition.y - value: -30 + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7791647524598842268, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} + propertyPath: m_SizeDelta.y + value: 40 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] diff --git a/Assets/GameContent/Feature_MainUI/Prefabs/TerminalSettingPanelMini.prefab b/Assets/GameContent/Feature_MainUI/Prefabs/TerminalSettingPanelMini.prefab index 70629cc25..7ad1033fb 100644 --- a/Assets/GameContent/Feature_MainUI/Prefabs/TerminalSettingPanelMini.prefab +++ b/Assets/GameContent/Feature_MainUI/Prefabs/TerminalSettingPanelMini.prefab @@ -195,7 +195,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -423, y: 151} - m_SizeDelta: {x: 186.67, y: 70} + m_SizeDelta: {x: 0, y: 70} m_Pivot: {x: 0, y: 0.5} --- !u!222 &2722517140198208553 CanvasRenderer: @@ -1284,42 +1284,162 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 1048584740274864082, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} + propertyPath: m_Color.a + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1163567057521848681, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1163567057521848681, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1163567057521848681, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} propertyPath: m_SizeDelta.x - value: 270 + value: 220 objectReference: {fileID: 0} - target: {fileID: 1163567057521848681, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} propertyPath: m_AnchoredPosition.x - value: 285 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1163567057521848681, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} propertyPath: m_AnchoredPosition.y - value: -25 + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1284729285510856511, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1425762017047074178, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} + propertyPath: m_AnchorMax.x + value: 0 objectReference: {fileID: 0} - target: {fileID: 1425762017047074178, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2580959752204425430, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} + propertyPath: m_AnchorMax.x + value: 0 objectReference: {fileID: 0} - target: {fileID: 2580959752204425430, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2580959752204425430, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2580959752204425430, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} + propertyPath: m_SizeDelta.x + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 2580959752204425430, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} + propertyPath: m_SizeDelta.y + value: -5 + objectReference: {fileID: 0} + - target: {fileID: 2580959752204425430, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 objectReference: {fileID: 0} - target: {fileID: 2949357837247552342, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} propertyPath: m_Name value: Volume Slider Item objectReference: {fileID: 0} + - target: {fileID: 3553234827604121308, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} + propertyPath: m_Value + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3553234827604121308, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} + propertyPath: m_Transition + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3656877915088725050, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} propertyPath: m_HorizontalAlignment value: 2 objectReference: {fileID: 0} + - target: {fileID: 4034804984428078857, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} + propertyPath: m_Spacing + value: 50 + objectReference: {fileID: 0} + - target: {fileID: 4316814271319446306, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} + propertyPath: m_AnchorMax.y + value: 0.75 + objectReference: {fileID: 0} + - target: {fileID: 4316814271319446306, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} + propertyPath: m_AnchorMin.y + value: 0.25 + objectReference: {fileID: 0} + - target: {fileID: 4316814271319446306, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} + propertyPath: m_SizeDelta.x + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 4316814271319446306, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} + propertyPath: m_SizeDelta.y + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 4316814271319446306, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4316814271319446306, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4367193049947482690, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} + propertyPath: m_Type + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4367193049947482690, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: -282505560, guid: cd4e429b23020584fa3adc443d1f5723, type: 3} + - target: {fileID: 4367193049947482690, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} + propertyPath: m_Color.a + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4367193049947482690, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} + propertyPath: m_Color.b + value: 0.3882353 + objectReference: {fileID: 0} + - target: {fileID: 4367193049947482690, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} + propertyPath: m_Color.g + value: 0.53333336 + objectReference: {fileID: 0} + - target: {fileID: 4367193049947482690, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} + propertyPath: m_Color.r + value: 0.6784314 + objectReference: {fileID: 0} + - target: {fileID: 4746590736449079525, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: -60672557, guid: cd4e429b23020584fa3adc443d1f5723, type: 3} + - target: {fileID: 4746590736449079525, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} + propertyPath: m_Color.b + value: 0.3882353 + objectReference: {fileID: 0} + - target: {fileID: 4746590736449079525, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} + propertyPath: m_Color.g + value: 0.53333336 + objectReference: {fileID: 0} + - target: {fileID: 4746590736449079525, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} + propertyPath: m_Color.r + value: 0.6784314 + objectReference: {fileID: 0} + - target: {fileID: 5811921145249754562, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} + propertyPath: m_Type + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5811921145249754562, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 891910533, guid: cd4e429b23020584fa3adc443d1f5723, type: 3} + - target: {fileID: 5811921145249754562, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} + propertyPath: m_Color.a + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5811921145249754562, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} propertyPath: m_Color.b value: 0.3882353 @@ -1334,19 +1454,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5952270497693892333, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5952270497693892333, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5952270497693892333, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} propertyPath: m_AnchoredPosition.x - value: 385 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5952270497693892333, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} propertyPath: m_AnchoredPosition.y - value: -25 + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6131397560991339167, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} + propertyPath: m_IsActive + value: 1 objectReference: {fileID: 0} - target: {fileID: 6338673825785440556, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} propertyPath: m_fontSize @@ -1358,19 +1482,27 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6732691262169134867, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6732691262169134867, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6732691262169134867, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} + propertyPath: m_SizeDelta.x + value: 250 + objectReference: {fileID: 0} + - target: {fileID: 6732691262169134867, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} + propertyPath: m_SizeDelta.y + value: 40 objectReference: {fileID: 0} - target: {fileID: 6732691262169134867, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} propertyPath: m_AnchoredPosition.x - value: 685 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6732691262169134867, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} propertyPath: m_AnchoredPosition.y - value: -25 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6885231114081803451, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} propertyPath: normalTextColor.b @@ -1384,9 +1516,17 @@ PrefabInstance: propertyPath: normalTextColor.r value: 0.6784314 objectReference: {fileID: 0} + - target: {fileID: 7023726294702313920, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7791647524598842268, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} propertyPath: m_SizeDelta.x - value: 300 + value: 250 + objectReference: {fileID: 0} + - target: {fileID: 7791647524598842268, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} + propertyPath: m_SizeDelta.y + value: 40 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] diff --git a/Assets/Scripts/Game Loop/GameManager.cs b/Assets/Scripts/Game Loop/GameManager.cs index d0e894367..f4f1f955c 100644 --- a/Assets/Scripts/Game Loop/GameManager.cs +++ b/Assets/Scripts/Game Loop/GameManager.cs @@ -348,7 +348,8 @@ namespace AibisDream DialogController.Instance.StartDialog(chapter.yarnProject); TrySetPhase(GameSessionPhase.Playing); EnumEventSystem.Global.Send(GameLifecycleEvent.SessionReady); - yield return FadeOut(); + // 让Yarn自己处理淡出 + // yield return FadeOut(); } finally { @@ -419,7 +420,8 @@ namespace AibisDream DialogController.Instance.StartDialog(target.yarnProject); TrySetPhase(GameSessionPhase.Playing); EnumEventSystem.Global.Send(GameLifecycleEvent.SessionReady); - yield return FadeOut(); + // 让Yarn自己处理淡出 + // yield return FadeOut(); } private IEnumerator WaitForSourceDialogueCompletion(Action completed)