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

Merge branch 'develop' into simc

Browse Source
This commit is contained in:
Ovid
2025-03-17 18:15:45 +08:00
parent cfae76bb66 d60dfb527c
commit 27abd91495
16 changed files with 21 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Resources/Yarn/FP_Peipei2/Stage11_手术.yarn
+7 -7
View File
@@ -67,12 +67,12 @@ position: 33,-552
<<else>>
<<if $Memory1Fade_Peipei==false>>
->播放写生记忆
<<play_music event:/Music/mem_liuying1-1>>
//<<search_memory MemoryManager "liuying1-2" true true>>
<<play_music event:/Music/mem_liuying1-2>>
<<PlayMemory MemoryManager true liuying1-2>>
me: 和朋友的写生，你的决心就像旷野里的绿色那样不会褪去。
me: 人生是旷野，不是轨道……么？
->手动进行色彩初始化
<<stop_music event:/Music/mem_liuying1-1>>
<<stop_music event:/Music/mem_liuying1-2>>
<<play_sfx event:/Scriptal/colorerase>>
<<ColorFadeOut MemoryManager>>
me: 抱歉……如果不让绿色褪去，我就无法挽救你。
@@ -81,11 +81,11 @@ position: 33,-552
<<endif>>
<<if $Memory2Fade_Peipei==false>>
->播放夕阳记忆
//<<search_memory MemoryManager "liuying1-1" true true>>
<<play_music event:/Music/mem_liuying1-2>>
<<PlayMemory MemoryManager true liuying1-1>>
<<play_music event:/Music/mem_liuying1-1>>
me: 啊…粉红的火烧云，夏夜晚风虫鸣和他。
->手动进行色彩初始化
<<stop_music event:/Music/mem_liuying1-2>>
<<stop_music event:/Music/mem_liuying1-1>>
<<play_sfx event:/Scriptal/colorerase>>
<<ColorFadeOut MemoryManager>>
me: 对不起，冬天要来了。
@@ -95,7 +95,7 @@ position: 33,-552
<<if $Memory3Fade_Peipei==false>>
->播放蓝天记忆
<<play_music event:/Music/mem_liuying1-3>>
//<<search_memory MemoryManager "liuying1-3" true true>>
<<PlayMemory MemoryManager true liuying1-3>>
me: 你是因为生了什么病而被困在那个病房里呢？
me: 我可能永远也不会知道了……
->手动进行色彩初始化
Assets/StreamingAssets/TestSaveFiles/PeipeiDay2_UF拆壳.json
+1 -4
View File
@@ -5,10 +5,7 @@
},
"AibisDream.Kit.AudioData, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null": {
"sfxNames": {},
"musicNames": {
"music": "event:/Music/mus_peipei",
"shitou_music": "event:/Music/music_shitou"
}
"musicNames": {}
},
"AibisDream.ClinicData, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null": {
"characterName": null,
Assets/StreamingAssets/TestSaveFiles/PeipeiDay2_UF拆除.json
+1 -4
View File
@@ -5,10 +5,7 @@
},
"AibisDream.Kit.AudioData, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null": {
"sfxNames": {},
"musicNames": {
"music": "event:/Music/mus_peipei",
"shitou_music": "event:/Music/music_shitou"
}
"musicNames": {}
},
"AibisDream.ClinicData, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null": {
"characterName": null,
Assets/StreamingAssets/TestSaveFiles/PeipeiDay2_UF检查.json
+1 -4
View File
@@ -5,10 +5,7 @@
},
"AibisDream.Kit.AudioData, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null": {
"sfxNames": {},
"musicNames": {
"music": "event:/Music/mus_peipei",
"shitou_music": "event:/Music/music_shitou"
}
"musicNames": {}
},
"AibisDream.ClinicData, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null": {
"characterName": null,
Assets/StreamingAssets/TestSaveFiles/PeipeiDay2_停止想象.json
+1 -4
View File
@@ -5,10 +5,7 @@
},
"AibisDream.Kit.AudioData, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null": {
"sfxNames": {},
"musicNames": {
"music": "event:/Music/mus_peipei",
"shitou_music": "event:/Music/music_shitou"
}
"musicNames": {}
},
"AibisDream.ClinicData, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null": {
"characterName": null,
Assets/StreamingAssets/TestSaveFiles/PeipeiDay2_分析.json
+1 -4
View File
@@ -5,10 +5,7 @@
},
"AibisDream.Kit.AudioData, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null": {
"sfxNames": {},
"musicNames": {
"music": "event:/Music/mus_peipei",
"shitou_music": "event:/Music/music_shitou"
}
"musicNames": {}
},
"AibisDream.ClinicData, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null": {
"characterName": null,
Assets/StreamingAssets/TestSaveFiles/PeipeiDay2_开场对话.json
+1 -4
View File
@@ -5,10 +5,7 @@
},
"AibisDream.Kit.AudioData, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null": {
"sfxNames": {},
"musicNames": {
"music": "event:/Music/mus_peipei",
"shitou_music": "event:/Music/music_shitou"
}
"musicNames": {}
},
"AibisDream.ClinicData, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null": {
"characterName": null,
Assets/StreamingAssets/TestSaveFiles/PeipeiDay2_手术.json
+1 -4
View File
@@ -5,10 +5,7 @@
},
"AibisDream.Kit.AudioData, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null": {
"sfxNames": {},
"musicNames": {
"music": "event:/Music/mus_peipei",
"shitou_music": "event:/Music/music_shitou"
}
"musicNames": {}
},
"AibisDream.ClinicData, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null": {
"characterName": null,
Assets/StreamingAssets/TestSaveFiles/PeipeiDay2_术前谈话.json
+1 -4
View File
@@ -5,10 +5,7 @@
},
"AibisDream.Kit.AudioData, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null": {
"sfxNames": {},
"musicNames": {
"music": "event:/Music/mus_peipei",
"shitou_music": "event:/Music/music_shitou"
}
"musicNames": {}
},
"AibisDream.ClinicData, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null": {
"characterName": null,
Assets/StreamingAssets/TestSaveFiles/PeipeiDay2_术前谈话2.json
+1 -4
View File
@@ -5,10 +5,7 @@
},
"AibisDream.Kit.AudioData, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null": {
"sfxNames": {},
"musicNames": {
"music": "event:/Music/mus_peipei",
"shitou_music": "event:/Music/music_shitou"
}
"musicNames": {}
},
"AibisDream.ClinicData, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null": {
"characterName": null,
Assets/StreamingAssets/TestSaveFiles/PeipeiDay2_流程结束.json
+1 -4
View File
@@ -5,10 +5,7 @@
},
"AibisDream.Kit.AudioData, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null": {
"sfxNames": {},
"musicNames": {
"music": "event:/Music/mus_peipei",
"shitou_music": "event:/Music/music_shitou"
}
"musicNames": {}
},
"AibisDream.ClinicData, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null": {
"characterName": null,
Assets/StreamingAssets/TestSaveFiles/PeipeiDay2_第一次发热.json
+1 -4
View File
@@ -5,10 +5,7 @@
},
"AibisDream.Kit.AudioData, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null": {
"sfxNames": {},
"musicNames": {
"music": "event:/Music/mus_peipei",
"shitou_music": "event:/Music/music_shitou"
}
"musicNames": {}
},
"AibisDream.ClinicData, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null": {
"characterName": null,
Assets/StreamingAssets/TestSaveFiles/PeipeiDay2_结束对话.json
+1 -4
View File
@@ -5,10 +5,7 @@
},
"AibisDream.Kit.AudioData, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null": {
"sfxNames": {},
"musicNames": {
"music": "event:/Music/mus_peipei",
"shitou_music": "event:/Music/music_shitou"
}
"musicNames": {}
},
"AibisDream.ClinicData, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null": {
"characterName": null,
Assets/StreamingAssets/TestSaveFiles/PeipeiDay2_身体检查.json
+1 -4
View File
@@ -5,10 +5,7 @@
},
"AibisDream.Kit.AudioData, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null": {
"sfxNames": {},
"musicNames": {
"music": "event:/Music/mus_peipei",
"shitou_music": "event:/Music/music_shitou"
}
"musicNames": {}
},
"AibisDream.ClinicData, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null": {
"characterName": null,
Assets/StreamingAssets/TestSaveFiles/StoneDay2_2_5.json
-2
View File
@@ -6,8 +6,6 @@
"AibisDream.Kit.AudioData, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null": {
"sfxNames": {},
"musicNames": {
"music": "event:/Music/mus_peipei",
"shitou_music": "event:/Music/music_shitou",
"event:/Music/music_shitou_0": "event:/Music/music_shitou_0"
}
},
Assets/StreamingAssets/TestSaveFiles/StoneDay2_2_8.json
+1 -4
View File
@@ -5,10 +5,7 @@
},
"AibisDream.Kit.AudioData, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null": {
"sfxNames": {},
"musicNames": {
"music": "event:/Music/mus_peipei",
"shitou_music": "event:/Music/music_shitou"
}
"musicNames": {}
},
"AibisDream.ClinicData, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null": {
"characterName": null,