From 3b754c8a5dd543dab21b525c94fc5c1b8f559269 Mon Sep 17 00:00:00 2001 From: Ding Yuntian <1491671119@qq.com> Date: Mon, 19 May 2025 20:17:28 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/AddressableAssetsData/link.xml | 445 ++++++++++++++++++ Assets/AddressableAssetsData/link.xml.meta | 7 + Assets/DialogLine.cs | 21 - Assets/DialogLine.cs.meta | 11 - Assets/Font/Assets/ChillBitmap_16px SDF.asset | 4 +- Assets/Scenes/Persistence.unity | 8 +- Assets/Scripts/Framework/Config/Character.cs | 2 +- .../Framework/OtherKit/LocalizationKit.cs | 18 +- ProjectSettings/ProjectSettings.asset | 2 +- 9 files changed, 470 insertions(+), 48 deletions(-) create mode 100644 Assets/AddressableAssetsData/link.xml create mode 100644 Assets/AddressableAssetsData/link.xml.meta delete mode 100644 Assets/DialogLine.cs delete mode 100644 Assets/DialogLine.cs.meta diff --git a/Assets/AddressableAssetsData/link.xml b/Assets/AddressableAssetsData/link.xml new file mode 100644 index 000000000..9349bee82 --- /dev/null +++ b/Assets/AddressableAssetsData/link.xml @@ -0,0 +1,445 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Assets/AddressableAssetsData/link.xml.meta b/Assets/AddressableAssetsData/link.xml.meta new file mode 100644 index 000000000..450ae2f86 --- /dev/null +++ b/Assets/AddressableAssetsData/link.xml.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 5814112af9c1a52439cb7c4531796080 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/DialogLine.cs b/Assets/DialogLine.cs deleted file mode 100644 index 574c500c3..000000000 --- a/Assets/DialogLine.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -namespace AibisDream -{ - public class DialogLine : MonoBehaviour - { - // Start is called before the first frame update - void Start() - { - - } - - // Update is called once per frame - void Update() - { - - } - } -} diff --git a/Assets/DialogLine.cs.meta b/Assets/DialogLine.cs.meta deleted file mode 100644 index 9c121c74e..000000000 --- a/Assets/DialogLine.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: addb57296dac0c2429dd969b61b69940 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Font/Assets/ChillBitmap_16px SDF.asset b/Assets/Font/Assets/ChillBitmap_16px SDF.asset index fe512733f..a39efe647 100644 --- a/Assets/Font/Assets/ChillBitmap_16px SDF.asset +++ b/Assets/Font/Assets/ChillBitmap_16px SDF.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a69d607550a8a97f9190f8033d0a71a5c26a551ce55546a77b0ec230cde38571 -size 134563502 +oid sha256:95c8b022e0e1000e06bc42d47a4083fcdfba685495d0a6df194fe6523841f419 +size 36313 diff --git a/Assets/Scenes/Persistence.unity b/Assets/Scenes/Persistence.unity index 6f58524f2..33b9a6d16 100644 --- a/Assets/Scenes/Persistence.unity +++ b/Assets/Scenes/Persistence.unity @@ -2855,7 +2855,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 200, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &190932926 @@ -3932,7 +3932,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 200, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &237392156 @@ -20830,7 +20830,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 200, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1611684201 @@ -23833,7 +23833,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 200, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1960600463 diff --git a/Assets/Scripts/Framework/Config/Character.cs b/Assets/Scripts/Framework/Config/Character.cs index 214632979..385c9312a 100644 --- a/Assets/Scripts/Framework/Config/Character.cs +++ b/Assets/Scripts/Framework/Config/Character.cs @@ -59,7 +59,7 @@ namespace AibisDream.Kit else { // 人名能找到 - var entry = LocalizationKit.ActorTableName[key]; + var entry = LocalizationKit.ActorTable[key]; rawName = entry == null ? key : entry.LocalizedValue; } diff --git a/Assets/Scripts/Framework/OtherKit/LocalizationKit.cs b/Assets/Scripts/Framework/OtherKit/LocalizationKit.cs index b94abaca3..3e9903d19 100644 --- a/Assets/Scripts/Framework/OtherKit/LocalizationKit.cs +++ b/Assets/Scripts/Framework/OtherKit/LocalizationKit.cs @@ -9,10 +9,12 @@ namespace AibisDream.Framework public static class LocalizationKit { private const string LocalizationPrefix = "l10n."; + private const string ActorTableName = "ActorName"; + private const string ParamTableName = "Params"; private static LocalizationTable _paramTable; - public static LocalizationTable ActorTableName { get; private set; } + public static LocalizationTable ActorTable { get; private set; } static LocalizationKit() { @@ -20,8 +22,8 @@ namespace AibisDream.Framework #if UNITY_EDITOR EditorApplication.playModeStateChanged += OnPlayModeChanged; #else - _paramTable = new LocalizationTable("Param"); - ActorTableName = new LocalizationTable("ActorName"); + _paramTable = new LocalizationTable(ParamTableName); + ActorTable = new LocalizationTable(ActorTableName); #endif } @@ -32,16 +34,16 @@ namespace AibisDream.Framework { // 进入游戏模式的时候 _paramTable?.Dispose(); - ActorTableName?.Dispose(); - _paramTable = new LocalizationTable("Params"); - ActorTableName = new LocalizationTable("ActorName"); + ActorTable?.Dispose(); + _paramTable = new LocalizationTable(ParamTableName); + ActorTable = new LocalizationTable(ActorTableName); } else if (playMode == PlayModeStateChange.ExitingPlayMode) { _paramTable?.Dispose(); - ActorTableName?.Dispose(); + ActorTable?.Dispose(); _paramTable = null; - ActorTableName = null; + ActorTable = null; } } #endif diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 7ade2ad10..da6176105 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -133,7 +133,7 @@ PlayerSettings: vulkanEnableLateAcquireNextImage: 0 vulkanEnableCommandBufferRecycling: 1 loadStoreDebugModeEnabled: 0 - bundleVersion: 0.2.2.15-20250516-220439 + bundleVersion: 0.2.2.17-20250519-200923 preloadedAssets: - {fileID: 11400000, guid: 0fb2bc2476953fc43a74f0ab8879077c, type: 2} metroInputSource: 0