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

Merge branch 'develop' into feature/open

Browse Source
This commit is contained in:
dingyuntian
2025-05-14 21:21:10 +08:00
parent b68122f7d4 42e106f756
commit 0eb77750fb
5 changed files with 786 additions and 742 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Language/Dialog/FP_Shitou2/FP_Shitou2 Shared Data.asset
+726 -706
View File
File diff suppressed because it is too large Load Diff
Assets/Language/Dialog/FP_Shitou2/FP_Shitou2_en.asset
+36 -29
View File
@@ -469,15 +469,12 @@ MonoBehaviour:
m_Metadata:
m_Items: []
- m_Id: 2782307291241
m_Localized: Shitou sits at the entrance of a small shed, next to a damaged robot.
The shed, though worn, is neat and cozy. Sunlight filters through several pots
of small plants hanging by the door, sprinkling on the cracked surfaces of
the old wooden furniture. An imposing mountain of garbage casts a shadow over
their view from the window.
m_Localized: ' An imposing mountain of garbage casts a shadow over their view
from the window.'
m_Metadata:
m_Items: []
- m_Id: 2782307291242
m_Localized: \[Wind chimes\]
m_Localized: '[Wind chimes]'
m_Metadata:
m_Items: []
- m_Id: 2782307291243
@@ -492,7 +489,7 @@ MonoBehaviour:
m_Metadata:
m_Items: []
- m_Id: 2782307291245
m_Localized: "\\[Wind c\u0337h\u0338i\u0337m\u0337e\u0334s\u0334, car horns\\]"
m_Localized: "[Wind c\u0337h\u0338i\u0337m\u0337e\u0334s\u0334, car horns]"
m_Metadata:
m_Items: []
- m_Id: 2782307291246
@@ -514,8 +511,7 @@ MonoBehaviour:
m_Metadata:
m_Items: []
- m_Id: 2782307291250
m_Localized: "\\[Wind c\u0337h\u0338i\u0337m\u0337e\u0334s\u0334, car horns,
commercials\\]"
m_Localized: "[Wind c\u0337h\u0338i\u0337m\u0337e\u0334s\u0334, car horns, commercials]"
m_Metadata:
m_Items: []
- m_Id: 2782307291251
@@ -557,8 +553,8 @@ MonoBehaviour:
m_Metadata:
m_Items: []
- m_Id: 2782307291258
m_Localized: "\\[Wind c\u0337h\u0338i\u0337m\u0337e\u0334s\u0334, car horns,
commercials, motors\\]"
m_Localized: "[Wind c\u0337h\u0338i\u0337m\u0337e\u0334s\u0334, car horns, commercials,
motors]"
m_Metadata:
m_Items: []
- m_Id: 2782307291259
@@ -584,8 +580,8 @@ MonoBehaviour:
m_Metadata:
m_Items: []
- m_Id: 2782307291263
m_Localized: "\\[Wind c\u0337h\u0338i\u0337m\u0337e\u0334s\u0334, car horns,
commercials, louder motors\\]"
m_Localized: "[Wind c\u0337h\u0338i\u0337m\u0337e\u0334s\u0334, car horns, commercials,
louder motors]"
m_Metadata:
m_Items: []
- m_Id: 2782307291264
@@ -621,7 +617,7 @@ MonoBehaviour:
m_Metadata:
m_Items: []
- m_Id: 2782311485442
m_Localized: \[Car horns\]
m_Localized: '[Car horns]'
m_Metadata:
m_Items: []
- m_Id: 2782311485443
@@ -630,7 +626,7 @@ MonoBehaviour:
m_Metadata:
m_Items: []
- m_Id: 2782311485444
m_Localized: \[Loud motors\]
m_Localized: '[Loud motors]'
m_Metadata:
m_Items: []
- m_Id: 2782311485445
@@ -639,7 +635,7 @@ MonoBehaviour:
m_Metadata:
m_Items: []
- m_Id: 2782311485446
m_Localized: \[Commercials\]
m_Localized: '[Commercials]'
m_Metadata:
m_Items: []
- m_Id: 2782311485447
@@ -648,7 +644,7 @@ MonoBehaviour:
m_Metadata:
m_Items: []
- m_Id: 2782311485448
m_Localized: \[Memory cuts off\]
m_Localized: '[Memory cuts off]'
m_Metadata:
m_Items: []
- m_Id: 2782311485449
@@ -660,11 +656,11 @@ MonoBehaviour:
m_Metadata:
m_Items: []
- m_Id: 2782311485451
m_Localized: 'shitou: \[Starts to hum, pauses\]'
m_Localized: 'shitou: [Starts to hum, pauses]'
m_Metadata:
m_Items: []
- m_Id: 2782311485452
m_Localized: 'shitou: \[Starts to hum, pauses\]'
m_Localized: 'shitou: [Starts to hum, pauses]'
m_Metadata:
m_Items: []
- m_Id: 2782311485453
@@ -1003,7 +999,7 @@ MonoBehaviour:
m_Metadata:
m_Items: []
- m_Id: 2782311485529
m_Localized: 'DigestModule: '
m_Localized: 'DigestModule:'
m_Metadata:
m_Items: []
- m_Id: 2782311485530
@@ -1142,7 +1138,7 @@ MonoBehaviour:
m_Metadata:
m_Items: []
- m_Id: 2782311485562
m_Localized: \[~MUSIC~\]
m_Localized: '[~MUSIC~]'
m_Metadata:
m_Items: []
- m_Id: 2782311485563
@@ -1209,7 +1205,7 @@ MonoBehaviour:
m_Metadata:
m_Items: []
- m_Id: 2782311485578
m_Localized: \[~MUSIC~\]
m_Localized: '[~MUSIC~]'
m_Metadata:
m_Items: []
- m_Id: 2782311485579
@@ -1277,7 +1273,7 @@ MonoBehaviour:
m_Metadata:
m_Items: []
- m_Id: 2782311485594
m_Localized: \[~MUSIC~\]
m_Localized: '[~MUSIC~]'
m_Metadata:
m_Items: []
- m_Id: 2782311485595
@@ -1345,7 +1341,7 @@ MonoBehaviour:
m_Metadata:
m_Items: []
- m_Id: 2782311485609
m_Localized: \[~MUSIC~\]
m_Localized: '[~MUSIC~]'
m_Metadata:
m_Items: []
- m_Id: 2782311485610
@@ -1538,23 +1534,34 @@ MonoBehaviour:
m_Metadata:
m_Items: []
- m_Id: 1104919200272384
m_Localized: 'Task: Inspect all cranial modules'
m_Localized: 'Task: Check All Modules '
m_Metadata:
m_Items: []
- m_Id: 1104919200272385
m_Localized: 'Task: Assess the compromised state of memory'
m_Localized: 'Task: Check the Memory Module '
m_Metadata:
m_Items: []
- m_Id: 1104919200272386
m_Localized: 'Task: Enter the gearbox'
m_Localized: 'Task: Check the transmission'
m_Metadata:
m_Items: []
- m_Id: 1104919200272387
m_Localized: 'Task: Transcribe the song of the stones'
m_Localized: "Task: Record the Stone\u2019s Voice"
m_Metadata:
m_Items: []
- m_Id: 1104919200272388
m_Localized: 'Task: Transcribe the song of the stones'
m_Localized: "Task: Record the Stone\u2019s Voice"
m_Metadata:
m_Items: []
- m_Id: 3331711260852224
m_Localized: 'Shitou sits at the entrance of a small shed, next to a damaged
robot. '
m_Metadata:
m_Items: []
- m_Id: 3331711260852225
m_Localized: The shed, though worn, is neat and cozy. Sunlight filters through
several pots of small plants hanging by the door, sprinkling on the cracked
surfaces of the old wooden furniture
m_Metadata:
m_Items: []
references:
Assets/Language/Dialog/FP_Shitou2/FP_Shitou2_zh-Hans.asset
+9 -1
View File
@@ -443,7 +443,7 @@ MonoBehaviour:
m_Metadata:
m_Items: []
- m_Id: 2782307291241
m_Localized: "\u77F3\u5934\u548C\u4E00\u4E2A\u53D7\u635F\u7684\u673A\u4F53\u5750\u5728\u4E00\u4E2A\u5C0F\u68DA\u5C4B\u7684\u95E8\u53E3\uFF0C\u9633\u5149\u7A7F\u8FC7\u95E8\u53E3\u5782\u6302\u7684\u8BB8\u591A\u76C6\u5C0F\u690D\u7269\uFF0C\u6D12\u5728\u8001\u65E7\u5F00\u88C2\u7684\u6728\u5236\u5BB6\u5177\u4E0A\uFF0C\u7834\u65E7\u4F46\u6574\u6D01\u8212\u9002\u3002\u5C4B\u5916\u671B\u51FA\u53BB\uFF0C\u662F\u4E00\u5EA7\u9AD8\u9AD8\u7684\u5783\u573E\u5C71\u7684\u9634\u5F71\u3002"
m_Localized: "\u5C4B\u5916\u671B\u51FA\u53BB\uFF0C\u662F\u4E00\u5EA7\u9AD8\u9AD8\u7684\u5783\u573E\u5C71\u7684\u9634\u5F71\u3002"
m_Metadata:
m_Items: []
- m_Id: 2782307291242
@@ -1431,6 +1431,14 @@ MonoBehaviour:
m_Localized: "Task: \u68C0\u67E5\u6240\u6709\u5934\u90E8\u6A21\u5757"
m_Metadata:
m_Items: []
- m_Id: 3331711260852225
m_Localized: "\u9633\u5149\u7A7F\u8FC7\u95E8\u53E3\u5782\u6302\u7684\u8BB8\u591A\u76C6\u5C0F\u690D\u7269\uFF0C\u6D12\u5728\u8001\u65E7\u5F00\u88C2\u7684\u6728\u5236\u5BB6\u5177\u4E0A\uFF0C\u7834\u65E7\u4F46\u6574\u6D01\u8212\u9002\u3002"
m_Metadata:
m_Items: []
- m_Id: 3331711260852224
m_Localized: "\u77F3\u5934\u548C\u4E00\u4E2A\u53D7\u635F\u7684\u673A\u4F53\u5750\u5728\u4E00\u4E2A\u5C0F\u68DA\u5C4B\u7684\u95E8\u53E3."
m_Metadata:
m_Items: []
references:
version: 2
RefIds: []
Assets/Resources/Yarn/FP_Shitou2/Stage2_头部检查.yarn
+3 -1
View File
@@ -349,7 +349,9 @@ position: 80,48
---
<<play_music event:/Music/mem_shitou_0>>
<<set_music_param event:/Music/mem_shitou_0 shitou_mem_stage 0>>
石头和一个受损的机体坐在一个小棚屋的门口，阳光穿过门口垂挂的许多盆小植物，洒在老旧开裂的木制家具上，破旧但整洁舒适。屋外望出去，是一座高高的垃圾山的阴影。 #line:08bc411
石头和一个受损的机体坐在一个小棚屋的门口. #line:04687fa
阳光穿过门口垂挂的许多盆小植物，洒在老旧开裂的木制家具上，破旧但整洁舒适。 #line:06a3e0d
屋外望出去，是一座高高的垃圾山的阴影。 #line:08bc411
<<set_music_param event:/Music/mem_shitou_0 shitou_mem_stage 0.1>>
<<wait 2>>
【风铃声】 #line:0de2a2f
Assets/Scripts/FixSystemNew/Screen System/ScreenSystem.cs
+12 -5
View File
@@ -46,7 +46,7 @@ namespace AibisDream.FixSystem
{
_textScreen = transform.Find("旋转屏幕");
_imageMaterial = screenImage.material;
_generator = new TextGenerator();
_generationSettings = new TextGenerationSettings
{
@@ -102,7 +102,14 @@ namespace AibisDream.FixSystem
if (cutLineNum <= text.textInfo.lineCount)
{
var lastCharIndex = text.textInfo.lineInfo[cutLineNum - 1].lastCharacterIndex;
oldText = text.text[lastCharIndex..];
if (lastCharIndex + 1 < text.text.Length)
{
oldText = text.text.Substring(lastCharIndex + 1);
}
else
{
oldText = string.Empty;
}
}
}
else
@@ -112,7 +119,7 @@ namespace AibisDream.FixSystem
var targetLength = oldText.Length + targetText.Length;
// 逐个字符添加
yield return DOTween.To(() => oldText.Length, x => UpdateText(x, targetText, oldText), targetLength,
targetText.Length * typeSpeed).WaitForCompletion();
@@ -121,7 +128,7 @@ namespace AibisDream.FixSystem
EnumEventSystem.Global.Send(DialogEventEnum.LineEnd);
_nextStep.Invoke();
}
private int EstimateLineNum(string str)
{
var height = _generator.GetPreferredHeight(str, _generationSettings);
@@ -211,7 +218,7 @@ namespace AibisDream.FixSystem
#region 对话框功能实现
public void ShowLine(string dialogLine, CharacterVo character, Action nextStep, string lineId ,bool isAutoSkip = false)
public void ShowLine(string dialogLine, CharacterVo character, Action nextStep, string lineId, bool isAutoSkip = false)
{
ShowTitle(character.GetActorName());
StartCoroutine(ShowText(dialogLine));