From c2cd42435b33b58b1de697def0bab0889fd20ac6 Mon Sep 17 00:00:00 2001
From: bottlefish <781230111@qq.com>
Date: Wed, 28 Aug 2024 19:51:01 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=85=85=E7=A4=BA=E4=BE=8Byarn?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Assets/Prototype/佩佩/佩佩视觉模块.unity      |  2 +-
 Assets/Resources/Yarn/ChunTest/ChunTest1.yarn | 32 -------------------
 .../Yarn/{ChunTest.meta => EyeGetColor.meta}  |  2 +-
 .../EyeGetColor.yarnproject}                  |  0
 .../EyeGetColor.yarnproject.meta}             |  2 +-
 .../Yarn/EyeGetColor/EyeGetColor1.yarn        | 20 ++++++++++++
 .../EyeGetColor1.yarn.meta}                   |  2 +-
 7 files changed, 24 insertions(+), 36 deletions(-)
 delete mode 100644 Assets/Resources/Yarn/ChunTest/ChunTest1.yarn
 rename Assets/Resources/Yarn/{ChunTest.meta => EyeGetColor.meta} (77%)
 rename Assets/Resources/Yarn/{ChunTest/ChunTest.yarnproject => EyeGetColor/EyeGetColor.yarnproject} (100%)
 rename Assets/Resources/Yarn/{ChunTest/ChunTest.yarnproject.meta => EyeGetColor/EyeGetColor.yarnproject.meta} (90%)
 create mode 100644 Assets/Resources/Yarn/EyeGetColor/EyeGetColor1.yarn
 rename Assets/Resources/Yarn/{ChunTest/ChunTest1.yarn.meta => EyeGetColor/EyeGetColor1.yarn.meta} (86%)

diff --git a/Assets/Prototype/佩佩/佩佩视觉模块.unity b/Assets/Prototype/佩佩/佩佩视觉模块.unity
index 286d3bc77..28fea960a 100644
--- a/Assets/Prototype/佩佩/佩佩视觉模块.unity
+++ b/Assets/Prototype/佩佩/佩佩视觉模块.unity
@@ -10903,7 +10903,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &1229487020
 RectTransform:
   m_ObjectHideFlags: 0
diff --git a/Assets/Resources/Yarn/ChunTest/ChunTest1.yarn b/Assets/Resources/Yarn/ChunTest/ChunTest1.yarn
deleted file mode 100644
index c0eaf25ca..000000000
--- a/Assets/Resources/Yarn/ChunTest/ChunTest1.yarn
+++ /dev/null
@@ -1,32 +0,0 @@
-title: Start
-tags:
----
-<<indoor>>
-//<<load_scene 佩佩视觉模块>>
-//<<EyeGetColor EyeManager>>
-<<set_EyeState EyeManager "CannotImagineColor">>
-<<start_transition ViewManager "EyeView">>
-->滴入红色
-<<set_EyeColor EyeManager "red">>
-->滴入黄色
-<<set_EyeColor EyeManager "yellow">>
-->滴入蓝色
-<<set_EyeColor EyeManager "blue">>
-->混合
-<<set_EyeState EyeManager "CanSeeColor">>
-<<EyeGetColor EyeManager>>
-<<set_EyeColor EyeManager "All">>
-
-// 我: 不可思议
-// <<set_EyeState EyeManager "CanSeeColor">>
-// ->进入视觉模块
-// <<start_transition ViewManager "EyeView">>
-// ->指示佩佩观察背景
-// <<set_Eyetarget EyeManager "background">>
-// 我: 不可思议
-// ->指示佩佩观察机器
-//     <<set_Eyetarget EyeManager "machine">>
-// 我: 不可思议
-// ->指示佩佩观察角色
-//     <<set_Eyetarget EyeManager "character">>
-===
diff --git a/Assets/Resources/Yarn/ChunTest.meta b/Assets/Resources/Yarn/EyeGetColor.meta
similarity index 77%
rename from Assets/Resources/Yarn/ChunTest.meta
rename to Assets/Resources/Yarn/EyeGetColor.meta
index 14969a07f..44102867a 100644
--- a/Assets/Resources/Yarn/ChunTest.meta
+++ b/Assets/Resources/Yarn/EyeGetColor.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 3a4125b203b1b074ab5fe04b6ff468da
+guid: 9270630ae27ba7c40b1f345307bd176c
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}
diff --git a/Assets/Resources/Yarn/ChunTest/ChunTest.yarnproject b/Assets/Resources/Yarn/EyeGetColor/EyeGetColor.yarnproject
similarity index 100%
rename from Assets/Resources/Yarn/ChunTest/ChunTest.yarnproject
rename to Assets/Resources/Yarn/EyeGetColor/EyeGetColor.yarnproject
diff --git a/Assets/Resources/Yarn/ChunTest/ChunTest.yarnproject.meta b/Assets/Resources/Yarn/EyeGetColor/EyeGetColor.yarnproject.meta
similarity index 90%
rename from Assets/Resources/Yarn/ChunTest/ChunTest.yarnproject.meta
rename to Assets/Resources/Yarn/EyeGetColor/EyeGetColor.yarnproject.meta
index f727dd584..27b9c0de8 100644
--- a/Assets/Resources/Yarn/ChunTest/ChunTest.yarnproject.meta
+++ b/Assets/Resources/Yarn/EyeGetColor/EyeGetColor.yarnproject.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 847e16eb764d7a64c8efae785cc407b6
+guid: 94856cd4798cb72429645b8e5d61fefa
 ScriptedImporter:
   internalIDToNameTable: []
   externalObjects: {}
diff --git a/Assets/Resources/Yarn/EyeGetColor/EyeGetColor1.yarn b/Assets/Resources/Yarn/EyeGetColor/EyeGetColor1.yarn
new file mode 100644
index 000000000..9c866beab
--- /dev/null
+++ b/Assets/Resources/Yarn/EyeGetColor/EyeGetColor1.yarn
@@ -0,0 +1,20 @@
+title: Start
+tags:
+---
+<<indoor>>
+<<load_scene 佩佩视觉模块>>
+//我们的两次上色都是从无色开始，所以先进入无色模式
+<<set_EyeState EyeManager "CannotImagineColor">>
+<<start_transition ViewManager "EyeView">>
+->滴入红色
+<<set_EyeColor EyeManager "red">>
+->滴入黄色
+<<set_EyeColor EyeManager "yellow">>
+->滴入蓝色
+<<set_EyeColor EyeManager "blue">>
+//如果这里不想要混合这一步，也可以自己做逻辑判断，在最后一部直接调用以下部分
+->混合
+<<set_EyeState EyeManager "CanSeeColor">>
+<<EyeGetColor EyeManager>>
+<<set_EyeColor EyeManager "All">>
+===
diff --git a/Assets/Resources/Yarn/ChunTest/ChunTest1.yarn.meta b/Assets/Resources/Yarn/EyeGetColor/EyeGetColor1.yarn.meta
similarity index 86%
rename from Assets/Resources/Yarn/ChunTest/ChunTest1.yarn.meta
rename to Assets/Resources/Yarn/EyeGetColor/EyeGetColor1.yarn.meta
index 59db8ee9d..ed96aea48 100644
--- a/Assets/Resources/Yarn/ChunTest/ChunTest1.yarn.meta
+++ b/Assets/Resources/Yarn/EyeGetColor/EyeGetColor1.yarn.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 4f44a4bafe146d04d8360b9edecd212e
+guid: e585e200c6ef95547840a28c8dd86246
 ScriptedImporter:
   internalIDToNameTable: []
   externalObjects: {}