From 3df0365d107583964fd82b2d29557eb5c1d44c59 Mon Sep 17 00:00:00 2001 From: bottlefish <781230111@qq.com> Date: Thu, 26 Jun 2025 18:03:18 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=89=93=E5=8C=85?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=92=8Cbug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Scenes/Persistence.unity | 12 ++++++------ Assets/Scripts/UI/Panel/EndPanel.cs | 4 ++-- ProjectSettings/ProjectSettings.asset | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Assets/Scenes/Persistence.unity b/Assets/Scenes/Persistence.unity index 736192988..362f4ca2e 100644 --- a/Assets/Scenes/Persistence.unity +++ b/Assets/Scenes/Persistence.unity @@ -10451,7 +10451,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: feee73ba51d6e1a4da81ed7f94ab4694, type: 3} m_Name: m_EditorClassIdentifier: - runMode: 1 + runMode: 0 firstTalkSo: {fileID: 11400000, guid: 2f763a2c04ecafb4981379b7363f9791, type: 2} testTalkSo: {fileID: 11400000, guid: 10601ce26230723479d875a630f15732, type: 2} saveFileName: @@ -22294,7 +22294,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: 300, y: -241.73447} + m_AnchoredPosition: {x: 300, y: -241.75} m_SizeDelta: {x: 300, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1758246148 @@ -23295,9 +23295,9 @@ RectTransform: - {fileID: 2139849581} m_Father: {fileID: 2091451641} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -600, y: 0} m_SizeDelta: {x: 600, y: 0} m_Pivot: {x: 0, y: 0.5} --- !u!114 &1867622715 @@ -27015,7 +27015,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: 300, y: -731.70337} + m_AnchoredPosition: {x: 300, y: -731.75} m_SizeDelta: {x: 298, y: 313} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2139849582 diff --git a/Assets/Scripts/UI/Panel/EndPanel.cs b/Assets/Scripts/UI/Panel/EndPanel.cs index 1291c3f80..d99a05b15 100644 --- a/Assets/Scripts/UI/Panel/EndPanel.cs +++ b/Assets/Scripts/UI/Panel/EndPanel.cs @@ -13,7 +13,7 @@ namespace AibisDream public void Show() { - GameManager.Instance.PauseGame(); + // GameManager.Instance.PauseGame(); gameObject.SetActive(true); RegisterButton(); } @@ -22,7 +22,7 @@ namespace AibisDream { gameObject.SetActive(false); UnRegisterButton(); - GameManager.Instance.ContinueGame(); + // GameManager.Instance.ContinueGame(); } #endregion diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 8834b6e1c..14d903f70 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -133,7 +133,7 @@ PlayerSettings: vulkanEnableLateAcquireNextImage: 0 vulkanEnableCommandBufferRecycling: 1 loadStoreDebugModeEnabled: 0 - bundleVersion: 0.3.0.21-20250625-235617 + bundleVersion: 0.3.0.23-20250626-173034 preloadedAssets: - {fileID: 11400000, guid: 0fb2bc2476953fc43a74f0ab8879077c, type: 2} metroInputSource: 0 @@ -658,7 +658,7 @@ PlayerSettings: webGLMemoryGeometricGrowthCap: 96 webGLPowerPreference: 2 scriptingDefineSymbols: - Android: DOTWEEN + Android: DOTWEEN;SHAPES_URP EmbeddedLinux: DOTWEEN GameCoreScarlett: DOTWEEN GameCoreXboxOne: DOTWEEN From dead40d87540f30cc9badf8a70ac78917dcecc1d Mon Sep 17 00:00:00 2001 From: bottlefish <781230111@qq.com> Date: Thu, 26 Jun 2025 18:16:04 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=89=93=E5=8C=85?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/AddressableAssetsData/link.xml | 528 +++++++++++++++++++++ Assets/AddressableAssetsData/link.xml.meta | 7 + ProjectSettings/ProjectSettings.asset | 2 +- 3 files changed, 536 insertions(+), 1 deletion(-) create mode 100644 Assets/AddressableAssetsData/link.xml create mode 100644 Assets/AddressableAssetsData/link.xml.meta diff --git a/Assets/AddressableAssetsData/link.xml b/Assets/AddressableAssetsData/link.xml new file mode 100644 index 000000000..63db36922 --- /dev/null +++ b/Assets/AddressableAssetsData/link.xml @@ -0,0 +1,528 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ 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..8c01dea86 --- /dev/null +++ b/Assets/AddressableAssetsData/link.xml.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 48b54d35ebbd16042a546482cf57c917 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 14d903f70..7e83623f8 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -133,7 +133,7 @@ PlayerSettings: vulkanEnableLateAcquireNextImage: 0 vulkanEnableCommandBufferRecycling: 1 loadStoreDebugModeEnabled: 0 - bundleVersion: 0.3.0.23-20250626-173034 + bundleVersion: 0.3.0.24-20250626-180808 preloadedAssets: - {fileID: 11400000, guid: 0fb2bc2476953fc43a74f0ab8879077c, type: 2} metroInputSource: 0