From d3ebee57284f380b19bedc2661355257d80608b8 Mon Sep 17 00:00:00 2001 From: shenjianxing <”315615051@qq.com“> Date: Fri, 28 Mar 2025 14:20:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Art/Fonts/PingFang Medium SDF.asset.meta | 2 +- .../PingFangSC-Medium SDF.asset.meta | 2 +- Assets/Art/UIPrefab/UI3DObjShow.prefab | 6 +- Assets/Art/UIPrefab/UIInstruction.prefab | 22 +- Assets/Art/UIPrefab/UIOperationList.prefab | 2 +- Assets/Art/UIPrefab/UISetting.prefab | 200 ++++++++++++++---- Packages/manifest.json | 3 +- Packages/packages-lock.json | 7 + 8 files changed, 181 insertions(+), 63 deletions(-) diff --git a/Assets/Art/Fonts/PingFang Medium SDF.asset.meta b/Assets/Art/Fonts/PingFang Medium SDF.asset.meta index 216ca8c0..a8066baa 100644 --- a/Assets/Art/Fonts/PingFang Medium SDF.asset.meta +++ b/Assets/Art/Fonts/PingFang Medium SDF.asset.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 userData: - assetBundleName: + assetBundleName: pingfang medium sdf_asset assetBundleVariant: diff --git a/Assets/Art/Fonts/pingfangSc/PingFangSC-Medium SDF.asset.meta b/Assets/Art/Fonts/pingfangSc/PingFangSC-Medium SDF.asset.meta index 6ff52c9c..80771010 100644 --- a/Assets/Art/Fonts/pingfangSc/PingFangSC-Medium SDF.asset.meta +++ b/Assets/Art/Fonts/pingfangSc/PingFangSC-Medium SDF.asset.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 userData: - assetBundleName: + assetBundleName: pingfangsc-medium sdf_asset assetBundleVariant: diff --git a/Assets/Art/UIPrefab/UI3DObjShow.prefab b/Assets/Art/UIPrefab/UI3DObjShow.prefab index 1eaea369..b3429571 100644 --- a/Assets/Art/UIPrefab/UI3DObjShow.prefab +++ b/Assets/Art/UIPrefab/UI3DObjShow.prefab @@ -457,7 +457,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: MarkType: 0 - CustomComponentName: + CustomComponentName: Right CustomComment: mComponentName: UnityEngine.UI.Image --- !u!1 &3408871029033640143 @@ -581,7 +581,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: MarkType: 0 - CustomComponentName: + CustomComponentName: Scroll CustomComment: mComponentName: UnityEngine.UI.ScrollRect --- !u!1 &4561816282390826745 @@ -835,7 +835,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: MarkType: 0 - CustomComponentName: + CustomComponentName: ObjBg CustomComment: mComponentName: UnityEngine.UI.RawImage --- !u!1 &6831573971870136393 diff --git a/Assets/Art/UIPrefab/UIInstruction.prefab b/Assets/Art/UIPrefab/UIInstruction.prefab index 27948151..0fe0334d 100644 --- a/Assets/Art/UIPrefab/UIInstruction.prefab +++ b/Assets/Art/UIPrefab/UIInstruction.prefab @@ -100,7 +100,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: MarkType: 0 - CustomComponentName: + CustomComponentName: Training CustomComment: mComponentName: UnityEngine.UI.Toggle --- !u!1 &511604240533759376 @@ -439,7 +439,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: MarkType: 0 - CustomComponentName: + CustomComponentName: TrainContent CustomComment: mComponentName: RectTransform --- !u!1 &1854468325030962358 @@ -782,7 +782,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: MarkType: 0 - CustomComponentName: + CustomComponentName: Operation CustomComment: mComponentName: UnityEngine.UI.Toggle --- !u!1 &2570030987872014484 @@ -1018,8 +1018,8 @@ MonoBehaviour: m_Calls: [] m_text: "\u5B9E\u8BAD\u8BF4\u660E" m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 97936a7b3a86809479ac89371e95b079, type: 2} - m_sharedMaterial: {fileID: 168401102475399263, guid: 97936a7b3a86809479ac89371e95b079, type: 2} + m_fontAsset: {fileID: 11400000, guid: e7da174c677019b49aa681250aa4ded8, type: 2} + m_sharedMaterial: {fileID: -7878122246201655599, guid: e7da174c677019b49aa681250aa4ded8, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -1473,7 +1473,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: MarkType: 0 - CustomComponentName: + CustomComponentName: OperationContent CustomComment: mComponentName: UnityEngine.UI.Image --- !u!1 &4068472154838936528 @@ -1611,7 +1611,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: MarkType: 0 - CustomComponentName: + CustomComponentName: ConfirmBtn CustomComment: mComponentName: UnityEngine.UI.Button --- !u!1 &4098278228048021229 @@ -1750,7 +1750,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: MarkType: 0 - CustomComponentName: + CustomComponentName: NoToggle CustomComment: mComponentName: UnityEngine.UI.Toggle --- !u!1 &5793951295459804211 @@ -2097,8 +2097,8 @@ MonoBehaviour: m_Calls: [] m_text: "\u64CD\u4F5C\u8BF4\u660E" m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 97936a7b3a86809479ac89371e95b079, type: 2} - m_sharedMaterial: {fileID: 168401102475399263, guid: 97936a7b3a86809479ac89371e95b079, type: 2} + m_fontAsset: {fileID: 11400000, guid: e7da174c677019b49aa681250aa4ded8, type: 2} + m_sharedMaterial: {fileID: -7878122246201655599, guid: e7da174c677019b49aa681250aa4ded8, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -2387,7 +2387,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: MarkType: 0 - CustomComponentName: + CustomComponentName: ContentText CustomComment: mComponentName: TMPro.TextMeshProUGUI --- !u!1 &8662634946358023954 diff --git a/Assets/Art/UIPrefab/UIOperationList.prefab b/Assets/Art/UIPrefab/UIOperationList.prefab index 0177b348..9101077e 100644 --- a/Assets/Art/UIPrefab/UIOperationList.prefab +++ b/Assets/Art/UIPrefab/UIOperationList.prefab @@ -972,7 +972,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: MarkType: 0 - CustomComponentName: + CustomComponentName: StepContent CustomComment: mComponentName: RectTransform --- !u!1 &5682155547481945418 diff --git a/Assets/Art/UIPrefab/UISetting.prefab b/Assets/Art/UIPrefab/UISetting.prefab index b8c81173..18d356a9 100644 --- a/Assets/Art/UIPrefab/UISetting.prefab +++ b/Assets/Art/UIPrefab/UISetting.prefab @@ -134,7 +134,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: MarkType: 0 - CustomComponentName: + CustomComponentName: VoiceAdd CustomComment: mComponentName: UnityEngine.UI.Button --- !u!1 &340564367494795038 @@ -355,8 +355,8 @@ MonoBehaviour: m_Calls: [] m_text: "\u97F3\u91CF\u8C03\u8282" m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 97936a7b3a86809479ac89371e95b079, type: 2} - m_sharedMaterial: {fileID: 168401102475399263, guid: 97936a7b3a86809479ac89371e95b079, type: 2} + m_fontAsset: {fileID: 11400000, guid: e7da174c677019b49aa681250aa4ded8, type: 2} + m_sharedMaterial: {fileID: -7878122246201655599, guid: e7da174c677019b49aa681250aa4ded8, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -489,8 +489,8 @@ MonoBehaviour: m_Calls: [] m_text: "\u9F20\u6807\u7075\u654F\u5EA6" m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 97936a7b3a86809479ac89371e95b079, type: 2} - m_sharedMaterial: {fileID: 168401102475399263, guid: 97936a7b3a86809479ac89371e95b079, type: 2} + m_fontAsset: {fileID: 11400000, guid: e7da174c677019b49aa681250aa4ded8, type: 2} + m_sharedMaterial: {fileID: -7878122246201655599, guid: e7da174c677019b49aa681250aa4ded8, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -566,7 +566,7 @@ GameObject: m_Component: - component: {fileID: 4603449952944263616} - component: {fileID: 2111290541918366963} - - component: {fileID: 8794892031925789476} + - component: {fileID: 1909886951280785919} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -601,7 +601,7 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1275590828871288331} m_CullTransparentMesh: 1 ---- !u!114 &8794892031925789476 +--- !u!114 &1909886951280785919 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -610,7 +610,7 @@ MonoBehaviour: m_GameObject: {fileID: 1275590828871288331} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} @@ -621,20 +621,75 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_FontData: - m_Font: {fileID: 12800000, guid: 20ebdb412ee9aec4a9d3005965d9c962, type: 3} - 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: "\u786E\u5B9A" + m_text: "\u786E\u5B9A" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: e7da174c677019b49aa681250aa4ded8, type: 2} + m_sharedMaterial: {fileID: -7878122246201655599, guid: e7da174c677019b49aa681250aa4ded8, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 16 + m_fontSizeBase: 16 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &1291984167039376258 GameObject: m_ObjectHideFlags: 0 @@ -782,7 +837,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: MarkType: 0 - CustomComponentName: + CustomComponentName: ConfirmBtn CustomComment: mComponentName: UnityEngine.UI.Button --- !u!1 &1336234533568578533 @@ -958,7 +1013,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: MarkType: 0 - CustomComponentName: + CustomComponentName: MouseSub CustomComment: mComponentName: UnityEngine.UI.Button --- !u!1 &2445174993273300670 @@ -1298,7 +1353,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: MarkType: 0 - CustomComponentName: + CustomComponentName: MouseAdd CustomComment: mComponentName: UnityEngine.UI.Button --- !u!1 &4566101257233310026 @@ -1710,7 +1765,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: MarkType: 0 - CustomComponentName: + CustomComponentName: MouseSlider CustomComment: mComponentName: UnityEngine.UI.Slider --- !u!1 &6857310105801723508 @@ -1723,7 +1778,7 @@ GameObject: m_Component: - component: {fileID: 8694246342311846549} - component: {fileID: 8710041809518762022} - - component: {fileID: 8821581120829563032} + - component: {fileID: 3366047067339770762} m_Layer: 5 m_Name: TitleTxt m_TagString: Untagged @@ -1758,7 +1813,7 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6857310105801723508} m_CullTransparentMesh: 1 ---- !u!114 &8821581120829563032 +--- !u!114 &3366047067339770762 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1767,7 +1822,7 @@ MonoBehaviour: m_GameObject: {fileID: 6857310105801723508} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} @@ -1778,20 +1833,75 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_FontData: - m_Font: {fileID: 12800000, guid: bf708833e50b7a746aa577360930b6ed, type: 3} - m_FontSize: 20 - 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: "\u8BBE\u7F6E" + m_text: "\u8BBE\u7F6E" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: e7da174c677019b49aa681250aa4ded8, type: 2} + m_sharedMaterial: {fileID: -7878122246201655599, guid: e7da174c677019b49aa681250aa4ded8, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 20 + m_fontSizeBase: 20 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &7344084794051543825 GameObject: m_ObjectHideFlags: 0 @@ -1926,7 +2036,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: MarkType: 0 - CustomComponentName: + CustomComponentName: VoiceSub CustomComment: mComponentName: UnityEngine.UI.Button --- !u!1 &7441298961810434495 @@ -2105,7 +2215,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: MarkType: 0 - CustomComponentName: + CustomComponentName: VoiceSlider CustomComment: mComponentName: UnityEngine.UI.Slider --- !u!1 &8015440409360597658 diff --git a/Packages/manifest.json b/Packages/manifest.json index b2eb2420..1d80c3dc 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -44,6 +44,7 @@ "com.unity.modules.video": "1.0.0", "com.unity.modules.vr": "1.0.0", "com.unity.modules.wind": "1.0.0", - "com.unity.modules.xr": "1.0.0" + "com.unity.modules.xr": "1.0.0", + "com.unity.assetbundlebrowser": "1.7.0" } } diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index b03adf1b..f0d22f42 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -15,6 +15,13 @@ "com.unity.modules.uielements": "1.0.0" } }, + "com.unity.assetbundlebrowser": { + "version": "1.7.0", + "depth": 0, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.cn" + }, "com.unity.burst": { "version": "1.8.11", "depth": 1,