Restore stashed changes and repair LFS conflicts

Assets/000_assets/material/M_SquareFrame 1.mat

@@ -213,7 +213,7 @@ Material:
     - _Dst: 10
     - _DstBlend: 0
     - _DstBlendAlpha: 0
-    - _EdgeValue: 0.9488194
+    - _EdgeValue: 0.51536673
     - _EnvironmentReflections: 1
     - _FNLfanxiangkaiguan: 0
     - _Face: 1
@@ -258,7 +258,7 @@ Material:
     - _Mask_scale: 1
     - _Metallic: 0
     - _OcclusionStrength: 1
-    - _Opacity: 0.0511806
+    - _Opacity: 0.48463327
     - _Parallax: 0.005
     - _Pass: 0
     - _QueueOffset: 0

Assets/Resources/Beatmaps/Chapter0/World for White Lies/Easy.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 991a788aeb2b59e4894d0c072361098c
+guid: 0f6221c28a664a64492a54b2e951a676
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Assets/Resources/Beatmaps/Chapter0/World for White Lies/Easy/Beatmap.bytes.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 753631091692ca345a8da0dd13e7d2bc
+guid: f89d4ed18a1a2db4c9b10bf6549b219d
 TextScriptImporter:
   externalObjects: {}
   userData: 

Assets/Resources/Beatmaps/Chapter0/World for White Lies/Easy/CommandScripts.bytes.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 5568a3795893a274f988fbc0b8fa5a07
+guid: 036df6c8c6fb43347a29426b7c9c51c6
 TextScriptImporter:
   externalObjects: {}
   userData: 

Assets/Resources/Beatmaps/Chapter0/World for White Lies/Easy/ProjectInfo.bytes.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: d61d4c3bc91f173489a2d1c8e311fdd6
+guid: 63d42bf35275e56408762ec8efdbbeb7
 TextScriptImporter:
   externalObjects: {}
   userData: 

Assets/Resources/Beatmaps/Chapter0/World for White Lies/Easy/SongInfo.bytes

@@ -1 +1,4 @@
-Îa7Rÿ<52>ýÙ鼞¸'©@É7Wì)ʽòvßC¦D¹Ö°¹Xhùé×è×ÖœdÃa9ˆpLß1†6þÓô<C393>Àf¼‹ÙÁŽŠ¦.+3oÁ|†toûÎ1»l·3¹ØH“Wyט$1ú(³oïyÓyŠë½Qf$]N›¿Ý'øFAK<41>±A=^Öº€a‚8x}ãVA¦<|ºvˆ¿5ÀÔŽžCRâ£
h¸Z[#€K?^ÊÞÒKæÖAš×¯Àš•·ë0F¥ØyÆèß…lTò<54>}²Zy«Õ$pL%÷¸Ã(*Bö .Xhœ/"ÊdœvÜÜ¥
+<9Бt8cФЉoЕЪг—z–,дd’OгMкqвb¬)„ЋЫ…p)“¤nћQCьhу„/Ћ";¤»6v}В
+Ў
1Qгє‰†јџ78°wҐКњHihn}—Ти7ял¶АќЪ_TущQ7UЭ-`ћ), Ј–RµжОЫ|Іш›АзХўєЈ?џKwX;•%0bИ zd[=yr(P~WPйљњВ’ЙI(/#ЕЬ3ФЪ^ЩJ|тmќГ2Зz
+ЮҐЋT‹Аq=›ХBЃ(~ИMg-и%|/2Lєo<ь#0пщґwпЧВћЛЂ}
+ЏY1эц

Assets/Resources/Beatmaps/Chapter0/World for White Lies/Easy/SongInfo.bytes.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: d95e0fc74d7593246b09ae4bc48539d9
+guid: d45cb1f1b2776e548a0838bb9956c721
 TextScriptImporter:
   externalObjects: {}
   userData: 

Assets/Scripts/NewStorySystem/Helper/StoryHelperController.cs

@@ -118,14 +118,12 @@ namespace Ichni.Story
         /// <summary>点击 Helper 的统一入口：播放反馈后创建一条新的专属气泡。</summary>
         private void HandleHelperClicked()
         {
-            if (Time.unscaledTime >= _nextClickTime)
+            if (Time.unscaledTime < _nextClickTime)
-            {
+                return;
-                TryCreateRandomTalk();
-                _nextClickTime = Time.unscaledTime + clickCooldown;
-            }
 
+            _nextClickTime = Time.unscaledTime + clickCooldown;
             PlayClickAnimation();
-
+            TryCreateRandomTalk();
         }
 
         /// <summary>

Assets/StreamingAssets/ThemeBundles/Android/Android.manifest

@@ -1,21 +1,21 @@
 ManifestFileVersion: 0
 UnityVersion: 6000.3.7f1
-CRC: 1212460786
+CRC: 3630187769
 HashAppended: 0
 AssetBundleManifest:
   AssetBundleInfos:
     Info_0:
-      Name: shapes
+      Name: unifiedraytracing
       Dependencies: {}
     Info_1:
       Name: basic
       Dependencies: {}
     Info_2:
-      Name: metropolis_on_orbit
-      Dependencies: {}
-    Info_3:
       Name: departure_to_multiverse
       Dependencies: {}
-    Info_4:
+    Info_3:
-      Name: unifiedraytracing
+      Name: metropolis_on_orbit
+      Dependencies: {}
+    Info_4:
+      Name: shapes
       Dependencies: {}

Assets/StreamingAssets/ThemeBundles/Android/basic.manifest

@@ -1,16 +1,16 @@
 ManifestFileVersion: 0
 UnityVersion: 6000.3.7f1
-CRC: 4187162310
+CRC: 3948698453
 Hashes:
   AssetFileHash:
     serializedVersion: 2
-    Hash: 041639c891c497f5cda773d76795250a
+    Hash: af7857bf316830adc26e256fe67e7e6e
   TypeTreeHash:
     serializedVersion: 2
     Hash: dfed41e3b38758e5f34df30221d719dc
   IncrementalBuildHash:
     serializedVersion: 2
-    Hash: fd431a0871b3281e203d8c5ae1ef07e3
+    Hash: 3808ec220bbc7f0a81ac1b76e5dfc9cf
 HashAppended: 0
 ClassTypes:
 - Class: 1

Assets/StreamingAssets/ThemeBundles/Android/departure_to_multiverse.manifest

@@ -1,16 +1,16 @@
 ManifestFileVersion: 0
 UnityVersion: 6000.3.7f1
-CRC: 1325295300
+CRC: 2734173510
 Hashes:
   AssetFileHash:
     serializedVersion: 2
-    Hash: 5451f82a726dcc14425b20ee9bc64122
+    Hash: a4542586529d099b3c27cdc77de4f41d
   TypeTreeHash:
     serializedVersion: 2
     Hash: 6d9f9b8bc1074349261a0dbbf7f0f9f8
   IncrementalBuildHash:
     serializedVersion: 2
-    Hash: 93d05b1cb2304ccbb2af18c7f4892613
+    Hash: 36398cc0e2113060e136863ff5a62156
 HashAppended: 0
 ClassTypes:
 - Class: 1

Assets/StreamingAssets/ThemeBundles/Android/metropolis_on_orbit.manifest

@@ -10,7 +10,7 @@ Hashes:
     Hash: 8ab77e54d824a64c30bc20496c5f5926
   IncrementalBuildHash:
     serializedVersion: 2
-    Hash: b9d9c1ed16d6159626cf983018a7d02a
+    Hash: 839fe28321d6bb7ee758d0377b2aba67
 HashAppended: 0
 ClassTypes:
 - Class: 1