diff --git a/Assets/Resources/SceneSO/StoneDay1.asset b/Assets/Resources/SceneSO/StoneDay1.asset
index 9f6e3dd85..f221ba530 100644
--- a/Assets/Resources/SceneSO/StoneDay1.asset
+++ b/Assets/Resources/SceneSO/StoneDay1.asset
@@ -13,6 +13,6 @@ MonoBehaviour:
m_Name: StoneDay1
m_EditorClassIdentifier:
nextScene: {fileID: 11400000, guid: 10601ce26230723479d875a630f15732, type: 2}
- yarnProject: {fileID: 7545569452688597077, guid: 23b032aeb7a33db4a94b50b89fc530a7, type: 3}
+ yarnProject: {fileID: 7545569452688597077, guid: f6e881cda6d5aed4eb97465135a6082b, type: 3}
firstSceneName: ExpressFixScene
isEndOfDay: 0
diff --git a/Assets/Resources/Yarn/ShitouTalk1/Shitou_Stage5.yarn b/Assets/Resources/Yarn/ShitouTalk1/Shitou_Stage5.yarn
index bae6fe2de..ab225a732 100644
--- a/Assets/Resources/Yarn/ShitouTalk1/Shitou_Stage5.yarn
+++ b/Assets/Resources/Yarn/ShitouTalk1/Shitou_Stage5.yarn
@@ -25,7 +25,7 @@ me: 打开卡扣,装上透析剂,关上卡扣,开始…
要是治疗都
title: 泵机运行后
-position: -1088,330
+position: -1087,408
---
<>
@@ -156,7 +156,7 @@ me: 到时候身体里面全是老旧的模块…也只不过刚好把贷还完
shitou: 医生,没那么夸张啦。
<>
-<>
+<>
<>
<>
<>
diff --git a/Assets/Scenes/ExpressFixScene.unity b/Assets/Scenes/ExpressFixScene.unity
index 70cc9924c..a46b7f2e5 100644
--- a/Assets/Scenes/ExpressFixScene.unity
+++ b/Assets/Scenes/ExpressFixScene.unity
@@ -1958,7 +1958,7 @@ Transform:
m_GameObject: {fileID: 551825976}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: -3.8979297, y: 2.619558, z: 0}
+ m_LocalPosition: {x: -3.891, y: 2.62, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@@ -1977,8 +1977,8 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
curLevel: 1
- heightY: 0.562
- minY: 0.221
+ heightY: 0.553
+ minY: 2.517
--- !u!61 &551825979
BoxCollider2D:
m_ObjectHideFlags: 0
@@ -2064,7 +2064,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 1134468525
m_SortingLayer: 10
- m_SortingOrder: 6
+ m_SortingOrder: 7
m_Sprite: {fileID: 6212179574069646204, guid: 149a798e8f987264f82beb4f4052eb5e, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
@@ -5460,7 +5460,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 1134468525
m_SortingLayer: 10
- m_SortingOrder: 5
+ m_SortingOrder: 6
m_Sprite: {fileID: 6398009670296464108, guid: 149a798e8f987264f82beb4f4052eb5e, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
diff --git a/Assets/Scenes/Persistence.unity b/Assets/Scenes/Persistence.unity
index 5ebe14f62..a507f143d 100644
--- a/Assets/Scenes/Persistence.unity
+++ b/Assets/Scenes/Persistence.unity
@@ -1018,37 +1018,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 85815d386fde43dca8b4be1cfd26fe89, type: 3}
m_Name:
m_EditorClassIdentifier:
---- !u!1 &72131186
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 72131187}
- m_Layer: 0
- m_Name: TestManager
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &72131187
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 72131186}
- 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: 1009826577}
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &72512885
GameObject:
m_ObjectHideFlags: 0
@@ -7864,10 +7833,10 @@ MonoBehaviour:
- {fileID: 11400000, guid: 9e3b2c77ad4a9454188d458da2cf0ddd, type: 2}
- {fileID: 11400000, guid: 6d49b124127007b48b6881ce33350263, type: 2}
- {fileID: 11400000, guid: fe71f935f1f9a52458c994362567a211, type: 2}
- runMode: 1
+ runMode: 2
firstTalkSo: {fileID: 11400000, guid: 6d49b124127007b48b6881ce33350263, type: 2}
testTalkSo: {fileID: 11400000, guid: 6d49b124127007b48b6881ce33350263, type: 2}
- saveFileName: StoneDay1_2
+ saveFileName: StoneDay1_5
--- !u!4 &719228339
Transform:
m_ObjectHideFlags: 0
@@ -7877,7 +7846,7 @@ Transform:
m_GameObject: {fileID: 719228336}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: -748.1581, y: -442.48004, z: 11.807568}
+ m_LocalPosition: {x: 0, y: 0, z: 11.807568}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@@ -7958,37 +7927,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 731599307}
m_CullTransparentMesh: 1
---- !u!1 &736543452
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 736543453}
- m_Layer: 0
- m_Name: NotificationManager
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &736543453
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 736543452}
- 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: 1009826577}
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &759307075
PrefabInstance:
m_ObjectHideFlags: 0
@@ -10472,7 +10410,7 @@ Transform:
m_GameObject: {fileID: 1009826576}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 748.1581, y: 442.48004, z: -11.807568}
+ m_LocalPosition: {x: 0, y: 0, z: -11.807568}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
@@ -10481,8 +10419,6 @@ Transform:
- {fileID: 40915750}
- {fileID: 442870838}
- {fileID: 2000641911}
- - {fileID: 72131187}
- - {fileID: 736543453}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1015707783
diff --git a/Assets/Scripts/Dialog System/DialogController.cs b/Assets/Scripts/Dialog System/DialogController.cs
index 12b49c94b..28ce28499 100644
--- a/Assets/Scripts/Dialog System/DialogController.cs
+++ b/Assets/Scripts/Dialog System/DialogController.cs
@@ -114,7 +114,7 @@ namespace AibisDream
public void LoadDialog(YarnProject yarnProject)
{
_dialogueRunner.SetProject(yarnProject);
- _dialogueRunner.StartDialogue("主维修界面");
+ _dialogueRunner.StartDialogue("Center");
}
public void StartDialogNode(string nodeName)
diff --git a/Assets/Scripts/FixSystemNew/BodyModule/BodyModuleSystem.cs b/Assets/Scripts/FixSystemNew/BodyModule/BodyModuleSystem.cs
index d2693ffc5..3c95efb08 100644
--- a/Assets/Scripts/FixSystemNew/BodyModule/BodyModuleSystem.cs
+++ b/Assets/Scripts/FixSystemNew/BodyModule/BodyModuleSystem.cs
@@ -1,3 +1,4 @@
+using System;
using System.Linq;
using AibisDream.Framework;
using AibisDream.Kit;
@@ -78,6 +79,11 @@ namespace AibisDream.FixSystem
CameraKit.Instance.RegisterCamera(FixState.BodyModule, virtualCam);
}
+ private void OnDestroy()
+ {
+ CameraKit.Instance.UnRegisterCamera(FixState.BodyModule);
+ }
+
///
/// 寻找最接近的Module
///
diff --git a/Assets/Scripts/FixSystemNew/Clinic/CharacterViewer.cs b/Assets/Scripts/FixSystemNew/Clinic/CharacterViewer.cs
index 1cce62b14..6245318a3 100644
--- a/Assets/Scripts/FixSystemNew/Clinic/CharacterViewer.cs
+++ b/Assets/Scripts/FixSystemNew/Clinic/CharacterViewer.cs
@@ -19,7 +19,7 @@ namespace AibisDream.FixSystem
private SpriteRenderer _blinkLayer;
public CharacterData characterData;
- public event Action CharacterChangeEvent;
+ public event Action CharacterChangeEvent;
public IEnumerator CharacterInit(string characterName)
{
@@ -62,7 +62,6 @@ namespace AibisDream.FixSystem
yield return new WaitForSeconds(1);
// 激活角色
_curCharacter.SetActive(true);
-
UpdateCharacterData();
}
@@ -80,7 +79,7 @@ namespace AibisDream.FixSystem
{
layer.enabled = layer.gameObject.name == layerName;
}
-
+
// 如果输入为空,就默认激活一层
if (layerName == null)
{
@@ -95,12 +94,7 @@ namespace AibisDream.FixSystem
{
_characterAlpha = alpha;
SpriteRenderer[] renderers = _curCharacter.GetComponentsInChildren(true);
- foreach (var childRenderer in renderers)
- {
- Color color = childRenderer.color;
- color.a = alpha;
- childRenderer.color = color;
- }
+ Array.ForEach(renderers, spriteRenderer => { spriteRenderer.SetAlpha(alpha); });
}
public IEnumerator CharacterFadeIn(float duration = 1f)
@@ -178,7 +172,7 @@ namespace AibisDream.FixSystem
{
LinkDevice.gameObject.SetActive(false);
}
-
+
public void CharacterShow(string characterName)
{
if (_curCharacter != null)
diff --git a/Assets/Scripts/FixSystemNew/Clinic/ClinicSystem.cs b/Assets/Scripts/FixSystemNew/Clinic/ClinicSystem.cs
index c8aadcd08..dbf3915a0 100644
--- a/Assets/Scripts/FixSystemNew/Clinic/ClinicSystem.cs
+++ b/Assets/Scripts/FixSystemNew/Clinic/ClinicSystem.cs
@@ -88,6 +88,7 @@ namespace AibisDream
_clinicData.LoadEvent -= LoadData;
GameLoopManager.FixDataContainer.Unregister();
FixSystemCenter.SystemDic.Unregister();
+ CameraKit.Instance.UnRegisterCamera(FixState.Clinic);
}
private void OnCharacterChange(CharacterData characterData)
@@ -101,7 +102,7 @@ namespace AibisDream
public string characterName;
public string faceName;
public string poseName;
-
+
public event Action LoadEvent;
public void Load()
diff --git a/Assets/Scripts/FixSystemNew/CoolingMachine/CoolingSystem.cs b/Assets/Scripts/FixSystemNew/CoolingMachine/CoolingSystem.cs
index 4af19e774..3a5b22d30 100644
--- a/Assets/Scripts/FixSystemNew/CoolingMachine/CoolingSystem.cs
+++ b/Assets/Scripts/FixSystemNew/CoolingMachine/CoolingSystem.cs
@@ -1,4 +1,5 @@
-using System.Collections;
+using System;
+using System.Collections;
using AibisDream.FixSystem;
using Cinemachine;
using UnityEngine;
@@ -41,7 +42,12 @@ namespace AibisDream.Framework
isLocked = true;
}
-
+
+ private void OnDestroy()
+ {
+ CameraKit.Instance.UnRegisterCamera(FixState.CoolingMachine);
+ }
+
#region 对外开放
public IEnumerator OpenCoolingSystem()
diff --git a/Assets/Scripts/FixSystemNew/FixStateMachine.cs b/Assets/Scripts/FixSystemNew/FixStateMachine.cs
index f9df4f1c0..52d665a00 100644
--- a/Assets/Scripts/FixSystemNew/FixStateMachine.cs
+++ b/Assets/Scripts/FixSystemNew/FixStateMachine.cs
@@ -21,6 +21,14 @@ namespace AibisDream.FixSystem
yield return _curState.Enter();
}
+ public IEnumerator QuitState()
+ {
+ _curArgs = null;
+ yield return _curState?.Exit();
+ GameLoopManager.Instance?.UpdateFixState(FixState.Default, _curArgs);
+ _curState = null;
+ }
+
private static IState CreateState(FixState nextState, string args)
{
IState res = nextState switch
@@ -49,7 +57,7 @@ namespace AibisDream.FixSystem
public IEnumerator Exit();
}
- public class ClinicState : IState
+ public struct ClinicState : IState
{
public FixState GetState => FixState.Clinic;
@@ -71,7 +79,7 @@ namespace AibisDream.FixSystem
}
}
- public class BodyModuleState : IState
+ public struct BodyModuleState : IState
{
public FixState GetState => FixState.BodyModule;
@@ -98,7 +106,7 @@ namespace AibisDream.FixSystem
}
}
- public class GearState : IState
+ public struct GearState : IState
{
public FixState GetState => FixState.Gear;
@@ -111,6 +119,13 @@ namespace AibisDream.FixSystem
public IEnumerator Enter()
{
+ // 先切BodyModule
+ if (!CameraKit.Instance.EqualToCameraState(FixState.BodyModule))
+ {
+ yield return MainUIController.Instance?.FadeInSync(0.5f);
+ yield return CameraKit.Instance.SwitchCamera(FixState.BodyModule);
+ yield return MainUIController.Instance?.FadeOutSync(0.5f);
+ }
// 切换相机
yield return CameraKit.Instance.SwitchCamera(FixState.Gear);
// 加载关卡数据
@@ -128,7 +143,7 @@ namespace AibisDream.FixSystem
}
}
- public class EngineState : IState
+ public struct EngineState : IState
{
public FixState GetState => FixState.Engine;
@@ -139,6 +154,13 @@ namespace AibisDream.FixSystem
public IEnumerator Enter()
{
+ // 先切BodyModule
+ if (!CameraKit.Instance.EqualToCameraState(FixState.BodyModule))
+ {
+ yield return MainUIController.Instance?.FadeInSync(0.5f);
+ yield return CameraKit.Instance.SwitchCamera(FixState.BodyModule);
+ yield return MainUIController.Instance?.FadeOutSync(0.5f);
+ }
// 切换相机
yield return CameraKit.Instance.SwitchCamera(FixState.Engine);
}
@@ -151,7 +173,7 @@ namespace AibisDream.FixSystem
}
}
- public class CoolingMachineState : IState
+ public struct CoolingMachineState : IState
{
private bool _playLink;
@@ -188,7 +210,7 @@ namespace AibisDream.FixSystem
}
}
- public class UfState : IState
+ public struct UfState : IState
{
public FixState GetState => FixState.UF;
@@ -208,7 +230,7 @@ namespace AibisDream.FixSystem
}
}
- public class EyeState : IState
+ public struct EyeState : IState
{
public FixState GetState => FixState.Eye;
@@ -228,7 +250,7 @@ namespace AibisDream.FixSystem
}
}
- public class MemoryState : IState
+ public struct MemoryState : IState
{
public FixState GetState => FixState.Memory;
diff --git a/Assets/Scripts/FixSystemNew/FixSystemCenter.cs b/Assets/Scripts/FixSystemNew/FixSystemCenter.cs
index dd05266d7..fddb50d6a 100644
--- a/Assets/Scripts/FixSystemNew/FixSystemCenter.cs
+++ b/Assets/Scripts/FixSystemNew/FixSystemCenter.cs
@@ -22,6 +22,13 @@ namespace AibisDream.FixSystem
StartCoroutine(StateMachine.SwitchState(FixState.Clinic));
}
+ public override void OnSingletonDestroy()
+ {
+ SystemDic.Clear();
+ StartCoroutine(StateMachine.QuitState());
+ CameraKit.Instance.RemoveAllCam();
+ }
+
#region 系统索引
// 容纳System
@@ -78,12 +85,6 @@ namespace AibisDream.FixSystem
return command;
}
- protected override void OnDestroy()
- {
- SystemDic.Clear();
- base.OnDestroy();
- }
-
#endregion
}
}
\ No newline at end of file
diff --git a/Assets/Scripts/Framework/OtherKit/CameraKit.cs b/Assets/Scripts/Framework/OtherKit/CameraKit.cs
index dcf9936fb..eca2599ba 100644
--- a/Assets/Scripts/Framework/OtherKit/CameraKit.cs
+++ b/Assets/Scripts/Framework/OtherKit/CameraKit.cs
@@ -84,6 +84,16 @@ namespace AibisDream.Framework
#endregion
+ ///
+ /// 检查当前是否需要切相机
+ ///
+ ///
+ /// 是就不用切相机
+ public bool EqualToCameraState(FixState targetCameraState)
+ {
+ return _curFixState == targetCameraState;
+ }
+
///
/// 切换相机
///
diff --git a/Assets/Scripts/Framework/SingletonKit/Singleton.cs b/Assets/Scripts/Framework/SingletonKit/Singleton.cs
index b14a339bd..1b02732eb 100644
--- a/Assets/Scripts/Framework/SingletonKit/Singleton.cs
+++ b/Assets/Scripts/Framework/SingletonKit/Singleton.cs
@@ -25,11 +25,11 @@ namespace AibisDream.Kit
protected virtual void OnDestroy()
{
+ OnSingletonDestroy();
if (Instance == this)
{
Instance = null;
}
- OnSingletonDestroy();
}
public virtual void OnSingletonDestroy()
diff --git a/Assets/Scripts/MiniGame/Engine/EngineSystem.cs b/Assets/Scripts/MiniGame/Engine/EngineSystem.cs
index 58df9fd73..cf1b60aaf 100644
--- a/Assets/Scripts/MiniGame/Engine/EngineSystem.cs
+++ b/Assets/Scripts/MiniGame/Engine/EngineSystem.cs
@@ -57,6 +57,11 @@ namespace AibisDream
engineData.UpdateAirLevel(1, config.maxLevel); // 内部档位从0计数,1就是2
}
+ private void OnDestroy()
+ {
+ CameraKit.Instance.UnRegisterCamera(FixState.Engine);
+ }
+
private void Update()
{
// 更新部分按时间自然计算的指标
diff --git a/Assets/Scripts/MiniGame/Gear/GearSystem.cs b/Assets/Scripts/MiniGame/Gear/GearSystem.cs
index 37deb92e6..10890bc12 100644
--- a/Assets/Scripts/MiniGame/Gear/GearSystem.cs
+++ b/Assets/Scripts/MiniGame/Gear/GearSystem.cs
@@ -59,7 +59,7 @@ namespace AibisDream
CameraKit.Instance.RegisterCamera(FixState.Gear, virtualCam);
}
- public void Start()
+ private void Start()
{
_shaftGraph?.Clear();
var shafts = transform.Find("Shafts").GetComponentsInChildren();
@@ -69,6 +69,11 @@ namespace AibisDream
_panel.gameObject.SetActive(false);
}
+ private void OnDestroy()
+ {
+ CameraKit.Instance.UnRegisterCamera(FixState.Gear);
+ }
+
#endregion
///
diff --git a/Assets/Scripts/Utility/CommonUtil.cs b/Assets/Scripts/Utility/CommonUtil.cs
index 0ceb9c074..b62051e7b 100644
--- a/Assets/Scripts/Utility/CommonUtil.cs
+++ b/Assets/Scripts/Utility/CommonUtil.cs
@@ -123,5 +123,16 @@ namespace AibisDream.Utility
}
#endregion
+
+ #region 静态扩展
+
+ public static void SetAlpha(this SpriteRenderer renderer, float targetAlpha)
+ {
+ Color color = renderer.color;
+ color.a = targetAlpha;
+ renderer.color = color;
+ }
+
+ #endregion
}
}
\ No newline at end of file
diff --git a/Assets/StreamingAssets/TestSaveFiles/StoneDay1_1.json b/Assets/StreamingAssets/TestSaveFiles/StoneDay1_1.json
new file mode 100644
index 000000000..11f8c1ef8
--- /dev/null
+++ b/Assets/StreamingAssets/TestSaveFiles/StoneDay1_1.json
@@ -0,0 +1,41 @@
+{
+ "fixDataContainer": {
+ "AibisDream.ClinicData, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null": {
+ "characterName": null,
+ "faceName": null,
+ "poseName": null
+ }
+ },
+ "floatDict": {
+ "$curAirLevel": 2.0,
+ "$gameStage": 1.0,
+ "$coolingCount": 0.0,
+ "$failTime": 0.0,
+ "$selection": 0.0,
+ "$PlugCount": 0.0,
+ "$Yarn.Internal.Visiting.调速popup_过速": 0.0,
+ "$Yarn.Internal.Visiting.调速popup_掉速": 0.0,
+ "$Yarn.Internal.Visiting.调速popup_调整进气档位": 0.0
+ },
+ "stringDict": {
+ "$StartNode": "",
+ "$EndNode": "",
+ "$currentSocket": "",
+ "$curBottleName": ""
+ },
+ "boolDict": {
+ "$isFinishedClueBoard": false,
+ "$hintFlag": false,
+ "$lungProblemKnown": false,
+ "$fuelProblemKnown": false,
+ "$engineProblemKnown": false,
+ "$bloodProblemKnown": false,
+ "$bloodRenewedKnown": false,
+ "$bloodQuestioned": false,
+ "$PlugAll": false
+ },
+ "curSceneKey": "ExpressFixScene",
+ "curTalkSceneSo": "StoneDay1",
+ "fixState": 0,
+ "fixStateArgs": null
+}
\ No newline at end of file
diff --git a/Assets/StreamingAssets/TestSaveFiles/StoneDay1_1.json.meta b/Assets/StreamingAssets/TestSaveFiles/StoneDay1_1.json.meta
new file mode 100644
index 000000000..3e6870cab
--- /dev/null
+++ b/Assets/StreamingAssets/TestSaveFiles/StoneDay1_1.json.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: d523c44b32332ff4eb71c17d0871799b
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/StreamingAssets/TestSaveFiles/StoneDay1_2.json b/Assets/StreamingAssets/TestSaveFiles/StoneDay1_2.json
index b8756b64e..c6bc4d4e0 100644
--- a/Assets/StreamingAssets/TestSaveFiles/StoneDay1_2.json
+++ b/Assets/StreamingAssets/TestSaveFiles/StoneDay1_2.json
@@ -9,12 +9,12 @@
"floatDict": {
"$curAirLevel": 2.0,
"$gameStage": 2.0,
+ "$coolingCount": 0.0,
+ "$failTime": 0.0,
"$selection": 0.0,
"$PlugCount": 0.0,
- "$failTime": 0.0,
"$Yarn.Internal.Visiting.调速popup_过速": 0.0,
"$Yarn.Internal.Visiting.调速popup_掉速": 0.0,
- "$Yarn.Internal.Visiting.调速popup_初次调速完成": 0.0,
"$Yarn.Internal.Visiting.调速popup_调整进气档位": 0.0
},
"stringDict": {
@@ -26,7 +26,7 @@
"boolDict": {
"$isFinishedClueBoard": false,
"$hintFlag": false,
- "$lungProblemKnown": true,
+ "$lungProblemKnown": false,
"$fuelProblemKnown": false,
"$engineProblemKnown": false,
"$bloodProblemKnown": false,
@@ -36,6 +36,6 @@
},
"curSceneKey": "ExpressFixScene",
"curTalkSceneSo": "StoneDay1",
- "fixState": 3,
+ "fixState": 1,
"fixStateArgs": ""
}
\ No newline at end of file
diff --git a/Assets/StreamingAssets/TestSaveFiles/StoneDay1_2.json.meta b/Assets/StreamingAssets/TestSaveFiles/StoneDay1_2.json.meta
index 61191fb9c..dab9010c1 100644
--- a/Assets/StreamingAssets/TestSaveFiles/StoneDay1_2.json.meta
+++ b/Assets/StreamingAssets/TestSaveFiles/StoneDay1_2.json.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: a8506b35c63c60f4eadaafafd23b18d4
+guid: 681c0a879cedd4344bf354d1e037ea7a
DefaultImporter:
externalObjects: {}
userData:
diff --git a/Assets/StreamingAssets/TestSaveFiles/StoneDay1_3.json b/Assets/StreamingAssets/TestSaveFiles/StoneDay1_3.json
new file mode 100644
index 000000000..1e6306da8
--- /dev/null
+++ b/Assets/StreamingAssets/TestSaveFiles/StoneDay1_3.json
@@ -0,0 +1,41 @@
+{
+ "fixDataContainer": {
+ "AibisDream.ClinicData, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null": {
+ "characterName": "石头",
+ "faceName": "大笑",
+ "poseName": "直立"
+ }
+ },
+ "floatDict": {
+ "$curAirLevel": 2.0,
+ "$gameStage": 3.0,
+ "$coolingCount": 0.0,
+ "$failTime": 0.0,
+ "$selection": 0.0,
+ "$PlugCount": 0.0,
+ "$Yarn.Internal.Visiting.调速popup_过速": 0.0,
+ "$Yarn.Internal.Visiting.调速popup_掉速": 0.0,
+ "$Yarn.Internal.Visiting.调速popup_调整进气档位": 0.0
+ },
+ "stringDict": {
+ "$StartNode": "",
+ "$EndNode": "",
+ "$currentSocket": "",
+ "$curBottleName": ""
+ },
+ "boolDict": {
+ "$isFinishedClueBoard": false,
+ "$hintFlag": false,
+ "$lungProblemKnown": true,
+ "$fuelProblemKnown": true,
+ "$engineProblemKnown": true,
+ "$bloodProblemKnown": true,
+ "$bloodRenewedKnown": false,
+ "$bloodQuestioned": false,
+ "$PlugAll": false
+ },
+ "curSceneKey": "ExpressFixScene",
+ "curTalkSceneSo": "StoneDay1",
+ "fixState": 3,
+ "fixStateArgs": ""
+}
\ No newline at end of file
diff --git a/Assets/StreamingAssets/TestSaveFiles/StoneDay1_3.json.meta b/Assets/StreamingAssets/TestSaveFiles/StoneDay1_3.json.meta
new file mode 100644
index 000000000..0cfd5568c
--- /dev/null
+++ b/Assets/StreamingAssets/TestSaveFiles/StoneDay1_3.json.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 8347ef311d954d1448c183f471b36523
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/StreamingAssets/TestSaveFiles/StoneDay1_4.json b/Assets/StreamingAssets/TestSaveFiles/StoneDay1_4.json
new file mode 100644
index 000000000..8a1af8118
--- /dev/null
+++ b/Assets/StreamingAssets/TestSaveFiles/StoneDay1_4.json
@@ -0,0 +1,41 @@
+{
+ "fixDataContainer": {
+ "AibisDream.ClinicData, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null": {
+ "characterName": "石头",
+ "faceName": "大笑",
+ "poseName": "摸头"
+ }
+ },
+ "floatDict": {
+ "$curAirLevel": 2.0,
+ "$gameStage": 4.0,
+ "$coolingCount": 0.0,
+ "$failTime": 0.0,
+ "$selection": 0.0,
+ "$PlugCount": 0.0,
+ "$Yarn.Internal.Visiting.调速popup_过速": 0.0,
+ "$Yarn.Internal.Visiting.调速popup_掉速": 0.0,
+ "$Yarn.Internal.Visiting.调速popup_调整进气档位": 0.0
+ },
+ "stringDict": {
+ "$StartNode": "",
+ "$EndNode": "",
+ "$currentSocket": "",
+ "$curBottleName": ""
+ },
+ "boolDict": {
+ "$isFinishedClueBoard": false,
+ "$hintFlag": false,
+ "$lungProblemKnown": true,
+ "$fuelProblemKnown": true,
+ "$engineProblemKnown": true,
+ "$bloodProblemKnown": true,
+ "$bloodRenewedKnown": false,
+ "$bloodQuestioned": false,
+ "$PlugAll": false
+ },
+ "curSceneKey": "ExpressFixScene",
+ "curTalkSceneSo": "StoneDay1",
+ "fixState": 1,
+ "fixStateArgs": ""
+}
\ No newline at end of file
diff --git a/Assets/StreamingAssets/TestSaveFiles/StoneDay1_4.json.meta b/Assets/StreamingAssets/TestSaveFiles/StoneDay1_4.json.meta
new file mode 100644
index 000000000..7f5b8d9bc
--- /dev/null
+++ b/Assets/StreamingAssets/TestSaveFiles/StoneDay1_4.json.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 40a092b581f193441bc8b911496f95a2
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/StreamingAssets/TestSaveFiles/StoneDay1_5.json b/Assets/StreamingAssets/TestSaveFiles/StoneDay1_5.json
new file mode 100644
index 000000000..c6540a8f6
--- /dev/null
+++ b/Assets/StreamingAssets/TestSaveFiles/StoneDay1_5.json
@@ -0,0 +1,41 @@
+{
+ "fixDataContainer": {
+ "AibisDream.ClinicData, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null": {
+ "characterName": "石头",
+ "faceName": "正常微微笑",
+ "poseName": "摸头"
+ }
+ },
+ "floatDict": {
+ "$curAirLevel": 3.0,
+ "$gameStage": 5.0,
+ "$coolingCount": 0.0,
+ "$failTime": 4.0,
+ "$selection": 0.0,
+ "$PlugCount": 0.0,
+ "$Yarn.Internal.Visiting.调速popup_过速": 1.0,
+ "$Yarn.Internal.Visiting.调速popup_掉速": 1.0,
+ "$Yarn.Internal.Visiting.调速popup_调整进气档位": 2.0
+ },
+ "stringDict": {
+ "$StartNode": "",
+ "$EndNode": "",
+ "$currentSocket": "",
+ "$curBottleName": ""
+ },
+ "boolDict": {
+ "$isFinishedClueBoard": false,
+ "$hintFlag": false,
+ "$lungProblemKnown": true,
+ "$fuelProblemKnown": true,
+ "$engineProblemKnown": true,
+ "$bloodProblemKnown": true,
+ "$bloodRenewedKnown": false,
+ "$bloodQuestioned": false,
+ "$PlugAll": false
+ },
+ "curSceneKey": "ExpressFixScene",
+ "curTalkSceneSo": "StoneDay1",
+ "fixState": 1,
+ "fixStateArgs": ""
+}
\ No newline at end of file
diff --git a/Assets/StreamingAssets/TestSaveFiles/StoneDay1_5.json.meta b/Assets/StreamingAssets/TestSaveFiles/StoneDay1_5.json.meta
new file mode 100644
index 000000000..370c38dfa
--- /dev/null
+++ b/Assets/StreamingAssets/TestSaveFiles/StoneDay1_5.json.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: c5546a4c5278b9a4db5dc1ed70da21e0
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant: