diff --git a/Assets/Main Camera Blends.asset b/Assets/Main Camera Blends.asset new file mode 100644 index 000000000..2e9e9634d --- /dev/null +++ b/Assets/Main Camera Blends.asset @@ -0,0 +1,37 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 36baaa8bdcb9d8b49b9199833965d2c3, type: 3} + m_Name: Main Camera Blends + m_EditorClassIdentifier: + m_CustomBlends: + - m_From: Clinic Camera + m_To: Body Module Camera + m_Blend: + m_Style: 0 + m_Time: 1 + m_CustomCurve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 0 + m_PostInfinity: 0 + m_RotationOrder: 0 + - m_From: '**ANY CAMERA**' + m_To: Clinic Camera + m_Blend: + m_Style: 0 + m_Time: 1 + m_CustomCurve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 0 + m_PostInfinity: 0 + m_RotationOrder: 0 diff --git a/Assets/Main Camera Blends.asset.meta b/Assets/Main Camera Blends.asset.meta new file mode 100644 index 000000000..b496123cf --- /dev/null +++ b/Assets/Main Camera Blends.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 97ddad596c0b5f94e8bb6e86e444a1cc +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/SceneSO/PeipeiDay1.asset b/Assets/Resources/SceneSO/PeipeiDay1.asset index a406aff72..3cbbc8e62 100644 --- a/Assets/Resources/SceneSO/PeipeiDay1.asset +++ b/Assets/Resources/SceneSO/PeipeiDay1.asset @@ -13,6 +13,6 @@ MonoBehaviour: m_Name: PeipeiDay1 m_EditorClassIdentifier: nextScene: {fileID: 11400000, guid: fe71f935f1f9a52458c994362567a211, type: 2} - yarnProject: {fileID: 7545569452688597077, guid: 51b65ccc67faacd4bbf55f6fb0e4bd1e, type: 3} + yarnProject: {fileID: 7545569452688597077, guid: 9a7094b80de0e31488cf2a86c34d18be, type: 3} firstSceneName: PeipeiFixScene isEndOfDay: 1 diff --git a/Assets/Resources/Yarn/PeipeiTalk1.meta b/Assets/Resources/Yarn/PeipeiTalk1.meta new file mode 100644 index 000000000..06489e8a3 --- /dev/null +++ b/Assets/Resources/Yarn/PeipeiTalk1.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: be24dc7b2bf99a04296a02983e298e1f +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Yarn/PeipeiTalk1/EventNode.yarn b/Assets/Resources/Yarn/PeipeiTalk1/EventNode.yarn new file mode 100644 index 000000000..807657e86 --- /dev/null +++ b/Assets/Resources/Yarn/PeipeiTalk1/EventNode.yarn @@ -0,0 +1,138 @@ + +title: EmoPlugIn +tags: 待编辑 +colorID: 8 +position: -2,-3039 +--- +<> +=== +title: SpeakPlugIn +tags: 待编辑 +colorID: 8 +position: 240,-2640 +--- +<> + +=== +title: LogicPlugIn +tags: 待编辑 +colorID: 8 +position: 480,-3040 +--- +<> +=== +title: ColorPlugIn +tags: 待编辑 +colorID: 8 +position: 240,-2840 +--- +<> +=== +title: MemoryPlugIn +tags: 待编辑 +colorID: 8 +position: 240,-3040 +--- +<> +=== + +title: UFPlugIn +tags: 待编辑 +colorID: 8 +position: 0,-2840 +--- +<> +=== + + +title: EyePlugIn +tags: 待编辑 +colorID: 8 +position: 480,-2840 +--- +<> +=== +title: IntoEyeView +tags: +group:视觉检查 +colorID: 6 +position: 244,271 +--- +//如果视觉检查任务已经完成了,那么就退出 +<> + <> +<> + +//只要看一次,就知道佩佩看不到颜色 +<> + <> +<> +//复查以及复查后的逻辑 +<> + <> + <> + <> + <> + <> + <> + <> + <> + <> + <> + <> +//检查以及检查后,复查前的逻辑 +<> + //如果没检查完,就检查 + <> + //触发第一次观察佩佩视觉的对话 + <> + <> + //如果不是第一次,而且没看过记忆,那么这里没什么好看的,去别处看看 + <> + <> + //如果不是第一次,看过记忆了后还没来看过视觉(还不知道佩佩可以臆想颜色),那么佩佩会告诉你 + <> + <> + <> + <> + <> + <> + <> + <> + <> + <> + <> + <> +<> +=== + +title: MemoryDeepIn +tags: +--- +<> +<> +<> +=== +title: UFDeepIn +tags: +--- +<> +=== +title: EyeDeepIn +tags: +position: -9,21 +--- +<> +<> +=== +title: OnMemoryInsert +tags: +group:记忆 +colorID: 3 +position: -1580,-2168 +--- +<> +<> +<> +=== + diff --git a/Assets/Resources/Yarn/PeipeiTalk1/EventNode.yarn.meta b/Assets/Resources/Yarn/PeipeiTalk1/EventNode.yarn.meta new file mode 100644 index 000000000..334e6cbd4 --- /dev/null +++ b/Assets/Resources/Yarn/PeipeiTalk1/EventNode.yarn.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: f4263a04a6106cb4d8868973d888a070 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 94073015eacc34c1d8fc6786e43d60ca, type: 3} diff --git a/Assets/Resources/Yarn/PeipeiTalk1/PeipeiTalk1.yarnproject b/Assets/Resources/Yarn/PeipeiTalk1/PeipeiTalk1.yarnproject new file mode 100644 index 000000000..016b7ab29 --- /dev/null +++ b/Assets/Resources/Yarn/PeipeiTalk1/PeipeiTalk1.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/PeipeiTalk1/PeipeiTalk1.yarnproject.meta b/Assets/Resources/Yarn/PeipeiTalk1/PeipeiTalk1.yarnproject.meta new file mode 100644 index 000000000..56dbb219a --- /dev/null +++ b/Assets/Resources/Yarn/PeipeiTalk1/PeipeiTalk1.yarnproject.meta @@ -0,0 +1,13 @@ +fileFormatVersion: 2 +guid: 9a7094b80de0e31488cf2a86c34d18be +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/Resources/Yarn/PeipeiTalk1/Start.yarn b/Assets/Resources/Yarn/PeipeiTalk1/Start.yarn new file mode 100644 index 000000000..c80fc31b7 --- /dev/null +++ b/Assets/Resources/Yarn/PeipeiTalk1/Start.yarn @@ -0,0 +1,106 @@ +title: Start +tags: +colorID: 8 +position: 253,-2041 +--- + +<> +=== + +title: 数据初始化 +tags: +colorID: 4 +position: 248,-1739 +--- +<> + +///【流程逻辑】 + +//统计查看记忆数目,用来判断是否收集够,这是完成主目标的必要目标 +<> +//记录是否已经完成了UF的检查 +<> +//记录是否已经完成了视觉的检查 +<> + +<> + +//统计进入视觉后触发目标的次数,主要是用来触发第一次点击任意目标触发首次对话,以及判断是否收集够打孔带,这是完成主目标的必要目标 +<> +//方便的触发针对eyetarget的对话,如果不喜欢这种写法可以商量,然后分开写 +<> +//是否剪断了线 +<> +// //是否归还了工具 +// <> +<> +<> + +///【谈论对象初始化】 +<> +<> +<> +<> +<> +<> +<> + + +///【剧情信息】 +//一开始选择的UF图像 +<> +//是否已经见过UF +<> +//是否已知:为什么要使用UF +<> +<> +//是否已知:色觉芯片是缺失的 +<> +//是否已知:佩佩的眼睛不舒服 +<> +//是否已知:佩佩视觉是黑白的 +<> +//是否已知:佩佩会想象出颜色 +<> +//是否插入过视觉产生的打孔带 +<> +<> + +///一些状态初始化 + +//没有色彩晶圆 +<> +=== + +title: Center +description: 脚本跳转中心,GameStage在此处处理,理论上不在其他地方读取GameStage +position: 205,446 +colorID: 1 +--- +// 每次进入维修界面就自动保存 +<> +<> + <> +<> +<> + <> +<> +<> + <> +<> +<> + <> +<> +<> + <> +<> +<> + <> +<> +<> + <> +<> +<> + <> +<> +=== \ No newline at end of file diff --git a/Assets/Resources/Yarn/PeipeiTalk1/Start.yarn.meta b/Assets/Resources/Yarn/PeipeiTalk1/Start.yarn.meta new file mode 100644 index 000000000..da1e53869 --- /dev/null +++ b/Assets/Resources/Yarn/PeipeiTalk1/Start.yarn.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 16285cbce17e42d409f13248a71e0c8b +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 94073015eacc34c1d8fc6786e43d60ca, type: 3} diff --git a/Assets/Resources/Yarn/PeipeiTalk1/佩佩开场对话.yarn b/Assets/Resources/Yarn/PeipeiTalk1/佩佩开场对话.yarn new file mode 100644 index 000000000..d3dcccc1a --- /dev/null +++ b/Assets/Resources/Yarn/PeipeiTalk1/佩佩开场对话.yarn @@ -0,0 +1,36 @@ +title: 进入佩佩开场对话 +tags: +colorID: 8 +position: 272,-1156 +--- +<> +<> +<> +<> +<> +【占位】: 佩佩入场,说明来看病的原因,绘图效率低,眼睛痛 +【占位】: 说明UF是安装在眼睛上的 +<> +<> +<> +<> +【占位】: 试着绘制 +<> +<> +<> +<> +<> +<> +【占位】: 画面看起来颜色错乱 +<> +<> +<> +=== + +title: 结束引入对话 +position: 275,-222 +--- +<> +<> +=== + diff --git a/Assets/Resources/Yarn/PeipeiTalk1/佩佩开场对话.yarn.meta b/Assets/Resources/Yarn/PeipeiTalk1/佩佩开场对话.yarn.meta new file mode 100644 index 000000000..1ca1c7841 --- /dev/null +++ b/Assets/Resources/Yarn/PeipeiTalk1/佩佩开场对话.yarn.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: f5d4550e330b9dc44b1a6fe65530ed6b +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 94073015eacc34c1d8fc6786e43d60ca, type: 3} diff --git a/Assets/Resources/Yarn/PeipeiTalk1/分析.yarn b/Assets/Resources/Yarn/PeipeiTalk1/分析.yarn new file mode 100644 index 000000000..49bfb5228 --- /dev/null +++ b/Assets/Resources/Yarn/PeipeiTalk1/分析.yarn @@ -0,0 +1,17 @@ +title: 进入分析 +tags: +position: 43,-97 +--- +///可以先用思考专用黑幕,把showobj之外的部分都盖住,做一个思考阶段,把线索回顾一下 +【占位】:这里需要说明下问题在于视觉引用记忆的色彩来填色,这是一个bug +【占位】:需要做视觉和记忆的色彩通路剪除 +【占位】:剪掉后视觉不会直接填色了,也不会再有颜色被记住了,但是色彩记忆是保留得 +【占位】:不过绘图机器人存储的颜色记忆也足够多了,也没什么新得值得记住得东西了 +<> +=== +title: 结束分析 +position: 275,-222 +--- +<> +<> +=== \ No newline at end of file diff --git a/Assets/Resources/Yarn/PeipeiTalk1/分析.yarn.meta b/Assets/Resources/Yarn/PeipeiTalk1/分析.yarn.meta new file mode 100644 index 000000000..a53c33803 --- /dev/null +++ b/Assets/Resources/Yarn/PeipeiTalk1/分析.yarn.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: e6ee3015bfd6abf419d1c9e0ca8a8f79 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 94073015eacc34c1d8fc6786e43d60ca, type: 3} diff --git a/Assets/Resources/Yarn/PeipeiTalk1/复查.yarn b/Assets/Resources/Yarn/PeipeiTalk1/复查.yarn new file mode 100644 index 000000000..c1f6729a9 --- /dev/null +++ b/Assets/Resources/Yarn/PeipeiTalk1/复查.yarn @@ -0,0 +1,115 @@ +title: 进入复查 +tags: +colorID: 8 +position: 272,-1156 +--- +<> + <> +<> +<> +<> +<> +me: 还没结束…保险起见,我们进视觉复查一下吧。 +=== + +title: EyeCheckEnd_AfterSurgery +tags: +colorID: 3 +group:视觉检查 +position: 251,1116 +--- +<> +me:这里应该已经彻底检查过了 +<> +<> +<> + + <> + me: 佩佩,试一下吧。还能看见那些颜色吗? + <> + <> + peipei: 我… + <> + peipei: 没了吗?症状没了吗…… + me: 目前没观察到 + <> + <> + me: 好了,分析是对的……佩佩,不用再试了。 + me:她的精神已经很紧张了。 + <> + <> + <> + <> + <> + <> + <> + <> +<> +=== + + +title: Eye_skyAfterSurgery +tags: +colorID: 8 +group:视觉检查 +position: 559,756 +--- +<> +<> + <> + <> +=== + + + + +title: Eye_computerAfterSurgery +tags: +colorID: 8 +group:视觉检查 +position: 1228,749 +--- +<> +<> + <> +<> +=== + + + + +title: Eye_posterAfterSurgery +tags: +colorID: 8 +group:视觉检查 +position: 1006,747 +--- +<> +<> + <> +<> +=== + + + + +title: Eye_plantAfterSurgery +tags: +colorID: 8 +group:视觉检查 +position: 787,755 +--- +<> +<> +<> +<> + +=== + +title: 结束复查 +position: 275,-222 +--- +<> +<> +=== + diff --git a/Assets/Resources/Yarn/PeipeiTalk1/复查.yarn.meta b/Assets/Resources/Yarn/PeipeiTalk1/复查.yarn.meta new file mode 100644 index 000000000..a6c7fdf62 --- /dev/null +++ b/Assets/Resources/Yarn/PeipeiTalk1/复查.yarn.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 71c15eebe39cb1c4db1c9ed1828ea23a +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 94073015eacc34c1d8fc6786e43d60ca, type: 3} diff --git a/Assets/Resources/Yarn/PeipeiTalk1/手术.yarn b/Assets/Resources/Yarn/PeipeiTalk1/手术.yarn new file mode 100644 index 000000000..2ef2554ff --- /dev/null +++ b/Assets/Resources/Yarn/PeipeiTalk1/手术.yarn @@ -0,0 +1,40 @@ +title: 进入手术 +tags: +colorID: 3 +position: 251,-1150 +--- +<> +<> +<> +<> +<> +me: 开始吧…截断视觉-记忆桥,阻止视觉模块的记忆反流。 +<> +<> +=== + +title: CutLine +tags: +group:手术相关 +position: -273,-66 +--- +<> + <> + peipei: 啊…眼睛……我的…… + peipei: 好痛! + me: 怎么了?怪了,这不应该引起任何痛觉的… + peipei: …… + peipei: 呼…… + peipei: 好像……好多了。 + <> +<> +me: 这不是我应该剪断的线…… +<> +=== + +title: 结束手术 +position: 275,-222 +--- +<> +<> +=== \ No newline at end of file diff --git a/Assets/Resources/Yarn/PeipeiTalk1/手术.yarn.meta b/Assets/Resources/Yarn/PeipeiTalk1/手术.yarn.meta new file mode 100644 index 000000000..85277dcd7 --- /dev/null +++ b/Assets/Resources/Yarn/PeipeiTalk1/手术.yarn.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 3f70a8ad040b07049b3ce378298f8e2d +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 94073015eacc34c1d8fc6786e43d60ca, type: 3} diff --git a/Assets/Resources/Yarn/PeipeiTalk1/术前谈话.yarn b/Assets/Resources/Yarn/PeipeiTalk1/术前谈话.yarn new file mode 100644 index 000000000..9f9845885 --- /dev/null +++ b/Assets/Resources/Yarn/PeipeiTalk1/术前谈话.yarn @@ -0,0 +1,18 @@ +title: 进入术前谈话 +tags: +colorID: 3 +position: 251,-1150 +--- +<> +【占位】:告诉佩佩诊疗方式 +【占位】:佩佩有点失落,但是还是接受了 +<> +=== + + +title: 结束术前谈话 +position: 275,-222 +--- +<> +<> +=== \ No newline at end of file diff --git a/Assets/Resources/Yarn/PeipeiTalk1/术前谈话.yarn.meta b/Assets/Resources/Yarn/PeipeiTalk1/术前谈话.yarn.meta new file mode 100644 index 000000000..9d100939c --- /dev/null +++ b/Assets/Resources/Yarn/PeipeiTalk1/术前谈话.yarn.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 6e43f5c15fb2a2841bb644e23f8d1995 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 94073015eacc34c1d8fc6786e43d60ca, type: 3} diff --git a/Assets/Resources/Yarn/PeipeiTalk1/结束对话.yarn b/Assets/Resources/Yarn/PeipeiTalk1/结束对话.yarn new file mode 100644 index 000000000..e3ed052f2 --- /dev/null +++ b/Assets/Resources/Yarn/PeipeiTalk1/结束对话.yarn @@ -0,0 +1,18 @@ +title: 进入结束对话 +tags: +colorID: 3 +position: 251,-1150 +--- +<> +【占位】:再次测试绘图,发现ok了 +【占位】:佩佩离开 +<> +=== + + +title: 结束结束对话 +position: 275,-222 +--- +<> +<> +=== \ No newline at end of file diff --git a/Assets/Resources/Yarn/PeipeiTalk1/结束对话.yarn.meta b/Assets/Resources/Yarn/PeipeiTalk1/结束对话.yarn.meta new file mode 100644 index 000000000..7a09653cb --- /dev/null +++ b/Assets/Resources/Yarn/PeipeiTalk1/结束对话.yarn.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: c4c50cbb5d438a148af9f38f8ab9d8aa +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 94073015eacc34c1d8fc6786e43d60ca, type: 3} diff --git a/Assets/Resources/Yarn/PeipeiTalk1/视觉色彩检查.yarn b/Assets/Resources/Yarn/PeipeiTalk1/视觉色彩检查.yarn new file mode 100644 index 000000000..1e43ca1fe --- /dev/null +++ b/Assets/Resources/Yarn/PeipeiTalk1/视觉色彩检查.yarn @@ -0,0 +1,34 @@ + +title: 视觉收集色彩信息目标检查 +tags: +colorID: 3 +group:视觉检查 +position: 251,1116 +--- +<> + <> + me: 佩佩在看东西的时候,能够唤起记忆来填补失去的颜色…… + me: UF的绘图错误也是因为唤起了不该唤起的记忆 + me: 说不定…… + me: 先去记忆模块看看刚才佩佩都想到了什么吧 + <> + <> + <> + <> + <> + <> + <> + <> + <> + <> + +<> + <> +<> +=== +title: 结束视觉色彩检查 +position: 275,-222 +--- +<> +<> +=== \ No newline at end of file diff --git a/Assets/Resources/Yarn/PeipeiTalk1/视觉色彩检查.yarn.meta b/Assets/Resources/Yarn/PeipeiTalk1/视觉色彩检查.yarn.meta new file mode 100644 index 000000000..027fca8d2 --- /dev/null +++ b/Assets/Resources/Yarn/PeipeiTalk1/视觉色彩检查.yarn.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 979edc8be2e910941b175195fa54c565 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 94073015eacc34c1d8fc6786e43d60ca, type: 3} diff --git a/Assets/Resources/Yarn/PeipeiTalk1/身体检查.yarn b/Assets/Resources/Yarn/PeipeiTalk1/身体检查.yarn new file mode 100644 index 000000000..fcd686291 --- /dev/null +++ b/Assets/Resources/Yarn/PeipeiTalk1/身体检查.yarn @@ -0,0 +1,628 @@ +title: 进入身体检查 +tags: +colorID: 8 +position: -449,-3574 +--- +<> +<> +=== + +title: 身体检查状态 +position: -436,-2338 +--- +//退出状态条件 +<> + <> + 【占位】:检查结束 + <> +<> + +//不同状态的相关提示信息 +<> +【占位】:应该去看看记忆 +<> + <> + 【占位】:应该去看看视觉 + <> + 【占位】:视觉刚刚有报错,应该去看看视觉 + <> + 【占位】:感觉很奇怪,视觉检查过了啊 + 【占位】:佩佩告诉你,刚才有些事没告诉你,可以再去检查按下 + <> +<> +=== + +title: 结束身体检查 +position: -432,-1732 +--- +<> +<> +=== + + +title: 检查情绪 +tags: 待编辑 +colorID: 8 +group:插线检查 +position: -47,-3242 +--- +<> +<> +<> +<> +->检查 + <> + <> + <> + <> + <> + <> + <> + <> + <> + <> + <> + <> + <> + <> + me: 佩佩,你的情绪模块有点发热。 + peipei: 啊——医生……你的手好凉。 + <> + <> + <> + <> +=== +title: 检查语言 +tags: 待编辑 +colorID: 8 +group:插线检查 +position: 194,-2880 +--- +<> +<> +<> +<> +->检查 + <> + <> + <> + <> + <> + <> + <> + <> + <> + <> + <> + <> + me: 佩佩,你平时是不是很少和同事交流? + peipei: 主管说,我们是为画画而生的人…… + peipei: 要克服懒癌,不能整天和同事交头接耳。 + peipei: 她说得对!我不能浪费时间。 + <> + <> + <> + <> +=== +title: 检查逻辑 +tags: 待编辑 +colorID: 8 +group:插线检查 +position: 428,-3246 +--- +<> +<> +<> +<> +->检查 + <> + <> + <> + <> + <> + <> + <> + <> + <> + <> + <> + <> + <> + <> + peipei: 有时候……我觉得UF是一个正在醒来的神,
而我只是供奉它的神龛。 + me: 但愿这只是一个比喻。 + <> + <> + <> + <> +//待编辑 +=== +title: 检查色觉 +tags: 待编辑 +colorID: 8 +group:插线检查 +position: 195,-3043 +--- +<> +<> +<> +<> +<> +<> +<> + +<> + <> + <> + me: 这似乎是佩佩的核心模块…让我查查。 + <> + <> + me: 核心模块-色觉晶圆训练槽,是美术型机体专门安置色觉晶圆的槽位。 + me:佩佩的色觉晶圆应该在这儿,可是问题是…为什么上面是空的? + <> + //////理论上应该这里已经解释过这个晶圆槽的? + <> + me: 如果佩佩没有色觉晶圆,难怪她的视觉里看到的都是黑白…… + <> + me: 如果没有色觉晶圆,佩佩可能根本看不见颜色?她可是画师啊…… + <> + me:佩佩,你的色觉晶圆去哪里了,你知道吗? + peipei:哎,它没有在我后脑的那个什么槽里吗?那是我读大学时做的改造。 + me:没有,那里是空的。 + peipei:啊?噢……我想起来了,很久以前安装UF的时候,手术师说要给它做改造,拿走了。 + 佩佩: 但具体是什么改造…我记不太清了……条目很多,我就在最后签了个名。 + me: 拿走晶圆?是正规手术吗?这太奇怪了。 + me: 色觉晶圆……可是每个人都只有一个的啊! + peipei: 应该是的吧……那个人……跟我说UF是公司的礼物,以后我的同事们都要装的。 + peipei: 他也是公司的领导,和主管一样。 + peipei: 而且后来果然和他说的一样,大家很快都装上了UF模块。 + me: 公司领导亲自给佩佩安装UF模块,美术部第一例……先记下来吧。 + //获得信息“另一位公司领导装载UF” + <> + <> +<> + +//佩佩很焦虑,不知道该怎么办了 +=== +title: 检查记忆 +tags: 待编辑 +colorID: 8 +group:插线检查 +position: 195,-3243 +--- +<> +<> +<> +<> +<> +<> + <> + <> + <> +<> + <> + <> +<> +<> + <> + <> + <> +<> + +//总体表现:对工作的焦虑、虚弱的身体状态 +=== +title: 检查UF +tags: 待编辑 +colorID: 8 +group:插线检查 +position: -45,-3043 +--- +<> +<> +<> +<> +->检查 + <> + <> + <> + <> + <> + <> + <> + <> +=== +title: 检查视觉 +tags: 待编辑 +colorID: 8 +group:插线检查 +position: 435,-3043 +--- +<> +<> +<> +<> +->检查 + <> + <> + <> + <> + <> + <> + <> + <> + <> + <> + <> + <> + <> + <> + <> + <> + <> + //<> + <> + <> + <> +=== + +title: UF深入检查 +tags: 待编辑 +color: red +group:UF深入检查 +position: -856,-2640 +--- +<> + 【占位】:尝试深入但是禁止深入 + 【占位】:可以打印log,log显示视觉中出现了色彩干扰了UF + 【占位】:虽然进不去,但是看来影响UF的是视觉,需要看看 + <> +<> + 【占位】:UF发生视觉色彩不兼容 +<> +=== + + +title: 佩佩告诉你可以想象颜色 +tags: +colorID: 6 +group:视觉检查 +position: -2053,-2656 +--- + +peipei: 还有一件事,我最好还是主动告诉你。 +me: 是什么事呢,佩佩? +peipei: 我不是故意要瞒着的…只是我还以为,这不是什么大问题。 +peipei: 我也不知道这是什么原理,但是只要我…… +<> +peipei: 看到窗外的蓝天了吗? +<> +<> +me: 啊? +peipei: 我其实能够以某种方式看到一些颜色…… +<> +<> +<> +<> +<> +<> +<> +me: 记忆…向视觉发送了数据?然后生成了这些颜色? +me: 从来没见过……我需要做更多的症状记录…… +->放入收藏夹 +<> +me: 佩佩,这个现象很重要,或许能解释你体内的异常。 +me: 我需要让你再观察几个东西,你只要重复刚才做的事情就好了。 +peipei: 好的,医生。 +<> +<> +<> +=== + + +title: FirstDialogue +tags: +group:视觉检查 +colorID: 8 +position: -2476,-2555 +--- +//!!电脑不会触发这个对话,而电脑是屏幕正中央的 +<> + me: …… + //me: 不对啊…不是检查仪器的问题。 + me:这就是佩佩眼睛里看到的画面吗?如此灰暗…… + me:太奇怪了,难道是检查仪器的问题? + <> + <> + me: 佩佩,你眼里的世界……一直都是黑白的吗? +<> + me: 这就是佩佩眼睛里看到的画面吗?如此灰暗…… + me: 很可能是视觉晶圆失踪造成的。 + <> + <> + me: 佩佩,你眼里的世界……一直都是黑白的吗? +<> +peipei: 啊……这个是正常的。 +peipei: 已经多久了?我自己都记不清什么时候开始的了……应该是装UF的时候吧。 +peipei: 所有美工都这样,大家都已经适应了,我还……太慢。 +me: 都?也就是说UF模块一定会让美术同事失去色觉,这…… +peipei: 还好啦,医生……我们都是这么过来的。 +peipei: 如果连这都接受不了的话,当初就不应该做美工……这是主管说的。 +peipei: 我没关系的,医生... +peipei: 因为...这就是做美工必须承担的呀。 +me: …… +<> + me: 好吧…可是从机体医学的角度来说,这是为什么呢… +<> +//TODO-↓理论上只有看过一次记忆才会弹出下面内容 +<> +<> +<> +<> +=== + + +title: Eye_sky +tags: +colorID: 8 +group:视觉检查 +position: -2469,-1924 +--- +<> +<> +<> +=== + + + + +title: Eye_computer +tags: +colorID: 8 +group:视觉检查 +position: -2475,-2383 +--- +me:这个没有生成颜色,奇怪…… +<> +=== + + + + +title: Eye_poster +tags: +colorID: 8 +group:视觉检查 +position: -2474,-2226 +--- +<> +<> +me:佩佩,看到那张海报了么? +<> +<> +peipei: 那是……我的第一张广告画……护肤机油…… +me:原来这是你画的。 +peipei: 那是我和主管第一次沟通。当时,因为我执意要用笔来作画,她非常生气。 +peipei: 你在电视上应该看不到吧?医生…… +peipei: 主管生气时,脸红得像辣椒一样噢。 +<> +<> +<> +<> +<> +<> +<> +->放入收藏夹 +<> +//<> + <> +<> +<> + <> +=== + + + + +title: Eye_plant +tags: +colorID: 8 +group:视觉检查 +position: -2470,-2075 +--- +<> +<> + me:佩佩,看到那个绿萝了么? + peipei: 医生,你的绿萝长得很不错喔! +//植物出现颜色;其中一片叶子枯萎了,但也显示出了绿色 +peipei: 小时候我养过一盆绿萝。爸爸说等我慢慢长大,这盆绿萝就会跟我一起长大变成绿萝树! +<> +<> +peipei: 可惜…… +///<>枯萎的叶子变成了正确的黄色 +peipei: 我还是把它养死了。 +peipei: 我愧疚了好久,那时的我真的以为小草可以长成一棵树。 +<> +<> +<> +<> +<> +<> +<> +->放入收藏夹 +<> +//<> +<> +<> +<> +<> + +=== + + + + +title: EyeCheckEnd +tags: +colorID: 3 +group:视觉检查 +position: -2052,-2351 +--- +<> +me:没什么头绪,先看看别的地方 +<> +<> +<> + +<> +me:这里应该已经彻底检查过了 +<> +<> +<> + +<> + <> + <> + <> + <> + <> + <> + <> + <> + <> + <> + <> +<> + +<> +=== + + + + + +title: 第一次进入记忆时 +tags: +group:记忆 +position: -1574,-1998 +--- +<> +<> + me: 把打孔带放进插槽里,读取记忆吧。 + <> +<> +=== + +title: End_memoryPaly +tags: +colorID: 3 +group:记忆 +position: -1248,-2433 +--- +<> + <> + <> + peipei: 医生…快停下。 + peipei: 我…我的头好痛…… + <> + <> + <> + <> + <> + <> + <> + <> + <> +<> +=== + + +title: 第一次插入记忆打孔带时 +tags: +group:记忆 +colorID: 3 +position: -1580,-2168 +--- +me: 需要拖动滑条,校正频率才能播放记忆… +me: 要把两个滑条都拖到正确的位置,先拖动上面这个吧。 +<> +=== + + + + +title: 天空 +tags: +colorID: 8 +group:记忆 +position: -1585,-2322 +--- +<> +peipei_child: 医生!看,大象! +docter: 哪里有?…啊,那朵云呀。确实很像大象喔。 +docter: 但是佩佩为什么会见过大象呢? +peipei_child: 我在博物馆见过!好大好大的大象标本,有个哥哥跟我说,大象可以比房子还大! +docter: 佩佩是个很有想象力的小朋友噢。 +peipei_child: 想象力…是什么? +docter: 我们的大脑里面有一个区域专门控制视觉,但是这个区域也控制想象力。 +<> +docter: 佩佩以后会成为一个艺术家的。 +peipei_child: 艺术家又是什么? +<> +peipei_child: 医生快看,它现在更像一个飞机啦! +<> +<> + <> +<> +<> +=== + + + + +title: 海报 +tags: +colorID: 8 +group:记忆 +position: -1586,-2480 +--- +<> +unknown:你以为自己独一无二,能靠自己的创作让大家喜爱,引领潮流? +unknown:历史上所有的创作都记录在UF的数据库里,你凭什么觉得自己比他们的创作更高贵? +unknown:你一个月画一张图,UF一晚上画一万张,请给我一个选择你的理由。 +unknown:记住,机器人就是为了效率而生的,这就是社会的规则,你改变不了! +unknown:咚—— +主管关门的力气把窗户震碎了,我一块块捡起来。 +那晚,我只记得……碎成一地的玻璃渣…… +还有主管的脸……好红,好烫。 +<> +<> +e-assistant: 哎,这个记忆我们是不是看到过? +me: 或许这就是问题所在 +<> +<> +=== + + + + +title: 植物 +tags: +colorID: 8 +group:记忆 +position: -1585,-2634 +--- +<> +peipei: 要是工作也能画画…要是能永远画画就好了。 +同学: 哈哈,可能等我们进入公司就不这么觉得了。听说进公司之后做什么都不会再快乐了。 +peipei: 不会的。至少画画这件事情让我感觉到很纯粹的快乐…… +peipei: 那种朝九晚五,一眼看到头的生活,我想我反而会受不了的。 +同学: 哈哈…… +同学: 但愿你是对的。 +peipei: 我肯定是对的。 +<> +peipei: 如果公司这么讨厌的话,我就不在那里干就好了啊! +<> + <> +<> +<> +=== diff --git a/Assets/Resources/Yarn/PeipeiTalk1/身体检查.yarn.meta b/Assets/Resources/Yarn/PeipeiTalk1/身体检查.yarn.meta new file mode 100644 index 000000000..e209763c1 --- /dev/null +++ b/Assets/Resources/Yarn/PeipeiTalk1/身体检查.yarn.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 70261a3bab381ef4d96ee8ab93621a6e +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 94073015eacc34c1d8fc6786e43d60ca, type: 3} diff --git a/Assets/Scenes/PeipeiFixScene.unity b/Assets/Scenes/PeipeiFixScene.unity index a09e76df2..bcd2dd329 100644 --- a/Assets/Scenes/PeipeiFixScene.unity +++ b/Assets/Scenes/PeipeiFixScene.unity @@ -228,7 +228,7 @@ GameObject: - component: {fileID: 28197537} - component: {fileID: 28197536} - component: {fileID: 28197535} - m_Layer: 5 + m_Layer: 9 m_Name: Button m_TagString: Untagged m_Icon: {fileID: 0} @@ -346,7 +346,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 35416255} - m_Layer: 5 + m_Layer: 9 m_Name: "\u6253\u5370\u673A" m_TagString: Untagged m_Icon: {fileID: 0} @@ -903,7 +903,7 @@ GameObject: - component: {fileID: 74279253} - component: {fileID: 74279255} - component: {fileID: 74279254} - m_Layer: 5 + m_Layer: 9 m_Name: Item Checkmark m_TagString: Untagged m_Icon: {fileID: 0} @@ -978,7 +978,7 @@ GameObject: - component: {fileID: 77015536} - component: {fileID: 77015538} - component: {fileID: 77015537} - m_Layer: 5 + m_Layer: 9 m_Name: Text (TMP) m_TagString: Untagged m_Icon: {fileID: 0} @@ -1113,7 +1113,7 @@ GameObject: - component: {fileID: 91136830} - component: {fileID: 91136829} - component: {fileID: 91136828} - m_Layer: 5 + m_Layer: 9 m_Name: Button m_TagString: Untagged m_Icon: {fileID: 0} @@ -1473,7 +1473,7 @@ GameObject: - component: {fileID: 109653322} - component: {fileID: 109653321} - component: {fileID: 109653320} - m_Layer: 5 + m_Layer: 9 m_Name: Button m_TagString: Untagged m_Icon: {fileID: 0} @@ -1692,7 +1692,7 @@ Transform: m_GameObject: {fileID: 110632226} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.29908502, y: -0.108584344, z: -0.022224218} + m_LocalPosition: {x: -30.589087, y: -0.108584344, z: -0.022224218} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -1733,7 +1733,7 @@ GameObject: - component: {fileID: 113104497} - component: {fileID: 113104499} - component: {fileID: 113104498} - m_Layer: 5 + m_Layer: 9 m_Name: Handle m_TagString: Untagged m_Icon: {fileID: 0} @@ -1808,7 +1808,7 @@ GameObject: - component: {fileID: 125795316} - component: {fileID: 125795318} - component: {fileID: 125795317} - m_Layer: 5 + m_Layer: 9 m_Name: Background m_TagString: Untagged m_Icon: {fileID: 0} @@ -1882,7 +1882,7 @@ GameObject: m_Component: - component: {fileID: 135806335} - component: {fileID: 135806336} - m_Layer: 5 + m_Layer: 9 m_Name: color m_TagString: Untagged m_Icon: {fileID: 0} @@ -2081,7 +2081,7 @@ GameObject: - component: {fileID: 142983757} - component: {fileID: 142983756} - component: {fileID: 142983755} - m_Layer: 5 + m_Layer: 9 m_Name: Button (1) m_TagString: Untagged m_Icon: {fileID: 0} @@ -3000,7 +3000,7 @@ GameObject: - component: {fileID: 150309217} - component: {fileID: 150309219} - component: {fileID: 150309218} - m_Layer: 5 + m_Layer: 9 m_Name: Menu m_TagString: Untagged m_Icon: {fileID: 0} @@ -3077,7 +3077,7 @@ GameObject: - component: {fileID: 152092642} - component: {fileID: 152092641} - component: {fileID: 152092640} - m_Layer: 5 + m_Layer: 9 m_Name: RawImage m_TagString: Untagged m_Icon: {fileID: 0} @@ -3489,7 +3489,7 @@ GameObject: - component: {fileID: 178947447} - component: {fileID: 178947449} - component: {fileID: 178947448} - m_Layer: 5 + m_Layer: 9 m_Name: Text (TMP) m_TagString: Untagged m_Icon: {fileID: 0} @@ -3914,6 +3914,34 @@ PrefabInstance: propertyPath: m_TextStyleHashCode value: -1183493901 objectReference: {fileID: 0} + - target: {fileID: 536572174185929720, guid: 2cec9b064a8a95f41ba830d25ea87d2e, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1200673020346522525, guid: 2cec9b064a8a95f41ba830d25ea87d2e, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1460698461071452310, guid: 2cec9b064a8a95f41ba830d25ea87d2e, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1816989196148034697, guid: 2cec9b064a8a95f41ba830d25ea87d2e, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 3083274345868045372, guid: 2cec9b064a8a95f41ba830d25ea87d2e, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 3083274345906872067, guid: 2cec9b064a8a95f41ba830d25ea87d2e, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 3083274345920604344, guid: 2cec9b064a8a95f41ba830d25ea87d2e, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} - target: {fileID: 3083274345920604345, guid: 2cec9b064a8a95f41ba830d25ea87d2e, type: 3} propertyPath: m_AnchorMax.x value: 0.5 @@ -3926,10 +3954,22 @@ PrefabInstance: propertyPath: m_AnchorMin.x value: 0.5 objectReference: {fileID: 0} + - target: {fileID: 3083274346940298100, guid: 2cec9b064a8a95f41ba830d25ea87d2e, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 3083274347254332314, guid: 2cec9b064a8a95f41ba830d25ea87d2e, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} - target: {fileID: 3083274347254332314, guid: 2cec9b064a8a95f41ba830d25ea87d2e, type: 3} propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 3083274347384374708, guid: 2cec9b064a8a95f41ba830d25ea87d2e, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} - target: {fileID: 3083274347384374709, guid: 2cec9b064a8a95f41ba830d25ea87d2e, type: 3} propertyPath: m_AnchorMax.x value: 0.5 @@ -3942,6 +3982,10 @@ PrefabInstance: propertyPath: m_Name value: SliderScaleBasic_Stamp (1) objectReference: {fileID: 0} + - target: {fileID: 3083274347408712451, guid: 2cec9b064a8a95f41ba830d25ea87d2e, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} - target: {fileID: 3083274347408712451, guid: 2cec9b064a8a95f41ba830d25ea87d2e, type: 3} propertyPath: m_IsActive value: 1 @@ -4042,10 +4086,30 @@ PrefabInstance: propertyPath: m_WholeNumbers value: 0 objectReference: {fileID: 0} + - target: {fileID: 3770969739482169645, guid: 2cec9b064a8a95f41ba830d25ea87d2e, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} - target: {fileID: 6118684074714811541, guid: 2cec9b064a8a95f41ba830d25ea87d2e, type: 3} propertyPath: hasText value: 0 objectReference: {fileID: 0} + - target: {fileID: 6372361153642431477, guid: 2cec9b064a8a95f41ba830d25ea87d2e, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 6973589123833841946, guid: 2cec9b064a8a95f41ba830d25ea87d2e, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 8144688368270242003, guid: 2cec9b064a8a95f41ba830d25ea87d2e, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 9155876842306098898, guid: 2cec9b064a8a95f41ba830d25ea87d2e, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -5273,7 +5337,7 @@ GameObject: - component: {fileID: 236862862} - component: {fileID: 236862864} - component: {fileID: 236862863} - m_Layer: 5 + m_Layer: 9 m_Name: PunchTapemask m_TagString: Untagged m_Icon: {fileID: 0} @@ -5482,7 +5546,7 @@ GameObject: - component: {fileID: 247562152} - component: {fileID: 247562154} - component: {fileID: 247562153} - m_Layer: 5 + m_Layer: 9 m_Name: eyeView m_TagString: Untagged m_Icon: {fileID: 0} @@ -5694,7 +5758,7 @@ GameObject: m_Component: - component: {fileID: 259861588} - component: {fileID: 259861589} - m_Layer: 5 + m_Layer: 9 m_Name: focus m_TagString: Untagged m_Icon: {fileID: 0} @@ -5786,7 +5850,7 @@ GameObject: - component: {fileID: 270409710} - component: {fileID: 270409712} - component: {fileID: 270409711} - m_Layer: 5 + m_Layer: 9 m_Name: Text (TMP) m_TagString: Untagged m_Icon: {fileID: 0} @@ -5922,7 +5986,7 @@ GameObject: - component: {fileID: 277380798} - component: {fileID: 277380800} - component: {fileID: 277380799} - m_Layer: 5 + m_Layer: 9 m_Name: Image m_TagString: Untagged m_Icon: {fileID: 0} @@ -6079,7 +6143,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 293524579} - m_Layer: 5 + m_Layer: 9 m_Name: Fill Area m_TagString: Untagged m_Icon: {fileID: 0} @@ -6161,7 +6225,7 @@ GameObject: - component: {fileID: 298621640} - component: {fileID: 298621642} - component: {fileID: 298621641} - m_Layer: 5 + m_Layer: 9 m_Name: Image m_TagString: Untagged m_Icon: {fileID: 0} @@ -6253,6 +6317,10 @@ PrefabInstance: propertyPath: m_Name value: PunchTapeSlot objectReference: {fileID: 0} + - target: {fileID: 2424662228528623556, guid: 0eeca7d625d8a9a40ad9a02ca0c4aad2, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} - target: {fileID: 2424662228528623556, guid: 0eeca7d625d8a9a40ad9a02ca0c4aad2, type: 3} propertyPath: m_IsActive value: 1 @@ -6277,6 +6345,10 @@ PrefabInstance: propertyPath: m_Name value: close objectReference: {fileID: 0} + - target: {fileID: 7880595094219686492, guid: 0eeca7d625d8a9a40ad9a02ca0c4aad2, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} - target: {fileID: 7880595094219686492, guid: 0eeca7d625d8a9a40ad9a02ca0c4aad2, type: 3} propertyPath: m_IsActive value: 1 @@ -6549,7 +6621,7 @@ GameObject: - component: {fileID: 347112476} - component: {fileID: 347112475} - component: {fileID: 347112474} - m_Layer: 5 + m_Layer: 9 m_Name: ManualButton m_TagString: Untagged m_Icon: {fileID: 0} @@ -6943,7 +7015,7 @@ GameObject: - component: {fileID: 369252989} - component: {fileID: 369252991} - component: {fileID: 369252990} - m_Layer: 5 + m_Layer: 9 m_Name: Text (TMP) m_TagString: Untagged m_Icon: {fileID: 0} @@ -7078,7 +7150,7 @@ GameObject: - component: {fileID: 383915073} - component: {fileID: 383915072} - component: {fileID: 383915071} - m_Layer: 5 + m_Layer: 9 m_Name: ZoomInUF m_TagString: Untagged m_Icon: {fileID: 0} @@ -7357,7 +7429,7 @@ GameObject: - component: {fileID: 454830773} - component: {fileID: 454830775} - component: {fileID: 454830774} - m_Layer: 5 + m_Layer: 9 m_Name: MemoryProcess m_TagString: Untagged m_Icon: {fileID: 0} @@ -7432,7 +7504,7 @@ GameObject: - component: {fileID: 466676743} - component: {fileID: 466676745} - component: {fileID: 466676744} - m_Layer: 5 + m_Layer: 9 m_Name: Text (TMP) m_TagString: Untagged m_Icon: {fileID: 0} @@ -7884,7 +7956,7 @@ GameObject: - component: {fileID: 480476657} - component: {fileID: 480476656} - component: {fileID: 480476655} - m_Layer: 5 + m_Layer: 9 m_Name: HeadMask m_TagString: Untagged m_Icon: {fileID: 0} @@ -7973,7 +8045,7 @@ GameObject: - component: {fileID: 487032385} - component: {fileID: 487032388} - component: {fileID: 487032387} - m_Layer: 5 + m_Layer: 9 m_Name: open m_TagString: Untagged m_Icon: {fileID: 0} @@ -8048,7 +8120,7 @@ GameObject: - component: {fileID: 501441329} - component: {fileID: 501441331} - component: {fileID: 501441330} - m_Layer: 5 + m_Layer: 9 m_Name: Text (TMP) m_TagString: Untagged m_Icon: {fileID: 0} @@ -8182,7 +8254,7 @@ GameObject: - component: {fileID: 503082897} - component: {fileID: 503082899} - component: {fileID: 503082898} - m_Layer: 5 + m_Layer: 9 m_Name: MemoryView m_TagString: Untagged m_Icon: {fileID: 0} @@ -8371,7 +8443,7 @@ GameObject: - component: {fileID: 515993798} - component: {fileID: 515993800} - component: {fileID: 515993799} - m_Layer: 5 + m_Layer: 9 m_Name: Text (TMP) m_TagString: Untagged m_Icon: {fileID: 0} @@ -8503,7 +8575,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 517117469} - m_Layer: 5 + m_Layer: 9 m_Name: Content m_TagString: Untagged m_Icon: {fileID: 0} @@ -8576,7 +8648,7 @@ GameObject: - component: {fileID: 522428455} - component: {fileID: 522428454} - component: {fileID: 522428453} - m_Layer: 5 + m_Layer: 9 m_Name: Template m_TagString: Untagged m_Icon: {fileID: 0} @@ -9485,7 +9557,7 @@ GameObject: - component: {fileID: 530194903} - component: {fileID: 530194905} - component: {fileID: 530194904} - m_Layer: 5 + m_Layer: 9 m_Name: Text (TMP) m_TagString: Untagged m_Icon: {fileID: 0} @@ -9720,7 +9792,7 @@ GameObject: - component: {fileID: 532162184} - component: {fileID: 532162186} - component: {fileID: 532162185} - m_Layer: 5 + m_Layer: 9 m_Name: punchTape m_TagString: Untagged m_Icon: {fileID: 0} @@ -10252,7 +10324,7 @@ GameObject: - component: {fileID: 588235815} - component: {fileID: 588235814} - component: {fileID: 588235813} - m_Layer: 5 + m_Layer: 9 m_Name: ZoomInMemory m_TagString: Untagged m_Icon: {fileID: 0} @@ -10566,6 +10638,10 @@ PrefabInstance: propertyPath: m_Name value: Line (1) objectReference: {fileID: 0} + - target: {fileID: 5470153155665659945, guid: 7e1248171f8348e4db6e10ab0667a497, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -10585,7 +10661,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 627739805} - m_Layer: 5 + m_Layer: 9 m_Name: Handle Slide Area m_TagString: Untagged m_Icon: {fileID: 0} @@ -10696,11 +10772,11 @@ Transform: m_GameObject: {fileID: 633823201} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.24300003, y: 0.148, z: 0} + m_LocalPosition: {x: -0.24300194, y: 0.148, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 2071292136} + m_Father: {fileID: 1822610250} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &633823203 SpriteRenderer: @@ -10858,6 +10934,10 @@ PrefabInstance: propertyPath: m_Name value: Line objectReference: {fileID: 0} + - target: {fileID: 5470153155665659945, guid: 7e1248171f8348e4db6e10ab0667a497, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -11041,7 +11121,7 @@ GameObject: - component: {fileID: 696533770} - component: {fileID: 696533772} - component: {fileID: 696533771} - m_Layer: 5 + m_Layer: 9 m_Name: MemoryFinishedNoColor m_TagString: Untagged m_Icon: {fileID: 0} @@ -11265,6 +11345,10 @@ PrefabInstance: propertyPath: m_Name value: Eye objectReference: {fileID: 0} + - target: {fileID: 7058771273709505771, guid: 076ce1386c7b1df45bf5c92a2ff4c5ea, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} - target: {fileID: 7086589638264441731, guid: 076ce1386c7b1df45bf5c92a2ff4c5ea, type: 3} propertyPath: m_IsActive value: 0 @@ -11289,6 +11373,10 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 7947718163668976181, guid: 076ce1386c7b1df45bf5c92a2ff4c5ea, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} - target: {fileID: 7947718163668976181, guid: 076ce1386c7b1df45bf5c92a2ff4c5ea, type: 3} propertyPath: m_IsActive value: 1 @@ -11422,7 +11510,7 @@ GameObject: m_Component: - component: {fileID: 730553275} - component: {fileID: 730553276} - m_Layer: 5 + m_Layer: 9 m_Name: Item m_TagString: Untagged m_Icon: {fileID: 0} @@ -11511,7 +11599,7 @@ GameObject: - component: {fileID: 748395818} - component: {fileID: 748395817} - component: {fileID: 748395816} - m_Layer: 5 + m_Layer: 9 m_Name: Button m_TagString: Untagged m_Icon: {fileID: 0} @@ -11630,7 +11718,7 @@ GameObject: - component: {fileID: 753279731} - component: {fileID: 753279733} - component: {fileID: 753279732} - m_Layer: 5 + m_Layer: 9 m_Name: TaskManager m_TagString: Untagged m_Icon: {fileID: 0} @@ -11693,7 +11781,7 @@ GameObject: - component: {fileID: 755572873} - component: {fileID: 755572872} - component: {fileID: 755572871} - m_Layer: 5 + m_Layer: 9 m_Name: DeepCanvas m_TagString: Untagged m_Icon: {fileID: 0} @@ -11749,7 +11837,7 @@ Canvas: m_GameObject: {fileID: 755572870} m_Enabled: 1 serializedVersion: 3 - m_RenderMode: 0 + m_RenderMode: 1 m_Camera: {fileID: 0} m_PlaneDistance: 100 m_PixelPerfect: 0 @@ -11757,10 +11845,10 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 - m_VertexColorAlwaysGammaSpace: 0 + m_VertexColorAlwaysGammaSpace: 1 m_AdditionalShaderChannelsFlag: 25 m_UpdateRectTransformForStandalone: 0 - m_SortingLayerID: 0 + m_SortingLayerID: 813150151 m_SortingOrder: 4 m_TargetDisplay: 0 --- !u!224 &755572874 @@ -11846,7 +11934,7 @@ Transform: m_GameObject: {fileID: 763669270} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.27432632, y: -0.62164545, z: 0.06738746} + m_LocalPosition: {x: -30.015675, y: -0.62164545, z: 0.06738746} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -12354,7 +12442,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 784449372} - m_Layer: 5 + m_Layer: 9 m_Name: Fill Area m_TagString: Untagged m_Icon: {fileID: 0} @@ -12392,7 +12480,7 @@ GameObject: - component: {fileID: 790007031} - component: {fileID: 790007033} - component: {fileID: 790007032} - m_Layer: 5 + m_Layer: 9 m_Name: Text (TMP) m_TagString: Untagged m_Icon: {fileID: 0} @@ -12610,7 +12698,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 839463332} - m_Layer: 5 + m_Layer: 9 m_Name: Handle Slide Area m_TagString: Untagged m_Icon: {fileID: 0} @@ -12747,7 +12835,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 847697968} - m_Layer: 5 + m_Layer: 9 m_Name: Head m_TagString: Untagged m_Icon: {fileID: 0} @@ -12955,7 +13043,7 @@ GameObject: - component: {fileID: 856622111} - component: {fileID: 856622113} - component: {fileID: 856622112} - m_Layer: 5 + m_Layer: 9 m_Name: Image m_TagString: Untagged m_Icon: {fileID: 0} @@ -13030,7 +13118,7 @@ GameObject: - component: {fileID: 876835175} - component: {fileID: 876835177} - component: {fileID: 876835176} - m_Layer: 5 + m_Layer: 9 m_Name: headview m_TagString: Untagged m_Icon: {fileID: 0} @@ -13105,7 +13193,7 @@ GameObject: - component: {fileID: 879953260} - component: {fileID: 879953262} - component: {fileID: 879953261} - m_Layer: 5 + m_Layer: 9 m_Name: entry1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -13182,7 +13270,7 @@ GameObject: - component: {fileID: 884696054} - component: {fileID: 884696053} - component: {fileID: 884696052} - m_Layer: 5 + m_Layer: 9 m_Name: ExecuteButton m_TagString: Untagged m_Icon: {fileID: 0} @@ -13364,7 +13452,7 @@ GameObject: - component: {fileID: 893682038} - component: {fileID: 893682040} - component: {fileID: 893682039} - m_Layer: 5 + m_Layer: 9 m_Name: MemoryFinishedforFade m_TagString: Untagged m_Icon: {fileID: 0} @@ -13440,7 +13528,7 @@ GameObject: - component: {fileID: 902033656} - component: {fileID: 902033655} - component: {fileID: 902033654} - m_Layer: 5 + m_Layer: 9 m_Name: EyeBackToFace m_TagString: Untagged m_Icon: {fileID: 0} @@ -13899,7 +13987,7 @@ GameObject: - component: {fileID: 908121221} - component: {fileID: 908121223} - component: {fileID: 908121222} - m_Layer: 0 + m_Layer: 9 m_Name: "\u6253\u5370\u673A\u9876\u90E8" m_TagString: Untagged m_Icon: {fileID: 0} @@ -13972,7 +14060,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 911086724} - m_Layer: 5 + m_Layer: 9 m_Name: Fill Area m_TagString: Untagged m_Icon: {fileID: 0} @@ -14134,7 +14222,7 @@ GameObject: - component: {fileID: 964820572} - component: {fileID: 964820571} - component: {fileID: 964820570} - m_Layer: 5 + m_Layer: 9 m_Name: Panel m_TagString: Untagged m_Icon: {fileID: 0} @@ -14209,7 +14297,7 @@ GameObject: - component: {fileID: 966176896} - component: {fileID: 966176898} - component: {fileID: 966176897} - m_Layer: 5 + m_Layer: 9 m_Name: Text (TMP) m_TagString: Untagged m_Icon: {fileID: 0} @@ -14467,7 +14555,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1008884025} - m_Layer: 5 + m_Layer: 9 m_Name: Handle Slide Area m_TagString: Untagged m_Icon: {fileID: 0} @@ -14506,7 +14594,7 @@ GameObject: - component: {fileID: 1010589978} - component: {fileID: 1010589977} - component: {fileID: 1010589976} - m_Layer: 5 + m_Layer: 9 m_Name: Image m_TagString: Untagged m_Icon: {fileID: 0} @@ -14594,7 +14682,7 @@ GameObject: - component: {fileID: 1021119647} - component: {fileID: 1021119649} - component: {fileID: 1021119648} - m_Layer: 5 + m_Layer: 9 m_Name: Text (TMP) m_TagString: Untagged m_Icon: {fileID: 0} @@ -14730,7 +14818,7 @@ GameObject: - component: {fileID: 1029300070} - component: {fileID: 1029300072} - component: {fileID: 1029300071} - m_Layer: 5 + m_Layer: 9 m_Name: Text (TMP) m_TagString: Untagged m_Icon: {fileID: 0} @@ -14866,7 +14954,7 @@ GameObject: - component: {fileID: 1030302554} - component: {fileID: 1030302556} - component: {fileID: 1030302555} - m_Layer: 5 + m_Layer: 9 m_Name: Background m_TagString: Untagged m_Icon: {fileID: 0} @@ -15473,7 +15561,7 @@ GameObject: - component: {fileID: 1088275437} - component: {fileID: 1088275439} - component: {fileID: 1088275438} - m_Layer: 5 + m_Layer: 9 m_Name: frame m_TagString: Untagged m_Icon: {fileID: 0} @@ -15548,7 +15636,7 @@ GameObject: - component: {fileID: 1098761360} - component: {fileID: 1098761362} - component: {fileID: 1098761361} - m_Layer: 5 + m_Layer: 9 m_Name: Text (TMP) m_TagString: Untagged m_Icon: {fileID: 0} @@ -15680,7 +15768,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1110463260} - m_Layer: 5 + m_Layer: 9 m_Name: Sliding Area m_TagString: Untagged m_Icon: {fileID: 0} @@ -16012,7 +16100,7 @@ GameObject: - component: {fileID: 1149585994} - component: {fileID: 1149585996} - component: {fileID: 1149585995} - m_Layer: 5 + m_Layer: 9 m_Name: Item Background m_TagString: Untagged m_Icon: {fileID: 0} @@ -16088,7 +16176,7 @@ GameObject: - component: {fileID: 1152260727} - component: {fileID: 1152260726} - component: {fileID: 1152260725} - m_Layer: 5 + m_Layer: 9 m_Name: MemoryRender m_TagString: Untagged m_Icon: {fileID: 0} @@ -16280,7 +16368,7 @@ GameObject: - component: {fileID: 1162055061} - component: {fileID: 1162055063} - component: {fileID: 1162055062} - m_Layer: 5 + m_Layer: 9 m_Name: MemoryFinished m_TagString: Untagged m_Icon: {fileID: 0} @@ -16731,7 +16819,7 @@ GameObject: - component: {fileID: 1179576785} - component: {fileID: 1179576787} - component: {fileID: 1179576786} - m_Layer: 5 + m_Layer: 9 m_Name: Handle m_TagString: Untagged m_Icon: {fileID: 0} @@ -16892,7 +16980,7 @@ GameObject: - component: {fileID: 1183750205} - component: {fileID: 1183750204} - component: {fileID: 1183750203} - m_Layer: 5 + m_Layer: 9 m_Name: Dropdown m_TagString: Untagged m_Icon: {fileID: 0} @@ -17044,7 +17132,7 @@ GameObject: - component: {fileID: 1189421215} - component: {fileID: 1189421214} - component: {fileID: 1189421213} - m_Layer: 5 + m_Layer: 9 m_Name: Scrollbar m_TagString: Untagged m_Icon: {fileID: 0} @@ -17170,7 +17258,7 @@ GameObject: - component: {fileID: 1194991039} - component: {fileID: 1194991038} - component: {fileID: 1194991037} - m_Layer: 5 + m_Layer: 9 m_Name: Button m_TagString: Untagged m_Icon: {fileID: 0} @@ -17291,7 +17379,7 @@ GameObject: - component: {fileID: 1207870025} - component: {fileID: 1207870024} - component: {fileID: 1207870023} - m_Layer: 5 + m_Layer: 9 m_Name: page2 m_TagString: Untagged m_Icon: {fileID: 0} @@ -17387,7 +17475,7 @@ GameObject: - component: {fileID: 1209510058} - component: {fileID: 1209510060} - component: {fileID: 1209510059} - m_Layer: 5 + m_Layer: 9 m_Name: Text (TMP) m_TagString: Untagged m_Icon: {fileID: 0} @@ -17874,7 +17962,7 @@ GameObject: - component: {fileID: 1220514958} - component: {fileID: 1220514960} - component: {fileID: 1220514959} - m_Layer: 5 + m_Layer: 9 m_Name: Image m_TagString: Untagged m_Icon: {fileID: 0} @@ -17949,7 +18037,7 @@ GameObject: - component: {fileID: 1224176948} - component: {fileID: 1224176950} - component: {fileID: 1224176949} - m_Layer: 5 + m_Layer: 9 m_Name: Text (TMP) m_TagString: Untagged m_Icon: {fileID: 0} @@ -18083,7 +18171,7 @@ GameObject: - component: {fileID: 1235255815} - component: {fileID: 1235255817} - component: {fileID: 1235255816} - m_Layer: 5 + m_Layer: 9 m_Name: Text (TMP) m_TagString: Untagged m_Icon: {fileID: 0} @@ -18217,7 +18305,7 @@ GameObject: - component: {fileID: 1244183433} - component: {fileID: 1244183435} - component: {fileID: 1244183434} - m_Layer: 5 + m_Layer: 9 m_Name: Fill m_TagString: Untagged m_Icon: {fileID: 0} @@ -18292,7 +18380,7 @@ GameObject: - component: {fileID: 1255230569} - component: {fileID: 1255230571} - component: {fileID: 1255230570} - m_Layer: 5 + m_Layer: 9 m_Name: Background m_TagString: Untagged m_Icon: {fileID: 0} @@ -18486,6 +18574,34 @@ PrefabInstance: propertyPath: m_TextStyleHashCode value: -1183493901 objectReference: {fileID: 0} + - target: {fileID: 536572174185929720, guid: 2cec9b064a8a95f41ba830d25ea87d2e, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1200673020346522525, guid: 2cec9b064a8a95f41ba830d25ea87d2e, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1460698461071452310, guid: 2cec9b064a8a95f41ba830d25ea87d2e, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1816989196148034697, guid: 2cec9b064a8a95f41ba830d25ea87d2e, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 3083274345868045372, guid: 2cec9b064a8a95f41ba830d25ea87d2e, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 3083274345906872067, guid: 2cec9b064a8a95f41ba830d25ea87d2e, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 3083274345920604344, guid: 2cec9b064a8a95f41ba830d25ea87d2e, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} - target: {fileID: 3083274345920604345, guid: 2cec9b064a8a95f41ba830d25ea87d2e, type: 3} propertyPath: m_AnchorMax.x value: 0.5 @@ -18498,10 +18614,22 @@ PrefabInstance: propertyPath: m_AnchorMin.x value: 0.5 objectReference: {fileID: 0} + - target: {fileID: 3083274346940298100, guid: 2cec9b064a8a95f41ba830d25ea87d2e, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 3083274347254332314, guid: 2cec9b064a8a95f41ba830d25ea87d2e, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} - target: {fileID: 3083274347254332314, guid: 2cec9b064a8a95f41ba830d25ea87d2e, type: 3} propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 3083274347384374708, guid: 2cec9b064a8a95f41ba830d25ea87d2e, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} - target: {fileID: 3083274347384374709, guid: 2cec9b064a8a95f41ba830d25ea87d2e, type: 3} propertyPath: m_AnchorMax.x value: 0.5 @@ -18514,6 +18642,10 @@ PrefabInstance: propertyPath: m_Name value: SliderScaleBasic_Stamp objectReference: {fileID: 0} + - target: {fileID: 3083274347408712451, guid: 2cec9b064a8a95f41ba830d25ea87d2e, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} - target: {fileID: 3083274347408712451, guid: 2cec9b064a8a95f41ba830d25ea87d2e, type: 3} propertyPath: m_IsActive value: 1 @@ -18602,10 +18734,30 @@ PrefabInstance: propertyPath: m_WholeNumbers value: 0 objectReference: {fileID: 0} + - target: {fileID: 3770969739482169645, guid: 2cec9b064a8a95f41ba830d25ea87d2e, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} - target: {fileID: 6118684074714811541, guid: 2cec9b064a8a95f41ba830d25ea87d2e, type: 3} propertyPath: hasText value: 0 objectReference: {fileID: 0} + - target: {fileID: 6372361153642431477, guid: 2cec9b064a8a95f41ba830d25ea87d2e, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 6973589123833841946, guid: 2cec9b064a8a95f41ba830d25ea87d2e, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 8144688368270242003, guid: 2cec9b064a8a95f41ba830d25ea87d2e, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 9155876842306098898, guid: 2cec9b064a8a95f41ba830d25ea87d2e, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -18841,7 +18993,7 @@ GameObject: - component: {fileID: 1307071590} - component: {fileID: 1307071592} - component: {fileID: 1307071591} - m_Layer: 5 + m_Layer: 9 m_Name: Text (TMP) m_TagString: Untagged m_Icon: {fileID: 0} @@ -18975,7 +19127,7 @@ GameObject: - component: {fileID: 1334591742} - component: {fileID: 1334591744} - component: {fileID: 1334591743} - m_Layer: 5 + m_Layer: 9 m_Name: CodeWindow m_TagString: Untagged m_Icon: {fileID: 0} @@ -19463,7 +19615,7 @@ GameObject: - component: {fileID: 1404540170} - component: {fileID: 1404540169} - component: {fileID: 1404540171} - m_Layer: 5 + m_Layer: 9 m_Name: PlayBackground m_TagString: Untagged m_Icon: {fileID: 0} @@ -19590,7 +19742,7 @@ GameObject: - component: {fileID: 1422065000} - component: {fileID: 1422064999} - component: {fileID: 1422064998} - m_Layer: 5 + m_Layer: 9 m_Name: ZoomInEye m_TagString: Untagged m_Icon: {fileID: 0} @@ -20007,7 +20159,7 @@ GameObject: - component: {fileID: 1446891234} - component: {fileID: 1446891233} - component: {fileID: 1446891232} - m_Layer: 5 + m_Layer: 9 m_Name: Button m_TagString: Untagged m_Icon: {fileID: 0} @@ -20128,7 +20280,7 @@ GameObject: - component: {fileID: 1447811017} - component: {fileID: 1447811016} - component: {fileID: 1447811015} - m_Layer: 5 + m_Layer: 9 m_Name: tapeImage (1) m_TagString: Untagged m_Icon: {fileID: 0} @@ -20319,6 +20471,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 847697968} m_Modifications: + - target: {fileID: 95621502591072554, guid: 8f5a6866f8a4c844e9e9c9280990fe6c, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} - target: {fileID: 95621502591072554, guid: 8f5a6866f8a4c844e9e9c9280990fe6c, type: 3} propertyPath: m_IsActive value: 1 @@ -20359,6 +20515,10 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 2539434050591565950, guid: 8f5a6866f8a4c844e9e9c9280990fe6c, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} - target: {fileID: 4703978764888130386, guid: 8f5a6866f8a4c844e9e9c9280990fe6c, type: 3} propertyPath: m_IsActive value: 0 @@ -20375,6 +20535,10 @@ PrefabInstance: propertyPath: m_Name value: UF objectReference: {fileID: 0} + - target: {fileID: 5248113521652737614, guid: 8f5a6866f8a4c844e9e9c9280990fe6c, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} - target: {fileID: 5612588720789407537, guid: 8f5a6866f8a4c844e9e9c9280990fe6c, type: 3} propertyPath: m_IsActive value: 0 @@ -20395,6 +20559,10 @@ PrefabInstance: propertyPath: m_Maskable value: 1 objectReference: {fileID: 0} + - target: {fileID: 7235470322137206611, guid: 8f5a6866f8a4c844e9e9c9280990fe6c, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} - target: {fileID: 8058912131025573858, guid: 8f5a6866f8a4c844e9e9c9280990fe6c, type: 3} propertyPath: m_Enabled value: 0 @@ -20833,7 +21001,7 @@ GameObject: - component: {fileID: 1474527768} - component: {fileID: 1474527770} - component: {fileID: 1474527769} - m_Layer: 5 + m_Layer: 9 m_Name: UFView m_TagString: Untagged m_Icon: {fileID: 0} @@ -21261,7 +21429,7 @@ GameObject: - component: {fileID: 1496761515} - component: {fileID: 1496761517} - component: {fileID: 1496761516} - m_Layer: 5 + m_Layer: 9 m_Name: Handle m_TagString: Untagged m_Icon: {fileID: 0} @@ -21336,7 +21504,7 @@ GameObject: - component: {fileID: 1498347707} - component: {fileID: 1498347709} - component: {fileID: 1498347708} - m_Layer: 5 + m_Layer: 9 m_Name: Text (TMP) m_TagString: Untagged m_Icon: {fileID: 0} @@ -21473,7 +21641,7 @@ GameObject: - component: {fileID: 1502187946} - component: {fileID: 1502187945} - component: {fileID: 1502187944} - m_Layer: 5 + m_Layer: 9 m_Name: background m_TagString: Untagged m_Icon: {fileID: 0} @@ -21565,7 +21733,7 @@ GameObject: - component: {fileID: 1512557162} - component: {fileID: 1512557164} - component: {fileID: 1512557163} - m_Layer: 5 + m_Layer: 9 m_Name: Handle m_TagString: Untagged m_Icon: {fileID: 0} @@ -21640,7 +21808,7 @@ GameObject: - component: {fileID: 1534779241} - component: {fileID: 1534779243} - component: {fileID: 1534779242} - m_Layer: 5 + m_Layer: 9 m_Name: Memery m_TagString: Untagged m_Icon: {fileID: 0} @@ -22211,7 +22379,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6021814356272328302, guid: 63c42386abc960544897d0bd62a77387, type: 3} propertyPath: m_LocalPosition.x - value: 4.6500006 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6021814356272328302, guid: 63c42386abc960544897d0bd62a77387, type: 3} propertyPath: m_LocalPosition.y @@ -22413,7 +22581,7 @@ GameObject: - component: {fileID: 1590015856} - component: {fileID: 1590015858} - component: {fileID: 1590015857} - m_Layer: 5 + m_Layer: 9 m_Name: entry2 m_TagString: Untagged m_Icon: {fileID: 0} @@ -22573,7 +22741,7 @@ GameObject: - component: {fileID: 1596246722} - component: {fileID: 1596246724} - component: {fileID: 1596246723} - m_Layer: 5 + m_Layer: 9 m_Name: Fill m_TagString: Untagged m_Icon: {fileID: 0} @@ -22649,7 +22817,7 @@ GameObject: - component: {fileID: 1597388066} - component: {fileID: 1597388065} - component: {fileID: 1597388064} - m_Layer: 5 + m_Layer: 9 m_Name: TargetIndicator (1) m_TagString: Untagged m_Icon: {fileID: 0} @@ -22742,7 +22910,7 @@ GameObject: - component: {fileID: 1598659268} - component: {fileID: 1598659267} - component: {fileID: 1598659266} - m_Layer: 5 + m_Layer: 9 m_Name: Background m_TagString: Untagged m_Icon: {fileID: 0} @@ -22830,7 +22998,7 @@ GameObject: - component: {fileID: 1603419541} - component: {fileID: 1603419543} - component: {fileID: 1603419542} - m_Layer: 5 + m_Layer: 9 m_Name: entry1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -22955,7 +23123,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1613409760} - m_Layer: 5 + m_Layer: 9 m_Name: Handle Slide Area m_TagString: Untagged m_Icon: {fileID: 0} @@ -22993,7 +23161,7 @@ GameObject: - component: {fileID: 1615079357} - component: {fileID: 1615079359} - component: {fileID: 1615079358} - m_Layer: 5 + m_Layer: 9 m_Name: Fill m_TagString: Untagged m_Icon: {fileID: 0} @@ -23237,7 +23405,7 @@ GameObject: - component: {fileID: 1620905589} - component: {fileID: 1620905588} - component: {fileID: 1620905587} - m_Layer: 5 + m_Layer: 9 m_Name: next m_TagString: Untagged m_Icon: {fileID: 0} @@ -23923,7 +24091,7 @@ GameObject: - component: {fileID: 1684830029} - component: {fileID: 1684830031} - component: {fileID: 1684830030} - m_Layer: 5 + m_Layer: 9 m_Name: Label m_TagString: Untagged m_Icon: {fileID: 0} @@ -24056,7 +24224,7 @@ GameObject: m_Component: - component: {fileID: 1687435156} - component: {fileID: 1687435157} - m_Layer: 5 + m_Layer: 9 m_Name: Slider m_TagString: Untagged m_Icon: {fileID: 0} @@ -25869,7 +26037,7 @@ GameObject: - component: {fileID: 1728600799} - component: {fileID: 1728600798} - component: {fileID: 1728600797} - m_Layer: 5 + m_Layer: 9 m_Name: punchTapeoutline m_TagString: Untagged m_Icon: {fileID: 0} @@ -25961,7 +26129,7 @@ GameObject: - component: {fileID: 1734431900} - component: {fileID: 1734431899} - component: {fileID: 1734431898} - m_Layer: 5 + m_Layer: 9 m_Name: Button m_TagString: Untagged m_Icon: {fileID: 0} @@ -26936,7 +27104,7 @@ GameObject: - component: {fileID: 1805580365} - component: {fileID: 1805580367} - component: {fileID: 1805580366} - m_Layer: 5 + m_Layer: 9 m_Name: Image m_TagString: Untagged m_Icon: {fileID: 0} @@ -27012,7 +27180,7 @@ GameObject: - component: {fileID: 1810288628} - component: {fileID: 1810288627} - component: {fileID: 1810288626} - m_Layer: 5 + m_Layer: 9 m_Name: page1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -27108,7 +27276,7 @@ GameObject: - component: {fileID: 1810834547} - component: {fileID: 1810834549} - component: {fileID: 1810834548} - m_Layer: 5 + m_Layer: 9 m_Name: BlackPanel m_TagString: Untagged m_Icon: {fileID: 0} @@ -27183,7 +27351,7 @@ GameObject: - component: {fileID: 1821060324} - component: {fileID: 1821060326} - component: {fileID: 1821060325} - m_Layer: 5 + m_Layer: 9 m_Name: Item Label m_TagString: Untagged m_Icon: {fileID: 0} @@ -27338,6 +27506,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2071292136} + - {fileID: 633823202} m_Father: {fileID: 6045551082333026153} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1822610251 @@ -27463,6 +27632,50 @@ Transform: m_Children: [] m_Father: {fileID: 997068238} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1838968274 +GameObject: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1838968275} + - component: {fileID: 1838968276} + m_Layer: 0 + m_Name: cm + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1838968275 +Transform: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1838968274} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2108328659} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1838968276 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1838968274} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1841275528 GameObject: m_ObjectHideFlags: 0 @@ -27659,7 +27872,7 @@ GameObject: - component: {fileID: 1854177015} - component: {fileID: 1854177017} - component: {fileID: 1854177016} - m_Layer: 5 + m_Layer: 9 m_Name: Arrow m_TagString: Untagged m_Icon: {fileID: 0} @@ -27732,7 +27945,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1882069007} - m_Layer: 5 + m_Layer: 9 m_Name: Visual m_TagString: Untagged m_Icon: {fileID: 0} @@ -27777,7 +27990,7 @@ GameObject: - component: {fileID: 1905949535} - component: {fileID: 1905949534} - component: {fileID: 1905949533} - m_Layer: 5 + m_Layer: 9 m_Name: Viewport m_TagString: Untagged m_Icon: {fileID: 0} @@ -27881,10 +28094,11 @@ Transform: m_GameObject: {fileID: 1912719093} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: -30.29, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 2108328659} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1912719095 @@ -27972,7 +28186,7 @@ GameObject: - component: {fileID: 1940301554} - component: {fileID: 1940301556} - component: {fileID: 1940301555} - m_Layer: 5 + m_Layer: 9 m_Name: Handle m_TagString: Untagged m_Icon: {fileID: 0} @@ -28048,7 +28262,7 @@ GameObject: - component: {fileID: 1944658453} - component: {fileID: 1944658452} - component: {fileID: 1944658451} - m_Layer: 5 + m_Layer: 9 m_Name: Previous m_TagString: Untagged m_Icon: {fileID: 0} @@ -28168,7 +28382,7 @@ GameObject: - component: {fileID: 1953358213} - component: {fileID: 1953358215} - component: {fileID: 1953358214} - m_Layer: 5 + m_Layer: 9 m_Name: Text (TMP) m_TagString: Untagged m_Icon: {fileID: 0} @@ -28336,7 +28550,7 @@ GameObject: - component: {fileID: 1976507904} - component: {fileID: 1976507906} - component: {fileID: 1976507905} - m_Layer: 5 + m_Layer: 9 m_Name: Manual m_TagString: Untagged m_Icon: {fileID: 0} @@ -28499,7 +28713,7 @@ GameObject: - component: {fileID: 1995873728} - component: {fileID: 1995873730} - component: {fileID: 1995873729} - m_Layer: 5 + m_Layer: 9 m_Name: camera m_TagString: Untagged m_Icon: {fileID: 0} @@ -29028,7 +29242,7 @@ GameObject: - component: {fileID: 2028795587} - component: {fileID: 2028795589} - component: {fileID: 2028795588} - m_Layer: 0 + m_Layer: 9 m_Name: "\u6253\u5B54\u5E26 \u62F7\u8D1D" m_TagString: Untagged m_Icon: {fileID: 0} @@ -29103,7 +29317,7 @@ GameObject: - component: {fileID: 2029038284} - component: {fileID: 2029038286} - component: {fileID: 2029038285} - m_Layer: 0 + m_Layer: 9 m_Name: "\u6253\u5370\u673A\u5E95\u90E8" m_TagString: Untagged m_Icon: {fileID: 0} @@ -29178,7 +29392,7 @@ GameObject: - component: {fileID: 2043782141} - component: {fileID: 2043782143} - component: {fileID: 2043782142} - m_Layer: 5 + m_Layer: 9 m_Name: Back m_TagString: Untagged m_Icon: {fileID: 0} @@ -29256,7 +29470,7 @@ GameObject: - component: {fileID: 2051653936} - component: {fileID: 2051653938} - component: {fileID: 2051653937} - m_Layer: 5 + m_Layer: 9 m_Name: entry2 m_TagString: Untagged m_Icon: {fileID: 0} @@ -29332,7 +29546,7 @@ GameObject: - component: {fileID: 2061474655} - component: {fileID: 2061474657} - component: {fileID: 2061474656} - m_Layer: 5 + m_Layer: 9 m_Name: Text (TMP) m_TagString: Untagged m_Icon: {fileID: 0} @@ -29634,7 +29848,7 @@ GameObject: - component: {fileID: 2066942290} - component: {fileID: 2066942292} - component: {fileID: 2066942291} - m_Layer: 5 + m_Layer: 9 m_Name: Fill m_TagString: Untagged m_Icon: {fileID: 0} @@ -29729,7 +29943,6 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1434391375} - - {fileID: 633823202} - {fileID: 1465407177} - {fileID: 1484838014} m_Father: {fileID: 1822610250} @@ -29879,7 +30092,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2076089330} - m_Layer: 5 + m_Layer: 9 m_Name: Fill Area m_TagString: Untagged m_Icon: {fileID: 0} @@ -29977,7 +30190,7 @@ GameObject: m_Component: - component: {fileID: 2088818327} - component: {fileID: 2088818328} - m_Layer: 5 + m_Layer: 9 m_Name: exposure m_TagString: Untagged m_Icon: {fileID: 0} @@ -31524,7 +31737,7 @@ GameObject: - component: {fileID: 2099861576} - component: {fileID: 2099861575} - component: {fileID: 2099861574} - m_Layer: 5 + m_Layer: 9 m_Name: element m_TagString: Untagged m_Icon: {fileID: 0} @@ -31719,6 +31932,10 @@ PrefabInstance: propertyPath: m_Name value: Tasktext objectReference: {fileID: 0} + - target: {fileID: 5295477770541402281, guid: ab166642babe53e4993fa1bd9bd57204, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -31729,6 +31946,78 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 2064460273118752238, guid: ab166642babe53e4993fa1bd9bd57204, type: 3} m_PrefabInstance: {fileID: 2104582589} m_PrefabAsset: {fileID: 0} +--- !u!1 &2108328658 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2108328659} + - component: {fileID: 2108328660} + m_Layer: 0 + m_Name: UF Camera + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2108328659 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2108328658} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -4.23, y: 0.54141563, z: -10} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1838968275} + m_Father: {fileID: 1912719094} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &2108328660 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2108328658} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 45e653bab7fb20e499bda25e1b646fea, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ExcludedPropertiesInInspector: + - m_Script + m_LockStageInInspector: + m_StreamingVersion: 20170927 + m_Priority: 9 + m_StandbyUpdate: 2 + m_LookAt: {fileID: 0} + m_Follow: {fileID: 0} + m_Lens: + FieldOfView: 34 + OrthographicSize: 1.17 + NearClipPlane: 0.3 + FarClipPlane: 1000 + Dutch: 0 + ModeOverride: 0 + LensShift: {x: 0, y: 0} + GateFit: 2 + FocusDistance: 10 + m_SensorSize: {x: 1, y: 1} + m_Transitions: + m_BlendHint: 0 + m_InheritPosition: 0 + m_OnCameraLive: + m_PersistentCalls: + m_Calls: [] + m_LegacyBlendHint: 0 + m_ComponentOwner: {fileID: 1838968275} --- !u!1 &2115011991 GameObject: m_ObjectHideFlags: 0 @@ -31774,7 +32063,7 @@ GameObject: - component: {fileID: 2122469748} - component: {fileID: 2122469750} - component: {fileID: 2122469749} - m_Layer: 5 + m_Layer: 9 m_Name: Background m_TagString: Untagged m_Icon: {fileID: 0} @@ -32620,7 +32909,7 @@ GameObject: - component: {fileID: 2147012103} - component: {fileID: 2147012105} - component: {fileID: 2147012104} - m_Layer: 5 + m_Layer: 9 m_Name: back m_TagString: Untagged m_Icon: {fileID: 0} @@ -32834,7 +33123,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3722350651361937496, guid: 92aec29b557d59a4ca5363aadd06c7bb, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: -30.29 objectReference: {fileID: 0} - target: {fileID: 3722350651361937496, guid: 92aec29b557d59a4ca5363aadd06c7bb, type: 3} propertyPath: m_LocalPosition.y @@ -33098,8 +33387,8 @@ PrefabInstance: value: Fix System Center objectReference: {fileID: 0} - target: {fileID: 667196269251774960, guid: 95188b5d2a557274fb52febde14400b8, type: 3} - propertyPath: curState - value: 2 + propertyPath: sceneCamera + value: objectReference: {fileID: 0} - target: {fileID: 4256475766480134775, guid: 95188b5d2a557274fb52febde14400b8, type: 3} propertyPath: m_LocalPosition.x diff --git a/Assets/Scripts/Clue/FavoritesManager.cs b/Assets/Scripts/Clue/FavoritesManager.cs index 81ae0b483..e0492c0dc 100644 --- a/Assets/Scripts/Clue/FavoritesManager.cs +++ b/Assets/Scripts/Clue/FavoritesManager.cs @@ -10,7 +10,7 @@ public class FavoritesManager : MonoBehaviour { public static FavoritesManager Instance; - private ClueData _clueData; + private ClueData _clueData=new ClueData(); public Button toggleFavoritesButton; // 用于打开/关闭收藏夹的按钮 diff --git a/Assets/Scripts/FixSystemNew/BodyModule/BodyModule.cs b/Assets/Scripts/FixSystemNew/BodyModule/BodyModule.cs index c23ec8a77..be87ea634 100644 --- a/Assets/Scripts/FixSystemNew/BodyModule/BodyModule.cs +++ b/Assets/Scripts/FixSystemNew/BodyModule/BodyModule.cs @@ -14,6 +14,7 @@ namespace AibisDream.FixSystem public Transform socketPos; + // public Transform _indicatorPos; private BodyModuleSystem _bodyModuleSystem; private Material _highlightMaterial; private Material _alarmMaterial; @@ -58,24 +59,26 @@ namespace AibisDream.FixSystem public void PlugIn() { - // 插入就在示波器显示图片 - if (!_bodyModuleSystem.inHotErr) - { - StartCoroutine(FixSystemCenter.SystemDic.Get() - ?.ShowScanImage(data.ScreenPic, data.checkPoints)); - } - - // 然后触发Yarn节点 - DialogController.Instance?.StartDialogNode(_bodyModuleSystem.inHotErr ? "系统过热" : data.PlugInNodeName); + if (DialogController.Instance) + // 然后触发Yarn节点 + DialogController.Instance.StartDialogNode(_bodyModuleSystem.inHotErr ? "系统过热" : data.PlugInNodeName); } public void PlugOut() { - FixSystemCenter.SystemDic.Get()?.HideScanImage(); - _bodyModuleSystem.oscilloscopeSystem.MessageBoxSetNull(); StartCoroutine(_bodyModuleSystem.oscilloscopeSystem.DisableDeepInButton()); + + // TODO 触发Yarn节点(似乎目前没有拔出对话?) } + + public void DeepIn() + { + if(DialogController.Instance) + DialogController.Instance.StartDialogNode(data.DeepInNodeName); + } + + public Vector3 GetSocketPos() { @@ -138,6 +141,14 @@ namespace AibisDream.FixSystem } } + // public void HideModule(bool enable) + // { + // if (targetSpriteRenderer != null && highlightMaterial != null) + // { + // targetSpriteRenderer.material = enable ? highlightMaterial : originalMaterial; + // } + // } + #endregion } @@ -145,6 +156,7 @@ namespace AibisDream.FixSystem public struct BodyModuleData { public const string PlugInNodeTemplate = "{0}PlugIn"; + public const string DeepInTemplate = "{0}DeepIn"; // ID public string moduleName; @@ -154,14 +166,11 @@ namespace AibisDream.FixSystem public SerializableVector3 modulePos; public SerializableVector3 socketPos; - // 功能信息 - [Header("功能参数")] public bool cantStopRunning; - - public string showPicPath; - public CheckPoint[] checkPoints; + public bool cantStopRunning; // 只读 [JsonIgnore] public string PlugInNodeName => string.Format(PlugInNodeTemplate, moduleName); + [JsonIgnore] public string DeepInNodeName => string.Format(DeepInTemplate, moduleName); [JsonIgnore] public Sprite ModulePic @@ -170,9 +179,6 @@ namespace AibisDream.FixSystem set => modulePicPath = ResourceKit.SaveSprite(value); } - public Sprite ScreenPic => - !string.IsNullOrEmpty(showPicPath) ? ResourceKit.LoadSpriteFromPsd(showPicPath) : null; - [JsonIgnore] public Vector3 ModulePos { @@ -187,18 +193,4 @@ namespace AibisDream.FixSystem set => socketPos = new SerializableVector3(value); } } - - [Serializable] - public struct CheckPoint - { - public string id; - private SerializableVector3 _serializablePos3; - - [JsonIgnore] - public Vector3 PointPos - { - get => _serializablePos3.ToVector3(); - set => _serializablePos3 = new SerializableVector3(value); - } - } } \ No newline at end of file diff --git a/Assets/Scripts/FixSystemNew/BodyModule/BodyModuleSystem.cs b/Assets/Scripts/FixSystemNew/BodyModule/BodyModuleSystem.cs index 6c3f1eb94..a46e18b36 100644 --- a/Assets/Scripts/FixSystemNew/BodyModule/BodyModuleSystem.cs +++ b/Assets/Scripts/FixSystemNew/BodyModule/BodyModuleSystem.cs @@ -183,6 +183,14 @@ namespace AibisDream.FixSystem CableSystem.ResetPlug(); } + public void HandleDeepIn() + { + if (CableSystem.curBodyModule) + { + CableSystem.curBodyModule.DeepIn(); + } + } + #region 数据加载与保存 public override string GetConfigPath() diff --git a/Assets/Scripts/FixSystemNew/BodyModule/Modules/ChipModule.cs b/Assets/Scripts/FixSystemNew/BodyModule/Modules/ChipModule.cs index 194b218d5..f79ef809a 100644 --- a/Assets/Scripts/FixSystemNew/BodyModule/Modules/ChipModule.cs +++ b/Assets/Scripts/FixSystemNew/BodyModule/Modules/ChipModule.cs @@ -10,7 +10,7 @@ public class ChipModule : MonoBehaviour { private GameObject _chipModule; - private ChipData _chipData = new(); + private ChipData _chipData=new (); private void Awake() { @@ -22,6 +22,7 @@ public class ChipModule : MonoBehaviour } // Start is called before the first frame update + public void RemoveChipModule() { if (_chipModule.activeInHierarchy) diff --git a/Assets/Scripts/FixSystemNew/BodyModule/Modules/UFModule.cs b/Assets/Scripts/FixSystemNew/BodyModule/Modules/UFModule.cs index d8ad353d0..8944f6105 100644 --- a/Assets/Scripts/FixSystemNew/BodyModule/Modules/UFModule.cs +++ b/Assets/Scripts/FixSystemNew/BodyModule/Modules/UFModule.cs @@ -7,7 +7,7 @@ public class UFModule : MonoBehaviour { private GameObject _ufCover; private GameObject _ufModule; - private UFData _ufData; + private UFData _ufData=new (); private void Awake() { @@ -16,7 +16,7 @@ public class UFModule : MonoBehaviour // 添加加载逻辑 _ufData.LoadEvent += LoadData; _ufModule = transform.Find("Module Pic").gameObject; - _ufCover = transform.Find("Cover").gameObject; + _ufCover = _ufModule.transform.Find("Cover").gameObject; } // Start is called before the first frame update diff --git a/Assets/Scripts/FixSystemNew/BodyModule/OscilloscopeSystem.cs b/Assets/Scripts/FixSystemNew/BodyModule/OscilloscopeSystem.cs index ba230a2ee..ae36ab327 100644 --- a/Assets/Scripts/FixSystemNew/BodyModule/OscilloscopeSystem.cs +++ b/Assets/Scripts/FixSystemNew/BodyModule/OscilloscopeSystem.cs @@ -28,6 +28,8 @@ namespace AibisDream.FixSystem _state = transform.Find("Screen State Text").GetComponent(); _deepinButton = new SpriteButton(transform.Find("Deepin Button").gameObject, false); MessageBoxSetNull(); + + _deepinButton.OnButtonDown += HandleDeepInButtonClick; } private void Update() @@ -43,6 +45,11 @@ namespace AibisDream.FixSystem _state.color = Color.red; // 红色 } + private void HandleDeepInButtonClick() + { + FixSystemCenter.SystemDic.Get().HandleDeepIn(); + } + public void MessageBoxSetWarning() { _state.text = "警告"; diff --git a/Assets/Scripts/FixSystemNew/FixStateMachine.cs b/Assets/Scripts/FixSystemNew/FixStateMachine.cs index d4c675d35..e73b8b9c0 100644 --- a/Assets/Scripts/FixSystemNew/FixStateMachine.cs +++ b/Assets/Scripts/FixSystemNew/FixStateMachine.cs @@ -172,9 +172,9 @@ namespace AibisDream.FixSystem // 先切BodyModule if (!CameraKit.Instance.EqualToCameraState(FixState.BodyModule)) { - yield return MainUIController.Instance?.FadeInSync(0.5f); + //yield return MainUIController.Instance?.FadeInSync(0.5f); yield return CameraKit.Instance.SwitchCamera(FixState.BodyModule); - yield return MainUIController.Instance?.FadeOutSync(0.5f); + //yield return MainUIController.Instance?.FadeOutSync(0.5f); } // 切换相机 yield return CameraKit.Instance.SwitchCamera(FixState.Engine); @@ -231,7 +231,7 @@ namespace AibisDream.FixSystem public void SetArgs(string args) { - throw new NotImplementedException(); + } public IEnumerator Enter() @@ -272,7 +272,7 @@ namespace AibisDream.FixSystem public void SetArgs(string args) { - throw new NotImplementedException(); + } @@ -315,7 +315,7 @@ namespace AibisDream.FixSystem public void SetArgs(string args) { - throw new NotImplementedException(); + } public IEnumerator Enter() diff --git a/Assets/Scripts/FixSystemNew/FixSystemCenter.cs b/Assets/Scripts/FixSystemNew/FixSystemCenter.cs index a7f3aadaf..06f290b0f 100644 --- a/Assets/Scripts/FixSystemNew/FixSystemCenter.cs +++ b/Assets/Scripts/FixSystemNew/FixSystemCenter.cs @@ -1,5 +1,6 @@ using AibisDream.Framework; using AibisDream.Kit; +using UnityEngine; namespace AibisDream.FixSystem { @@ -7,13 +8,18 @@ namespace AibisDream.FixSystem { public FixState CurState => StateMachine.CurState; + public Canvas deepCanvas; + public override void OnSingletonInit() { SystemDic ??= new IOCContainer(); - + // TODO 这个回头要改 AudioManager.PlayAmb1Audio("amb_room"); + // 初始化场景组件 + InitScene(); + // 初始化状态机 StateMachine = new FixStateMachine(); StartCoroutine(StateMachine.SwitchState(FixState.Clinic)); @@ -21,9 +27,18 @@ namespace AibisDream.FixSystem public override void OnSingletonDestroy() { - SystemDic.Clear(); - GameLoopManager.Instance.StartCoroutine(StateMachine.QuitState()); CameraKit.Instance.RemoveAllCam(); + GameLoopManager.Instance.StartCoroutine(StateMachine.QuitState()); + SystemDic.Clear(); + } + + private void InitScene() + { + if (deepCanvas) + { + deepCanvas.worldCamera = CameraKit.Instance.uiCamera; + deepCanvas.sortingLayerName = "FixTop"; + } } #region 系统索引 diff --git a/Assets/Scripts/Framework/OtherKit/CameraKit.cs b/Assets/Scripts/Framework/OtherKit/CameraKit.cs index 232c5394b..8428eb5de 100644 --- a/Assets/Scripts/Framework/OtherKit/CameraKit.cs +++ b/Assets/Scripts/Framework/OtherKit/CameraKit.cs @@ -27,6 +27,7 @@ namespace AibisDream.Framework private FixState _curFixState; private CamState _curInitState; + public Camera uiCamera; private struct CamState { @@ -60,6 +61,25 @@ namespace AibisDream.Framework #region 相机信息注册 + /// + /// 添加UI相机 + /// + public void AddUICamera(Camera camera) + { + if (Camera.main && Camera.main.TryGetComponent(out var cameraData)) + { + cameraData.cameraStack.Add(camera); + } + } + + public void RemoveUICamera(Camera camera) + { + if (Camera.main && Camera.main.TryGetComponent(out var cameraData)) + { + cameraData.cameraStack.Remove(camera); + } + } + public void RegisterCamera(FixState camType, ICinemachineCamera virtualCamera) { _virtualCameraDict[camType] = virtualCamera; diff --git a/Assets/Scripts/Game Loop/GameLoopManager.cs b/Assets/Scripts/Game Loop/GameLoopManager.cs index 620c084f7..609339cf0 100644 --- a/Assets/Scripts/Game Loop/GameLoopManager.cs +++ b/Assets/Scripts/Game Loop/GameLoopManager.cs @@ -1,6 +1,7 @@ using System; using System.Collections; using System.Collections.Generic; +using System.Globalization; using AibisDream.FixSystem; using AibisDream.Framework; using AibisDream.Kit; @@ -185,8 +186,19 @@ namespace AibisDream private string GetSavePath() { - _dialogStorage.TryGetValue("$gameStage", out float gameStage); - return $"{SaveFilePath}/{_currentTalkSceneSo.name}_{gameStage}_{DateTime.Now:yyyyMMdd_HHmmss}"; + string gameStageStr; + try + { + _dialogStorage.TryGetValue("$gameStage", out float gameStage); + gameStageStr = gameStage.ToString(CultureInfo.InvariantCulture); + } + catch (Exception e) + { + _dialogStorage.TryGetValue("$gameStage", out string gameStage); + gameStageStr = gameStage; + } + + return $"{SaveFilePath}/{_currentTalkSceneSo.name}_{gameStageStr}_{DateTime.Now:yyyyMMdd_HHmmss}"; } #endregion diff --git a/Assets/Scripts/MiniGame/Peipei/Eye/EyeSystem.cs b/Assets/Scripts/MiniGame/Peipei/Eye/EyeSystem.cs index 90faf8a54..8b1fc6a5e 100644 --- a/Assets/Scripts/MiniGame/Peipei/Eye/EyeSystem.cs +++ b/Assets/Scripts/MiniGame/Peipei/Eye/EyeSystem.cs @@ -23,10 +23,9 @@ public class EyeSystem : MonoBehaviour public GameObject eyeView; public ViewCameraManager cameraManager; private IEyeStateEffect eyeStateEffect; - private EyeData _eyeData = new(); + private EyeData _eyeData=new (); private Tween hsvShiftTween; private MouseFollowAndZoom mouseFollowAndZoom; - private void Awake() { Init(); @@ -37,14 +36,14 @@ public class EyeSystem : MonoBehaviour FixSystemCenter.SystemDic.Register(this); var virtualCam = transform.Find("Eye Camera").GetComponent(); CameraKit.Instance.RegisterCamera(FixState.Eye, virtualCam); - GameLoopManager.FixDataContainer.Register(_eyeData); + GameLoopManager.FixDataContainer.Register(_eyeData); // 添加加载逻辑 _eyeData.LoadEvent += LoadData; } - - private void LoadData(EyeData eyedata) + private void LoadData(EyeData eyedata) { SetEyeColorState(eyedata.currentState); + } public void OnEnter() @@ -233,7 +232,7 @@ public class EyeSystem : MonoBehaviour private void SetEyeColorState(EyeData.EyeColorState state) { - _eyeData.currentState = state; + _eyeData.currentState=state; switch (state) { case EyeData.EyeColorState.CanImagineColor: @@ -452,7 +451,6 @@ public class EyeSystem : MonoBehaviour } } } - public class EyeData : IData { public enum EyeColorState diff --git a/Assets/StreamingAssets/TestSaveFiles/PeipeiDay1_身体检查.json b/Assets/StreamingAssets/TestSaveFiles/PeipeiDay1_身体检查.json new file mode 100644 index 000000000..22e6acf23 --- /dev/null +++ b/Assets/StreamingAssets/TestSaveFiles/PeipeiDay1_身体检查.json @@ -0,0 +1,82 @@ +{ + "fixDataContainer": { + "ClueData, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null": { + "punchTapeFavorites": [] + }, + "AibisDream.ClinicData, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null": { + "characterName": "佩佩", + "faceName": "不开心", + "poseName": "无动作", + "hasDevice": false, + "isShow": true + }, + "EyeData, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null": { + "currentState": 1 + }, + "ChipData, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null": { + "isChipRemoved": false + }, + "UFData, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null": { + "isUFCoverRemoved": false, + "isUFRemoved": false + } + }, + "floatDict": { + "$memoryCount": 0.0, + "$eyeTargetTriggerCount": 0.0, + "$PlugCount": 0.0, + "$chipDiscussCount": 0.0, + "$ufDiscussCount": 0.0, + "$eyeDiscussCount": 0.0, + "$memDiscussCount": 0.0, + "$emoDiscussCount": 0.0, + "$logicDiscussCount": 0.0, + "$speakerDiscussCount": 0.0, + "$UFPhotoID_PeipeiTalk": 1.0, + "$Yarn.Internal.Visiting.IntoEyeView": 0.0, + "$Yarn.Internal.Visiting.End_memoryPaly": 0.0, + "$Yarn.Internal.Visiting.OnMemoryViewShow": 0.0, + "$Yarn.Internal.Visiting.OnMemoryInsert": 0.0, + "$Yarn.Internal.Visiting.Eye_skyAfterSurgery": 0.0, + "$Yarn.Internal.Visiting.Eye_computerAfterSurgery": 0.0, + "$Yarn.Internal.Visiting.Eye_posterAfterSurgery": 0.0, + "$Yarn.Internal.Visiting.Eye_plantAfterSurgery": 0.0, + "$Yarn.Internal.Visiting.检查视觉": 0.0, + "$Yarn.Internal.Visiting.FirstDialogue": 0.0, + "$Yarn.Internal.Visiting.EmoPlugIn": 0.0, + "$Yarn.Internal.Visiting.SpeakPlugIn": 0.0, + "$Yarn.Internal.Visiting.LogicPlugIn": 0.0, + "$Yarn.Internal.Visiting.ColorPlugIn": 0.0, + "$Yarn.Internal.Visiting.MemoryPlugIn": 0.0, + "$Yarn.Internal.Visiting.EyePlugIn": 0.0, + "$Yarn.Internal.Visiting.UF深入检查": 0.0, + "$Yarn.Internal.Visiting.Eye_poster": 0.0, + "$Yarn.Internal.Visiting.Eye_plant": 0.0, + "$Yarn.Internal.Visiting.天空": 0.0, + "$Yarn.Internal.Visiting.海报": 0.0, + "$Yarn.Internal.Visiting.植物": 0.0 + }, + "stringDict": { + "$gameStage": "身体检查", + "$currentEyeTarget": "未定义" + }, + "boolDict": { + "$isFinishedUFCheck": false, + "$isFinishedEyeCheck": false, + "$hasUncheckedMemory": false, + "$isLineCut": false, + "$PlugAll": false, + "$ufSeen": false, + "$ufKnown": false, + "$ufpurposeKnown": false, + "$chipmissingKnown": false, + "$eyeproblemKnown": false, + "$eyenocolorKnown": false, + "$eyecolorKnown": false, + "$isCheckedPunchTapeFormEye": false + }, + "curSceneKey": "PeipeiFixScene", + "curTalkSceneSo": "PeipeiDay1", + "fixState": 1, + "fixStateArgs": "" +} \ No newline at end of file diff --git a/Assets/StreamingAssets/TestSaveFiles/PeipeiDay1_身体检查.json.meta b/Assets/StreamingAssets/TestSaveFiles/PeipeiDay1_身体检查.json.meta new file mode 100644 index 000000000..0dbd555fe --- /dev/null +++ b/Assets/StreamingAssets/TestSaveFiles/PeipeiDay1_身体检查.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 3a58d88c3dea8884490a8cfba5f794f4 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 21031810d..d51d5d818 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -20,7 +20,7 @@ TagManager: - Post - ViewPost - Clinic - - + - DeepCanvas - - -