diff --git a/Assets/Resources/Yarn/ShitouTalk1/Shitou_Stage5.yarn b/Assets/Resources/Yarn/ShitouTalk1/Shitou_Stage5.yarn index ab225a732..a5040b7e6 100644 --- a/Assets/Resources/Yarn/ShitouTalk1/Shitou_Stage5.yarn +++ b/Assets/Resources/Yarn/ShitouTalk1/Shitou_Stage5.yarn @@ -164,6 +164,10 @@ shitou: 医生,没那么夸张啦。 me: …… me: 我先给你换第二瓶。 + +<> +<> +<> <> <> diff --git a/Assets/StreamingAssets/TestSaveFiles/StoneDay1_1.json b/Assets/StreamingAssets/TestSaveFiles/StoneDay1_1.json index 11f8c1ef8..08aef1b5b 100644 --- a/Assets/StreamingAssets/TestSaveFiles/StoneDay1_1.json +++ b/Assets/StreamingAssets/TestSaveFiles/StoneDay1_1.json @@ -3,7 +3,9 @@ "AibisDream.ClinicData, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null": { "characterName": null, "faceName": null, - "poseName": null + "poseName": null, + "hasDevice": false, + "isShow": false } }, "floatDict": { diff --git a/Assets/StreamingAssets/TestSaveFiles/StoneDay1_1.json.meta b/Assets/StreamingAssets/TestSaveFiles/StoneDay1_1.json.meta index 3e6870cab..f5b31cd5e 100644 --- a/Assets/StreamingAssets/TestSaveFiles/StoneDay1_1.json.meta +++ b/Assets/StreamingAssets/TestSaveFiles/StoneDay1_1.json.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d523c44b32332ff4eb71c17d0871799b +guid: dc2060b84a61a774aa5cac465d856625 DefaultImporter: externalObjects: {} userData: diff --git a/Assets/StreamingAssets/TestSaveFiles/StoneDay1_2.json b/Assets/StreamingAssets/TestSaveFiles/StoneDay1_2.json index c6bc4d4e0..fa2c2e0d7 100644 --- a/Assets/StreamingAssets/TestSaveFiles/StoneDay1_2.json +++ b/Assets/StreamingAssets/TestSaveFiles/StoneDay1_2.json @@ -3,7 +3,9 @@ "AibisDream.ClinicData, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null": { "characterName": "石头", "faceName": "大笑", - "poseName": "直立" + "poseName": "直立", + "hasDevice": false, + "isShow": true } }, "floatDict": { diff --git a/Assets/StreamingAssets/TestSaveFiles/StoneDay1_2.json.meta b/Assets/StreamingAssets/TestSaveFiles/StoneDay1_2.json.meta index dab9010c1..ecdb905b1 100644 --- a/Assets/StreamingAssets/TestSaveFiles/StoneDay1_2.json.meta +++ b/Assets/StreamingAssets/TestSaveFiles/StoneDay1_2.json.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 681c0a879cedd4344bf354d1e037ea7a +guid: 5f7754e5bde65fc43b3ebb14a6411306 DefaultImporter: externalObjects: {} userData: diff --git a/Assets/StreamingAssets/TestSaveFiles/StoneDay1_3.json b/Assets/StreamingAssets/TestSaveFiles/StoneDay1_3.json index 1e6306da8..0bfa9d2b5 100644 --- a/Assets/StreamingAssets/TestSaveFiles/StoneDay1_3.json +++ b/Assets/StreamingAssets/TestSaveFiles/StoneDay1_3.json @@ -3,7 +3,9 @@ "AibisDream.ClinicData, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null": { "characterName": "石头", "faceName": "大笑", - "poseName": "直立" + "poseName": "直立", + "hasDevice": false, + "isShow": true } }, "floatDict": { diff --git a/Assets/StreamingAssets/TestSaveFiles/StoneDay1_3.json.meta b/Assets/StreamingAssets/TestSaveFiles/StoneDay1_3.json.meta index 0cfd5568c..42d9611e4 100644 --- a/Assets/StreamingAssets/TestSaveFiles/StoneDay1_3.json.meta +++ b/Assets/StreamingAssets/TestSaveFiles/StoneDay1_3.json.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8347ef311d954d1448c183f471b36523 +guid: ab242221b1a61744c93e0e48952e8a5c DefaultImporter: externalObjects: {} userData: diff --git a/Assets/StreamingAssets/TestSaveFiles/StoneDay1_4.json b/Assets/StreamingAssets/TestSaveFiles/StoneDay1_4.json index 8a1af8118..7a8142871 100644 --- a/Assets/StreamingAssets/TestSaveFiles/StoneDay1_4.json +++ b/Assets/StreamingAssets/TestSaveFiles/StoneDay1_4.json @@ -3,7 +3,9 @@ "AibisDream.ClinicData, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null": { "characterName": "石头", "faceName": "大笑", - "poseName": "摸头" + "poseName": "摸头", + "hasDevice": false, + "isShow": true } }, "floatDict": { diff --git a/Assets/StreamingAssets/TestSaveFiles/StoneDay1_4.json.meta b/Assets/StreamingAssets/TestSaveFiles/StoneDay1_4.json.meta index 7f5b8d9bc..f76748028 100644 --- a/Assets/StreamingAssets/TestSaveFiles/StoneDay1_4.json.meta +++ b/Assets/StreamingAssets/TestSaveFiles/StoneDay1_4.json.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 40a092b581f193441bc8b911496f95a2 +guid: 66db0ad945851424c9719a7c9a8b1d07 DefaultImporter: externalObjects: {} userData: diff --git a/Assets/StreamingAssets/TestSaveFiles/StoneDay1_5.json b/Assets/StreamingAssets/TestSaveFiles/StoneDay1_5.json index c6540a8f6..3b0fad6b6 100644 --- a/Assets/StreamingAssets/TestSaveFiles/StoneDay1_5.json +++ b/Assets/StreamingAssets/TestSaveFiles/StoneDay1_5.json @@ -3,18 +3,20 @@ "AibisDream.ClinicData, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null": { "characterName": "石头", "faceName": "正常微微笑", - "poseName": "摸头" + "poseName": "摸头", + "hasDevice": false, + "isShow": true } }, "floatDict": { "$curAirLevel": 3.0, "$gameStage": 5.0, "$coolingCount": 0.0, - "$failTime": 4.0, + "$failTime": 0.0, "$selection": 0.0, "$PlugCount": 0.0, - "$Yarn.Internal.Visiting.调速popup_过速": 1.0, - "$Yarn.Internal.Visiting.调速popup_掉速": 1.0, + "$Yarn.Internal.Visiting.调速popup_过速": 0.0, + "$Yarn.Internal.Visiting.调速popup_掉速": 0.0, "$Yarn.Internal.Visiting.调速popup_调整进气档位": 2.0 }, "stringDict": { diff --git a/Assets/StreamingAssets/TestSaveFiles/StoneDay1_5.json.meta b/Assets/StreamingAssets/TestSaveFiles/StoneDay1_5.json.meta index 370c38dfa..c794aedfb 100644 --- a/Assets/StreamingAssets/TestSaveFiles/StoneDay1_5.json.meta +++ b/Assets/StreamingAssets/TestSaveFiles/StoneDay1_5.json.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c5546a4c5278b9a4db5dc1ed70da21e0 +guid: 7466a0e7d9784df4ea14dc9ca943ff9a DefaultImporter: externalObjects: {} userData: