From f9fcfe7c57368c8fa982a15e8011d1ed64d1d61c Mon Sep 17 00:00:00 2001 From: bottlefish <781230111@qq.com> Date: Wed, 13 Nov 2024 20:38:37 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E8=AE=B0=E5=BF=86?= =?UTF-8?q?=E6=92=AD=E6=94=BE=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=8CDay1?= =?UTF-8?q?=E5=92=8CDay2=E7=8E=B0=E5=9C=A8=E9=83=BD=E8=83=BD=E8=B7=91?= =?UTF-8?q?=E9=80=9A=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 待做 1.day1和day2的正式版本clueboard 2.day1和day2的诊疗单添加，增加任务目标 3.day2的降温玩法 4.day2的UF内部 5.教程 6.可交互模块的outline 7.打孔带的状态，已看和未看 --- .../Clue => Prefabs}/PunchTape.prefab | 0 .../Clue => Prefabs}/PunchTape.prefab.meta | 0 .../Clue => Prefabs}/PunchTapeSlot.prefab | 0 .../PunchTapeSlot.prefab.meta | 0 .../Prototype/佩佩/Scripts/MemoryProcess.cs | 3 + Assets/Prototype/佩佩/佩佩视觉模块.unity | 868 ++++++++++++++++-- .../Materials/MemorySearchScreen.mat | 6 +- .../Resources/Yarn/PeipeiNew/ClueBoard.yarn | 2 +- .../Resources/Yarn/PeipeiNew/PeipeiNew.yarn | 40 +- Assets/Scenes/Persistence.unity | 4 +- Assets/Scripts/FixSystem/Tools/Screwdriver.cs | 36 - 11 files changed, 838 insertions(+), 121 deletions(-) rename Assets/{Scripts/Clue => Prefabs}/PunchTape.prefab (100%) rename Assets/{Scripts/Clue => Prefabs}/PunchTape.prefab.meta (100%) rename Assets/{Scripts/Clue => Prefabs}/PunchTapeSlot.prefab (100%) rename Assets/{Scripts/Clue => Prefabs}/PunchTapeSlot.prefab.meta (100%) diff --git a/Assets/Scripts/Clue/PunchTape.prefab b/Assets/Prefabs/PunchTape.prefab similarity index 100% rename from Assets/Scripts/Clue/PunchTape.prefab rename to Assets/Prefabs/PunchTape.prefab diff --git a/Assets/Scripts/Clue/PunchTape.prefab.meta b/Assets/Prefabs/PunchTape.prefab.meta similarity index 100% rename from Assets/Scripts/Clue/PunchTape.prefab.meta rename to Assets/Prefabs/PunchTape.prefab.meta diff --git a/Assets/Scripts/Clue/PunchTapeSlot.prefab b/Assets/Prefabs/PunchTapeSlot.prefab similarity index 100% rename from Assets/Scripts/Clue/PunchTapeSlot.prefab rename to Assets/Prefabs/PunchTapeSlot.prefab diff --git a/Assets/Scripts/Clue/PunchTapeSlot.prefab.meta b/Assets/Prefabs/PunchTapeSlot.prefab.meta similarity index 100% rename from Assets/Scripts/Clue/PunchTapeSlot.prefab.meta rename to Assets/Prefabs/PunchTapeSlot.prefab.meta diff --git a/Assets/Prototype/佩佩/Scripts/MemoryProcess.cs b/Assets/Prototype/佩佩/Scripts/MemoryProcess.cs index 475092daf..2fb360dec 100644 --- a/Assets/Prototype/佩佩/Scripts/MemoryProcess.cs +++ b/Assets/Prototype/佩佩/Scripts/MemoryProcess.cs @@ -332,6 +332,9 @@ public IEnumerator PlayMemory(bool useYarn=false,string memName="") if (processedPunchTapes.TryGetValue(punchTape, out bool isProcessed) && isProcessed) { + Sprite memorySprite1 = Resources.Load("Art/Memory/" + PunchTape.MemoryIndex); + memoryFinishedImage.sprite = memorySprite1; + memoryFinishedImageNoColor.sprite = memorySprite1; PlayMemory(); yield break; } diff --git a/Assets/Prototype/佩佩/佩佩视觉模块.unity b/Assets/Prototype/佩佩/佩佩视觉模块.unity index db73bbfa7..f1945b129 100644 --- a/Assets/Prototype/佩佩/佩佩视觉模块.unity +++ b/Assets/Prototype/佩佩/佩佩视觉模块.unity @@ -34088,49 +34088,6 @@ MonoBehaviour: burnRadiusMax: 21 backSpriteRenderer: {fileID: 1624786076} wrongColorSpriteRenderer: {fileID: 578644886} ---- !u!21 &1599501171 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: AllIn1SpriteShader/AllIn1SpriteShader - m_Shader: {fileID: 4800000, guid: 0803c241834332942abfcbd27c498b46, type: 3} - m_Parent: {fileID: 2100000, guid: e54618b1fa673734dae0038617cf6f9a, type: 2} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: - - _ENABLEDIRECTIONALDISTORTION_ON - - _SHADERFADING_NONE - - _SHADERSPACE_UV - - _TEXTURELAYER1SHEETTOGGLE_ON - - _TEXTURELAYER2SHEETTOGGLE_ON - m_InvalidKeywords: - - DISTORT_ON - - OFFSETUV_ON - - PIXELATE_ON - - _DIRECTIONALDISTORTIONINVERT_ON - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: [] - m_Ints: [] - m_Floats: - - _Brightness: 0 - - _EnableSaturation: 0 - - _HologramMinAlpha: 0.1 - - _Saturation: 1 - m_Colors: - - _InnerOutlineColor: {r: 1, g: 0, b: 0, a: 1} - - _ShadowColor: {r: 0, g: 0, b: 0, a: 1} - - _ShineColor: {r: 1, g: 1, b: 1, a: 1} - m_BuildTextureStacks: [] --- !u!21 &1606359295 Material: serializedVersion: 8 @@ -38557,6 +38514,810 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1720973168} m_CullTransparentMesh: 1 +--- !u!21 &1725787722 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Sprites/Default + m_Shader: {fileID: 4800000, guid: a36b7719ff0465b42ab1407d67672c5f, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - DISTORT_ON + - OFFSETUV_ON + - PIXELATE_ON + m_InvalidKeywords: + - _SHADERFADING_NONE + - _SHADERSPACE_UV + - _TEXTURELAYER1SHEETTOGGLE_ON + - _TEXTURELAYER2SHEETTOGGLE_ON + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _AddColorMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _AddHueMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _AlphaTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ColorRampTex: + m_Texture: {fileID: 2800000, guid: 279657edc397ece4b8029c727adf6ddc, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ColorRampTexGradient: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ColorSwapTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _CustomFadeFadeMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DistortTex: + m_Texture: {fileID: 2800000, guid: 7aad8c583ef292e48b06af0d1f2fab97, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _FadeBurnTex: + m_Texture: {fileID: 2800000, guid: 677cca399782dea41aedc1d292ecb67d, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _FadeTex: + m_Texture: {fileID: 2800000, guid: 7aad8c583ef292e48b06af0d1f2fab97, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _FadingMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _GlowTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _InnerOutlineTintTexture: + m_Texture: {fileID: 2800000, guid: 5af9a397a8643994c829e696a24a7845, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetalMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OuterOutlineTintTexture: + m_Texture: {fileID: 2800000, guid: 5af9a397a8643994c829e696a24a7845, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OutlineDistortTex: + m_Texture: {fileID: 2800000, guid: 7aad8c583ef292e48b06af0d1f2fab97, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OutlineTex: + m_Texture: {fileID: 2800000, guid: 74087f6d03f233e4a8a142fa01f9e5cf, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OverlayTex: + m_Texture: {fileID: 2800000, guid: 677cca399782dea41aedc1d292ecb67d, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _PixelOutlineTintTexture: + m_Texture: {fileID: 2800000, guid: 5af9a397a8643994c829e696a24a7845, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _RecolorRGBTexture: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _RecolorRGBYCPTexture: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ShineMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SineGlowMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _StrongTintMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _TextureLayer1Texture: + m_Texture: {fileID: 2800000, guid: 9685c3a024e22a946a7e8c2ce3542300, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _TextureLayer2Texture: + m_Texture: {fileID: 2800000, guid: 9685c3a024e22a946a7e8c2ce3542300, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _UVDistortMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _UberNoiseTexture: + m_Texture: {fileID: 2800000, guid: b8d18cd117976254d94a812a0bfc336e, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _texcoord: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - PixelSnap: 0 + - _AddColorContrast: 0.5 + - _AddColorContrastToggle: 0 + - _AddColorFade: 1 + - _AddColorMaskToggle: 0 + - _AddHueBrightness: 2 + - _AddHueContrast: 0.5 + - _AddHueFade: 1 + - _AddHueMaskToggle: 0 + - _AddHueSaturation: 1 + - _AddHueSpeed: 1 + - _Alpha: 1 + - _AlphaCutoffValue: 0.25 + - _AlphaOutlineBlend: 1 + - _AlphaOutlineGlow: 5 + - _AlphaOutlineMinAlpha: 0 + - _AlphaOutlinePower: 1 + - _AlphaRoundThreshold: 0.5 + - _AlphaTintFade: 1 + - _AlphaTintMinAlpha: 0.02 + - _BakedMaterial: 0 + - _BillboardY: 0 + - _BlackTintFade: 1 + - _BlackTintPower: 4 + - _BlurHD: 0 + - _BlurIntensity: 10 + - _Brightness: 1 + - _BurnEdgeNoiseFactor: 0.5 + - _BurnFade: 1 + - _BurnInsideContrast: 2 + - _BurnInsideNoiseFactor: 0.2 + - _BurnRadius: 5 + - _BurnSwirlFactor: 1 + - _BurnWidth: 0.1 + - _CamouflageAnimationToggle: 0 + - _CamouflageContrast: 1 + - _CamouflageDensityA: 0.4 + - _CamouflageDensityB: 0.4 + - _CamouflageFade: 1 + - _CamouflageSmoothnessA: 0.2 + - _CamouflageSmoothnessB: 0.2 + - _CheckerboardDarken: 0.5 + - _CheckerboardTiling: 1 + - _ChromAberrAlpha: 0.4 + - _ChromAberrAmount: 1 + - _ClipUvDown: 0 + - _ClipUvLeft: 0 + - _ClipUvRight: 0 + - _ClipUvUp: 0 + - _ColorChangeLuminosity: 0 + - _ColorChangeTolerance: 0.25 + - _ColorChangeTolerance2: 0.25 + - _ColorChangeTolerance3: 0.25 + - _ColorRampBlend: 1 + - _ColorRampLuminosity: 0 + - _ColorRampOutline: 0 + - _ColorReplaceContrast: 1 + - _ColorReplaceFade: 1 + - _ColorReplaceRange: 0.05 + - _ColorReplaceSmoothness: 0.1 + - _ColorSwapBlend: 1 + - _ColorSwapBlueLuminosity: 0.5 + - _ColorSwapGreenLuminosity: 0.5 + - _ColorSwapRedLuminosity: 0.5 + - _Contrast: 1 + - _CullingOption: 0 + - _CustomFadeAlpha: 1 + - _CustomFadeNoiseFactor: 0 + - _CustomFadeSmoothness: 2 + - _DirectionalAlphaFadeFade: 0 + - _DirectionalAlphaFadeInvert: 0 + - _DirectionalAlphaFadeNoiseFactor: 0.2 + - _DirectionalAlphaFadeRotation: 0 + - _DirectionalAlphaFadeWidth: 0.2 + - _DirectionalDistortionFade: 0 + - _DirectionalDistortionInvert: 0 + - _DirectionalDistortionNoiseFactor: 0.2 + - _DirectionalDistortionRandomDirection: 0.1 + - _DirectionalDistortionRotation: 0 + - _DirectionalDistortionWidth: 0.5 + - _DirectionalGlowFadeFade: 0 + - _DirectionalGlowFadeInvert: 0 + - _DirectionalGlowFadeNoiseFactor: 0.2 + - _DirectionalGlowFadeRotation: 0 + - _DirectionalGlowFadeWidth: 0.1 + - _DistortAmount: 0.5 + - _DistortTexXSpeed: 5 + - _DistortTexYSpeed: 5 + - _EditorDrawers: 6 + - _EnableAddColor: 0 + - _EnableAddHue: 0 + - _EnableAlphaTint: 0 + - _EnableBlackTint: 0 + - _EnableBrightness: 0 + - _EnableBurn: 0 + - _EnableCamouflage: 0 + - _EnableCheckerboard: 0 + - _EnableColorReplace: 0 + - _EnableContrast: 0 + - _EnableCustomFade: 0 + - _EnableDirectionalAlphaFade: 0 + - _EnableDirectionalDistortion: 0 + - _EnableDirectionalGlowFade: 0 + - _EnableEnchanted: 0 + - _EnableExternalAlpha: 0 + - _EnableFlame: 0 + - _EnableFrozen: 0 + - _EnableFullAlphaDissolve: 0 + - _EnableFullDistortion: 0 + - _EnableFullGlowDissolve: 0 + - _EnableGaussianBlur: 0 + - _EnableGlitch: 0 + - _EnableHalftone: 0 + - _EnableHologram: 0 + - _EnableHue: 0 + - _EnableInkSpread: 0 + - _EnableInnerOutline: 0 + - _EnableMetal: 0 + - _EnableNegative: 0 + - _EnableOuterOutline: 0 + - _EnablePingPongGlow: 0 + - _EnablePixelOutline: 0 + - _EnablePixelate: 0 + - _EnablePoison: 0 + - _EnableRainbow: 0 + - _EnableRecolorRGB: 0 + - _EnableRecolorRGBYCP: 0 + - _EnableSaturation: 0 + - _EnableScreenTiling: 0 + - _EnableShadow: 0 + - _EnableSharpen: 0 + - _EnableShiftHue: 0 + - _EnableShifting: 0 + - _EnableShine: 0 + - _EnableSineGlow: 0 + - _EnableSineMove: 0 + - _EnableSineRotate: 0 + - _EnableSineScale: 0 + - _EnableSmoke: 0 + - _EnableSmoothPixelArt: 0 + - _EnableSourceAlphaDissolve: 0 + - _EnableSourceGlowDissolve: 0 + - _EnableSplitToning: 0 + - _EnableSqueeze: 0 + - _EnableSquish: 0 + - _EnableStrongTint: 0 + - _EnableTextureLayer1: 0 + - _EnableTextureLayer2: 0 + - _EnableUVDistort: 0 + - _EnableUVRotate: 0 + - _EnableUVScale: 0 + - _EnableUVScroll: 0 + - _EnableVibrate: 0 + - _EnableWiggle: 0 + - _EnableWind: 0 + - _EnableWorldTiling: 0 + - _EnchantedBrightness: 1 + - _EnchantedContrast: 0.5 + - _EnchantedFade: 1 + - _EnchantedLerpToggle: 0 + - _EnchantedRainbowDensity: 0.5 + - _EnchantedRainbowSaturation: 0.8 + - _EnchantedRainbowSpeed: 0.5 + - _EnchantedRainbowToggle: 0 + - _EnchantedReduce: 0 + - _FadeAmount: -0.1 + - _FadeBurnGlow: 2 + - _FadeBurnTransition: 0.075 + - _FadeBurnWidth: 0.025 + - _FadingFade: 1 + - _FadingNoiseFactor: 0.2 + - _FadingWidth: 0.3 + - _FishEyeUvAmount: 0.35 + - _FlameBrightness: 10 + - _FlameNoiseFactor: 2.5 + - _FlameNoiseHeightFactor: 1.5 + - _FlameRadius: 0.2 + - _FlameSmooth: 2 + - _FlickerAlpha: 0 + - _FlickerFreq: 0.2 + - _FlickerPercent: 0.05 + - _FrozenContrast: 2 + - _FrozenFade: 1 + - _FrozenHighlightContrast: 2 + - _FrozenHighlightDensity: 1 + - _FrozenSnowContrast: 1 + - _FrozenSnowDensity: 0.25 + - _FullAlphaDissolveFade: 0.5 + - _FullAlphaDissolveWidth: 0.5 + - _FullDistortionFade: 1 + - _FullGlowDissolveFade: 0.5 + - _FullGlowDissolveWidth: 0.5 + - _GaussianBlurFade: 1 + - _GaussianBlurOffset: 0.5 + - _GhostBlend: 1 + - _GhostColorBoost: 1 + - _GhostTransparency: 0 + - _GlitchAmount: 3 + - _GlitchBrightness: 4 + - _GlitchFade: 1 + - _GlitchHueSpeed: 1 + - _GlitchMaskMin: 0.4 + - _GlitchSize: 1 + - _Glow: 10 + - _GlowGlobal: 1 + - _GradBlend: 1 + - _GradBoostX: 1.2 + - _GradBoostY: 1.2 + - _GradIsRadial: 0 + - _GrassManualAnim: 1 + - _GrassManualToggle: 0 + - _GrassRadialBend: 0.1 + - _GrassSpeed: 2 + - _GrassWind: 20 + - _GreyscaleBlend: 1 + - _GreyscaleLuminosity: 0 + - _GreyscaleOutline: 0 + - _HalftoneFade: 1 + - _HalftoneFadeWidth: 1.5 + - _HalftoneInvert: 0 + - _HalftoneTiling: 4 + - _HandDrawnAmount: 10 + - _HandDrawnSpeed: 5 + - _HitEffectBlend: 1 + - _HitEffectGlow: 5 + - _HologramBlend: 1 + - _HologramContrast: 1 + - _HologramDistortionDensity: 0.5 + - _HologramDistortionOffset: 0.5 + - _HologramDistortionScale: 10 + - _HologramDistortionSpeed: 2 + - _HologramFade: 1 + - _HologramLineFrequency: 500 + - _HologramLineGap: 3 + - _HologramLineSpeed: 0.01 + - _HologramMaxAlpha: 0.75 + - _HologramMinAlpha: 0.2 + - _HologramStripesAmount: 0.1 + - _HologramStripesSpeed: 4.5 + - _HologramUnmodAmount: 0 + - _HsvBright: 1 + - _HsvSaturation: 1 + - _HsvShift: 180 + - _Hue: 0 + - _InkSpreadContrast: 2 + - _InkSpreadDistance: 3 + - _InkSpreadFade: 1 + - _InkSpreadNoiseFactor: 0.5 + - _InkSpreadWidth: 0.2 + - _InnerOutlineAlpha: 1 + - _InnerOutlineDistortionToggle: 0 + - _InnerOutlineFade: 1 + - _InnerOutlineGlow: 4 + - _InnerOutlineOutlineOnlyToggle: 0 + - _InnerOutlineTextureToggle: 0 + - _InnerOutlineThickness: 1 + - _InnerOutlineWidth: 0.02 + - _MaxXUV: 1 + - _MaxYUV: 1 + - _MetalContrast: 2 + - _MetalFade: 1 + - _MetalHighlightContrast: 2 + - _MetalHighlightDensity: 1 + - _MetalMaskToggle: 0 + - _MinXUV: 0 + - _MinYUV: 0 + - _MotionBlurAngle: 0.1 + - _MotionBlurDist: 1.25 + - _MyDstMode: 10 + - _MySrcMode: 5 + - _NegativeAmount: 1 + - _NegativeFade: 1 + - _OffsetUvX: 0 + - _OffsetUvY: 0 + - _OnlyInnerOutline: 0 + - _OnlyOutline: 0 + - _OuterOutlineDistortionToggle: 0 + - _OuterOutlineFade: 1 + - _OuterOutlineOutlineOnlyToggle: 0 + - _OuterOutlineTextureToggle: 0 + - _OuterOutlineWidth: 0.04 + - _OutlineAlpha: 1 + - _OutlineDistortAmount: 0.5 + - _OutlineDistortTexXSpeed: 5 + - _OutlineDistortTexYSpeed: 5 + - _OutlineGlow: 1.5 + - _OutlinePixelWidth: 1 + - _OutlineTexXSpeed: 10 + - _OutlineTexYSpeed: 0 + - _OutlineWidth: 0.004 + - _OverlayBlend: 1 + - _OverlayGlow: 1 + - _OverlayTextureScrollXSpeed: 0.25 + - _OverlayTextureScrollYSpeed: 0.25 + - _PinchUvAmount: 0.35 + - _PingPongGlowContrast: 1 + - _PingPongGlowFade: 1 + - _PingPongGlowFrequency: 3 + - _PixelOutlineFade: 1 + - _PixelOutlineOutlineOnlyToggle: 0 + - _PixelOutlineTextureToggle: 0 + - _PixelOutlineWidth: 1 + - _PixelPerfectSpace: 0 + - _PixelPerfectUV: 0 + - _PixelateFade: 1 + - _PixelatePixelDensity: 16 + - _PixelatePixelsPerUnit: 100 + - _PixelateSize: 32 + - _PixelsPerUnit: 100 + - _PoisonDensity: 3 + - _PoisonFade: 1 + - _PoisonNoiseBrightness: 2 + - _PoisonRecolorFactor: 0.5 + - _PoisonShiftSpeed: 0.2 + - _PosterizeGamma: 0.75 + - _PosterizeNumColors: 8 + - _PosterizeOutline: 0 + - _RadialClip: 45 + - _RadialClip2: 0 + - _RadialStartAngle: 90 + - _RainbowBrightness: 2 + - _RainbowContrast: 1 + - _RainbowDensity: 0.5 + - _RainbowFade: 1 + - _RainbowNoiseFactor: 0.2 + - _RainbowSaturation: 1 + - _RainbowSpeed: 1 + - _RandomSeed: 0 + - _RecolorRGBFade: 1 + - _RecolorRGBTextureToggle: 0 + - _RecolorRGBYCPFade: 1 + - _RecolorRGBYCPTextureToggle: 0 + - _RectHeight: 100 + - _RectSize: 1 + - _RectWidth: 100 + - _RotateUvAmount: 0 + - _RoundWaveSpeed: 2 + - _RoundWaveStrength: 0.7 + - _Saturation: 1 + - _ScreenTilingPixelsPerUnit: 100 + - _ScreenWidthUnits: 10 + - _ShaderFading: 0 + - _ShaderSpace: 0 + - _ShadowAlpha: 0.5 + - _ShadowFade: 1 + - _ShadowX: 0.1 + - _ShadowY: -0.05 + - _ShakeUvSpeed: 2.5 + - _ShakeUvX: 1.5 + - _ShakeUvY: 1 + - _SharpenFactor: 4 + - _SharpenFade: 1 + - _SharpenOffset: 2 + - _ShiftHueSpeed: 0.5 + - _ShiftingBrightness: 1 + - _ShiftingContrast: 0.5 + - _ShiftingDensity: 1.5 + - _ShiftingFade: 1 + - _ShiftingRainbowToggle: 0 + - _ShiftingSaturation: 0.8 + - _ShiftingSpeed: 0.5 + - _ShineContrast: 2 + - _ShineFade: 1 + - _ShineFrequency: 0.3 + - _ShineGlow: 1 + - _ShineLocation: 0.5 + - _ShineMaskToggle: 0 + - _ShineRotate: 0 + - _ShineRotation: 30 + - _ShineSaturation: 0.5 + - _ShineSmooth: 1 + - _ShineSpeed: 5 + - _ShineWidth: 0.1 + - _SineGlowContrast: 1 + - _SineGlowFade: 1 + - _SineGlowFrequency: 4 + - _SineGlowMaskToggle: 0 + - _SineGlowMax: 1 + - _SineGlowMin: 0 + - _SineMoveFade: 1 + - _SineRotateAngle: 15 + - _SineRotateFade: 1 + - _SineRotateFrequency: 1 + - _SineScaleFrequency: 2 + - _SmokeAlpha: 1 + - _SmokeDarkEdge: 1 + - _SmokeNoiseFactor: 0.4 + - _SmokeNoiseScale: 0.5 + - _SmokeSmoothness: 1 + - _SmokeVertexSeed: 0 + - _SourceAlphaDissolveFade: 1 + - _SourceAlphaDissolveInvert: 0 + - _SourceAlphaDissolveNoiseFactor: 0.2 + - _SourceAlphaDissolveWidth: 0.2 + - _SourceGlowDissolveFade: 1 + - _SourceGlowDissolveInvert: 0 + - _SourceGlowDissolveNoiseFactor: 0.2 + - _SourceGlowDissolveWidth: 0.1 + - _SplitToningBalance: 1 + - _SplitToningContrast: 1 + - _SplitToningFade: 1 + - _SplitToningShift: 0 + - _SpriteSheetFix: 0 + - _SqueezeFade: 1 + - _SqueezePower: 1 + - _SquishFade: 1 + - _SquishFlip: 0 + - _SquishSquish: 0.1 + - _SquishStretch: 0.1 + - _StrongTintContrast: 0 + - _StrongTintContrastToggle: 0 + - _StrongTintFade: 1 + - _StrongTintMaskToggle: 0 + - _TextureLayer1Columns: 3 + - _TextureLayer1Contrast: 1 + - _TextureLayer1ContrastToggle: 0 + - _TextureLayer1EdgeClip: 0.005 + - _TextureLayer1Fade: 1 + - _TextureLayer1Rows: 3 + - _TextureLayer1ScrollToggle: 0 + - _TextureLayer1SheetToggle: 1 + - _TextureLayer1Speed: 20 + - _TextureLayer1StartFrame: 0 + - _TextureLayer2Columns: 3 + - _TextureLayer2Contrast: 1 + - _TextureLayer2ContrastToggle: 0 + - _TextureLayer2EdgeClip: 0.005 + - _TextureLayer2Fade: 1 + - _TextureLayer2Rows: 3 + - _TextureLayer2ScrollToggle: 0 + - _TextureLayer2SheetToggle: 1 + - _TextureLayer2Speed: 20 + - _TextureLayer2StartFrame: 0 + - _TextureScrollXSpeed: 1 + - _TextureScrollYSpeed: 0 + - _TilingFix: 0 + - _TimeFPS: 5 + - _TimeFrequency: 2 + - _TimeRange: 0.5 + - _TimeSpeed: 1 + - _TimeValue: 0 + - _ToggleCustomTime: 0 + - _ToggleTimeFPS: 0 + - _ToggleTimeFrequency: 0 + - _ToggleTimeSpeed: 0 + - _ToggleUnscaledTime: 0 + - _TwistUvAmount: 1 + - _TwistUvPosX: 0.5 + - _TwistUvPosY: 0.5 + - _TwistUvRadius: 0.75 + - _UVDistortFade: 1 + - _UVDistortMaskToggle: 0 + - _UVRotateSpeed: 1 + - _VertexTintFirst: 0 + - _VibrateFade: 1 + - _VibrateFrequency: 100 + - _VibrateOffset: 0.04 + - _VibrateRotation: 4 + - _WarpScale: 0.5 + - _WarpSpeed: 8 + - _WarpStrength: 0.025 + - _WaveAmount: 7 + - _WaveSpeed: 10 + - _WaveStrength: 7.5 + - _WaveX: 0 + - _WaveY: 0.5 + - _WiggleFade: 1 + - _WiggleFixedGroundToggle: 0 + - _WiggleFrequency: 2 + - _WiggleOffset: 0.02 + - _WiggleSpeed: 2 + - _WindFlip: 0 + - _WindHighQualityNoise: 0 + - _WindIsParallax: 0 + - _WindLocalWind: 0 + - _WindMaxIntensity: 0.4 + - _WindMaxRotation: 2 + - _WindMinIntensity: -0.4 + - _WindNoiseScale: 0.1 + - _WindNoiseSpeed: 1 + - _WindRotation: 0 + - _WindRotationWindFactor: 1 + - _WindSquishFactor: 0.3 + - _WindSquishWindFactor: 0 + - _WindXPosition: 0 + - _WorldTilingPixelsPerUnit: 100 + - _ZTestMode: 4 + - _ZWrite: 0 + - _ZoomUvAmount: 0.5 + m_Colors: + - _AddColorColor: {r: 2.996078, g: 0, b: 0, a: 0} + - _AlphaOutlineColor: {r: 1, g: 1, b: 1, a: 1} + - _AlphaTintColor: {r: 95.87451, g: 5.019608, b: 95.87451, a: 0} + - _BlackTintColor: {r: 0, g: 0, b: 1, a: 0} + - _BurnEdgeColor: {r: 11.98431, g: 1.129412, b: 0.1254902, a: 0} + - _BurnEdgeNoiseScale: {r: 0.3, g: 0.3, b: 0, a: 0} + - _BurnInsideColor: {r: 0.75, g: 0.5625, b: 0.525, a: 0} + - _BurnInsideNoiseColor: {r: 3084.047, g: 257.0039, b: 0, a: 0} + - _BurnInsideNoiseScale: {r: 0.5, g: 0.5, b: 0, a: 0} + - _BurnPosition: {r: 0, g: 5, b: 0, a: 0} + - _BurnSwirlNoiseScale: {r: 0.1, g: 0.1, b: 0, a: 0} + - _CamouflageBaseColor: {r: 0.7450981, g: 0.7254902, b: 0.5686274, a: 0} + - _CamouflageColorA: {r: 0.62745106, g: 0.5882353, b: 0.43137258, a: 0} + - _CamouflageColorB: {r: 0.47058815, g: 0.43137258, b: 0.31372547, a: 0} + - _CamouflageDistortionIntensity: {r: 0.1, g: 0.1, b: 0, a: 0} + - _CamouflageDistortionScale: {r: 0.5, g: 0.5, b: 0, a: 0} + - _CamouflageDistortionSpeed: {r: 0.1, g: 0.1, b: 0, a: 0} + - _CamouflageNoiseScaleA: {r: 0.25, g: 0.25, b: 0, a: 0} + - _CamouflageNoiseScaleB: {r: 0.25, g: 0.25, b: 0, a: 0} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _ColorChangeNewCol: {r: 1, g: 1, b: 0, a: 1} + - _ColorChangeNewCol2: {r: 1, g: 1, b: 0, a: 1} + - _ColorChangeNewCol3: {r: 1, g: 1, b: 0, a: 1} + - _ColorChangeTarget: {r: 1, g: 0, b: 0, a: 1} + - _ColorChangeTarget2: {r: 1, g: 0, b: 0, a: 1} + - _ColorChangeTarget3: {r: 1, g: 0, b: 0, a: 1} + - _ColorReplaceFromColor: {r: 0, g: 0, b: 0, a: 0} + - _ColorReplaceToColor: {r: 0, g: 0, b: 0.2, a: 0} + - _ColorSwapBlue: {r: 1, g: 1, b: 1, a: 1} + - _ColorSwapGreen: {r: 1, g: 1, b: 1, a: 1} + - _ColorSwapRed: {r: 1, g: 1, b: 1, a: 1} + - _CustomFadeNoiseScale: {r: 1, g: 1, b: 0, a: 0} + - _DirectionalAlphaFadeNoiseScale: {r: 0.3, g: 0.3, b: 0, a: 0} + - _DirectionalDistortionDistortion: {r: 0, g: 0.1, b: 0, a: 0} + - _DirectionalDistortionDistortionScale: {r: 1, g: 1, b: 0, a: 0} + - _DirectionalDistortionNoiseScale: {r: 0.4, g: 0.4, b: 0, a: 0} + - _DirectionalGlowFadeEdgeColor: {r: 11.98431, g: 0.6901961, b: 0.6901961, a: 0} + - _DirectionalGlowFadeNoiseScale: {r: 0.4, g: 0.4, b: 0, a: 0} + - _EnchantedHighColor: {r: 0, g: 0.7098798, b: 4.237095, a: 0} + - _EnchantedLowColor: {r: 2.996078, g: 0, b: 0, a: 0} + - _EnchantedScale: {r: 0.1, g: 0.1, b: 0, a: 0} + - _EnchantedSpeed: {r: 0, g: 1, b: 0, a: 0} + - _FadeBurnColor: {r: 1, g: 1, b: 0, a: 1} + - _FadingNoiseScale: {r: 0.2, g: 0.2, b: 0, a: 0} + - _FadingPosition: {r: 0, g: 0, b: 0, a: 0} + - _FlameNoiseScale: {r: 1.2, g: 0.8, b: 0, a: 0} + - _FlameSpeed: {r: 0, g: -0.5, b: 0, a: 0} + - _Flip: {r: 1, g: 1, b: 1, a: 1} + - _FrozenHighlightColor: {r: 1.797647, g: 4.604501, b: 5.992157, a: 1} + - _FrozenHighlightDistortion: {r: 0.5, g: 0.5, b: 0, a: 0} + - _FrozenHighlightDistortionScale: {r: 0.2, g: 0.2, b: 0, a: 0} + - _FrozenHighlightDistortionSpeed: {r: -0.05, g: -0.05, b: 0, a: 0} + - _FrozenHighlightScale: {r: 0.2, g: 0.2, b: 0, a: 0} + - _FrozenHighlightSpeed: {r: 0.1, g: 0.1, b: 0, a: 0} + - _FrozenSnowColor: {r: 1.123529, g: 1.373203, b: 1.498039, a: 0} + - _FrozenSnowScale: {r: 0.1, g: 0.1, b: 0, a: 0} + - _FrozenTint: {r: 1.819608, g: 4.611765, b: 5.992157, a: 0} + - _FullAlphaDissolveNoiseScale: {r: 0.1, g: 0.1, b: 0, a: 0} + - _FullDistortionDistortion: {r: 0.2, g: 0.2, b: 0, a: 0} + - _FullDistortionNoiseScale: {r: 0.5, g: 0.5, b: 0, a: 0} + - _FullGlowDissolveEdgeColor: {r: 11.98431, g: 0.627451, b: 0.627451, a: 0} + - _FullGlowDissolveNoiseScale: {r: 0.1, g: 0.1, b: 0, a: 0} + - _GlitchDistortion: {r: 0.1, g: 0, b: 0, a: 0} + - _GlitchDistortionScale: {r: 0, g: 3, b: 0, a: 0} + - _GlitchDistortionSpeed: {r: 0, g: 1, b: 0, a: 0} + - _GlitchMaskScale: {r: 0, g: 0.2, b: 0, a: 0} + - _GlitchMaskSpeed: {r: 0, g: 4, b: 0, a: 0} + - _GlitchNoiseScale: {r: 0, g: 3, b: 0, a: 0} + - _GlitchNoiseSpeed: {r: 0, g: 1, b: 0, a: 0} + - _GlowColor: {r: 1, g: 1, b: 1, a: 1} + - _GradBotLeftCol: {r: 0, g: 0, b: 1, a: 1} + - _GradBotRightCol: {r: 0, g: 1, b: 0, a: 1} + - _GradTopLeftCol: {r: 1, g: 0, b: 0, a: 1} + - _GradTopRightCol: {r: 1, g: 1, b: 0, a: 1} + - _GreyscaleTintColor: {r: 1, g: 1, b: 1, a: 1} + - _HalftonePosition: {r: 0, g: 0, b: 0, a: 0} + - _HitEffectColor: {r: 1, g: 1, b: 1, a: 1} + - _HologramStripeColor: {r: 0, g: 1, b: 1, a: 1} + - _HologramTint: {r: 0.3137255, g: 1.662745, b: 2.996078, a: 1} + - _InkSpreadColor: {r: 8.47419, g: 5.013525, b: 0.08873497, a: 0} + - _InkSpreadNoiseScale: {r: 0.4, g: 0.4, b: 0, a: 0} + - _InkSpreadPosition: {r: 0.5, g: -1, b: 0, a: 0} + - _InnerOutlineColor: {r: 11.98431, g: 1.254902, b: 1.254902, a: 1} + - _InnerOutlineDistortionIntensity: {r: 0.01, g: 0.01, b: 0, a: 0} + - _InnerOutlineNoiseScale: {r: 4, g: 4, b: 0, a: 0} + - _InnerOutlineNoiseSpeed: {r: 0, g: 0.1, b: 0, a: 0} + - _InnerOutlineTextureSpeed: {r: 0.5, g: 0, b: 0, a: 0} + - _MetalColor: {r: 5.992157, g: 3.639216, b: 0.3137255, a: 1} + - _MetalHighlightColor: {r: 5.992157, g: 3.796078, b: 0.6588235, a: 1} + - _MetalNoiseDistortion: {r: 0.5, g: 0.5, b: 0, a: 0} + - _MetalNoiseDistortionScale: {r: 0.2, g: 0.2, b: 0, a: 0} + - _MetalNoiseDistortionSpeed: {r: -0.05, g: -0.05, b: 0, a: 0} + - _MetalNoiseScale: {r: 0.25, g: 0.25, b: 0, a: 0} + - _MetalNoiseSpeed: {r: 0.05, g: 0.05, b: 0, a: 0} + - _OuterOutlineColor: {r: 0, g: 0, b: 0, a: 1} + - _OuterOutlineDistortionIntensity: {r: 0.01, g: 0.01, b: 0, a: 0} + - _OuterOutlineNoiseScale: {r: 4, g: 4, b: 0, a: 0} + - _OuterOutlineNoiseSpeed: {r: 0, g: 0.1, b: 0, a: 0} + - _OuterOutlineTextureSpeed: {r: 0.5, g: 0, b: 0, a: 0} + - _OutlineColor: {r: 1, g: 1, b: 1, a: 1} + - _OverlayColor: {r: 1, g: 1, b: 1, a: 1} + - _PingPongGlowFrom: {r: 5.992157, g: 0.1882353, b: 0.1882353, a: 0} + - _PingPongGlowTo: {r: 0.1882353, g: 0.1882353, b: 5.992157, a: 0} + - _PixelOutlineColor: {r: 0, g: 0, b: 0, a: 1} + - _PixelOutlineTextureSpeed: {r: 0.5, g: 0, b: 0, a: 0} + - _PoisonColor: {r: 0.3137255, g: 2.996078, b: 0.3137255, a: 0} + - _PoisonNoiseScale: {r: 0.2, g: 0.2, b: 0, a: 0} + - _PoisonNoiseSpeed: {r: 0, g: -0.2, b: 0, a: 0} + - _RainbowCenter: {r: 0, g: 0, b: 0, a: 0} + - _RainbowNoiseScale: {r: 0.2, g: 0.2, b: 0, a: 0} + - _RecolorRGBBlueTint: {r: 1, g: 1, b: 1, a: 0.5019608} + - _RecolorRGBGreenTint: {r: 1, g: 1, b: 1, a: 0.5019608} + - _RecolorRGBRedTint: {r: 1, g: 1, b: 1, a: 0.5019608} + - _RecolorRGBYCPBlueTint: {r: 1, g: 1, b: 1, a: 0.5019608} + - _RecolorRGBYCPCyanTint: {r: 1, g: 1, b: 1, a: 0.5019608} + - _RecolorRGBYCPGreenTint: {r: 1, g: 1, b: 1, a: 0.5019608} + - _RecolorRGBYCPPurpleTint: {r: 1, g: 1, b: 1, a: 0.5019608} + - _RecolorRGBYCPRedTint: {r: 1, g: 1, b: 1, a: 0.5019608} + - _RecolorRGBYCPYellowTint: {r: 1, g: 1, b: 1, a: 0.5019608} + - _RendererColor: {r: 1, g: 1, b: 1, a: 1} + - _ScreenTilingOffset: {r: 0, g: 0, b: 0, a: 0} + - _ScreenTilingScale: {r: 1, g: 1, b: 0, a: 0} + - _ShadowColor: {r: 0, g: 0, b: 0, a: 0} + - _ShadowOffset: {r: 0.05, g: -0.05, b: 0, a: 0} + - _ShiftingColorA: {r: 1.498039, g: 0, b: 0, a: 0} + - _ShiftingColorB: {r: 1.498039, g: 0.7490196, b: 0, a: 0} + - _ShineColor: {r: 11.98431, g: 11.98431, b: 11.98431, a: 0} + - _SineGlowColor: {r: 0, g: 2.007843, b: 2.996078, a: 0} + - _SineMoveFrequency: {r: 1, g: 1, b: 0, a: 0} + - _SineMoveOffset: {r: 0, g: 0.5, b: 0, a: 0} + - _SineRotatePivot: {r: 0.5, g: 0.5, b: 0, a: 0} + - _SineScaleFactor: {r: 0.2, g: 0.2, b: 0, a: 0} + - _SourceAlphaDissolveNoiseScale: {r: 0.3, g: 0.3, b: 0, a: 0} + - _SourceAlphaDissolvePosition: {r: 0, g: 0, b: 0, a: 0} + - _SourceGlowDissolveEdgeColor: {r: 11.98431, g: 0.627451, b: 0.627451, a: 0} + - _SourceGlowDissolveNoiseScale: {r: 0.3, g: 0.3, b: 0, a: 0} + - _SourceGlowDissolvePosition: {r: 0, g: 0, b: 0, a: 0} + - _SplitToningHighlightsColor: {r: 1, g: 0.1, b: 0.1, a: 0} + - _SplitToningShadowsColor: {r: 0.1, g: 0.4000002, b: 1, a: 0} + - _SpriteSheetRect: {r: 0, g: 0, b: 1, a: 1} + - _SqueezeCenter: {r: 0.5, g: 0.5, b: 0, a: 0} + - _SqueezeScale: {r: 2, g: 0, b: 0, a: 0} + - _StrongTintTint: {r: 1, g: 1, b: 1, a: 1} + - _TextureLayer1Color: {r: 0.4494117, g: 1.298301, b: 2.996079, a: 1} + - _TextureLayer1Offset: {r: 0, g: 0, b: 0, a: 0} + - _TextureLayer1Scale: {r: 1, g: 1, b: 0, a: 0} + - _TextureLayer1ScrollSpeed: {r: 0, g: 1, b: 0, a: 0} + - _TextureLayer2Color: {r: 0.4494117, g: 1.298301, b: 2.996079, a: 1} + - _TextureLayer2Offset: {r: 0, g: 0, b: 0, a: 0} + - _TextureLayer2Scale: {r: 1, g: 1, b: 0, a: 0} + - _TextureLayer2ScrollSpeed: {r: 0, g: 1, b: 0, a: 0} + - _UVDistortFrom: {r: -0.02, g: -0.02, b: 0, a: 0} + - _UVDistortNoiseScale: {r: 0.1, g: 0.1, b: 0, a: 0} + - _UVDistortSpeed: {r: 2, g: 2, b: 0, a: 0} + - _UVDistortTo: {r: 0.02, g: 0.02, b: 0, a: 0} + - _UVRotatePivot: {r: 0.5, g: 0.5, b: 0, a: 0} + - _UVScalePivot: {r: 0.5, g: 0.5, b: 0, a: 0} + - _UVScaleScale: {r: 1, g: 1, b: 0, a: 0} + - _UVScrollSpeed: {r: 0.2, g: 0, b: 0, a: 0} + - _WorldTilingOffset: {r: 0, g: 0, b: 0, a: 0} + - _WorldTilingScale: {r: 1, g: 1, b: 0, a: 0} + m_BuildTextureStacks: [] --- !u!1 &1731361025 GameObject: m_ObjectHideFlags: 0 @@ -44479,14 +45240,13 @@ GameObject: - component: {fileID: 2025235957} - component: {fileID: 2025235959} - component: {fileID: 2025235958} - - component: {fileID: 2025235960} m_Layer: 5 m_Name: MemoryFinished m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &2025235957 RectTransform: m_ObjectHideFlags: 0 @@ -44518,7 +45278,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 1599501171} + m_Material: {fileID: 1725787722} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} @@ -44544,22 +45304,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2025235956} m_CullTransparentMesh: 1 ---- !u!114 &2025235960 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2025235956} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ee158225ee1e59f4791627785501d950, type: 3} - m_Name: - m_EditorClassIdentifier: - shaderTypes: 0 - normalStrength: 5 - normalSmoothing: 1 - computingNormal: 0 --- !u!1 &2027094971 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Materials/MemorySearchScreen.mat b/Assets/Resources/Materials/MemorySearchScreen.mat index e544546b2..852ba0e43 100644 --- a/Assets/Resources/Materials/MemorySearchScreen.mat +++ b/Assets/Resources/Materials/MemorySearchScreen.mat @@ -267,7 +267,7 @@ Material: - _FrozenHighlightDensity: 1 - _FrozenSnowContrast: 1 - _FrozenSnowDensity: 0.25 - - _FullAlphaDissolveFade: 1 + - _FullAlphaDissolveFade: 0 - _FullAlphaDissolveWidth: 0.5 - _FullDistortionFade: 1 - _FullGlowDissolveFade: 0.5 @@ -275,7 +275,7 @@ Material: - _GaussianBlurFade: 1 - _GaussianBlurOffset: 50 - _GlitchBrightness: 3 - - _GlitchFade: 0 + - _GlitchFade: 1 - _GlitchHueSpeed: 1 - _GlitchMaskMin: 0.4 - _HalftoneFade: 1 @@ -409,7 +409,7 @@ Material: - _SquishStretch: 0.1 - _StrongTintContrast: 0 - _StrongTintContrastToggle: 0 - - _StrongTintFade: 1 + - _StrongTintFade: 0 - _StrongTintMaskToggle: 0 - _TextureLayer1Columns: 3 - _TextureLayer1Contrast: 1 diff --git a/Assets/Resources/Yarn/PeipeiNew/ClueBoard.yarn b/Assets/Resources/Yarn/PeipeiNew/ClueBoard.yarn index 0ff58be7c..fbeb5f99d 100644 --- a/Assets/Resources/Yarn/PeipeiNew/ClueBoard.yarn +++ b/Assets/Resources/Yarn/PeipeiNew/ClueBoard.yarn @@ -30,7 +30,7 @@ me: 视觉模块。 me: 这是一种罕见的症状…记忆模块种的数据逆向进入了视觉模块。 me: 这似乎也就是导致佩佩会看见一部分颜色的原因。 me: 我们对这种症状的产生原因知之甚少… - <> + <> me: 这或许和佩佩看不见颜色有关系。 me: 直观地说…这像是一种代偿，“因为她看不见颜色，所以通过某种方式补偿了回来”。 me: 不过…机体医学更关心机体如何正常工作，对于它们能不能看见颜色这种小问题…探索得很少。 diff --git a/Assets/Resources/Yarn/PeipeiNew/PeipeiNew.yarn b/Assets/Resources/Yarn/PeipeiNew/PeipeiNew.yarn index 98ae20e86..abe75ab30 100644 --- a/Assets/Resources/Yarn/PeipeiNew/PeipeiNew.yarn +++ b/Assets/Resources/Yarn/PeipeiNew/PeipeiNew.yarn @@ -1,8 +1,9 @@ title: Start tags: colorID: 8 -position: 242,-2376 +position: 242,-2378 --- +<> <> 本demo为早期验证版本，其中文本，交互，画面,声音均为过程版 如果遇到bug或困扰，请随在玩家群325268983中反馈 @@ -354,8 +355,9 @@ position: 241,-598 me: 刚才从视觉收集的打孔带…最好检查一下这些打孔带对应的记忆数据。 <> me: 收集的症状应该足够进行诊断了。 + me: 佩佩，这边检查结束了，你先稍微休息下吧 + peipei:好... <> - <> <> <> === @@ -366,10 +368,13 @@ position: 241,-598 title: 分析准备 tags: colorID: 8 -position: -137,-1052 +position: -57,-1194 --- //现在关于切换场景的数据保存还没有完成，建议先不切场景 +<> <> +<> +<> peipei: 不…不…不…… peipei: 不…我不要…… me: 怎么了…冷静，佩佩。 @@ -384,25 +389,23 @@ me: 但是我明白了你的担心，佩佩。如果有选择，我会考虑你 peipei: 好的…谢谢你……谢谢你，医生。 me: 我只是在履行职责罢了。 me: 现在…来完成诊断吧。 -<> +<> === - - - title: 结论 tags: colorID: 8 -position: -141,-1329 +position: -227,-1392 --- //现在关于切换场景的数据保存还没有完成，建议先不切场景 -<> - -<> +// <> +// <> <> <> -<> -<> +// <> +// <> +me: 佩佩，我大概明白了 +peipei: 医生，我是怎么了？ <> me: 好的…所以，现在你的身体里存在两个问题。 me: 其一，你的色觉晶圆是缺失的。 @@ -454,14 +457,17 @@ me: 那么…我们开始吧。 title: 手术准备 tags: colorID: 8 -position: -137,-1052 +position: -402,-1006 --- //现在关于切换场景的数据保存还没有完成，建议先不切场景 +<> +<> <> +<> <> <> -<> me: 开始吧…截断视觉-记忆桥，阻止视觉模块的记忆反流。 +<> === @@ -469,7 +475,7 @@ me: 开始吧…截断视觉-记忆桥，阻止视觉模块的记忆反流。 title: CutLine tags: -position: -142,-793 +position: -412,-719 --- <> peipei: 啊…眼睛……我的…… @@ -870,7 +876,7 @@ position: 1638,-1240 title: End_memoryPaly tags: colorID: 3 -position: 2640,-840 +position: 2630,-843 --- <> <> diff --git a/Assets/Scenes/Persistence.unity b/Assets/Scenes/Persistence.unity index 062078dcf..a540636e2 100644 --- a/Assets/Scenes/Persistence.unity +++ b/Assets/Scenes/Persistence.unity @@ -1897,7 +1897,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: -1228, y: 0} + m_AnchoredPosition: {x: -971, y: 0} m_SizeDelta: {x: 41.76538, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &578124940 @@ -2259,7 +2259,7 @@ MonoBehaviour: runMode: 0 firstTalkSO: {fileID: 11400000, guid: 10601ce26230723479d875a630f15732, type: 2} clinicScene: ClinicScene - testYarnProject: PeipeiNew2 + testYarnProject: PeipeiNew --- !u!4 &719228339 Transform: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/FixSystem/Tools/Screwdriver.cs b/Assets/Scripts/FixSystem/Tools/Screwdriver.cs index bb537ebc4..42b654490 100644 --- a/Assets/Scripts/FixSystem/Tools/Screwdriver.cs +++ b/Assets/Scripts/FixSystem/Tools/Screwdriver.cs @@ -5,10 +5,6 @@ using DG.Tweening; public class Screwdriver : Tool { - // private int rotationCount = 0; - // private int requiredRotations = 5; - // private bool isFixing = false; // 是否在维修状态 - public override void UseTool() { @@ -17,37 +13,5 @@ public class Screwdriver : Tool { } - - // public void StartFixMode() - // { - // isFixing = true; // 设置为维修模式 - // } - - // private bool IsOverScrewSlot(Vector3 position) - // { - // // 假设使用碰撞检测或其他方法确认是否靠近螺丝槽位 - // // 可以在此实现实际的检测逻辑 - // return true; // 简单返回true用于测试 - // } - - // private void StartRemoveScrew() - // { - // // 螺丝旋转动画 - // transform.DORotate(new Vector3(0, 0, -90), 0.5f, RotateMode.LocalAxisAdd).OnComplete(() => - // { - // rotationCount++; - // if (rotationCount >= requiredRotations) - // { - // RemoveScrew(); - // } - // }); - // } - - // private void RemoveScrew() - // { - // Debug.Log("Screw removed"); - // rotationCount = 0; - // // 可以加入螺丝掉落的逻辑，比如销毁对象或改变其状态 - // } }