From db9d5c8c01c64fb14c55711c136e6d47bc98e5e6 Mon Sep 17 00:00:00 2001
From: bottlefish <781230111@qq.com>
Date: Mon, 30 Dec 2024 02:04:33 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A9currenttartget=E9=87=8D=E5=A4=8D?=
 =?UTF-8?q?=E4=B9=9F=E8=83=BD=E8=A7=A6=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Assets/Resources/Yarn/EyeTest.meta            |  8 ++
 Assets/Resources/Yarn/EyeTest/EyeTest.yarn    | 84 +++++++++++++++++++
 .../Resources/Yarn/EyeTest/EyeTest.yarn.meta  | 10 +++
 .../Yarn/EyeTest/EyeTest.yarnproject          | 12 +++
 .../Yarn/EyeTest/EyeTest.yarnproject.meta     | 13 +++
 .../Scripts/MiniGame/Peipei/Eye/EyeSystem.cs  | 16 ++--
 6 files changed, 135 insertions(+), 8 deletions(-)
 create mode 100644 Assets/Resources/Yarn/EyeTest.meta
 create mode 100644 Assets/Resources/Yarn/EyeTest/EyeTest.yarn
 create mode 100644 Assets/Resources/Yarn/EyeTest/EyeTest.yarn.meta
 create mode 100644 Assets/Resources/Yarn/EyeTest/EyeTest.yarnproject
 create mode 100644 Assets/Resources/Yarn/EyeTest/EyeTest.yarnproject.meta

diff --git a/Assets/Resources/Yarn/EyeTest.meta b/Assets/Resources/Yarn/EyeTest.meta
new file mode 100644
index 000000000..5ed35ee34
--- /dev/null
+++ b/Assets/Resources/Yarn/EyeTest.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 55815694d4a85b94bb7a56c5b004b0ef
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Resources/Yarn/EyeTest/EyeTest.yarn b/Assets/Resources/Yarn/EyeTest/EyeTest.yarn
new file mode 100644
index 000000000..244bc3d42
--- /dev/null
+++ b/Assets/Resources/Yarn/EyeTest/EyeTest.yarn
@@ -0,0 +1,84 @@
+title: Start
+tags: 
+colorID: 8
+position: 253,-2041
+---
+<<declare $currentEyeTarget="">>
+<<load_scene PeipeiFixScene>>
+<<indoor_new 1>>
+<<switch_fix_system_to "BodyModule">>
+<<switch_fix_system_to "Eye">>
+===
+title: IntoEyeView
+tags: 
+group:视觉检查
+colorID: 6
+position: 244,271
+---
+        <<if $currentEyeTarget == "computer">>
+            <<jump Eye_computerAfterSurgery>>
+        <<elseif $currentEyeTarget == "poster">>
+            <<jump Eye_posterAfterSurgery>>
+        <<elseif $currentEyeTarget == "sky">>
+            <<jump Eye_skyAfterSurgery>>
+        <<elseif $currentEyeTarget == "plant">>
+            <<jump Eye_plantAfterSurgery>>
+         <<endif>>
+===
+title: Eye_skyAfterSurgery
+tags:  
+colorID: 8
+group:视觉检查
+position: 559,756
+---
+看目标
+ <<jump EyeCheckEnd>>
+
+===
+title: EyeCheckEnd
+tags:  
+colorID: 3
+group:视觉检查
+position: 251,1116
+---
+<<Set_MouseMovementLockState EyeManager false>>
+===
+
+
+
+title: Eye_computerAfterSurgery
+tags:  
+colorID: 8
+group:视觉检查
+position: 1228,749
+---
+看目标
+ <<jump EyeCheckEnd>>
+===
+
+
+
+
+title: Eye_posterAfterSurgery
+tags:  
+colorID: 8
+group:视觉检查
+position: 1006,747
+---
+看目标
+<<jump EyeCheckEnd>>
+===
+
+
+
+
+title: Eye_plantAfterSurgery
+tags: 
+colorID: 8
+group:视觉检查
+position: 787,755
+---
+看目标
+<<jump EyeCheckEnd>>
+===
+
diff --git a/Assets/Resources/Yarn/EyeTest/EyeTest.yarn.meta b/Assets/Resources/Yarn/EyeTest/EyeTest.yarn.meta
new file mode 100644
index 000000000..06efbd3d8
--- /dev/null
+++ b/Assets/Resources/Yarn/EyeTest/EyeTest.yarn.meta
@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: cdad29dc629aa0f4786f5445bb65caf1
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 11500000, guid: 94073015eacc34c1d8fc6786e43d60ca, type: 3}
diff --git a/Assets/Resources/Yarn/EyeTest/EyeTest.yarnproject b/Assets/Resources/Yarn/EyeTest/EyeTest.yarnproject
new file mode 100644
index 000000000..f6fcc7227
--- /dev/null
+++ b/Assets/Resources/Yarn/EyeTest/EyeTest.yarnproject
@@ -0,0 +1,12 @@
+{
+  "projectFileVersion": 2,
+  "sourceFiles": [
+    "**/*.yarn"
+  ],
+  "excludeFiles": [
+    "**/*~/*"
+  ],
+  "localisation": {},
+  "baseLanguage": "zh-CHS",
+  "compilerOptions": {}
+}
\ No newline at end of file
diff --git a/Assets/Resources/Yarn/EyeTest/EyeTest.yarnproject.meta b/Assets/Resources/Yarn/EyeTest/EyeTest.yarnproject.meta
new file mode 100644
index 000000000..0cd4dbbfa
--- /dev/null
+++ b/Assets/Resources/Yarn/EyeTest/EyeTest.yarnproject.meta
@@ -0,0 +1,13 @@
+fileFormatVersion: 2
+guid: f4b36c70851a3dd4eb172dc7613b3386
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 11500000, guid: 053561912b1654d80a424bb0696a74ae, type: 3}
+  useAddressableAssets: 0
+  UseUnityLocalisationSystem: 0
+  unityLocalisationStringTableCollection: {instanceID: 0}
diff --git a/Assets/Scripts/MiniGame/Peipei/Eye/EyeSystem.cs b/Assets/Scripts/MiniGame/Peipei/Eye/EyeSystem.cs
index d24ddd363..5511930b0 100644
--- a/Assets/Scripts/MiniGame/Peipei/Eye/EyeSystem.cs
+++ b/Assets/Scripts/MiniGame/Peipei/Eye/EyeSystem.cs
@@ -139,10 +139,10 @@ public class EyeSystem : MonoBehaviour
 
     public void SetTarget(EyeTarget newTarget)
     {
-        if (newTarget != currentTarget)
-        {
+        // if (newTarget != currentTarget)
+        // {
             StartCoroutine(SetTargetCoroutine(newTarget.gameObject.name));
-        }
+        // }
     }
     [YarnCommand("set_Eyetarget")]
     public IEnumerator SetTargetCoroutine(string targetName,bool startDialogue=true)
@@ -156,11 +156,11 @@ public class EyeSystem : MonoBehaviour
             yield break;
         }
 
-        if (currentTarget == target)
-        {
-            // DialogController.Instance.SetVariable("$currentEyeTarget",target.name);   
-            yield break;
-        }
+        // if (currentTarget == target)
+        // {
+        //     DialogController.Instance.SetVariable("$currentEyeTarget",target.name);   
+        //     yield break;
+        // }
         DialogController.Instance.SetVariable("$currentEyeTarget",target.name);   
         StartCoroutine(EyeEffectFadeOut());
         float duration = eyeStateEffect.TransitionDuration;