Merge branch 'D1S流程加锁' into 'develop'

Lock Day1 sleep flow and allow early ring pickup

See merge request aibis-dream/aibis-dream!713

Assets/Yarn/FP/FP_Day1_sleep/FP_Day1_sleep-en.csv

@@ -197,6 +197,7 @@
 "en","line:09c5690","Search for parts","FP_Day1_sleep","","","",""
 "en","line:04bff73","<i>You don't recognize most of the parts. But luck is on your side.</i>","FP_Day1_sleep","","","",""
 "en","line:06c0942","Intact Compression Ring","FP_Day1_sleep","","","",""
+"en","line:0c9a2d1","<i>You pick up a small metal ring. You don't know what it could be used for yet.</i>","FP_Day1_sleep","","","",""
 "en","line:01ed9bc","me:This should do the trick.","FP_Day1_sleep","","","",""
 "en","line:00798be","Telescope","FP_Day1_sleep","","","",""
 "en","line:04e4782","<i>The telescope is large, engraved with parameters and model numbers you can't decipher.</i>","FP_Day1_sleep","","","",""

Assets/Yarn/FP/FP_Day1_sleep/FP_Day1_sleep-ja.csv

@@ -197,6 +197,7 @@
 "ja-JP","line:09c5690","部品を探す","FP_Day1_sleep","","","",""
 "ja-JP","line:04bff73","<i>ほとんどの部品は見覚えがない。でも運が良かった。</i>","FP_Day1_sleep","","","",""
 "ja-JP","line:06c0942","無損傷の圧縮リング","FP_Day1_sleep","","","",""
+"ja-JP","line:0c9a2d1","<i>小さな金属の輪を拾った。何に使えるのかは、まだわからない。</i>","FP_Day1_sleep","","","",""
 "ja-JP","line:01ed9bc","me:これでなんとかなるはず。","FP_Day1_sleep","","","",""
 "ja-JP","line:00798be","望遠鏡","FP_Day1_sleep","","","",""
 "ja-JP","line:04e4782","<i>望遠鏡は大きく、読み取れないパラメータや型番が刻まれている。</i>","FP_Day1_sleep","","","",""

Assets/Yarn/FP/FP_Day1_sleep/FP_Day1_sleep.yarn

@@ -348,9 +348,7 @@ tags: hub
         //你进门又走上一圈旋转楼梯，进入了一个昏暗圆形的房间。 #line:0c07ecc 
         <<hide_sprite>>
         <<jump 天文台>>
-    ->下去 #line:0d7f5dc 
-        <<jump 天台>> 
-->下楼 #line:0bf285a 
+->下楼<<if $gameStage<2>> #line:0bf285a #deps:gameStage
     <<hide_sprite>>
     <<jump 走廊>>
 <<jump 天台>>
@@ -531,16 +529,22 @@ tags: detour
         <i>望远镜上贴着一张白色的便笺。</i> #line:092260e 
         <i>你碰了一下，便笺碎掉了。</i> #line:012a3a1 
     <<endif>>
-->仪器 #line:007cbe4 #deps:wyjStage
+->仪器 #line:007cbe4 #deps:wyjStage,hasCompressionRing
     <i>这些仪器看着很像你工作用的工具……</i> #line:0076043 
     <<if $wyjStage == 0>>
         <i>……不对，你真的有那个工作吗？你只是一个学生吧。</i> #line:0256c87 
     <<elseif $wyjStage == 1>>
         me: 只要…什么都能修好，对吧。你说的… #line:005b630 
+    <<endif>>
+    <<if $hasCompressionRing == false && $wyjStage < 2>>
         ->翻找零件 #line:09c5690 
             <i>大部分零件你都不认识。不过你的运气不错。</i> #line:04bff73 
             ->完好的压缩环 #line:06c0942 
-                me: 这下应该可以了。 #line:01ed9bc 
+                <<if $wyjStage == 0>>
+                    <i>你拿起一个小小的金属环。你还不知道它能用在哪里。</i> #line:0c9a2d1
+                <<else>>
+                    me: 这下应该可以了。 #line:01ed9bc
+                <<endif>>
                 <<detour 找到压缩环_Set>>
     <<endif>>
 ===

Assets/Yarn/FP/FP_Day1_sleep/Func.yarn

@@ -6,6 +6,7 @@ tags: init
 <<declare $pphChecked=false>>
 <<declare $scj=0>>
 <<declare $wyjStage=0>>
+<<declare $hasCompressionRing=false>>
 <<declare $gameStage=0>> // 0=白天 1=夕阳 2=门开
 ===
 
@@ -115,11 +116,18 @@ tags: function
 title: 找到压缩环_Set
 tags: function
 ---
-<<set $wyjStage=2>>
+<<set $hasCompressionRing=true>>
+<<if $wyjStage==1>>
+    <<set $wyjStage=2>>
+<<endif>>
 ===
 
 title: 目镜掉落_Set
 tags: function
 ---
-<<set $wyjStage=$wyjStage+1>>
+<<if $hasCompressionRing>>
+    <<set $wyjStage=2>>
+<<else>>
+    <<set $wyjStage=1>>
+<<endif>>
 ===