tinbird/aibis-dream
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'bugfix/为playtest小修' into 'develop'

Browse Source 
Bugfix/为playtest小修

See merge request aibis-dream/aibis-dream!545
This commit is contained in:
dingyuntian
2025-09-02 08:01:41 +00:00
parent 111c143fdf 62d3ebf6ae
commit b956cffdff
28 changed files with 9569 additions and 4508 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Language/Dialog/FP_Day1_mid/FP_Day1_mid Shared Data.asset
+722 -100
View File
File diff suppressed because it is too large Load Diff
Assets/Language/Dialog/FP_Day1_mid/FP_Day1_mid_en.asset
+9
View File
@@ -434,6 +434,15 @@ MonoBehaviour:
m_Localized: Back to the consultation room
m_Metadata:
m_Items: []
- m_Id: 28414440050253824
m_Localized: Thanks for playing All Our Broken Parts. The demo experience ends
here.
m_Metadata:
m_Items: []
- m_Id: 28414440008310784
m_Localized: "peipei: Right\uFF0C<waitfor=0.2>we are Robots."
m_Metadata:
m_Items: []
references:
version: 2
RefIds: []
Assets/Language/Dialog/FP_Day1_mid/FP_Day1_mid_zh-Hans.asset
+15 -8
View File
@@ -31,8 +31,7 @@ MonoBehaviour:
m_Metadata:
m_Items: []
- m_Id: 134690799618
m_Localized: "\u6211\u672C\u6765\u4E0D\u5E94\u8BE5\u9700\u8981\u66FF\u4F60\u64CD\u5FC3\u8FD9\u4E9B\u4E8B\u60C5\u7684\uFF0C\u552F\u72EC\u4F60\u2026\u2026:
but you're the only one\u2026"
m_Localized: "yl: \u6211\u672C\u6765\u4E0D\u5E94\u8BE5\u9700\u8981\u66FF\u4F60\u64CD\u5FC3\u8FD9\u4E9B\u4E8B\u60C5\u7684\uFF0C\u552F\u72EC\u4F60\u2026\u2026"
m_Metadata:
m_Items: []
- m_Id: 134690799619
@@ -40,8 +39,7 @@ MonoBehaviour:
m_Metadata:
m_Items: []
- m_Id: 134690799620
m_Localized: "\u4F60\u662F\u4E0D\u662F\u4E0D\u60F3\u6D3B\u4E86\uFF1F\u4E0D\u60F3\u6D3B\u4E86\u53EF\u4EE5\u73B0\u5728\u5C31\u7533\u8BF7\u56DE\u6536\u3002:
you can apply for recycling right now."
m_Localized: "yl: \u4F60\u662F\u4E0D\u662F\u4E0D\u60F3\u6D3B\u4E86\uFF1F\u4E0D\u60F3\u6D3B\u4E86\u53EF\u4EE5\u73B0\u5728\u5C31\u7533\u8BF7\u56DE\u6536\u3002"
m_Metadata:
m_Items: []
- m_Id: 134690799621
@@ -49,7 +47,7 @@ MonoBehaviour:
m_Metadata:
m_Items: []
- m_Id: 134690799622
m_Localized: me
m_Localized: 'me:'
m_Metadata:
m_Items: []
- m_Id: 134690799623
@@ -233,7 +231,7 @@ MonoBehaviour:
m_Metadata:
m_Items: []
- m_Id: 134690799952
m_Localized: "me: \u2026\u2026"
m_Localized: 'me: Nostalgia?'
m_Metadata:
m_Items: []
- m_Id: 134690799953
@@ -353,7 +351,7 @@ MonoBehaviour:
m_Metadata:
m_Items: []
- m_Id: 134690799982
m_Localized: "peipei: \u5BF9\u554A\uFF0C<waitfor=0.2>\u6211\u4EEC\u662F\u673A\u4F53\u3002"
m_Localized: "\u4F69\u4F69\u4F9D\u65E7\u62AC\u7740\u5934\uFF0C\u6811\u53F6\u4ECE\u5B83\u7684\u9762\u524D\u98D8\u843D\u3002"
m_Metadata:
m_Items: []
- m_Id: 134690799983
@@ -409,7 +407,7 @@ MonoBehaviour:
m_Metadata:
m_Items: []
- m_Id: 134690799996
m_Localized: "\u518D\u89C1\u4E86\uFF0C<waitfor=0.4>\u53F6\u5B50\u3002"
m_Localized: "peipei: \u518D\u89C1\u4E86\uFF0C<waitfor=0.4>\u53F6\u5B50\u3002"
m_Metadata:
m_Items: []
- m_Id: 134690799997
@@ -420,6 +418,15 @@ MonoBehaviour:
m_Localized: "\u56DE\u5230\u8BCA\u5BA4"
m_Metadata:
m_Items: []
- m_Id: 28414440008310784
m_Localized: "peipei: \u5BF9\u554A\uFF0C<waitfor=0.2>\u6211\u4EEC\u662F\u673A\u4F53\u3002"
m_Metadata:
m_Items: []
- m_Id: 28414440050253824
m_Localized: "\u611F\u8C22\u6E38\u73A9 \u7231\u4E0E\u673A\u5668\u4EBA\u7EF4\u4FEE\u6280\u672F
\uFF0C\u672C\u6B21demo\u7684\u4F53\u9A8C\u6D41\u7A0B\u5DF2\u7ED3\u675F\u3002"
m_Metadata:
m_Items: []
references:
version: 2
RefIds: []
Assets/Language/Dialog/FP_Peipei1/FP_Peipei1 Shared Data.asset
+2742 -391
View File
File diff suppressed because it is too large Load Diff
Assets/Language/Dialog/FP_Peipei1/FP_Peipei1_en.asset
+466 -499
View File
File diff suppressed because it is too large Load Diff
Assets/Language/Params/Params Shared Data.asset
+12
View File
@@ -31,6 +31,18 @@ MonoBehaviour:
m_Key: "\u670B\u53CB"
m_Metadata:
m_Items: []
- m_Id: 38228265868734464
m_Key: "\u60C5\u7EEA"
m_Metadata:
m_Items: []
- m_Id: 38228311804751872
m_Key: "\u8BB0\u5FC6"
m_Metadata:
m_Items: []
- m_Id: 38228890660646912
m_Key: "\u903B\u8F91"
m_Metadata:
m_Items: []
m_Metadata:
m_Items: []
m_KeyGenerator:
Assets/Language/Params/Params_en.asset
+12
View File
@@ -34,6 +34,18 @@ MonoBehaviour:
m_Localized: Poster
m_Metadata:
m_Items: []
- m_Id: 38228265868734464
m_Localized: Emo
m_Metadata:
m_Items: []
- m_Id: 38228311804751872
m_Localized: Memory
m_Metadata:
m_Items: []
- m_Id: 38228890660646912
m_Localized: Logic
m_Metadata:
m_Items: []
references:
version: 2
RefIds: []
Assets/Language/Params/Params_zh-Hans.asset
+12
View File
@@ -34,6 +34,18 @@ MonoBehaviour:
m_Localized: "\u670B\u53CB"
m_Metadata:
m_Items: []
- m_Id: 38228265868734464
m_Localized: "\u60C5\u7EEA"
m_Metadata:
m_Items: []
- m_Id: 38228311804751872
m_Localized: "\u8BB0\u5FC6"
m_Metadata:
m_Items: []
- m_Id: 38228890660646912
m_Localized: "\u903B\u8F91"
m_Metadata:
m_Items: []
references:
version: 2
RefIds: []
Assets/Language/UIText/UIText Shared Data.asset
+16
View File
@@ -175,6 +175,22 @@ MonoBehaviour:
m_Key: bug_report
m_Metadata:
m_Items: []
- m_Id: 47648061470531584
m_Key: note
m_Metadata:
m_Items: []
- m_Id: 47671075222315008
m_Key: Pain
m_Metadata:
m_Items: []
- m_Id: 47672437142183936
m_Key: Stop
m_Metadata:
m_Items: []
- m_Id: 47673186144215040
m_Key: "Kill\t"
m_Metadata:
m_Items: []
m_Metadata:
m_Items: []
m_KeyGenerator:
Assets/Language/UIText/UIText_en.asset
+16
View File
@@ -192,6 +192,22 @@ MonoBehaviour:
m_Localized: Bug Report
m_Metadata:
m_Items: []
- m_Id: 47648061470531584
m_Localized: Early test, not final quality
m_Metadata:
m_Items: []
- m_Id: 47671075222315008
m_Localized: Please, JUST LET ME DIE
m_Metadata:
m_Items: []
- m_Id: 47672437142183936
m_Localized: JUST STOP! STOP PLEASE !
m_Metadata:
m_Items: []
- m_Id: 47673186144215040
m_Localized: KILL ME! KILL ME!
m_Metadata:
m_Items: []
references:
version: 2
RefIds:
Assets/Language/UIText/UIText_zh-Hans.asset
+16
View File
@@ -180,6 +180,22 @@ MonoBehaviour:
m_Localized: "Bug\u53CD\u9988"
m_Metadata:
m_Items: []
- m_Id: 47648061470531584
m_Localized: "\u65E9\u671F\u6D4B\u8BD5\uFF0C\u4E0D\u4EE3\u8868\u6700\u7EC8\u54C1\u8D28"
m_Metadata:
m_Items: []
- m_Id: 47671075222315008
m_Localized: "\u8BA9\u6211\u6B7B\uFF0C\u8BA9\u6211\u53BB\u6B7B"
m_Metadata:
m_Items: []
- m_Id: 47672437142183936
m_Localized: "\u505C\u4E0B\u6765\uFF01\u505C\u4E0B\u6765\uFF01"
m_Metadata:
m_Items: []
- m_Id: 47673186144215040
m_Localized: "\u6740\u4E86\u6211\u5427\uFF01\u6740\u4E86\u6211\u5427\uFF01"
m_Metadata:
m_Items: []
references:
version: 2
RefIds:
Assets/Resources/Yarn/FP_Day1_mid/Day1_mid.yarn
+9 -9
View File
@@ -260,15 +260,15 @@ peipei: 再见了，<waitfor=0.4>叶子。 #line:0694ade
<<wait 1>>
<<fade_in 1>>
<<wait 1>>
<<NextYarn>>
// <<load_scene SubWay 1>>
// <<init_actor 地铁医生 左边>>
// <<show_actor 地铁医生>>
// <<init_environment Night>>
// // <<set_time_of_day EnvironmentManager "night">>
// <<fade_out 1>>
// <<wait 1>>
// 感谢游玩 爱与机器人维修技术 ，本次demo的体验流程已结束。 #line:0cd82d0
// <<NextYarn>>
<<load_scene SubWay 1>>
<<init_actor 地铁医生 左边>>
<<show_actor 地铁医生>>
<<init_environment Night>>
// <<set_time_of_day EnvironmentManager "night">>
<<fade_out 1>>
<<wait 1>>
感谢游玩 爱与机器人维修技术 ，本次demo的体验流程已结束。 #line:0cd82d0
//<<OpenEndMenu>>
===
Assets/Resources/Yarn/FP_Peipei1/Stage4_记忆检查.yarn
+1 -1
View File
@@ -68,7 +68,7 @@ position: -871,-2773
peipei: 医生…快停下。 #line:001082a
peipei: 我…我的头好痛…… #line:04b5588
me: 记忆波动引发的头痛吗……看来是原型排异没错了。 #line:01fe459
peipei: 原型…排异？
// peipei: 原型…排异？
<<hide_dialog>>
<<Set_MouseMovementLockState EyeManager false>>
<<set $ufDiscussCount=3>>
Assets/Resources/Yarn/FP_Prologue/EventNode.yarn
+3 -3
View File
@@ -4,7 +4,7 @@ colorID: 8
position: -2,-3039
---
// <<jump 检查情绪>>
<<set $currentCheckModule="情绪">>
<<set $currentCheckModule="l10n.情绪">>
<<set $currentCutModule="EmoCut">>
<<jump 检查异常模块>>
===
@@ -23,7 +23,7 @@ colorID: 8
position: 480,-3040
---
// <<jump 检查逻辑>>
<<set $currentCheckModule="逻辑">>
<<set $currentCheckModule="l10n.逻辑">>
<<set $currentCutModule="LogicCut">>
<<jump 检查异常模块>>
===
@@ -34,7 +34,7 @@ colorID: 8
position: 240,-3040
---
// <<jump 检查记忆>>
<<set $currentCheckModule="记忆">>
<<set $currentCheckModule="l10n.记忆">>
<<set $currentCutModule="MemoryCut">>
<<jump 检查异常模块>>
===
Assets/Scenes/ClinicOut.unity
+1 -1
View File
@@ -1412,7 +1412,7 @@ MonoBehaviour:
slotPosition: {x: 0, y: 0, z: 0}
actorRole: 2
idx: 0
maxWidth: 500
maxWidth: 450
minWidth: 250
bubbleStyle: {fileID: 11400000, guid: ca21b5df246f59945a0e2d33eba8a31b, type: 2}
pivotType: 3
Assets/Scenes/OpenFixScene.unity
+2901 -836
View File
File diff suppressed because it is too large Load Diff
Assets/Scenes/PeipeiFixScene.unity
+2354 -2347
View File
File diff suppressed because it is too large Load Diff
Assets/Scenes/Persistence.unity
+176 -271
View File
@@ -8807,7 +8807,6 @@ GameObject:
- component: {fileID: 519420033}
- component: {fileID: 519420034}
- component: {fileID: 519420035}
- component: {fileID: 519420036}
m_Layer: 0
m_Name: Main Camera
m_TagString: MainCamera
@@ -8977,20 +8976,6 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls: []
--- !u!114 &519420035
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!114 &519420036
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -16753,6 +16738,7 @@ RectTransform:
- {fileID: 1696845842}
- {fileID: 1180038149}
- {fileID: 1992739114}
- {fileID: 2056993779}
m_Father: {fileID: 2091451641}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
@@ -23266,127 +23252,6 @@ Transform:
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1677170541
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1677170545}
- component: {fileID: 1677170544}
- component: {fileID: 1677170543}
- component: {fileID: 1677170542}
m_Layer: 5
m_Name: Button
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &1677170542
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1677170541}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_WrapAround: 0
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 1
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_SelectedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_SelectedTrigger: Selected
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 1677170543}
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!114 &1677170543
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1677170541}
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: 10905, guid: 0000000000000000f000000000000000, type: 0}
m_Type: 1
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!222 &1677170544
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1677170541}
m_CullTransparentMesh: 1
--- !u!224 &1677170545
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1677170541}
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:
- {fileID: 2021050569}
m_Father: {fileID: 0}
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: 0, y: 0}
m_SizeDelta: {x: 160, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &1689237971
GameObject:
m_ObjectHideFlags: 0
@@ -27133,140 +26998,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2019424939}
m_CullTransparentMesh: 1
--- !u!1 &2021050568
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2021050569}
- component: {fileID: 2021050571}
- component: {fileID: 2021050570}
m_Layer: 5
m_Name: Text (TMP)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &2021050569
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2021050568}
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: 1677170545}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &2021050570
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2021050568}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: Button
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4281479730
m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, 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: 24
m_fontSizeBase: 24
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!222 &2021050571
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2021050568}
m_CullTransparentMesh: 1
--- !u!1001 &2033425615
PrefabInstance:
m_ObjectHideFlags: 0
@@ -27915,6 +27646,181 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2038665815}
m_CullTransparentMesh: 1
--- !u!1 &2056993778
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2056993779}
- component: {fileID: 2056993781}
- component: {fileID: 2056993780}
- component: {fileID: 2056993782}
m_Layer: 5
m_Name: Text (TMP)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &2056993779
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2056993778}
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: 1216017968}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: -10, y: 25}
m_SizeDelta: {x: 200, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &2056993780
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2056993778}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: New Text
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: f242fb3dde1933640859f1c54591c9c8, type: 2}
m_sharedMaterial: {fileID: -6659093157667844055, guid: f242fb3dde1933640859f1c54591c9c8, 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: 30
m_fontSizeBase: 30
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
m_HorizontalAlignment: 2
m_VerticalAlignment: 256
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: -144.49774, y: 0, z: -242.18636, 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!222 &2056993781
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2056993778}
m_CullTransparentMesh: 1
--- !u!114 &2056993782
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2056993778}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 56eb0353ae6e5124bb35b17aff880f16, type: 3}
m_Name:
m_EditorClassIdentifier:
m_StringReference:
m_TableReference:
m_TableCollectionName: GUID:994c69bf4b2403043bc9562f2d24ee56
m_TableEntryReference:
m_KeyId: 47648061470531584
m_Key:
m_FallbackState: 0
m_WaitForCompletion: 0
m_LocalVariables: []
m_FormatArguments: []
m_UpdateString:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 2056993780}
m_TargetAssemblyTypeName: TMPro.TMP_Text, Unity.TextMeshPro
m_MethodName: set_text
m_Mode: 0
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName:
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 1
references:
version: 2
RefIds: []
--- !u!1 &2065230354
GameObject:
m_ObjectHideFlags: 0
@@ -69651,4 +69557,3 @@ SceneRoots:
- {fileID: 1009826577}
- {fileID: 1110722291}
- {fileID: 1655147933}
- {fileID: 1677170545}
Assets/ScriptableObjects/SceneSO/Day1_mid.asset
+1 -1
View File
@@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 157431981b8a721458e6706c374a3867, type: 3}
m_Name: Day1_mid
m_EditorClassIdentifier:
nextScene: {fileID: 11400000, guid: 6d49b124127007b48b6881ce33350263, type: 2}
nextScene: {fileID: 0}
yarnProject: {fileID: 7545569452688597077, guid: 293561ce52efc594399242651d44b366, type: 3}
firstSceneName: ClinicOut
title: "\u5348\u4F11"
Assets/Scripts/FixSystemNew/FixStateMachine.cs
+3 -2
View File
@@ -114,12 +114,12 @@ namespace AibisDream.FixSystem
public IEnumerator Enter()
{
// 切换相机
yield return CameraKit.Instance.SwitchCamera(CameraEnum.Clinic);
// 注册对话气泡
var clinicSystem = FixSystemCenter.SystemDic.Get<ClinicSystem>();
var data = clinicSystem.bubbleSlotGroup.CollectData();
BubbleGroup.Instance.LoadBubbles(data);
// 切换相机
yield return CameraKit.Instance.SwitchCamera(CameraEnum.Clinic);
}
public IEnumerator Exit()
@@ -320,6 +320,7 @@ namespace AibisDream.FixSystem
public IEnumerator Enter()
{
var bodyModuleSystem = FixSystemCenter.SystemDic.Get<BodyModuleSystem>();
bodyModuleSystem.SwitchModuleGroup(ModuleState.Head);
var eyeSystem = FixSystemCenter.SystemDic.Get<EyeSystem>();
// 先切BodyModule
if (!CameraKit.Instance.EqualToCameraState(CameraEnum.BodyModule))
Assets/Scripts/Framework/OtherKit/CameraKit.cs
+9 -6
View File
@@ -58,12 +58,6 @@ namespace AibisDream.Framework
_curCameraEnum = CameraEnum.Default;
foreach (var overlayCam in _orthoMainCamera.GetUniversalAdditionalCameraData().cameraStack)
{
overlayCam.UpdateCameraViewport();
}
_orthoMainCamera.UpdateCameraViewport();
// if (_orthoMainCamera && _perspectiveMainCamera)
// {
// // 默认激活正交相机，禁用透视相机
@@ -74,6 +68,15 @@ namespace AibisDream.Framework
#region 相机信息注册
public void UpdateCameraViewport()
{
foreach (var overlayCam in _orthoMainCamera.GetUniversalAdditionalCameraData().cameraStack)
{
overlayCam.UpdateCameraViewport();
}
_orthoMainCamera.UpdateCameraViewport();
}
public void RegisterUICamera(Camera overlayCamera)
{
// 获取 Main Camera 的 UniversalAdditionalCameraData
Assets/Scripts/Framework/OtherKit/LocalizationKit.cs
+55 -20
View File
@@ -3,6 +3,7 @@ using UnityEngine;
using UnityEngine.Localization;
using UnityEngine.Localization.Settings;
using UnityEngine.Localization.Tables;
using UnityEngine.ResourceManagement.AsyncOperations;
namespace AibisDream.Framework
{
@@ -47,20 +48,23 @@ namespace AibisDream.Framework
}
#endif
public static void SwitchLanguage(string localeCode)
{
var selectedLocale =
LocalizationSettings.AvailableLocales.Locales.Find(locale => locale.Identifier.Code == localeCode);
public static async void SwitchLanguage(string localeCode)
{
// 等待本地化系统初始化完成
await LocalizationSettings.InitializationOperation.Task;
var selectedLocale =
LocalizationSettings.AvailableLocales.Locales.Find(locale => locale.Identifier.Code == localeCode);
if (selectedLocale)
{
LocalizationSettings.SelectedLocale = selectedLocale;
}
else
{
Debug.LogWarning($"Locale with code {localeCode} not found.");
}
if (selectedLocale)
{
LocalizationSettings.SelectedLocale = selectedLocale;
}
else
{
Debug.LogWarning($"Locale with code {localeCode} not found.");
}
}
/// <summary>
/// 本地化参数
@@ -100,6 +104,15 @@ namespace AibisDream.Framework
// 本地化参数则去除前缀，非本地化参数直接返回
return key.StartsWith(LocalizationPrefix) ? key[LocalizationPrefix.Length..] : key;
}
/// <summary>
/// 确保本地化系统已初始化
/// </summary>
/// <returns>初始化操作</returns>
public static async System.Threading.Tasks.Task EnsureInitialized()
{
await LocalizationSettings.InitializationOperation.Task;
}
}
public class LocalizationTable
@@ -107,36 +120,58 @@ namespace AibisDream.Framework
public string TableName { get; }
private StringTable _stringTable;
private bool _isInitialized = false;
public LocalizationTable(string tableName)
{
TableName = tableName;
Debug.Log($"表格{tableName}已加载");
Debug.Log($"开始初始化表格{tableName}");
InitializeAsync();
}
private async void InitializeAsync()
{
// 等待本地化系统初始化完成
await LocalizationSettings.InitializationOperation.Task;
_stringTable = LocalizationSettings.StringDatabase.GetTable(TableName);
LocalizationSettings.SelectedLocaleChanged += OnLocaleChanged;
_isInitialized = true;
Debug.Log($"表格{_stringTable.TableCollectionName}已加载");
Debug.Log($"表格{TableName}已成功加载");
}
public void Dispose()
{
LocalizationSettings.SelectedLocaleChanged -= OnLocaleChanged;
if (_isInitialized)
{
LocalizationSettings.SelectedLocaleChanged -= OnLocaleChanged;
}
_stringTable = null;
_isInitialized = false;
}
private void OnLocaleChanged(Locale locale)
{
_stringTable = LocalizationSettings.StringDatabase.GetTable(TableName);
if (_isInitialized)
{
_stringTable = LocalizationSettings.StringDatabase.GetTable(TableName);
}
}
public StringTableEntry this[string key] => _stringTable[key];
public StringTableEntry this[string key] => _isInitialized ? _stringTable?[key] : null;
public bool TryGetValue(string key, out StringTableEntry value)
{
value = _stringTable.GetEntry(key);
return value != null;
if (_isInitialized && _stringTable != null)
{
value = _stringTable.GetEntry(key);
return value != null;
}
value = null;
return false;
}
public LocaleIdentifier LocaleIdentifier => _stringTable.LocaleIdentifier;
public LocaleIdentifier? LocaleIdentifier => _isInitialized ? _stringTable?.LocaleIdentifier : null;
}
}
Assets/Scripts/Game Loop/ChapterController.cs
+1 -1
View File
@@ -35,7 +35,7 @@ namespace AibisDream
chapter = chapterSo.chapter,
desc = chapterSo.description,
pic = chapterSo.coverPic,
hasSaveFile = cacheChapter == chapterSo.chapter
hasSaveFile = cacheChapter == chapterSo.name
})
.ToList();
Assets/Scripts/Game Loop/GameManager.cs
+4 -1
View File
@@ -191,12 +191,15 @@ namespace AibisDream
{
case "FullScreen":
Screen.SetResolution(Screen.currentResolution.width, Screen.currentResolution.height, FullScreenMode.FullScreenWindow);
CameraKit.Instance.UpdateCameraViewport();
break;
case "Windowed":
Screen.SetResolution(1920, 1080, FullScreenMode.Windowed);
CameraKit.Instance.UpdateCameraViewport();
break;
case "MaximizedWindow":
Screen.SetResolution(Screen.currentResolution.width, Screen.currentResolution.height, FullScreenMode.MaximizedWindow);
CameraKit.Instance.UpdateCameraViewport();
break;
default:
Debug.Log($"{windowMode} err");
@@ -235,7 +238,7 @@ namespace AibisDream
public string GetSceneSoName()
{
return _currentTalkSceneSo.Value.title;
return _currentTalkSceneSo.Value.name;
}
}
Assets/Scripts/Game Loop/SettingLoader.cs
+4 -2
View File
@@ -3,6 +3,7 @@ using AibisDream.Framework;
using AibisDream.Kit;
using UnityEngine;
using UnityEngine.Localization.Settings;
using UnityEngine.ResourceManagement.AsyncOperations;
namespace AibisDream
{
@@ -33,7 +34,7 @@ namespace AibisDream
}
}
private void OnSettingChanged(string propName, string value)
private async void OnSettingChanged(string propName, string value)
{
// 配置项同步
switch (propName)
@@ -52,7 +53,8 @@ namespace AibisDream
GameManager.Instance.SetScreenMode(value);
break;
case "Language":
// TODO 修改语言
// 确保本地化系统已初始化
await LocalizationSettings.InitializationOperation.Task;
LocalizationKit.SwitchLanguage(value);
break;
default:
Assets/Scripts/SceneManagement/ActorKit/ActorManager.cs
+6 -6
View File
@@ -4,9 +4,7 @@ using System.Collections.Generic;
using System.Linq;
using AibisDream.Framework;
using AibisDream.Kit;
using Newtonsoft.Json;
using UnityEngine;
using UnityEngine.Events;
using Yarn.Unity;
namespace AibisDream
@@ -34,6 +32,7 @@ namespace AibisDream
public override void OnSingletonDestroy()
{
_actorSystemData.OnLoad -= OnDataLoad;
StorageSystem.Instance.UnregisterData<ActorSystemData>();
}
@@ -76,12 +75,13 @@ namespace AibisDream
// 注册数据
_actorSystemData = new ActorSystemData();
_actorSystemData.onLoad.AddListener(OnDataLoad);
_actorSystemData.OnLoad += OnDataLoad;
StorageSystem.Instance.RegisterData(_actorSystemData);
}
private void OnDataLoad(ActorSystemData data)
{
Debug.Log("Actor Load");
foreach (var actorData in data.actorDataList)
{
InitActor(actorData);
@@ -235,12 +235,12 @@ namespace AibisDream
[Serializable]
public class ActorSystemData : IData
{
public List<ActorData> actorDataList = new();
[JsonIgnore] public UnityEvent<ActorSystemData> onLoad = new();
public List<ActorData> actorDataList = new();
public event Action<ActorSystemData> OnLoad;
public IEnumerator Load()
{
onLoad?.Invoke(this);
OnLoad?.Invoke(this);
yield break;
}
Assets/StreamingAssets/Config/setting.json
+1 -1
View File
@@ -1,5 +1,5 @@
{
"Volume": "0.89",
"Language": "en",
"Language": "zh-Hans",
"WindowMode": "Windowed"
}
ProjectSettings/ProjectSettings.asset
+2 -2
View File
@@ -100,7 +100,7 @@ PlayerSettings:
xboxEnableFitness: 0
visibleInBackground: 1
allowFullscreenSwitch: 1
fullscreenMode: 1
fullscreenMode: 0
xboxSpeechDB: 0
xboxEnableHeadOrientation: 0
xboxEnableGuest: 0
@@ -133,7 +133,7 @@ PlayerSettings:
vulkanEnableLateAcquireNextImage: 0
vulkanEnableCommandBufferRecycling: 1
loadStoreDebugModeEnabled: 0
bundleVersion: 0.3.1.4-20250901-211336
bundleVersion: 0.3.2.11-20250902-153812
preloadedAssets:
- {fileID: 11400000, guid: 0fb2bc2476953fc43a74f0ab8879077c, type: 2}
metroInputSource: 0