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

Merge branch 'bugfix/美术素材填充' into 'develop'

Browse Source 
Bugfix/美术素材填充

See merge request aibis-dream/aibis-dream!765
This commit is contained in:
dingyuntian
2026-07-21 20:02:51 +00:00
parent 3b5d05260e b7fdcf97fe
commit ef3c14d3de
22 changed files with 191 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/GameContent/Scene_Peipei/Actor/佩佩像素版-通用动画.png
LFS
BIN
View File
Binary file not shown.
Assets/Language/ChapterInfo/ChapterInfo_zh-Hans.asset
+1 -1
View File
@@ -55,7 +55,7 @@ MonoBehaviour:
m_Metadata:
m_Items: []
- m_Id: 3062295029520000010
m_Localized: "\u7F8E\u5DE5\u578B\u53F7\u60A3\u8005-\u4F69\u4F69\uFF08\u590D\u8BCA\uFF09"
m_Localized: "\u4F69\u4F69-\u590D\u8BCA"
m_Metadata:
m_Items: []
- m_Id: 3062295029520000011
Assets/RawResources/Art/Obj/hs1_病历.png.meta
+40 -1
View File
@@ -34,7 +34,7 @@ TextureImporter:
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
filterMode: 0
aniso: 1
mipBias: 0
wrapU: 1
@@ -106,6 +106,45 @@ TextureImporter:
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: WebGL
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
Assets/RawResources/Art/Obj/hs1_病历1-1.png.meta
+40 -1
View File
@@ -34,7 +34,7 @@ TextureImporter:
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
filterMode: 0
aniso: 1
mipBias: 0
wrapU: 1
@@ -106,6 +106,45 @@ TextureImporter:
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: WebGL
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
Assets/RawResources/Art/Obj/hs1_病历1-2.png.meta
+40 -1
View File
@@ -34,7 +34,7 @@ TextureImporter:
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
filterMode: 0
aniso: 1
mipBias: 0
wrapU: 1
@@ -106,6 +106,45 @@ TextureImporter:
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: WebGL
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
Assets/RawResources/Art/Obj/佩佩day2UF之一.png
LFS
BIN
View File
Binary file not shown.
Assets/RawResources/Art/Obj/佩佩day2UF之三.png
LFS
BIN
View File
Binary file not shown.
Assets/RawResources/Art/Obj/佩佩day2UF之二.png
LFS
BIN
View File
Binary file not shown.
Assets/RawResources/Art/Obj/美人鱼正确.png
LFS
BIN
View File
Binary file not shown.
Assets/RawResources/Art/Obj/美人鱼错误.png
LFS
BIN
View File
Binary file not shown.
Assets/RawResources/Art/梦境素材/梦境图片/D2S天花板风扇1.png
LFS
BIN
View File
Binary file not shown.
Assets/RawResources/Art/梦境素材/梦境图片/D2S天花板风扇2.png
LFS
BIN
View File
Binary file not shown.
Assets/RawResources/Art/梦境素材/梦境图片/D2S天花板风扇3.png
LFS
BIN
View File
Binary file not shown.
Assets/RawResources/Art/梦境素材/梦境图片/D2S天花板风扇4.png
LFS
BIN
View File
Binary file not shown.
Assets/RawResources/Art/梦境素材/梦境图片/D2S天花板风扇5.png
LFS
BIN
View File
Binary file not shown.
Assets/Scripts/FixSystemNew/Screen System/FixPanel/CablePanel.cs
+4 -2
View File
@@ -245,11 +245,13 @@ namespace AibisDream.FixSystem
private void OnPullUpSocket()
{
bool wasPlugged = curSocket != null;
curSocket?.PlugOut();
AudioManager.Instance.PlaySfx("event:/FollowInput/plugout");
// 如果是模块
if (!EventSystemEx.Instance.isLocked && curSocket is BodyModule)
// 只要插头确实从 Socket 拔出，就通知 Screen 清空。
// 空闲状态下的防御性 PullUpSocket 调用不会误触发该事件。
if (wasPlugged)
{
EnumEventSystem.Global.Send(EventEnum.PlugOut);
}
Assets/Yarn/FP/FP_Huoshan1/Stage2.yarn
+8 -8
View File
@@ -96,7 +96,7 @@ EmoModule: 已与情绪模块建立连接！ #line:0b19318
<<endif>>
->结束 #line:006eb35
<<hide_dialog>>
<<clear_screen>>
//<<clear_screen>>
===
title: 检查记忆
@@ -129,7 +129,7 @@ MemModule: 已与记忆模块建立连接！ #line:00bc46a
<<set $memoryChecked = true>>
->结束 #line:0e7f27a
<<hide_dialog>>
<<clear_screen>>
//<<clear_screen>>
//<<endif>>
===
@@ -189,7 +189,7 @@ LogicModule: 已与逻辑模块建立连接！ #line:0a019ad
// <<endif>>
->结束 #line:0880ccd
<<hide_dialog>>
<<clear_screen>>
//<<clear_screen>>
===
title: 检查视觉
@@ -228,7 +228,7 @@ EyeModule: 已与视觉模块建立连接！ #line:0ac783f
<<endif>>
->结束 #line:0e66d9b
<<hide_dialog>>
<<clear_screen>>
//<<clear_screen>>
===
title: 检查表达
@@ -309,7 +309,7 @@ SpeakerModule: 已与表达模块建立连接！ #line:027b73c
//SpeakerModule: #line:061f0f5
SpeakerModule: 溢出告警 #line:02bdf53
// <<open_warning_window "[ERROR] 系统保护性中断">>
<<clear_screen>>
//<<clear_screen>>
Error: #line:07caad4
<<play_sfx "event:/Scriptal/beep_warning">>
Error: 系统保护性中断。请释放内存。 #line:08b6066
@@ -359,7 +359,7 @@ SpeakerModule: 已与表达模块建立连接！ #line:027b73c
<<endif>>
->结束 #line:0fdaf73
<<hide_dialog>>
<<clear_screen>>
//<<clear_screen>>
===
title: 检查销售模块
@@ -460,7 +460,7 @@ SaleModule: 已与销售语言拓展模块建立连接！ #line:0448f12
<<endif>>
->结束 #line:0f8d528
<<hide_dialog>>
<<clear_screen>>
//<<clear_screen>>
===
@@ -482,6 +482,6 @@ group: 插线检查
position: 300,1118
---
<<hide_dialog>>
<<clear_screen>>
//<<clear_screen>>
===
Assets/Yarn/FP/FP_Huoshan1/Stage3.yarn
+5 -5
View File
@@ -1,4 +1,4 @@
// ═══════════════════════════════════════════════════════════════
// ═══════════════════════════════════════════════════════════════
// Stage3: 滤波器深入检查
// 目标：1.进入步进查看模式，显示情绪输入波形
// 2.语义合成/语言审查/语气调整 由【销售模块转动完成】监听驱动（转1/2/3）
@@ -234,11 +234,11 @@ position: 350,2280
// Analysing: 副作用提示：未转化的情绪信号可能造成RAM堆积 #line:0076047
<<wait 0.5>>
<<show_obj "hs1_病历">>
<<show_full_screen "hs1_病历">>
<<wait 2>>
me: 嗯。这下就全明白了… #line:0288a4a
<<show_obj "hs1_病历1-1">>
<<show_obj "hs1_病历1-2">>
<<show_full_screen "hs1_病历1-1">>
<<show_full_screen "hs1_病历1-2">>
hs: ……<waitfor=0.5>当时那个医生只说，给我装上这个，我就不怕结巴了… #line:087e780
me: 医生没有和你说要复诊吗？ #line:051f73f
hs: ……<waitfor=0.5>有。 #line:0ee348f
@@ -248,7 +248,7 @@ position: 350,2280
me: 你为什么不去复诊？ #line:00778c4
hs: 因为我…一直以来……都感觉身体挺好的嘛。 #line:0211ff0
me: 你以为你感觉好，你的身体就真的没问题吗？为什么不听医生的话？ #line:0e46b56
<<hide_obj>>
<<hide_full_screen>>
me: 情绪数据在发出之后，是需要得到反馈才会消除的。这七年来，你每一个被压缩的情绪… #line:03ac325
me: 都堆在表达模块的RAM里。 #line:0767e58
me: 让我们去看看吧。 #line:01d4ab6
Assets/Yarn/FP/FP_Peipei1/Stage2_外部检查&UF.yarn
+13 -13
View File
@@ -111,7 +111,7 @@ position: 104,-2498
<<jump UFDeepIn>>
->结束 #line:0689336
<<hide_dialog>>
<<clear_screen>>
//<<clear_screen>>
<<else>>
Linking: 正在建立连接… #line:00e61f7
<<wait 0.2>>
@@ -124,17 +124,17 @@ position: 104,-2498
<<wait 0.1>>
me: 虽然有错误…<waitfor=0.2>但它竟然<waitfor=0.1>拒绝我进行深入检查。 #line:0d0e3c8
<<if $gameStage=="UF检查">>
<<clear_screen>>
//<<clear_screen>>
<<elseif $gameStage=="视觉检查">>
me: 只能按照它说的，<waitfor=0.1>去视觉模块检查一下了…… #line:05ea5d3
<<clear_screen>>
//<<clear_screen>>
<<elseif $gameStage=="记忆检查">>
me: 先去记忆模块<waitfor=0.1>检查一下记忆打孔带吧。 #line:0112d94
<<clear_screen>>
//<<clear_screen>>
<<endif>>
->结束 #line:0b093fa
<<hide_dialog>>
<<clear_screen>>
//<<clear_screen>>
<<endif>>
===
@@ -181,7 +181,7 @@ position: 572,-2497
<<clear_screen>>
<<jump EyeDeepIn>>
->结束 #line:01e5f0b
<<clear_screen>>
//<<clear_screen>>
<<else>>
<<wait 0.1>>
@@ -200,10 +200,10 @@ position: 572,-2497
<<jump EyeDeepIn>>
->结束 #line:042d124
<<hide_dialog>>
<<clear_screen>>
//<<clear_screen>>
->结束 #line:03a68dd
<<hide_dialog>>
<<clear_screen>>
//<<clear_screen>>
<<endif>>
===
@@ -245,7 +245,7 @@ MemModule: 已与记忆模块建立连接！ #line:08a12cc
me: 记忆模块一切正常。 #line:067e962
<<set $memoryChecked = true>>
->结束 #line:03b53e1
<<clear_screen>>
//<<clear_screen>>
<<endif>>
===
@@ -311,7 +311,7 @@ ChipModule: 已与附加模块建立连接！ #line:03032df
<<endif>>
<<endif>>
->结束 #line:0f57b73
<<clear_screen>>
//<<clear_screen>>
===
title: 检查情绪
@@ -348,7 +348,7 @@ EmoModule: 已与情绪模块建立连接！ #line:00d2d0b
<<endif>>
<<set $emoChecked = true>>
->结束 #line:01369b7
<<clear_screen>>
//<<clear_screen>>
===
title: 检查语言
@@ -379,7 +379,7 @@ SpeakerModule: 已与表达模块建立连接！ #line:0ce06c1
me: 表达模块正常…不过看起来很长一段时间内<waitfor=0.2>都没有什么使用痕迹。 #line:080f93f
<<endif>>
->结束 #line:087bb69
<<clear_screen>>
//<<clear_screen>>
===
title: 检查逻辑
@@ -420,6 +420,6 @@ LogicModule: 已与逻辑模块建立连接！ #line:0d49573
me: 逻辑模块一切正常。 #line:01bdd75
<<endif>>
->结束 #line:02fc442
<<clear_screen>>
//<<clear_screen>>
===
Assets/Yarn/FP/FP_Peipei1/Stage8_复查.yarn
+4 -4
View File
@@ -88,10 +88,10 @@ UfModule: 已与*UnstableFusion图像生成模块*建立连接！ #line:07fd83b
<<wait 1>>
UfModule: 检查完成！未检测到错误。 #line:0807bca
me: 搞定…<waitfor=0.1>报错已经消失了。 #line:0d9c586
<<clear_screen>>
//<<clear_screen>>
->结束 #line:064b992
<<hide_dialog>>
<<clear_screen>>
//<<clear_screen>>
===
title: 复查_检查视觉
@@ -127,9 +127,9 @@ EyeModule: 已与视觉模块建立连接！ #line:0dc8d9d
<<jump EyeDeepIn>>
->结束 #line:0aa268c
<<hide_dialog>>
<<clear_screen>>
//<<clear_screen>>
->结束 #line:0ec9395
<<clear_screen>>
//<<clear_screen>>
===
title: Eye_skyAfterSurgery
Assets/Yarn/FP/FP_Peipei2/Stage11_手术.yarn
+2 -2
View File
@@ -127,7 +127,7 @@ EyeModule: 已与视觉模块建立连接！ #line:0f3996e
<<switch_fix_system_to Eye>>
<<jump RecoverColor>>
->结束 #line:00f1ddd
<<clear_screen>>
//<<clear_screen>>
===
title: 色彩校准测试
@@ -196,7 +196,7 @@ MemModule: 未检测到可查看的记忆卡带。 #line:00d2cb0
MemModule: #line:05ab90a
MemModule: 报告传输完毕。 #line:0b75804
->结束 #line:093f0ff
<<clear_screen>>
//<<clear_screen>>
===
title: RecoverColor
Assets/Yarn/FP/FP_Peipei2/Stage3_身体检查.yarn
+12 -12
View File
@@ -73,9 +73,9 @@ EmoModule: 已与情绪模块建立连接！ #line:043977a
me: 情绪受到发热的影响…但整体没什么问题。 #line:01e49a5
<<endif>>
<<endif>>
<<clear_screen>>
//<<clear_screen>>
->结束 #line:023363b
<<clear_screen>>
//<<clear_screen>>
===
title: 检查语言
@@ -112,9 +112,9 @@ SpeakerModule: 已与表达模块建立连接！ #line:08e4ff7
me: 不过问题不在这里。 #line:09e9fb2
<<endif>>
<<endif>>
<<clear_screen>>
//<<clear_screen>>
->结束 #line:0abade5
<<clear_screen>>
//<<clear_screen>>
===
title: 检查逻辑
@@ -157,9 +157,9 @@ LogicModule: 已与逻辑处理模块建立连接！ #line:0c7c186
me: 不过问题不在这里。 #line:0cfae42
<<endif>>
<<endif>>
<<clear_screen>>
//<<clear_screen>>
->结束 #line:01a56ca
<<clear_screen>>
//<<clear_screen>>
===
title: 检查色觉
@@ -191,9 +191,9 @@ ChipModule: 已与附加模块建立连接！ #line:0e44178
<<set $colorChecked = true>>
<<set $PlugCount=$PlugCount+1>>
<<endif>>
<<clear_screen>>
//<<clear_screen>>
->结束 #line:080d555
<<clear_screen>>
//<<clear_screen>>
===
title: 检查记忆
@@ -228,9 +228,9 @@ MemModule: 未检测到可查看的记忆卡带。 #line:0cba6c7
<<if $gameStage == "身体检查">>
me: 不过记忆模块本身看起来没有出什么问题。 #line:0c179b1
<<endif>>
<<clear_screen>>
//<<clear_screen>>
->结束 #line:04b8b2b
<<clear_screen>>
//<<clear_screen>>
===
title: 检查UF_不可检查
@@ -310,9 +310,9 @@ EyeModule: 已与视觉模块建立连接！ #line:0a489b0
me: 没有新的问题……至少没有会影响UF的问题。 #line:06f508b
<<endif>>
<<endif>>
<<clear_screen>>
//<<clear_screen>>
->结束 #line:046ec30
<<clear_screen>>
//<<clear_screen>>
===
title: 第二次发热前对话