修复
This commit is contained in:
@@ -6,6 +6,7 @@ using AibisDream;
|
|||||||
using UnityEngine.Rendering.Universal;
|
using UnityEngine.Rendering.Universal;
|
||||||
using UnityEngine.Rendering;
|
using UnityEngine.Rendering;
|
||||||
using AibisDream.Utility;
|
using AibisDream.Utility;
|
||||||
|
using AibisDream.Kit;
|
||||||
|
|
||||||
public class EyeTarget : MonoBehaviour
|
public class EyeTarget : MonoBehaviour
|
||||||
{
|
{
|
||||||
@@ -126,17 +127,19 @@ public class EyeTarget : MonoBehaviour
|
|||||||
public void BlurIn(float duration, bool isForwardMaterial = true)
|
public void BlurIn(float duration, bool isForwardMaterial = true)
|
||||||
{
|
{
|
||||||
// AudioManager.PlayLoopAudio("visualturn");
|
// AudioManager.PlayLoopAudio("visualturn");
|
||||||
|
AudioManager.Instance.PlaySfx("event:/ActionFB/visualturn");
|
||||||
Material targetMaterial = isForwardMaterial ? forwardMaterial : backMaterial;
|
Material targetMaterial = isForwardMaterial ? forwardMaterial : backMaterial;
|
||||||
targetMaterial.DOFloat(1f, "_GaussianBlurFade", duration).SetEase(Ease.InOutSine);
|
targetMaterial.DOFloat(1f, "_GaussianBlurFade", duration).SetEase(Ease.InOutSine)
|
||||||
// .OnComplete(() => { AudioManager.PauseLoopAudio(); });
|
.OnComplete(() => { AudioManager.Instance.StopSfx("event:/ActionFB/visualturn"); });
|
||||||
}
|
}
|
||||||
|
|
||||||
public void BlurOut(float duration, bool isForwardMaterial = true)
|
public void BlurOut(float duration, bool isForwardMaterial = true)
|
||||||
{
|
{
|
||||||
// AudioManager.PlayLoopAudio("visualturn");
|
// AudioManager.PlayLoopAudio("visualturn");
|
||||||
|
AudioManager.Instance.PlaySfx("event:/ActionFB/visualturn");
|
||||||
Material targetMaterial = isForwardMaterial ? forwardMaterial : backMaterial;
|
Material targetMaterial = isForwardMaterial ? forwardMaterial : backMaterial;
|
||||||
targetMaterial.DOFloat(0f, "_GaussianBlurFade", duration).SetEase(Ease.InOutSine);
|
targetMaterial.DOFloat(0f, "_GaussianBlurFade", duration).SetEase(Ease.InOutSine)
|
||||||
// .OnComplete(() => { AudioManager.PauseLoopAudio(); });
|
.OnComplete(() => { AudioManager.Instance.StopSfx("event:/ActionFB/visualturn"); });
|
||||||
}
|
}
|
||||||
|
|
||||||
public void ColorBack()
|
public void ColorBack()
|
||||||
|
|||||||
@@ -1508,7 +1508,7 @@ MonoBehaviour:
|
|||||||
enabled: 1
|
enabled: 1
|
||||||
value:
|
value:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
m_Bits: 1
|
m_Bits: 33
|
||||||
_source:
|
_source:
|
||||||
_source: 1
|
_source: 1
|
||||||
_globalTex: _inputTex
|
_globalTex: _inputTex
|
||||||
|
|||||||
@@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: ff2ae3bbe6e305e4c8fd902927b6aadb
|
||||||
|
folderAsset: yes
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
Binary file not shown.
@@ -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:
|
||||||
Binary file not shown.
@@ -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:
|
||||||
Binary file not shown.
@@ -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:
|
||||||
@@ -48,7 +48,7 @@ TextureImporter:
|
|||||||
spriteMeshType: 1
|
spriteMeshType: 1
|
||||||
alignment: 0
|
alignment: 0
|
||||||
spritePivot: {x: 0.5, y: 0.5}
|
spritePivot: {x: 0.5, y: 0.5}
|
||||||
spritePixelsToUnits: 125
|
spritePixelsToUnits: 215
|
||||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||||
spriteGenerateFallbackPhysicsShape: 1
|
spriteGenerateFallbackPhysicsShape: 1
|
||||||
alphaUsage: 1
|
alphaUsage: 1
|
||||||
|
|||||||
@@ -7398,7 +7398,7 @@ Canvas:
|
|||||||
m_AdditionalShaderChannelsFlag: 25
|
m_AdditionalShaderChannelsFlag: 25
|
||||||
m_UpdateRectTransformForStandalone: 0
|
m_UpdateRectTransformForStandalone: 0
|
||||||
m_SortingLayerID: 1134468525
|
m_SortingLayerID: 1134468525
|
||||||
m_SortingOrder: 25
|
m_SortingOrder: 26
|
||||||
m_TargetDisplay: 0
|
m_TargetDisplay: 0
|
||||||
--- !u!224 &320706165
|
--- !u!224 &320706165
|
||||||
RectTransform:
|
RectTransform:
|
||||||
@@ -19508,7 +19508,7 @@ RectTransform:
|
|||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 1, y: 1}
|
m_AnchorMin: {x: 1, y: 1}
|
||||||
m_AnchorMax: {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_SizeDelta: {x: 0.75, y: 1}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!114 &1170503232
|
--- !u!114 &1170503232
|
||||||
@@ -23801,7 +23801,8 @@ Transform:
|
|||||||
m_LocalPosition: {x: -0.007, y: 0.016, z: 0}
|
m_LocalPosition: {x: -0.007, y: 0.016, z: 0}
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_ConstrainProportionsScale: 0
|
m_ConstrainProportionsScale: 0
|
||||||
m_Children: []
|
m_Children:
|
||||||
|
- {fileID: 6415796061723103982}
|
||||||
m_Father: {fileID: 2071292136}
|
m_Father: {fileID: 2071292136}
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
--- !u!212 &1434391376
|
--- !u!212 &1434391376
|
||||||
@@ -25352,7 +25353,7 @@ Transform:
|
|||||||
m_GameObject: {fileID: 1484838013}
|
m_GameObject: {fileID: 1484838013}
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
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_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_ConstrainProportionsScale: 0
|
m_ConstrainProportionsScale: 0
|
||||||
m_Children: []
|
m_Children: []
|
||||||
@@ -28408,7 +28409,7 @@ RectTransform:
|
|||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||||
m_AnchorMax: {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_SizeDelta: {x: 3, y: 3}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!114 &1652512856
|
--- !u!114 &1652512856
|
||||||
@@ -34167,7 +34168,6 @@ Transform:
|
|||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_ConstrainProportionsScale: 0
|
m_ConstrainProportionsScale: 0
|
||||||
m_Children:
|
m_Children:
|
||||||
- {fileID: 6415796061723103982}
|
|
||||||
- {fileID: 1434391375}
|
- {fileID: 1434391375}
|
||||||
- {fileID: 1465407177}
|
- {fileID: 1465407177}
|
||||||
- {fileID: 1484838014}
|
- {fileID: 1484838014}
|
||||||
@@ -38191,11 +38191,11 @@ Transform:
|
|||||||
m_GameObject: {fileID: 1740801664903788739}
|
m_GameObject: {fileID: 1740801664903788739}
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
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_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_ConstrainProportionsScale: 0
|
m_ConstrainProportionsScale: 0
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 2071292136}
|
m_Father: {fileID: 1434391375}
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
--- !u!4 &6675408765174314171
|
--- !u!4 &6675408765174314171
|
||||||
Transform:
|
Transform:
|
||||||
|
|||||||
@@ -9563,10 +9563,10 @@ MonoBehaviour:
|
|||||||
- {fileID: 11400000, guid: e749fe0f9aa32f44097e037f52a5bfe0, type: 2}
|
- {fileID: 11400000, guid: e749fe0f9aa32f44097e037f52a5bfe0, type: 2}
|
||||||
- {fileID: 11400000, guid: 7bf300be492f2634580f0eaabcca2b2e, type: 2}
|
- {fileID: 11400000, guid: 7bf300be492f2634580f0eaabcca2b2e, type: 2}
|
||||||
- {fileID: 11400000, guid: 088974ca6c9487041b695af86b6c93a1, type: 2}
|
- {fileID: 11400000, guid: 088974ca6c9487041b695af86b6c93a1, type: 2}
|
||||||
runMode: 0
|
runMode: 2
|
||||||
firstTalkSo: {fileID: 11400000, guid: ac5ca9a66ff22ab4b9cd5adbdade6b8c, type: 2}
|
firstTalkSo: {fileID: 11400000, guid: ac5ca9a66ff22ab4b9cd5adbdade6b8c, type: 2}
|
||||||
testTalkSo: {fileID: 11400000, guid: 10601ce26230723479d875a630f15732, type: 2}
|
testTalkSo: {fileID: 11400000, guid: 10601ce26230723479d875a630f15732, type: 2}
|
||||||
saveFileName: "PeipeiDay2_UF\u68C0\u67E5"
|
saveFileName: "PeipeiDay2_\u7B2C\u4E00\u6B21\u53D1\u70ED"
|
||||||
--- !u!4 &719228339
|
--- !u!4 &719228339
|
||||||
Transform:
|
Transform:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|||||||
@@ -39,7 +39,7 @@ public class DraggableUI : MonoBehaviour, IDragHandler, IPointerDownHandler
|
|||||||
{
|
{
|
||||||
float distance = Vector3.Distance(transform.position, target.position);
|
float distance = Vector3.Distance(transform.position, target.position);
|
||||||
|
|
||||||
if (distance <= 1 && !isDone)
|
if (distance <= 1 && !isLocked)
|
||||||
{
|
{
|
||||||
button.interactable=true;
|
button.interactable=true;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -275,17 +275,23 @@ namespace AibisDream.FixSystem
|
|||||||
bodyModuleSystem.ResetPlug();
|
bodyModuleSystem.ResetPlug();
|
||||||
// 切换相机
|
// 切换相机
|
||||||
yield return CameraKit.Instance.SwitchCamera(CameraEnum.UF);
|
yield return CameraKit.Instance.SwitchCamera(CameraEnum.UF);
|
||||||
|
yield return MainUIController.Instance?.FadeInSync(0.5f);
|
||||||
UFSystem.OpenUFView();
|
UFSystem.OpenUFView();
|
||||||
yield return CameraKit.Instance.SwitchCamera(CameraEnum.EyeDeep);
|
yield return CameraKit.Instance.SwitchCamera(CameraEnum.EyeDeep);
|
||||||
EyeSystem.OnEnter();
|
EyeSystem.OnEnter();
|
||||||
|
yield return MainUIController.Instance?.FadeOutSync(0.5f);
|
||||||
}
|
}
|
||||||
|
|
||||||
public IEnumerator Exit()
|
public IEnumerator Exit()
|
||||||
{
|
{
|
||||||
|
float duration = 0.5f;
|
||||||
var UFSystem = FixSystemCenter.SystemDic.Get<UFSystem>();
|
var UFSystem = FixSystemCenter.SystemDic.Get<UFSystem>();
|
||||||
var eyeSystem = FixSystemCenter.SystemDic.Get<EyeSystem>();
|
var eyeSystem = FixSystemCenter.SystemDic.Get<EyeSystem>();
|
||||||
|
yield return MainUIController.Instance?.FadeInSync(duration);
|
||||||
eyeSystem.OnExit();
|
eyeSystem.OnExit();
|
||||||
UFSystem.CloseUFView();
|
UFSystem.CloseUFView();
|
||||||
|
yield return CameraKit.Instance.SwitchCamera(CameraEnum.UF);
|
||||||
|
yield return MainUIController.Instance?.FadeOutSync(duration);
|
||||||
yield return null;
|
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<SpriteRenderer>();
|
||||||
|
sp.sprite=Resources.Load<Sprite>("Art/Fix/Peipei/Eye/视觉模块盖子打开A");
|
||||||
|
yield return new WaitForSeconds(0.1f);
|
||||||
|
sp.sprite=Resources.Load<Sprite>("Art/Fix/Peipei/Eye/视觉模块盖子打开B");
|
||||||
// 插头回到初始插孔
|
// 插头回到初始插孔
|
||||||
bodyModuleSystem.ResetPlug();
|
bodyModuleSystem.ResetPlug();
|
||||||
// 切换相机
|
// 切换相机
|
||||||
@@ -327,11 +336,16 @@ namespace AibisDream.FixSystem
|
|||||||
var bodyModuleSystem = FixSystemCenter.SystemDic.Get<BodyModuleSystem>();
|
var bodyModuleSystem = FixSystemCenter.SystemDic.Get<BodyModuleSystem>();
|
||||||
float duration = 0.5f;
|
float duration = 0.5f;
|
||||||
var eyeSystem = FixSystemCenter.SystemDic.Get<EyeSystem>();
|
var eyeSystem = FixSystemCenter.SystemDic.Get<EyeSystem>();
|
||||||
yield return MainUIController.Instance.FadeInSync(duration);
|
yield return MainUIController.Instance?.FadeInSync(duration);
|
||||||
|
yield return CameraKit.Instance.SwitchCamera(CameraEnum.Eye);
|
||||||
eyeSystem.OnExit();
|
eyeSystem.OnExit();
|
||||||
//关上
|
yield return new WaitForSeconds(0.1f);
|
||||||
bodyModuleSystem.FindBodyModuleByName("Eye").transform.Find("Cover").gameObject.SetActive(true);
|
|
||||||
yield return MainUIController.Instance.FadeOutSync(duration);
|
yield return MainUIController.Instance.FadeOutSync(duration);
|
||||||
|
//关上
|
||||||
|
SpriteRenderer sp= bodyModuleSystem.FindBodyModuleByName("Eye").transform.Find("Cover").GetComponent<SpriteRenderer>();
|
||||||
|
sp.sprite=Resources.Load<Sprite>("Art/Fix/Peipei/Eye/视觉模块盖子打开A");
|
||||||
|
yield return new WaitForSeconds(0.1f);
|
||||||
|
sp.sprite=Resources.Load<Sprite>("Art/Fix/Peipei/Eye/视觉模块盖子关闭");
|
||||||
yield return new WaitForSeconds(0.5f);
|
yield return new WaitForSeconds(0.5f);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -231,7 +231,7 @@ namespace AibisDream.Kit
|
|||||||
newSfx.start();
|
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))
|
if (_sfxDict.TryGetValue(key, out var oldSfx))
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ using AibisDream.FixSystem;
|
|||||||
using Cinemachine;
|
using Cinemachine;
|
||||||
using AibisDream;
|
using AibisDream;
|
||||||
using AibisDream.Framework;
|
using AibisDream.Framework;
|
||||||
|
using AibisDream.Kit;
|
||||||
|
|
||||||
public class EyeSystem : MonoBehaviour
|
public class EyeSystem : MonoBehaviour
|
||||||
{
|
{
|
||||||
@@ -194,6 +195,8 @@ public class EyeSystem : MonoBehaviour
|
|||||||
if (currentTarget != null)
|
if (currentTarget != null)
|
||||||
{
|
{
|
||||||
// AudioManager.RandomPlayInteraction("colorimagine");
|
// AudioManager.RandomPlayInteraction("colorimagine");
|
||||||
|
AudioManager.Instance.PlaySfx("event:/ActionFB/color_imagine");
|
||||||
|
|
||||||
eyeStateEffect?.ApplyFocusedEffect(currentTarget);
|
eyeStateEffect?.ApplyFocusedEffect(currentTarget);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -206,6 +209,7 @@ public class EyeSystem : MonoBehaviour
|
|||||||
if (currentTarget != null)
|
if (currentTarget != null)
|
||||||
{
|
{
|
||||||
// AudioManager.RandomPlayInteraction("colorimagine");
|
// AudioManager.RandomPlayInteraction("colorimagine");
|
||||||
|
AudioManager.Instance.PlaySfx("event:/ActionFB/color_imagine");
|
||||||
eyeStateEffect?.ApplyUnfocusedEffect(currentTarget);
|
eyeStateEffect?.ApplyUnfocusedEffect(currentTarget);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -326,6 +330,7 @@ public class EyeSystem : MonoBehaviour
|
|||||||
|
|
||||||
// AudioManager.RandomPlayInteraction("colorcorrect_in");
|
// AudioManager.RandomPlayInteraction("colorcorrect_in");
|
||||||
// AudioManager.PlayLoopAudio("colorcorrect_loop");
|
// AudioManager.PlayLoopAudio("colorcorrect_loop");
|
||||||
|
//AudioManager.Instance.PlaySfx("event:/ActionFB/visualturn");
|
||||||
// _HsvShift 从 0 ~ 360 来回变化
|
// _HsvShift 从 0 ~ 360 来回变化
|
||||||
hsvShiftTween = DOTween
|
hsvShiftTween = DOTween
|
||||||
.To(() => material.GetFloat("_HsvShift"), x => material.SetFloat("_HsvShift", x), 360, 1f)
|
.To(() => material.GetFloat("_HsvShift"), x => material.SetFloat("_HsvShift", x), 360, 1f)
|
||||||
|
|||||||
Reference in New Issue
Block a user