diff --git a/Assets/Prototype/佩佩/Scripts/EyeTarget.cs b/Assets/Prototype/佩佩/Scripts/EyeTarget.cs index 94e2b20a6..cc2465712 100644 --- a/Assets/Prototype/佩佩/Scripts/EyeTarget.cs +++ b/Assets/Prototype/佩佩/Scripts/EyeTarget.cs @@ -6,6 +6,7 @@ using AibisDream; using UnityEngine.Rendering.Universal; using UnityEngine.Rendering; using AibisDream.Utility; +using AibisDream.Kit; public class EyeTarget : MonoBehaviour { @@ -126,17 +127,19 @@ public class EyeTarget : MonoBehaviour public void BlurIn(float duration, bool isForwardMaterial = true) { // AudioManager.PlayLoopAudio("visualturn"); + AudioManager.Instance.PlaySfx("event:/ActionFB/visualturn"); Material targetMaterial = isForwardMaterial ? forwardMaterial : backMaterial; - targetMaterial.DOFloat(1f, "_GaussianBlurFade", duration).SetEase(Ease.InOutSine); - // .OnComplete(() => { AudioManager.PauseLoopAudio(); }); + targetMaterial.DOFloat(1f, "_GaussianBlurFade", duration).SetEase(Ease.InOutSine) + .OnComplete(() => { AudioManager.Instance.StopSfx("event:/ActionFB/visualturn"); }); } public void BlurOut(float duration, bool isForwardMaterial = true) { // AudioManager.PlayLoopAudio("visualturn"); + AudioManager.Instance.PlaySfx("event:/ActionFB/visualturn"); Material targetMaterial = isForwardMaterial ? forwardMaterial : backMaterial; - targetMaterial.DOFloat(0f, "_GaussianBlurFade", duration).SetEase(Ease.InOutSine); - // .OnComplete(() => { AudioManager.PauseLoopAudio(); }); + targetMaterial.DOFloat(0f, "_GaussianBlurFade", duration).SetEase(Ease.InOutSine) + .OnComplete(() => { AudioManager.Instance.StopSfx("event:/ActionFB/visualturn"); }); } public void ColorBack() diff --git a/Assets/Render/Renderer2Dtest.asset b/Assets/Render/Renderer2Dtest.asset index 4b9b10e27..bd16daaa1 100644 --- a/Assets/Render/Renderer2Dtest.asset +++ b/Assets/Render/Renderer2Dtest.asset @@ -1508,7 +1508,7 @@ MonoBehaviour: enabled: 1 value: serializedVersion: 2 - m_Bits: 1 + m_Bits: 33 _source: _source: 1 _globalTex: _inputTex diff --git a/Assets/Resources/Art/Fix/Peipei/Eye.meta b/Assets/Resources/Art/Fix/Peipei/Eye.meta new file mode 100644 index 000000000..a612d38fe --- /dev/null +++ b/Assets/Resources/Art/Fix/Peipei/Eye.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ff2ae3bbe6e305e4c8fd902927b6aadb +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Art/Fix/Peipei/Eye/视觉模块盖子关闭.png b/Assets/Resources/Art/Fix/Peipei/Eye/视觉模块盖子关闭.png new file mode 100644 index 000000000..95a2c0af3 --- /dev/null +++ b/Assets/Resources/Art/Fix/Peipei/Eye/视觉模块盖子关闭.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d0c0d0d5979bf79861c6c7c8380b27ef891bd426a86c9c6f86c703c67f27d541 +size 20564 diff --git a/Assets/Resources/Art/Fix/Peipei/Eye/视觉模块盖子关闭.png.meta b/Assets/Resources/Art/Fix/Peipei/Eye/视觉模块盖子关闭.png.meta new file mode 100644 index 000000000..31e4694fa --- /dev/null +++ b/Assets/Resources/Art/Fix/Peipei/Eye/视觉模块盖子关闭.png.meta @@ -0,0 +1,153 @@ +fileFormatVersion: 2 +guid: c0b9934a3747f114e9244a4d1e1587d2 +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: 215 + 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: Android + 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/Fix/Peipei/Eye/视觉模块盖子打开A.png b/Assets/Resources/Art/Fix/Peipei/Eye/视觉模块盖子打开A.png new file mode 100644 index 000000000..680b92fb9 --- /dev/null +++ b/Assets/Resources/Art/Fix/Peipei/Eye/视觉模块盖子打开A.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a63acd932ecbf91807dcafac6db886bd707bff2e4c7222e7b911a283e85b177e +size 36089 diff --git a/Assets/Resources/Art/Fix/Peipei/Eye/视觉模块盖子打开A.png.meta b/Assets/Resources/Art/Fix/Peipei/Eye/视觉模块盖子打开A.png.meta new file mode 100644 index 000000000..46d64baf8 --- /dev/null +++ b/Assets/Resources/Art/Fix/Peipei/Eye/视觉模块盖子打开A.png.meta @@ -0,0 +1,153 @@ +fileFormatVersion: 2 +guid: 601b5e7bb254e934ca5d62560864ae39 +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: 215 + 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: Android + 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/Fix/Peipei/Eye/视觉模块盖子打开B.png b/Assets/Resources/Art/Fix/Peipei/Eye/视觉模块盖子打开B.png new file mode 100644 index 000000000..4572f31d9 --- /dev/null +++ b/Assets/Resources/Art/Fix/Peipei/Eye/视觉模块盖子打开B.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:37db7f38cfc5ad7c22323ce137c52ad1bc602db94cd14f2b6954b9763f897035 +size 32778 diff --git a/Assets/Resources/Art/Fix/Peipei/Eye/视觉模块盖子打开B.png.meta b/Assets/Resources/Art/Fix/Peipei/Eye/视觉模块盖子打开B.png.meta new file mode 100644 index 000000000..5da4e6c7a --- /dev/null +++ b/Assets/Resources/Art/Fix/Peipei/Eye/视觉模块盖子打开B.png.meta @@ -0,0 +1,153 @@ +fileFormatVersion: 2 +guid: b9548ae0834a15c4d9bad693f37d6cec +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: 215 + 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: Android + 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/Fix/Peipei/UFheatMap.png.meta b/Assets/Resources/Art/Fix/Peipei/UFheatMap.png.meta index dcf54ed31..d78da0b5e 100644 --- a/Assets/Resources/Art/Fix/Peipei/UFheatMap.png.meta +++ b/Assets/Resources/Art/Fix/Peipei/UFheatMap.png.meta @@ -48,7 +48,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 125 + spritePixelsToUnits: 215 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/Assets/Scenes/PeipeiFixScene.unity b/Assets/Scenes/PeipeiFixScene.unity index dae9dd4d3..635c8c3c3 100644 --- a/Assets/Scenes/PeipeiFixScene.unity +++ b/Assets/Scenes/PeipeiFixScene.unity @@ -7398,7 +7398,7 @@ Canvas: m_AdditionalShaderChannelsFlag: 25 m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 1134468525 - m_SortingOrder: 25 + m_SortingOrder: 26 m_TargetDisplay: 0 --- !u!224 &320706165 RectTransform: @@ -19508,7 +19508,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0.23399997, y: -0.83} + m_AnchoredPosition: {x: 0.198, y: -0.83} m_SizeDelta: {x: 0.75, y: 1} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1170503232 @@ -23801,7 +23801,8 @@ Transform: m_LocalPosition: {x: -0.007, y: 0.016, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 6415796061723103982} m_Father: {fileID: 2071292136} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &1434391376 @@ -25352,7 +25353,7 @@ Transform: m_GameObject: {fileID: 1484838013} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.163, y: 0.154, z: 0} + m_LocalPosition: {x: -0.035, y: -0.011, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -28408,7 +28409,7 @@ RectTransform: 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: -25.31, y: -2.28} + m_AnchoredPosition: {x: -25.23, y: -2.28} m_SizeDelta: {x: 3, y: 3} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1652512856 @@ -34167,7 +34168,6 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 6415796061723103982} - {fileID: 1434391375} - {fileID: 1465407177} - {fileID: 1484838014} @@ -38191,11 +38191,11 @@ Transform: m_GameObject: {fileID: 1740801664903788739} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.34451348, y: -0.3002327, z: 0} + m_LocalPosition: {x: -0.33751348, y: -0.3162327, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 2071292136} + m_Father: {fileID: 1434391375} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &6675408765174314171 Transform: diff --git a/Assets/Scenes/Persistence.unity b/Assets/Scenes/Persistence.unity index f93f4b9f7..067ecd4a5 100644 --- a/Assets/Scenes/Persistence.unity +++ b/Assets/Scenes/Persistence.unity @@ -9563,10 +9563,10 @@ MonoBehaviour: - {fileID: 11400000, guid: e749fe0f9aa32f44097e037f52a5bfe0, type: 2} - {fileID: 11400000, guid: 7bf300be492f2634580f0eaabcca2b2e, type: 2} - {fileID: 11400000, guid: 088974ca6c9487041b695af86b6c93a1, type: 2} - runMode: 0 + runMode: 2 firstTalkSo: {fileID: 11400000, guid: ac5ca9a66ff22ab4b9cd5adbdade6b8c, type: 2} testTalkSo: {fileID: 11400000, guid: 10601ce26230723479d875a630f15732, type: 2} - saveFileName: "PeipeiDay2_UF\u68C0\u67E5" + saveFileName: "PeipeiDay2_\u7B2C\u4E00\u6B21\u53D1\u70ED" --- !u!4 &719228339 Transform: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/FixSystem/DraggableUI.cs b/Assets/Scripts/FixSystem/DraggableUI.cs index a46e47d81..3cb5160b3 100644 --- a/Assets/Scripts/FixSystem/DraggableUI.cs +++ b/Assets/Scripts/FixSystem/DraggableUI.cs @@ -39,7 +39,7 @@ public class DraggableUI : MonoBehaviour, IDragHandler, IPointerDownHandler { float distance = Vector3.Distance(transform.position, target.position); - if (distance <= 1 && !isDone) + if (distance <= 1 && !isLocked) { button.interactable=true; } diff --git a/Assets/Scripts/FixSystemNew/FixStateMachine.cs b/Assets/Scripts/FixSystemNew/FixStateMachine.cs index 0a37eb188..b48715a5b 100644 --- a/Assets/Scripts/FixSystemNew/FixStateMachine.cs +++ b/Assets/Scripts/FixSystemNew/FixStateMachine.cs @@ -275,17 +275,23 @@ namespace AibisDream.FixSystem bodyModuleSystem.ResetPlug(); // 切换相机 yield return CameraKit.Instance.SwitchCamera(CameraEnum.UF); + yield return MainUIController.Instance?.FadeInSync(0.5f); UFSystem.OpenUFView(); yield return CameraKit.Instance.SwitchCamera(CameraEnum.EyeDeep); EyeSystem.OnEnter(); + yield return MainUIController.Instance?.FadeOutSync(0.5f); } public IEnumerator Exit() { + float duration = 0.5f; var UFSystem = FixSystemCenter.SystemDic.Get(); var eyeSystem = FixSystemCenter.SystemDic.Get(); + yield return MainUIController.Instance?.FadeInSync(duration); eyeSystem.OnExit(); UFSystem.CloseUFView(); + yield return CameraKit.Instance.SwitchCamera(CameraEnum.UF); + yield return MainUIController.Instance?.FadeOutSync(duration); yield return null; } } @@ -311,7 +317,10 @@ namespace AibisDream.FixSystem } //打开盖子 - bodyModuleSystem.FindBodyModuleByName("Eye").transform.Find("Cover").gameObject.SetActive(false); + SpriteRenderer sp= bodyModuleSystem.FindBodyModuleByName("Eye").transform.Find("Cover").GetComponent(); + sp.sprite=Resources.Load("Art/Fix/Peipei/Eye/视觉模块盖子打开A"); + yield return new WaitForSeconds(0.1f); + sp.sprite=Resources.Load("Art/Fix/Peipei/Eye/视觉模块盖子打开B"); // 插头回到初始插孔 bodyModuleSystem.ResetPlug(); // 切换相机 @@ -327,11 +336,16 @@ namespace AibisDream.FixSystem var bodyModuleSystem = FixSystemCenter.SystemDic.Get(); float duration = 0.5f; var eyeSystem = FixSystemCenter.SystemDic.Get(); - yield return MainUIController.Instance.FadeInSync(duration); + yield return MainUIController.Instance?.FadeInSync(duration); + yield return CameraKit.Instance.SwitchCamera(CameraEnum.Eye); eyeSystem.OnExit(); - //关上 - bodyModuleSystem.FindBodyModuleByName("Eye").transform.Find("Cover").gameObject.SetActive(true); + yield return new WaitForSeconds(0.1f); yield return MainUIController.Instance.FadeOutSync(duration); + //关上 + SpriteRenderer sp= bodyModuleSystem.FindBodyModuleByName("Eye").transform.Find("Cover").GetComponent(); + sp.sprite=Resources.Load("Art/Fix/Peipei/Eye/视觉模块盖子打开A"); + yield return new WaitForSeconds(0.1f); + sp.sprite=Resources.Load("Art/Fix/Peipei/Eye/视觉模块盖子关闭"); yield return new WaitForSeconds(0.5f); } } diff --git a/Assets/Scripts/Framework/AudioKit/AudioManager.cs b/Assets/Scripts/Framework/AudioKit/AudioManager.cs index 551cf5c73..4052cf3aa 100644 --- a/Assets/Scripts/Framework/AudioKit/AudioManager.cs +++ b/Assets/Scripts/Framework/AudioKit/AudioManager.cs @@ -231,7 +231,7 @@ namespace AibisDream.Kit newSfx.start(); } - public void StopSfx(string key, STOP_MODE stopMode) + public void StopSfx(string key, STOP_MODE stopMode=STOP_MODE.IMMEDIATE) { if (_sfxDict.TryGetValue(key, out var oldSfx)) { diff --git a/Assets/Scripts/MiniGame/Peipei/Eye/EyeSystem.cs b/Assets/Scripts/MiniGame/Peipei/Eye/EyeSystem.cs index 0ed1d60b1..543a5a139 100644 --- a/Assets/Scripts/MiniGame/Peipei/Eye/EyeSystem.cs +++ b/Assets/Scripts/MiniGame/Peipei/Eye/EyeSystem.cs @@ -10,6 +10,7 @@ using AibisDream.FixSystem; using Cinemachine; using AibisDream; using AibisDream.Framework; +using AibisDream.Kit; public class EyeSystem : MonoBehaviour { @@ -194,6 +195,8 @@ public class EyeSystem : MonoBehaviour if (currentTarget != null) { // AudioManager.RandomPlayInteraction("colorimagine"); + AudioManager.Instance.PlaySfx("event:/ActionFB/color_imagine"); + eyeStateEffect?.ApplyFocusedEffect(currentTarget); } @@ -206,6 +209,7 @@ public class EyeSystem : MonoBehaviour if (currentTarget != null) { // AudioManager.RandomPlayInteraction("colorimagine"); + AudioManager.Instance.PlaySfx("event:/ActionFB/color_imagine"); eyeStateEffect?.ApplyUnfocusedEffect(currentTarget); } @@ -326,6 +330,7 @@ public class EyeSystem : MonoBehaviour // AudioManager.RandomPlayInteraction("colorcorrect_in"); // AudioManager.PlayLoopAudio("colorcorrect_loop"); + //AudioManager.Instance.PlaySfx("event:/ActionFB/visualturn"); // _HsvShift 从 0 ~ 360 来回变化 hsvShiftTween = DOTween .To(() => material.GetFloat("_HsvShift"), x => material.SetFloat("_HsvShift", x), 360, 1f)