diff --git a/Assets/AddressableAssetsData/link.xml b/Assets/AddressableAssetsData/link.xml
new file mode 100644
index 000000000..03b8f7c06
--- /dev/null
+++ b/Assets/AddressableAssetsData/link.xml
@@ -0,0 +1,558 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ 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..aeeb56e30
--- /dev/null
+++ b/Assets/AddressableAssetsData/link.xml.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 584f40cda73fae84ca1b41fb44dd0e6a
+TextScriptImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scenes/Persistence.unity b/Assets/Scenes/Persistence.unity
index 9d65cc818..7360652a8 100644
--- a/Assets/Scenes/Persistence.unity
+++ b/Assets/Scenes/Persistence.unity
@@ -412,8 +412,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: 297, y: -184}
- m_SizeDelta: {x: 500, y: 500}
+ m_AnchoredPosition: {x: 144, y: -293}
+ m_SizeDelta: {x: 500, y: 400}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &23905304
MonoBehaviour:
@@ -6882,7 +6882,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
defaultOptions: {fileID: 1612148021}
centerOptions: {fileID: 1586904157}
- dreamOptions: {fileID: 0}
+ onelineOptions: {fileID: 23905304}
defaultViewType: 1
--- !u!1 &387773934
GameObject:
@@ -12645,7 +12645,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!224 &761395783
RectTransform:
m_ObjectHideFlags: 0
diff --git a/Assets/Scenes/梦境.unity b/Assets/Scenes/梦境.unity
index c844f2e3f..a53fe5138 100644
--- a/Assets/Scenes/梦境.unity
+++ b/Assets/Scenes/梦境.unity
@@ -279,7 +279,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!81 &754616037
AudioListener:
m_ObjectHideFlags: 0
@@ -429,6 +429,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 132823523}
+ - {fileID: 1274244986}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &861686056
@@ -443,6 +444,37 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 41ad0a33cf7036c4b8f67fcae5e0c972, type: 3}
m_Name:
m_EditorClassIdentifier:
+--- !u!1 &1274244985
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1274244986}
+ m_Layer: 0
+ m_Name: "\u68A6\u5883\u56FE\u7247"
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &1274244986
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1274244985}
+ serializedVersion: 2
+ 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: 861686055}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1420961917
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/Scripts/Dialog System/OptionView.cs b/Assets/Scripts/Dialog System/OptionView.cs
index 3dfe3f4b9..a9e93d4dd 100644
--- a/Assets/Scripts/Dialog System/OptionView.cs
+++ b/Assets/Scripts/Dialog System/OptionView.cs
@@ -11,7 +11,7 @@ namespace AibisDream
private HashSet _selectedIds = new();
[SerializeField] private DefaultOptions defaultOptions;
[SerializeField] private CenterOptions centerOptions;
- [SerializeField] private DreamOptions dreamOptions;
+ [SerializeField] private OnelineOptions onelineOptions;
[SerializeField] private DialogViewType defaultViewType = DialogViewType.StandardBubble;
public void LoadBubbles(BubbleSlotGroupData data)
@@ -33,7 +33,7 @@ namespace AibisDream
defaultOptions.ShowOptions(options);
break;
case DialogViewType.OnelineBox:
- dreamOptions.ShowOptions(options);
+ onelineOptions.ShowOptions(options);
break;
case DialogViewType.CenterOption:
centerOptions.ShowOptions(options);
diff --git a/Assets/Scripts/Framework/LogKit/LogKit.cs b/Assets/Scripts/Framework/LogKit/LogKit.cs
index a86d0baad..4a38cc780 100644
--- a/Assets/Scripts/Framework/LogKit/LogKit.cs
+++ b/Assets/Scripts/Framework/LogKit/LogKit.cs
@@ -1,5 +1,6 @@
using System;
using UnityEngine;
+using AibisDream.Utility;
namespace AibisDream.Kit
{
diff --git a/Assets/Scripts/UI/DialogUI/Options/DreamOption.cs b/Assets/Scripts/UI/DialogUI/Options/OnelineOption.cs
similarity index 98%
rename from Assets/Scripts/UI/DialogUI/Options/DreamOption.cs
rename to Assets/Scripts/UI/DialogUI/Options/OnelineOption.cs
index 5d661094b..161214c3c 100644
--- a/Assets/Scripts/UI/DialogUI/Options/DreamOption.cs
+++ b/Assets/Scripts/UI/DialogUI/Options/OnelineOption.cs
@@ -5,7 +5,7 @@ using TMPro;
namespace AibisDream
{
- public class DreamOption : MonoBehaviour
+ public class OnelineOption : MonoBehaviour
{
[SerializeField] private TMP_Text text;
[SerializeField] private BaseButton button;
diff --git a/Assets/Scripts/UI/DialogUI/Options/DreamOption.cs.meta b/Assets/Scripts/UI/DialogUI/Options/OnelineOption.cs.meta
similarity index 100%
rename from Assets/Scripts/UI/DialogUI/Options/DreamOption.cs.meta
rename to Assets/Scripts/UI/DialogUI/Options/OnelineOption.cs.meta
diff --git a/Assets/Scripts/UI/DialogUI/Options/DreamOptions.cs b/Assets/Scripts/UI/DialogUI/Options/OnelineOptions.cs
similarity index 76%
rename from Assets/Scripts/UI/DialogUI/Options/DreamOptions.cs
rename to Assets/Scripts/UI/DialogUI/Options/OnelineOptions.cs
index 09a8dadfa..10dc8e88f 100644
--- a/Assets/Scripts/UI/DialogUI/Options/DreamOptions.cs
+++ b/Assets/Scripts/UI/DialogUI/Options/OnelineOptions.cs
@@ -3,7 +3,7 @@ using AibisDream.Framework;
namespace AibisDream
{
- public class DreamOptions : MonoBehaviour
+ public class OnelineOptions : MonoBehaviour
{
[SerializeField] private GameObject choiceButtonPrefab;
[SerializeField] private bool showDisabledOptions;
@@ -12,11 +12,7 @@ namespace AibisDream
{
gameObject.SetActive(true);
- // 销毁原来的按钮
- foreach (Transform child in transform)
- {
- Destroy(child.gameObject);
- }
+ Debug.Log($"ShowOptions: {dialogOptions.Length}, {dialogOptions[0].Line}");
// 生成新按钮
foreach (var option in dialogOptions)
@@ -26,10 +22,10 @@ namespace AibisDream
// 生成按钮
var choiceInstance = Instantiate(choiceButtonPrefab, transform);
- var choiceButton = choiceInstance.GetComponent();
+ var choiceButton = choiceInstance.GetComponent();
choiceButton.Init();
- choiceButton.SetOption(option, HideOptions);
+ choiceButton.SetOption(option);
}
}
diff --git a/Assets/Scripts/UI/DialogUI/Options/DreamOptions.cs.meta b/Assets/Scripts/UI/DialogUI/Options/OnelineOptions.cs.meta
similarity index 100%
rename from Assets/Scripts/UI/DialogUI/Options/DreamOptions.cs.meta
rename to Assets/Scripts/UI/DialogUI/Options/OnelineOptions.cs.meta
diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
index 9625db052..d21ab8249 100644
--- a/ProjectSettings/ProjectSettings.asset
+++ b/ProjectSettings/ProjectSettings.asset
@@ -133,7 +133,7 @@ PlayerSettings:
vulkanEnableLateAcquireNextImage: 0
vulkanEnableCommandBufferRecycling: 1
loadStoreDebugModeEnabled: 0
- bundleVersion: 0.4.0.5-20251231-183700
+ bundleVersion: 0.4.0.7-20260104-153041
preloadedAssets:
- {fileID: 11400000, guid: 0fb2bc2476953fc43a74f0ab8879077c, type: 2}
metroInputSource: 0