From 65607f96780c53aca5f820320ad5a054ba69c1bb Mon Sep 17 00:00:00 2001 From: bottlefish <781230111@qq.com> Date: Thu, 5 Dec 2024 22:57:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=92=8C=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E8=BF=AD=E4=BB=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Scripts/ModalWindow/ModalWindow.cs | 46 ++- Assets/Prototype/佩佩/佩佩视觉模块.unity | 8 +- Assets/Resources/Art/Memory/记忆占位.png | 3 + Assets/Resources/Art/Memory/记忆占位.png.meta | 140 +++++++ Assets/Resources/Art/Photos/UF占位.png | 3 + Assets/Resources/Art/Photos/UF占位.png.meta | 140 +++++++ .../Yarn/LTS_Peipeiday1/LTS_Peipeiday1.yarn | 263 ++++++------ Assets/Scenes/Persistence.unity | 389 +++++++++++++++++- Assets/Scripts/Clue/ClueManager.cs | 4 +- ...ialogueInteract.meta => SystemWindow.meta} | 2 +- Assets/Scripts/SystemWindow/WindowManager.cs | 84 ++++ .../SystemWindow/WindowManager.cs.meta | 11 + 12 files changed, 945 insertions(+), 148 deletions(-) create mode 100644 Assets/Resources/Art/Memory/记忆占位.png create mode 100644 Assets/Resources/Art/Memory/记忆占位.png.meta create mode 100644 Assets/Resources/Art/Photos/UF占位.png create mode 100644 Assets/Resources/Art/Photos/UF占位.png.meta rename Assets/Scripts/{DialogueInteract.meta => SystemWindow.meta} (77%) create mode 100644 Assets/Scripts/SystemWindow/WindowManager.cs create mode 100644 Assets/Scripts/SystemWindow/WindowManager.cs.meta diff --git a/Assets/Plugins/CleanFlatUI/Scripts/ModalWindow/ModalWindow.cs b/Assets/Plugins/CleanFlatUI/Scripts/ModalWindow/ModalWindow.cs index ba8816185..d9bce5b2b 100644 --- a/Assets/Plugins/CleanFlatUI/Scripts/ModalWindow/ModalWindow.cs +++ b/Assets/Plugins/CleanFlatUI/Scripts/ModalWindow/ModalWindow.cs @@ -62,8 +62,12 @@ namespace RainbowArt.CleanFlatUI [SerializeField] Animator animator; - [SerializeField] - TextMeshProUGUI description; + //[SerializeField] + TextMeshProUGUI description; + //[SerializeField] + Image image; + + private bool isConfirmButtonActive; [Serializable] public class ModalWindowEvent : UnityEvent{ } @@ -76,7 +80,13 @@ namespace RainbowArt.CleanFlatUI IEnumerator diableCoroutine; float disableTime = 0.5f; - + public bool IsConfirmButtonActive + { + set + { + buttonConfirm.enabled=value; + } + } public string DescriptionValue { get @@ -141,7 +151,35 @@ namespace RainbowArt.CleanFlatUI } } } - } + } + public Sprite ImageValue + { + get + { + if(image != null) + { + return image.sprite; + } + return null; + } + set + { + if(image != null) + { + if(value != null) + { + image.gameObject.SetActive(true); + image.sprite = value; + } + else + { + image.gameObject.SetActive(false); + image.sprite = null; + } + } + } + } + public ModalWindowEvent OnConfirm { diff --git a/Assets/Prototype/佩佩/佩佩视觉模块.unity b/Assets/Prototype/佩佩/佩佩视觉模块.unity index 278f0ab68..f0040d46d 100644 --- a/Assets/Prototype/佩佩/佩佩视觉模块.unity +++ b/Assets/Prototype/佩佩/佩佩视觉模块.unity @@ -22393,7 +22393,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1976127639} - - {fileID: 1606783658} - {fileID: 376361521} - {fileID: 18925489} m_Father: {fileID: 1407819326} @@ -31820,6 +31819,7 @@ RectTransform: m_Children: - {fileID: 972296210} - {fileID: 217924070} + - {fileID: 1606783658} m_Father: {fileID: 1108670798} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -34761,11 +34761,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 972296210} + m_Father: {fileID: 1407819326} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -0.21390057, y: 0.12089968} + m_AnchoredPosition: {x: -0.223, y: 0.102} m_SizeDelta: {x: 0.5, y: 0.51} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1606783659 @@ -34837,7 +34837,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c2a37d0f43cb6f14c8011e55a756c448, type: 3} m_Name: m_EditorClassIdentifier: - notAlowedDeep: 0 + notAlowedDeep: 1 targetData: {fileID: 0} --- !u!21 &1609483042 Material: diff --git a/Assets/Resources/Art/Memory/记忆占位.png b/Assets/Resources/Art/Memory/记忆占位.png new file mode 100644 index 000000000..565b72ea4 --- /dev/null +++ b/Assets/Resources/Art/Memory/记忆占位.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2436a2721db740f3c0150795f8dbcc5a06d20b993f645e7518456ab106515f1f +size 18988 diff --git a/Assets/Resources/Art/Memory/记忆占位.png.meta b/Assets/Resources/Art/Memory/记忆占位.png.meta new file mode 100644 index 000000000..e1a98f861 --- /dev/null +++ b/Assets/Resources/Art/Memory/记忆占位.png.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: f0f2a5e502c8ad841b19b22ce77e0a20 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Art/Photos/UF占位.png b/Assets/Resources/Art/Photos/UF占位.png new file mode 100644 index 000000000..211b4fdac --- /dev/null +++ b/Assets/Resources/Art/Photos/UF占位.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d7b50981601d84c45014e16750837903527ff4aa9424790bd455ce25e3c58b9b +size 3654 diff --git a/Assets/Resources/Art/Photos/UF占位.png.meta b/Assets/Resources/Art/Photos/UF占位.png.meta new file mode 100644 index 000000000..af0ac7e44 --- /dev/null +++ b/Assets/Resources/Art/Photos/UF占位.png.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: 3b7ba490bd714b94cac38aedd519653e +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Yarn/LTS_Peipeiday1/LTS_Peipeiday1.yarn b/Assets/Resources/Yarn/LTS_Peipeiday1/LTS_Peipeiday1.yarn index de3140949..8b9d7d62d 100644 --- a/Assets/Resources/Yarn/LTS_Peipeiday1/LTS_Peipeiday1.yarn +++ b/Assets/Resources/Yarn/LTS_Peipeiday1/LTS_Peipeiday1.yarn @@ -1,7 +1,7 @@ title: Start tags: colorID: 8 -position: 247,-2312 +position: 249,-2054 --- <> === @@ -12,7 +12,7 @@ position: 247,-2312 title: 数据初始化 tags: colorID: 4 -position: 251,-1952 +position: 251,-1774 --- ///在这里决定这次诊疗的目标是什么，以及目标判断相关的数值 @@ -84,32 +84,32 @@ position: 251,-1952 title: 引入对话 tags: colorID: 8 -position: 249,-1583 +position: 251,-1496 --- <> <> <> <> <> -【占位】佩佩来看病，佩佩说她最近的出图有问题，你让他绘制一幅图，她说是通过UF绘制的，需要提示词 -【占位】你们关于要绘制的图进行了一些交流，感觉UF很难沟通，不过还是出了一张图 +【占位】佩佩来看病，佩佩说她最近的出图有问题，你让他绘制一幅图，她说是通过UF绘制的，需要提示词，感觉UF很难沟通 +【占位】你们关于要绘制的图进行了一些交流，在交流的过程中，佩佩看着天空走神了一下，不过还是出了一张图 <> <> <> <> -<> +<> <> <> <> -【占位】这张图的色彩看起来很奇怪，明显颜色出错了，我们决定去诊疗台深入检查 -<> +【占位】这张图看起来很奇怪，大片的草地变成了蓝色，上面有鱼在游动，佩佩自己也很困惑，提示词没有输入这些啊 +<> <> === title: 诊疗室初始化 tags: colorID: 3 -position: 265,-1153 +position: 250,-1179 --- <> <> @@ -125,20 +125,40 @@ position: 265,-1153 title: 主维修界面游戏状态检查 tags: colorID: 3 -position: 261,-641 +position: 250,-777 --- <> //如果完成了当前状态该做的，那就什么都不做 <>//生成打孔带，生成维修部分初始目标 <> <> - 【占位】进入维修后，你发现UF这里传来了一个错误记忆引用记录 - <> - //<> + 【占位】进入维修后，你想要进UF内部看一看，但是UF不允许，UF只允许调取最近1h的记录 + 【占位】好在这也够了，你调取了上一次绘图的记录，生成了三个记忆索引 + <> + <> + <> + <> + <> <> - 【占位】看来UF在绘制的时候是在调用记忆，或许应该去看看 - <> + ->放入收藏夹 + <> + <> + <> + <> + <> + <> + ->放入收藏夹 + <> + <> + <> + <> + <> + <> + ->放入收藏夹 + <> + 【占位】原来UF是用记忆来绘图的，有线索就好办了，去记忆看看 + <> <> <> @@ -148,26 +168,36 @@ position: 261,-641 <> <>//现在的任务是去寻找记忆干扰的原因，需要完成全面检查,如果已经全身检查过了，那么就说刚才视觉很奇怪，或者佩佩让你看视觉 <> + 【占位】问题应该就出在这三个记忆中的一个，是哪个出了问题？ + <> + 【占位】在clueboard里进行了分析，认为是记忆3有问题 + <> + 【占位】这个记忆3不应该来到UF，是什么地方调用的记忆3呢？ + <> + <> + <> + <> + <> <> 【占位】玩家发现了视觉异常且深入了，没发现问题，佩佩说有个不该隐藏的事情要告诉你，要你再次检查视觉 - <> + <> <> 【占位】玩家发现了视觉异常，但是没有深入视觉，提示玩家或许可以深入看看之前的视觉错误，也可以继续全身检查 - <> + <> <> 【占位】玩家没有发现视觉异常，应该进行全身检查来寻找会调用记忆的模块 - <> + <> <> <> <>//现在的任务是检查刚才视觉里找到的记忆 <> <> - <> + <> <> <>//现在的任务是去clueboard分析 <> - <> + <> <> <> <> @@ -196,7 +226,7 @@ title: 进入分析前与病人谈话 tags: colorID: 8 group:分析相关 -position: -182,-456 +position: -274,-580 --- <> <> @@ -216,7 +246,7 @@ title: 结论 tags: colorID: 8 group:分析相关 -position: -177,-294 +position: -269,-418 --- <> <> @@ -251,7 +281,7 @@ title: 手术准备 tags: colorID: 8 group:手术相关 -position: -181,31 +position: -273,-93 --- <> <> @@ -270,7 +300,7 @@ position: -181,31 title: CutLine tags: group:手术相关 -position: -178,181 +position: -270,57 --- <> <> @@ -295,7 +325,7 @@ me: 这不是我应该剪断的线…… title: UF绘图复查 tags: -position: 264,54 +position: 259,-163 --- me: 检查应该都完成了…我们出去吧，佩佩。 <> @@ -380,7 +410,7 @@ title: 佩佩告诉你可以想象颜色 tags: colorID: 6 group:视觉检查 -position: 734,-1262 +position: 698,-1237 --- me: 为什么视觉模块会从记忆调用数据呢…奇怪了。 me: 我怎么也找不到…… @@ -397,9 +427,10 @@ peipei: 看到窗外的蓝天了吗？ <> me: 啊？ peipei: 我其实能够以某种方式看到一些颜色…… -<> +<> +<> +<> <> -<> me: 啊…有一条和记忆相关的错误记录生成了。 me: 记忆…向视觉发送了数据？然后生成了这些颜色？ <> @@ -417,7 +448,7 @@ title: FirstDialogue tags: group:视觉检查 colorID: 8 -position: 961,-1402 +position: 927,-1419 --- //!!电脑不会触发这个对话，而电脑是屏幕正中央的 <> @@ -466,7 +497,7 @@ title: Eye_sky tags: colorID: 8 group:视觉检查 -position: 1237,-1401 +position: 1240,-1410 --- <> <> @@ -493,7 +524,7 @@ title: Eye_poster tags: colorID: 8 group:视觉检查 -position: 1694,-1403 +position: 1694,-1408 --- <> <> @@ -504,7 +535,7 @@ peipei: 啊，又是罐头…… peipei: 坏了！我还有一张海报没出…… <> peipei: 啊……我差点忘了。我来这里就是为了这个。 -<> +<> <> <> me:把这个卡带收起来 @@ -523,7 +554,7 @@ title: Eye_plant tags: colorID: 8 group:视觉检查 -position: 1464,-1399 +position: 1467,-1411 --- <> <> @@ -537,7 +568,7 @@ peipei: 可惜…… ///<>枯萎的叶子变成了正确的黄色 peipei: 我还是把它养死了。 peipei: 我愧疚了好久，那时的我真的以为小草可以长成一棵树。 -<> +<> <> <> me:先收起来 @@ -557,7 +588,7 @@ title: EyeCheckEnd tags: colorID: 3 group:视觉检查 -position: 948,-960 +position: 933,-903 --- <> me:没什么头绪，先看看别的地方 @@ -595,7 +626,8 @@ me:这里应该已经彻底检查过了 <> <> - me: 症状应该收集够了…也生成了好几个打孔带。应该足够了。 + 【占位】目前收集的证据已经能够确定，视觉存在非法读取记忆的情况 + 【占位】虽然不知道为什么，但是我们应该去检查一下这些记忆都是什么，是否和UF的非法记忆有关 <> <> <> @@ -616,7 +648,7 @@ title: Eye_skyAfterSurgery tags: colorID: 8 group:视觉检查 -position: 1243,-1257 +position: 1241,-1263 --- <> <> @@ -671,17 +703,15 @@ position: 1469,-1264 === - - title: End_memoryPaly tags: colorID: 3 -position: 2362,-955 +position: 2323,-1044 --- <> <> - <> + <> <> peipei: 医生…快停下。 peipei: 我…我的头好痛…… @@ -692,13 +722,15 @@ position: 2362,-955 <> <> <> -<4>> - me: 该看的都看过了 - <> +<> + <> + 【占位】UF绘图索引的记忆都看完了，我们可以退出了 + <> + <> + <> + <> <> me: 该看的都看过了 - <> - <> <> <> === @@ -709,7 +741,7 @@ position: 2362,-955 title: OnMemoryViewShow tags: colorID: 3 -position: 2354,-1676 +position: 2300,-1766 --- <> me: 把打孔带放进插槽里，读取记忆吧。 @@ -732,7 +764,7 @@ position: 2354,-1676 title: OnMemoryInsert tags: colorID: 3 -position: 2604,-1677 +position: 2546,-1764 --- <> me: 需要拖动滑条，校正频率才能播放记忆… @@ -747,7 +779,7 @@ position: 2604,-1677 title: 天空 tags: colorID: 8 -position: 2336,-1364 +position: 2295,-1453 --- <> peipei_child: 医生！看，大象！ @@ -764,12 +796,8 @@ peipei_child: 艺术家又是什么？ peipei_child: 医生快看，它现在更像一个飞机啦！ <> <> -<> -me: 让我查询一下… -<> -me: 果然，这条记忆有类似的情况。 -//me:好了，这个记录下吧 -//<> + <> + 【占位】哎，这个记忆我们是不是看到过？先记录下来！ <> <> === @@ -780,7 +808,7 @@ me: 果然，这条记忆有类似的情况。 title: 海报 tags: colorID: 8 -position: 2561,-1363 +position: 2510,-1452 --- <> <> @@ -794,9 +822,6 @@ unknown: 我爱你。 <> <> <> -me: 让我查询一下… -<> -me: 果然，这条记忆有类似的情况。 <> <> === @@ -807,7 +832,7 @@ me: 果然，这条记忆有类似的情况。 title: 植物 tags: colorID: 8 -position: 2783,-1364 +position: 2746,-1452 --- <> peipei: 要是工作也能画画…要是能永远画画就好了。 @@ -817,60 +842,59 @@ peipei: 那种朝九晚五，一眼看到头的生活，我想我反而会受不 同学: 哈哈…… 同学: 但愿你是对的。 peipei: 我肯定是对的。 -<> +<> peipei: 如果公司这么讨厌的话，我就不在那里干就好了啊！ <> <> me: 这就是刚才看过的那个记忆… - <> - me: 这下没错了。视觉和UF都在调用这条记忆。 <> <> === - - -title: UF绘图 +title: UF绘图1 tags: colorID: 8 -position: 3004,-1364 +position: 3031,-1449 +--- +【占位】待描述 +<> + <> +<> +<> +=== +title: UF绘图2 +tags: +colorID: 8 +position: 3248,-1450 +--- +【占位】待描述 +<> + <> +<> +<> +=== +title: UF绘图3 +tags: +colorID: 8 +position: 3460,-1450 --- <> - peipei: 要是工作也能画画…要是能永远画画就好了。 - 同学: 哈哈，可能等我们进入公司就不这么觉得了。听说进公司之后做什么都不会再快乐了。 - peipei: 不会的。至少画画这件事情让我感觉到很纯粹的快乐…… - peipei: 那种朝九晚五，一眼看到头的生活，我想我反而会受不了的。 - 同学: 哈哈…… - 同学: 但愿你是对的。 - peipei: 我肯定是对的。 - <> - peipei: 如果公司这么讨厌的话，我就不在那里干就好了啊！ -<> +peipei_child: 医生！看，大象！ +docter: 哪里有？…啊，那朵云呀。确实很像大象喔。 +docter: 但是佩佩为什么会见过大象呢？ +peipei_child: 我在博物馆见过！好大好大的大象标本，有个哥哥跟我说，大象可以比房子还大！ +docter: 佩佩是个很有想象力的小朋友噢。 +peipei_child: 想象力…是什么？ +docter: 我们的大脑里面有一个区域专门控制视觉，但是这个区域也控制想象力。 +<> +docter: 佩佩以后会成为一个艺术家的。 +peipei_child: 艺术家又是什么？ +<> +peipei_child: 医生快看，它现在更像一个飞机啦！ +<> +<> <> - <> - <> - <> - <> - me: 该记忆正在被…视觉模块……占用？ - <> - <> - me: 奇怪，视觉不会从记忆读数据才对…… - //me: 而且…为什么UF要读取记忆呢？它不是图片生成用的吗？ - //peipei: 这就是它生成图片的方式…它会接管我们的记忆模块，用我们的记忆作为素材生成图片。 - //me: 也就是说，刚才UF生成的图片中的颜色…就是从这个记忆中提取的？ - //me: 这下明白了…怪不得它要被装在身体里。 - me: 无论如何，在视觉模块做一次深入检查吧。 - //<> - //<> - <> - <> - <> - <> - me: 有记录表明这个记忆被视觉模块“重复引用”了… - me: 这阻碍了UF的读取，导致了生成图片的错误。 - //<> - <> <> <> === @@ -878,42 +902,9 @@ position: 3004,-1364 -// title: OnUFViewDeepIn -// tags: -// colorID: 3 -// position: -450,-1011 -// --- -// // <> -// // <> -// // <> -// // me: 为什么你的左眼长得不一样？ -// // 解释UF -// // <>>> -// // me: 这就是你提到的UF吗？ -// // me: 没想到…竟然是加装在眼睛上的。 -// // <> -// // me:居然无法进入，权限还挺高。 -// // me: 为啥要专门用一个模块来做这件事情呢，还有这么高的权限… -// // peipei: 解释公司对AI绘图的规定 -// // <> -// // me:那就外部测试下吧 -// // me:生成UF图 -// // <> -// // <> -// // <> -// // me:生成好了 -// // <> -// // <> -// // <> -// // me: 再试试生成 -// // <> -// // <> -// // <> -// // me:生成好了 -// // <> -// // <> -// <> -// === + + + title: EmoViewDialogue tags: colorID: 8 diff --git a/Assets/Scenes/Persistence.unity b/Assets/Scenes/Persistence.unity index ab5241958..461f48f08 100644 --- a/Assets/Scenes/Persistence.unity +++ b/Assets/Scenes/Persistence.unity @@ -5585,10 +5585,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 18a3ec3914131d44199ae33902edf159, type: 3} m_Name: m_EditorClassIdentifier: - runMode: 1 + runMode: 0 firstTalkSO: {fileID: 11400000, guid: 10601ce26230723479d875a630f15732, type: 2} clinicScene: ClinicScene - testYarnProject: PeipeiNew2 + testYarnProject: LTS_Peipeiday1 --- !u!4 &719228339 Transform: m_ObjectHideFlags: 0 @@ -5679,6 +5679,37 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 731599307} m_CullTransparentMesh: 1 +--- !u!1 &736543452 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 736543453} + m_Layer: 0 + m_Name: NotificationManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &736543453 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 736543452} + 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: 1009826577} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &761395782 GameObject: m_ObjectHideFlags: 0 @@ -7911,6 +7942,7 @@ Transform: - {fileID: 442870838} - {fileID: 2000641911} - {fileID: 72131187} + - {fileID: 736543453} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1015707783 @@ -11247,6 +11279,123 @@ MonoBehaviour: m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 m_ReverseArrangement: 0 +--- !u!1001 &1704919983 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 2003858546407399498} + m_Modifications: + - target: {fileID: 1317429119650744762, guid: ad4eeb77017523e44a270e8f79897e87, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2971839373268861373, guid: ad4eeb77017523e44a270e8f79897e87, type: 3} + propertyPath: m_Name + value: "\u5355\u6309\u94AE\u7A97\u53E3" + objectReference: {fileID: 0} + - target: {fileID: 8061307773979316499, guid: ad4eeb77017523e44a270e8f79897e87, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8061307773979316499, guid: ad4eeb77017523e44a270e8f79897e87, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8061307773979316499, guid: ad4eeb77017523e44a270e8f79897e87, type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8061307773979316499, guid: ad4eeb77017523e44a270e8f79897e87, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8061307773979316499, guid: ad4eeb77017523e44a270e8f79897e87, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8061307773979316499, guid: ad4eeb77017523e44a270e8f79897e87, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8061307773979316499, guid: ad4eeb77017523e44a270e8f79897e87, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8061307773979316499, guid: ad4eeb77017523e44a270e8f79897e87, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8061307773979316499, guid: ad4eeb77017523e44a270e8f79897e87, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8061307773979316499, guid: ad4eeb77017523e44a270e8f79897e87, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8061307773979316499, guid: ad4eeb77017523e44a270e8f79897e87, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8061307773979316499, guid: ad4eeb77017523e44a270e8f79897e87, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8061307773979316499, guid: ad4eeb77017523e44a270e8f79897e87, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8061307773979316499, guid: ad4eeb77017523e44a270e8f79897e87, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8061307773979316499, guid: ad4eeb77017523e44a270e8f79897e87, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8061307773979316499, guid: ad4eeb77017523e44a270e8f79897e87, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8061307773979316499, guid: ad4eeb77017523e44a270e8f79897e87, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8061307773979316499, guid: ad4eeb77017523e44a270e8f79897e87, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8061307773979316499, guid: ad4eeb77017523e44a270e8f79897e87, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8061307773979316499, guid: ad4eeb77017523e44a270e8f79897e87, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: ad4eeb77017523e44a270e8f79897e87, type: 3} +--- !u!114 &1704919984 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3711545442057267838, guid: ad4eeb77017523e44a270e8f79897e87, type: 3} + m_PrefabInstance: {fileID: 1704919983} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8fb07e6cd5358104d8d5b7a77780ccfe, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!224 &1704919985 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 8061307773979316499, guid: ad4eeb77017523e44a270e8f79897e87, type: 3} + m_PrefabInstance: {fileID: 1704919983} + m_PrefabAsset: {fileID: 0} --- !u!114 &1733277639 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 694078731367665076, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} @@ -12593,6 +12742,123 @@ MonoBehaviour: onCommand: m_PersistentCalls: m_Calls: [] +--- !u!1001 &1978869332 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 2003858546407399498} + m_Modifications: + - target: {fileID: 2971839373268861373, guid: 461947898df9b4042b14c61056c016f0, type: 3} + propertyPath: m_Name + value: "\u8FDB\u5EA6\u6761\u7A97\u53E3" + objectReference: {fileID: 0} + - target: {fileID: 5253004576740219216, guid: 461947898df9b4042b14c61056c016f0, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8061307773979316499, guid: 461947898df9b4042b14c61056c016f0, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8061307773979316499, guid: 461947898df9b4042b14c61056c016f0, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8061307773979316499, guid: 461947898df9b4042b14c61056c016f0, type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8061307773979316499, guid: 461947898df9b4042b14c61056c016f0, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8061307773979316499, guid: 461947898df9b4042b14c61056c016f0, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8061307773979316499, guid: 461947898df9b4042b14c61056c016f0, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8061307773979316499, guid: 461947898df9b4042b14c61056c016f0, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8061307773979316499, guid: 461947898df9b4042b14c61056c016f0, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8061307773979316499, guid: 461947898df9b4042b14c61056c016f0, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8061307773979316499, guid: 461947898df9b4042b14c61056c016f0, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8061307773979316499, guid: 461947898df9b4042b14c61056c016f0, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8061307773979316499, guid: 461947898df9b4042b14c61056c016f0, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8061307773979316499, guid: 461947898df9b4042b14c61056c016f0, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8061307773979316499, guid: 461947898df9b4042b14c61056c016f0, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8061307773979316499, guid: 461947898df9b4042b14c61056c016f0, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8061307773979316499, guid: 461947898df9b4042b14c61056c016f0, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8061307773979316499, guid: 461947898df9b4042b14c61056c016f0, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8061307773979316499, guid: 461947898df9b4042b14c61056c016f0, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8061307773979316499, guid: 461947898df9b4042b14c61056c016f0, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8061307773979316499, guid: 461947898df9b4042b14c61056c016f0, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 461947898df9b4042b14c61056c016f0, type: 3} +--- !u!114 &1978869333 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 7463152916423266418, guid: 461947898df9b4042b14c61056c016f0, type: 3} + m_PrefabInstance: {fileID: 1978869332} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 772c40b3c83b9e84b9d54c2338fa5484, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!224 &1978869334 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 8061307773979316499, guid: 461947898df9b4042b14c61056c016f0, type: 3} + m_PrefabInstance: {fileID: 1978869332} + m_PrefabAsset: {fileID: 0} --- !u!1 &1983360897 GameObject: m_ObjectHideFlags: 0 @@ -13730,6 +13996,67 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e2211373480d40243a377721316dd8f7, type: 3} +--- !u!224 &2003858546407399498 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7690584928354748229} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1704919985} + - {fileID: 1978869334} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} +--- !u!114 &3436491674025276195 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7690584928354748229} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &4058409088064566546 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7690584928354748229} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 1 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 1920, y: 1080} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0.5 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 --- !u!114 &5110036007419992350 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 3209238968040187581, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} @@ -13952,6 +14279,63 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!223 &6729488462109819374 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7690584928354748229} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 + m_AdditionalShaderChannelsFlag: 25 + m_UpdateRectTransformForStandalone: 0 + m_SortingLayerID: 0 + m_SortingOrder: 6 + m_TargetDisplay: 0 +--- !u!1 &7690584928354748229 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2003858546407399498} + - component: {fileID: 6729488462109819374} + - component: {fileID: 4058409088064566546} + - component: {fileID: 3436491674025276195} + - component: {fileID: 7690584928354748230} + m_Layer: 5 + m_Name: WindowManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &7690584928354748230 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7690584928354748229} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ce44f06ac32fc8f4292c581f5c413b23, type: 3} + m_Name: + m_EditorClassIdentifier: + singleButtonWindowPrefab: {fileID: 1704919984} + progressWindowPrefab: {fileID: 1978869333} --- !u!1001 &7847025846205992388 PrefabInstance: m_ObjectHideFlags: 0 @@ -14080,4 +14464,5 @@ SceneRoots: - {fileID: 1559877096371354170} - {fileID: 1200911924} - {fileID: 366548950} + - {fileID: 2003858546407399498} - {fileID: 1620453322} diff --git a/Assets/Scripts/Clue/ClueManager.cs b/Assets/Scripts/Clue/ClueManager.cs index 4bf9fe0d5..976a659a9 100644 --- a/Assets/Scripts/Clue/ClueManager.cs +++ b/Assets/Scripts/Clue/ClueManager.cs @@ -71,8 +71,9 @@ public class ClueManager : MonoBehaviour } //用于生成打孔带的函数 [YarnCommand("generate_PunchTape")] - public void GeneratePunchTape(string clueName, string category, string memoryIndex,bool directlyAddToFavorites=false) + public void GeneratePunchTapeWindow(string clueName, string category, string memoryIndex,bool directlyAddToFavorites=false) { + PunchTape punchTape = new PunchTape(category, clueName, memoryIndex); if(directlyAddToFavorites) @@ -87,6 +88,7 @@ public class ClueManager : MonoBehaviour currentClue=clueGO; clueItem.Setup(punchTape); } + [YarnCommand("generate_UFClue")] public void GenerateUFClue(string clueName, string imageName,bool directlyAddToFavorites=false) { diff --git a/Assets/Scripts/DialogueInteract.meta b/Assets/Scripts/SystemWindow.meta similarity index 77% rename from Assets/Scripts/DialogueInteract.meta rename to Assets/Scripts/SystemWindow.meta index 417363a56..22475f6fc 100644 --- a/Assets/Scripts/DialogueInteract.meta +++ b/Assets/Scripts/SystemWindow.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9188f88eac24a824c82dffc844125cb4 +guid: edb7b170499105745ae6bb4fb21efd77 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Scripts/SystemWindow/WindowManager.cs b/Assets/Scripts/SystemWindow/WindowManager.cs new file mode 100644 index 000000000..7e8f6af57 --- /dev/null +++ b/Assets/Scripts/SystemWindow/WindowManager.cs @@ -0,0 +1,84 @@ +using UnityEngine; +using RainbowArt.CleanFlatUI; +using Yarn.Unity; +using System.Collections; + +public class WindowManager : MonoBehaviour +{ + public static WindowManager Instance { get; private set; } + + [Header("Window Prefabs")] + public ModalWindow singleButtonWindowPrefab; + + public ModalWindow ImageSingleButtonWindowPrefab; + public ModalWindowProgressBar progressWindowPrefab; + + private GameObject currentWindow; + + private void Awake() + { + if (Instance != null && Instance != this) + { + Destroy(gameObject); + return; + } + + Instance = this; + DontDestroyOnLoad(gameObject); // 如果需要全局保留 + } + +[YarnCommand("OpenSingleButtonWindow")] + public IEnumerator OpenSingleButtonWindow(string title, string description) + { + bool isConfirmed = false; + + singleButtonWindowPrefab.TitleValue = title; + singleButtonWindowPrefab.DescriptionValue = description; + singleButtonWindowPrefab.OnConfirm.AddListener(() => isConfirmed = true); + + singleButtonWindowPrefab.gameObject.SetActive(true); + + // 等待用户确认 + yield return new WaitUntil(() => isConfirmed); + + singleButtonWindowPrefab.OnConfirm.RemoveAllListeners(); + } +[YarnCommand("OpenProgressWindow")] + public IEnumerator OpenProgressWindow(string title, string description) + { + bool isConfirmed = false; + + progressWindowPrefab.TitleValue = title; + progressWindowPrefab.DescriptionValue = description; + progressWindowPrefab.OnFinish.AddListener(() => isConfirmed = true); + progressWindowPrefab.gameObject.SetActive(true); + + // 等待用户确认 + yield return new WaitUntil(() => isConfirmed); + progressWindowPrefab.OnFinish.RemoveAllListeners(); + } + [YarnCommand("OpenImageWindow_UFImage")] + public void OpenImageSingleButtonWindowPrefab(string title, string imageName) + { + //bool isConfirmed = false; + ImageSingleButtonWindowPrefab.IsConfirmButtonActive=false; + ImageSingleButtonWindowPrefab.TitleValue = title; + ImageSingleButtonWindowPrefab.ImageValue=Resources.Load("Art/Photos/" + imageName); + ImageSingleButtonWindowPrefab.DescriptionValue=""; + //progressWindowPrefab.OnFinish.AddListener(() => isConfirmed = true); + progressWindowPrefab.gameObject.SetActive(true); + } +[YarnCommand("EnableAndWaitForClosingUFImage")] + public IEnumerator EnableAndWaitForClosingUFImage() + { + bool isConfirmed = false; + ImageSingleButtonWindowPrefab.IsConfirmButtonActive=true; + yield return new WaitUntil(() => isConfirmed); + progressWindowPrefab.OnFinish.RemoveAllListeners(); + } +} + + + + + diff --git a/Assets/Scripts/SystemWindow/WindowManager.cs.meta b/Assets/Scripts/SystemWindow/WindowManager.cs.meta new file mode 100644 index 000000000..c06fa5f1c --- /dev/null +++ b/Assets/Scripts/SystemWindow/WindowManager.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: ce44f06ac32fc8f4292c581f5c413b23 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: