From 3eb30d6aecb24dbb4b5e1b7842aa02b4f9de4138 Mon Sep 17 00:00:00 2001 From: Ding Yuntian <1491671119@qq.com> Date: Wed, 3 Sep 2025 20:01:54 +0800 Subject: [PATCH] =?UTF-8?q?=E9=BB=91=E8=BE=B9=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FP_Prologue/FP_Prologue Shared Data.asset | 12 ++ .../Dialog/FP_Prologue/FP_Prologue_en.asset | 12 ++ .../FP_Prologue/FP_Prologue_zh-Hans.asset | 12 ++ Assets/Scenes/Persistence.unity | 118 +++++------------- .../Framework/OtherKit/LocalizationKit.cs | 3 +- Assets/Scripts/UI/Panel/ChapterPanel.cs | 2 - Assets/StreamingAssets/Config/chapter.json | 2 +- Assets/UI/Art/黑边.png | 4 +- Assets/UI/Art/黑边.png.meta | 6 +- 9 files changed, 71 insertions(+), 100 deletions(-) diff --git a/Assets/Language/Dialog/FP_Prologue/FP_Prologue Shared Data.asset b/Assets/Language/Dialog/FP_Prologue/FP_Prologue Shared Data.asset index 9e5209c20..c3a5a5b43 100644 --- a/Assets/Language/Dialog/FP_Prologue/FP_Prologue Shared Data.asset +++ b/Assets/Language/Dialog/FP_Prologue/FP_Prologue Shared Data.asset @@ -812,6 +812,18 @@ MonoBehaviour: m_Metadata: m_Items: - rid: 4007725415241089132 + - m_Id: 30830409666269184 + m_Key: "\u8BB0\u5FC6" + m_Metadata: + m_Items: [] + - m_Id: 30830420122669056 + m_Key: "\u60C5\u7EEA" + m_Metadata: + m_Items: [] + - m_Id: 30830520999874560 + m_Key: "\u903B\u8F91" + m_Metadata: + m_Items: [] m_Metadata: m_Items: [] m_KeyGenerator: diff --git a/Assets/Language/Dialog/FP_Prologue/FP_Prologue_en.asset b/Assets/Language/Dialog/FP_Prologue/FP_Prologue_en.asset index 184e81326..a96c3be1c 100644 --- a/Assets/Language/Dialog/FP_Prologue/FP_Prologue_en.asset +++ b/Assets/Language/Dialog/FP_Prologue/FP_Prologue_en.asset @@ -640,6 +640,18 @@ MonoBehaviour: m_Localized: "Mustcomplete\u2026exc\u03BBute_core\u20AD\u20ADEhh\u2026Uhhh\u2026" m_Metadata: m_Items: [] + - m_Id: 30830409666269184 + m_Localized: Memory + m_Metadata: + m_Items: [] + - m_Id: 30830420122669056 + m_Localized: Emo + m_Metadata: + m_Items: [] + - m_Id: 30830520999874560 + m_Localized: Logic + m_Metadata: + m_Items: [] references: version: 2 RefIds: [] diff --git a/Assets/Language/Dialog/FP_Prologue/FP_Prologue_zh-Hans.asset b/Assets/Language/Dialog/FP_Prologue/FP_Prologue_zh-Hans.asset index 7227c231d..cd453aa38 100644 --- a/Assets/Language/Dialog/FP_Prologue/FP_Prologue_zh-Hans.asset +++ b/Assets/Language/Dialog/FP_Prologue/FP_Prologue_zh-Hans.asset @@ -614,6 +614,18 @@ MonoBehaviour: m_Localized: "gotash?: \u5FC5\u987B\u5B8C\u6210\u2026\u2026exc\u03BBute_core\u20AD\u20AD\u5443\u2026\u554A\u2026\u2026" m_Metadata: m_Items: [] + - m_Id: 30830409666269184 + m_Localized: "\u8BB0\u5FC6" + m_Metadata: + m_Items: [] + - m_Id: 30830420122669056 + m_Localized: "\u60C5\u7EEA" + m_Metadata: + m_Items: [] + - m_Id: 30830520999874560 + m_Localized: "\u903B\u8F91" + m_Metadata: + m_Items: [] references: version: 2 RefIds: [] diff --git a/Assets/Scenes/Persistence.unity b/Assets/Scenes/Persistence.unity index 54fcedad0..80e194c1d 100644 --- a/Assets/Scenes/Persistence.unity +++ b/Assets/Scenes/Persistence.unity @@ -8807,6 +8807,7 @@ GameObject: - component: {fileID: 519420033} - component: {fileID: 519420034} - component: {fileID: 519420035} + - component: {fileID: 519420036} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -8987,6 +8988,20 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ab36b5f5522a4b42bf6e1054aa92bdce, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &519420036 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 519420028} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 86c6556701af9e04380698b89f691b6e, type: 3} + m_Name: + m_EditorClassIdentifier: + nonRigidbodyVelocity: 0 + attenuationObject: {fileID: 0} --- !u!1 &520475755 GameObject: m_ObjectHideFlags: 0 @@ -13649,8 +13664,8 @@ RectTransform: m_LocalScale: {x: 0, y: 0, z: 0} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 2006133630} - {fileID: 4279140645893611574} + - {fileID: 2006133630} m_Father: {fileID: 1343879457} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -31379,7 +31394,6 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1092037245900995022} - {fileID: 5051198975967391771} - {fileID: 3002724464343117551} m_Father: {fileID: 3421450060170556948} @@ -32275,7 +32289,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 90, y: -30} + m_AnchoredPosition: {x: 90, y: -41.12} m_SizeDelta: {x: 180, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &774766356709506317 @@ -33254,25 +33268,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1092037245900995022 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2414791207550821751} - 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: 545702105296164325} - 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: -181, y: 0} - m_SizeDelta: {x: 300, y: 500} - m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1103630869695482998 GameObject: m_ObjectHideFlags: 0 @@ -33363,8 +33358,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 90, y: -110} - m_SizeDelta: {x: 0, y: 0} + m_AnchoredPosition: {x: 290, y: -41.12} + m_SizeDelta: {x: 180, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &1179649294407379147 RectTransform: @@ -37952,7 +37947,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: -380} + m_SizeDelta: {x: 0, y: -499.745} m_Pivot: {x: 0, y: 1} --- !u!224 &2269458833432623331 RectTransform: @@ -38713,24 +38708,6 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &2414791207550821751 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1092037245900995022} - - component: {fileID: 6596569584681471401} - - component: {fileID: 4914518263987046263} - m_Layer: 5 - m_Name: Image - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 --- !u!114 &2420263190901106984 MonoBehaviour: m_ObjectHideFlags: 0 @@ -41311,8 +41288,8 @@ RectTransform: 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: 120, y: -179} - m_SizeDelta: {x: 180, y: 140} + m_AnchoredPosition: {x: -20, y: -240} + m_SizeDelta: {x: 560, y: 82.24} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &3003683739877155048 MonoBehaviour: @@ -45104,7 +45081,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -30} + m_AnchoredPosition: {x: 109, y: -30} m_SizeDelta: {x: 112, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &3874819584522454143 @@ -47167,7 +47144,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 3840, y: 2160} + m_SizeDelta: {x: 2780, y: 1620} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &4294950592807839846 MonoBehaviour: @@ -49719,36 +49696,6 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!114 &4914518263987046263 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2414791207550821751} - 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: 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: 0 - 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 &4918247861923848375 GameObject: m_ObjectHideFlags: 0 @@ -50255,7 +50202,7 @@ RectTransform: 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: 24, y: 210} + m_AnchoredPosition: {x: -294, y: 220} m_SizeDelta: {x: 300, y: 50} m_Pivot: {x: 0, y: 0.5} --- !u!224 &5053632209175661949 @@ -52172,7 +52119,7 @@ MonoBehaviour: m_Right: 0 m_Top: 0 m_Bottom: 0 - m_ChildAlignment: 7 + m_ChildAlignment: 3 m_StartCorner: 0 m_StartAxis: 0 m_CellSize: {x: 180, y: 60} @@ -57001,14 +56948,6 @@ RectTransform: m_AnchoredPosition: {x: -0.000004371139, y: 100} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6596569584681471401 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2414791207550821751} - m_CullTransparentMesh: 1 --- !u!222 &6627257267112439103 CanvasRenderer: m_ObjectHideFlags: 0 @@ -57102,7 +57041,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -30} + m_AnchoredPosition: {x: 109, y: -30} m_SizeDelta: {x: 112, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6663661713023777227 @@ -62048,7 +61987,6 @@ MonoBehaviour: chapterContentRect: {fileID: 2258326400197388297} errorInfo: {fileID: 6972011957959439507} chapterDetail: {fileID: 5226252568971842993} - chapterDetailImage: {fileID: 4914518263987046263} chapterDetailText: {fileID: 7190461387972107495} continueButton: {fileID: 4623837922595686632} restartButton: {fileID: 1838117938406717428} @@ -68587,7 +68525,7 @@ RectTransform: m_Father: {fileID: 8126345884050016280} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 109, y: -30} m_SizeDelta: {x: 112, y: 0} m_Pivot: {x: 0.5, y: 0.5} diff --git a/Assets/Scripts/Framework/OtherKit/LocalizationKit.cs b/Assets/Scripts/Framework/OtherKit/LocalizationKit.cs index c661be521..23f376ca0 100644 --- a/Assets/Scripts/Framework/OtherKit/LocalizationKit.cs +++ b/Assets/Scripts/Framework/OtherKit/LocalizationKit.cs @@ -3,7 +3,6 @@ using UnityEngine; using UnityEngine.Localization; using UnityEngine.Localization.Settings; using UnityEngine.Localization.Tables; -using UnityEngine.ResourceManagement.AsyncOperations; namespace AibisDream.Framework { @@ -120,7 +119,7 @@ namespace AibisDream.Framework public string TableName { get; } private StringTable _stringTable; - private bool _isInitialized = false; + private bool _isInitialized; public LocalizationTable(string tableName) { diff --git a/Assets/Scripts/UI/Panel/ChapterPanel.cs b/Assets/Scripts/UI/Panel/ChapterPanel.cs index 7dd9372fe..1fa17f970 100644 --- a/Assets/Scripts/UI/Panel/ChapterPanel.cs +++ b/Assets/Scripts/UI/Panel/ChapterPanel.cs @@ -16,7 +16,6 @@ namespace AibisDream public TMP_Text errorInfo; public GameObject chapterDetail; - public Image chapterDetailImage; public TMP_Text chapterDetailText; public Button continueButton; public Button restartButton; @@ -126,7 +125,6 @@ namespace AibisDream { chapterDetail.SetActive(true); - chapterDetailImage.sprite = chapterVo.pic; chapterDetailText.text = chapterVo.desc; continueButton.gameObject.SetActive(chapterVo.hasSaveFile); diff --git a/Assets/StreamingAssets/Config/chapter.json b/Assets/StreamingAssets/Config/chapter.json index b32dafa31..0637a088a 100644 --- a/Assets/StreamingAssets/Config/chapter.json +++ b/Assets/StreamingAssets/Config/chapter.json @@ -1 +1 @@ -["PeipeiDay1"] \ No newline at end of file +[] \ No newline at end of file diff --git a/Assets/UI/Art/黑边.png b/Assets/UI/Art/黑边.png index 2be9c77b9..ddc8753a4 100644 --- a/Assets/UI/Art/黑边.png +++ b/Assets/UI/Art/黑边.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f70aa12b64c9078b4017823bf6248ff7180ec03f6eab5a6ff434d4e17bba0505 -size 5044 +oid sha256:3b07037e3079910c9b130db6087360015b2c5cc34ada5b8728cc5953404a5edc +size 23917 diff --git a/Assets/UI/Art/黑边.png.meta b/Assets/UI/Art/黑边.png.meta index cad977429..7ea294296 100644 --- a/Assets/UI/Art/黑边.png.meta +++ b/Assets/UI/Art/黑边.png.meta @@ -34,7 +34,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 + filterMode: 0 aniso: 1 mipBias: 0 wrapU: 1 @@ -69,10 +69,10 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 4096 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0