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

Merge branch 'bugfix2.26' into 'develop'

Browse Source 
Bugfix2.26

See merge request aibis-dream/aibis-dream!278
This commit is contained in:
bottlefish
2025-02-26 17:11:10 +00:00
parent f2176441b9 5dc98da5ca
commit c640f79c09
14 changed files with 91 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/AddressableAssetsData/Android.meta
+8
View File
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: e18e867254e972440881f602d4e5f6fa
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/AddressableAssetsData/OSX.meta
+8
View File
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: c6a6197bc054ac245a76943fb61ec0f9
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/Plugins/FMOD/platforms/mac/lib/fmodstudioL.bundle.meta
+3 -1
View File
@@ -22,12 +22,14 @@ PluginImporter:
enabled: 1
settings:
CPU: AnyCPU
DefaultValueInitialized: true
OS: OSX
- first:
Standalone: OSXUniversal
second:
enabled: 1
settings: {}
settings:
CPU: AnyCPU
userData:
assetBundleName:
assetBundleVariant:
Assets/Plugins/FMOD/platforms/win/lib/x86_64/fmodstudioL.dll.meta
+1
View File
@@ -22,6 +22,7 @@ PluginImporter:
enabled: 1
settings:
CPU: x86_64
DefaultValueInitialized: true
OS: Windows
- first:
Standalone: Win64
Assets/Render/Renderer2Dtest.asset
+13 -9
View File
@@ -1053,15 +1053,19 @@ MonoBehaviour:
m_PostInfinity: 2
m_RotationOrder: 4
_filter:
- 0.007228916
- 0.043749984
- 0.12409639
- 0.20444278
- 0.24096388
- 0.20444278
- 0.12409639
- 0.043749984
- 0.007228916
- 0.0048309183
- 0.016401261
- 0.04532712
- 0.08293076
- 0.12053438
- 0.14946026
- 0.1610306
- 0.14946026
- 0.12053438
- 0.08293076
- 0.04532712
- 0.016401261
- 0.0048309183
--- !u!114 &-6086986437317696584
MonoBehaviour:
m_ObjectHideFlags: 3
Assets/Resources/Yarn/FP_Peipei1/Stage2_外部检查&UF.yarn
+4 -2
View File
@@ -49,9 +49,9 @@ position: 0,0
<<elseif $gameStage == "记忆检查">>
<<jump 记忆检查状态>>
<<elseif $gameStage == "手术">>
<<jump 手术状态>>
// <<jump 手术状态>>
<<elseif $gameStage == "复查">>
<<jump 复查状态>>
//<<jump 复查状态>>
<<endif>>
===
@@ -220,6 +220,8 @@ UfModule: 已与*UnstableFusion图像生成模块*建立连接！
<<else>>
UfModule: 检查完成！未检测到错误。
me: 搞定…报错已经消失了。
<<close_screen>>
<<clear_screen>>
<<endif>>
->结束
<<hide_dialog>>
Assets/Resources/Yarn/FP_Peipei3/Stage3_全身检查.yarn
+24 -23
View File
@@ -11,13 +11,13 @@ position: -449,-3574
title: 全身检查状态
position: -436,-2338
---
<<if $isFinishedUFCheck==true>>
<<jump 结束全身检查>>
<<endif>>
===
// title: 全身检查状态
// position: -436,-2338
// ---
// <<if $isFinishedUFCheck==true>>
// <<jump 结束全身检查>>
// <<endif>>
// ===
@@ -45,14 +45,14 @@ me: 对不起了。<br>等你一觉醒来，应该就都结束了。
title: PlugFinished
position: 151,-2688
---
<<if $UfChecked == true>>
<<set $PlugAll=true>>
<<jump 结束全身检查>>
<<endif>>
===
// title: PlugFinished
// position: 151,-2688
// ---
// <<if $UfChecked == true>>
// <<set $PlugAll=true>>
// <<jump 结束全身检查>>
// <<endif>>
// ===
@@ -62,7 +62,7 @@ tags:
position: 43,-97
---
<<ModuleHightLight UF true>>
<<jump 全身检查状态>>
// <<jump 全身检查状态>>
===
@@ -99,7 +99,7 @@ EmoModule: 已与情绪模块建立连接！
->结束
<<close_screen>>
<<clear_screen>>
<<jump PlugFinished>>
// <<jump PlugFinished>>
===
@@ -135,7 +135,7 @@ SpeakerModule: 已与表达模块建立连接！
->结束
<<close_screen>>
<<clear_screen>>
<<jump PlugFinished>>
//<<jump PlugFinished>>
===
@@ -172,7 +172,7 @@ LogicModule: 已与逻辑处理模块建立连接！
->结束
<<close_screen>>
<<clear_screen>>
<<jump PlugFinished>>
//<<jump PlugFinished>>
===
@@ -209,7 +209,7 @@ ChipModule: 已与附加模块建立连接！
->结束
<<close_screen>>
<<clear_screen>>
<<jump PlugFinished>>
//<<jump PlugFinished>>
===
@@ -246,7 +246,7 @@ MemModule: 未检测到可查看的记忆卡带。
->结束
<<close_screen>>
<<clear_screen>>
<<jump PlugFinished>>
//<<jump PlugFinished>>
===
@@ -288,7 +288,8 @@ UfModule: 已与*UnstableFusion图像生成模块*建立连接！
->结束
<<close_screen>>
<<clear_screen>>
<<jump PlugFinished>>
<<jump 结束全身检查>>
//<<jump PlugFinished>>
===
@@ -326,7 +327,7 @@ EyeModule: 已与视觉模块建立连接！
->结束
<<close_screen>>
<<clear_screen>>
<<jump PlugFinished>>
//<<jump PlugFinished>>
===
Assets/Resources/Yarn/FP_Peipei3/Stage4_记忆色彩清除.yarn
-1
View File
@@ -3,7 +3,6 @@ tags:
colorID: 3
position: 246,-866
---
<<delete_line LineManager MemoryEye>>
me: 来吧……
<<ModuleHightLight Memory true>>
===
Assets/Resources/Yarn/FP_Peipei3/Start.yarn
+7 -1
View File
@@ -68,7 +68,13 @@ position: 248,-1739
<<jump Center>>
///一些状态初始化
<<declare $emoChecked=false>>
<<declare $speakerChecked=false>>
<<declare $logicChecked=false>>
<<declare $colorChecked=false>>
<<declare $memoryChecked=false>>
<<declare $UfChecked=false>>
<<declare $eyeChecked=false>>
//没有色彩晶圆
<<Temp_RemoveChip>>
===
Assets/Resources/Yarn/FP_Shitou2_2/Stage4_刻录.yarn
+2
View File
@@ -464,6 +464,8 @@ shitou: 这一定比原曲还要好！毕竟这是我和医生共同演奏和演
me: 哈哈。别取笑我了。
me: 结束了，让我们出去听听吧。
<<close_gear_cover>>
<<hide_dialog>>
<<jump 进入阶段5>>
Assets/Scenes/PeipeiFixScene.unity
+1 -1
View File
@@ -20989,7 +20989,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 1134468525
m_SortingLayer: 10
m_SortingOrder: 5
m_SortingOrder: 6
m_Sprite: {fileID: 3822937466802405960, guid: fd04c28739017964789d58d573f9fabb, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
Assets/Scenes/Persistence.unity
+1 -1
View File
@@ -9287,7 +9287,7 @@ MonoBehaviour:
runMode: 0
firstTalkSo: {fileID: 11400000, guid: ac5ca9a66ff22ab4b9cd5adbdade6b8c, type: 2}
testTalkSo: {fileID: 11400000, guid: e749fe0f9aa32f44097e037f52a5bfe0, type: 2}
saveFileName: StoneDay2_2_3
saveFileName: "PeipeiDay1_\u624B\u672F"
--- !u!4 &719228339
Transform:
m_ObjectHideFlags: 0
Assets/Scenes/ShitouHeadiFixScene.unity
+2 -171
View File
@@ -12337,6 +12337,7 @@ MonoBehaviour:
- {fileID: 1983689271}
- {fileID: 190481521}
- {fileID: 9804159}
coolingButton: {fileID: 0}
heatmapGameobject: {fileID: 1652512854}
imageToMove: {fileID: 0}
imageToRotate: {fileID: 0}
@@ -18314,90 +18315,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1098761359}
m_CullTransparentMesh: 1
--- !u!1 &1106054980
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1106054981}
- component: {fileID: 1106054982}
m_Layer: 0
m_Name: Socket
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!4 &1106054981
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1106054980}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0.005, y: -0.011, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1709695297}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &1106054982
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1106054980}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 0
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 0
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 1134468525
m_SortingLayer: 10
m_SortingOrder: 40
m_Sprite: {fileID: 3822937466802405960, guid: fd04c28739017964789d58d573f9fabb, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 0.43, y: 0.43}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 1
--- !u!1 &1110463259
GameObject:
m_ObjectHideFlags: 0
@@ -20456,7 +20373,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 1134468525
m_SortingLayer: 10
m_SortingOrder: 5
m_SortingOrder: 6
m_Sprite: {fileID: 3822937466802405960, guid: fd04c28739017964789d58d573f9fabb, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
@@ -29986,8 +29903,6 @@ Transform:
m_Children:
- {fileID: 16205055}
- {fileID: 1707229603}
- {fileID: 1970278982}
- {fileID: 1106054981}
m_Father: {fileID: 6045551082333026153}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1709695298
@@ -32980,90 +32895,6 @@ Transform:
- {fileID: 1305420100}
m_Father: {fileID: 1902723237}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1970278981
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1970278982}
- component: {fileID: 1970278983}
m_Layer: 0
m_Name: Module Pic
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!4 &1970278982
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1970278981}
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: 1709695297}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &1970278983
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1970278981}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 0
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 0
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 1134468525
m_SortingLayer: 10
m_SortingOrder: 10
m_Sprite: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 1.32, y: 1.11}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 0
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1 &1976507903
GameObject:
m_ObjectHideFlags: 0
ProjectSettings/BurstAotSettings_StandaloneOSX.json
+17
View File
@@ -0,0 +1,17 @@
{
"MonoBehaviour": {
"Version": 4,
"EnableBurstCompilation": true,
"EnableOptimisations": true,
"EnableSafetyChecks": false,
"EnableDebugInAllBuilds": false,
"DebugDataKind": 1,
"EnableArmv9SecurityFeatures": false,
"CpuMinTargetX32": 0,
"CpuMaxTargetX32": 0,
"CpuMinTargetX64": 0,
"CpuMaxTargetX64": 0,
"CpuTargetsX64": 72,
"OptimizeFor": 0
}
}