diff --git a/Assets/RawResources/Art/手术灯.meta b/Assets/RawResources/Art/手术灯.meta new file mode 100644 index 000000000..205af2fea --- /dev/null +++ b/Assets/RawResources/Art/手术灯.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d6b3bef92e5859944a71965cf4b5de1e +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/RawResources/Art/手术灯/OFF.png b/Assets/RawResources/Art/手术灯/OFF.png new file mode 100644 index 000000000..a416a6097 --- /dev/null +++ b/Assets/RawResources/Art/手术灯/OFF.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8445df70227cd40c1ca801a581f4fa72faa2f6efb5544939827f4f25bfe70966 +size 69493 diff --git a/Assets/RawResources/Art/手术灯/OFF.png.meta b/Assets/RawResources/Art/手术灯/OFF.png.meta new file mode 100644 index 000000000..cada6eca6 --- /dev/null +++ b/Assets/RawResources/Art/手术灯/OFF.png.meta @@ -0,0 +1,153 @@ +fileFormatVersion: 2 +guid: 9ed971e806082b2448da93315c2f1dec +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: 21.5 + 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/RawResources/Art/手术灯/ON-A.png b/Assets/RawResources/Art/手术灯/ON-A.png new file mode 100644 index 000000000..b8221fe25 --- /dev/null +++ b/Assets/RawResources/Art/手术灯/ON-A.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9d1aa207265f855aa2601865335a22a04905222042b5bef8d80696a6197c8344 +size 91135 diff --git a/Assets/RawResources/Art/手术灯/ON-A.png.meta b/Assets/RawResources/Art/手术灯/ON-A.png.meta new file mode 100644 index 000000000..536b6aa95 --- /dev/null +++ b/Assets/RawResources/Art/手术灯/ON-A.png.meta @@ -0,0 +1,153 @@ +fileFormatVersion: 2 +guid: 7b4cee17c2ff0244a94aa68ffcb64547 +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: 21.5 + 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/RawResources/Art/手术灯/ON-B.png b/Assets/RawResources/Art/手术灯/ON-B.png new file mode 100644 index 000000000..934449965 --- /dev/null +++ b/Assets/RawResources/Art/手术灯/ON-B.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:603e79f7e4aac55295e85d72ea37c5f70a493225d2c03d2b8196dc513ee491a0 +size 98214 diff --git a/Assets/RawResources/Art/手术灯/ON-B.png.meta b/Assets/RawResources/Art/手术灯/ON-B.png.meta new file mode 100644 index 000000000..05dca4ee0 --- /dev/null +++ b/Assets/RawResources/Art/手术灯/ON-B.png.meta @@ -0,0 +1,153 @@ +fileFormatVersion: 2 +guid: 38a08453262651b42b6001669d0522de +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: 21.5 + 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/RawResources/Art/深入素材/摄像头maybe.png.meta b/Assets/RawResources/Art/深入素材/摄像头maybe.png.meta index 293e1d054..6508c64fe 100644 --- a/Assets/RawResources/Art/深入素材/摄像头maybe.png.meta +++ b/Assets/RawResources/Art/深入素材/摄像头maybe.png.meta @@ -69,7 +69,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 4096 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 diff --git a/Assets/RawResources/Art/深入素材/深入闪回.png b/Assets/RawResources/Art/深入素材/深入闪回.png new file mode 100644 index 000000000..9c8b2ff90 --- /dev/null +++ b/Assets/RawResources/Art/深入素材/深入闪回.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f9a8a5f4c9066f69a093b71c0bf25a164ba4b7e755fdd8924807062bcbc532cf +size 1083339 diff --git a/Assets/RawResources/Art/深入素材/深入闪回.png.meta b/Assets/RawResources/Art/深入素材/深入闪回.png.meta new file mode 100644 index 000000000..c8c229642 --- /dev/null +++ b/Assets/RawResources/Art/深入素材/深入闪回.png.meta @@ -0,0 +1,153 @@ +fileFormatVersion: 2 +guid: 7052c85408cbb6941ac2d297f94a8110 +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: 4096 + 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/RawResources/Art/深入素材/素材A.png.meta b/Assets/RawResources/Art/深入素材/素材A.png.meta index 600aa4b39..acebf6762 100644 --- a/Assets/RawResources/Art/深入素材/素材A.png.meta +++ b/Assets/RawResources/Art/深入素材/素材A.png.meta @@ -69,7 +69,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 4096 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 diff --git a/Assets/RawResources/Art/深入素材/素材B.png.meta b/Assets/RawResources/Art/深入素材/素材B.png.meta index c9dd03c13..302f4b5e1 100644 --- a/Assets/RawResources/Art/深入素材/素材B.png.meta +++ b/Assets/RawResources/Art/深入素材/素材B.png.meta @@ -69,7 +69,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 4096 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 diff --git a/Assets/RawResources/Art/深入素材/素材C.png.meta b/Assets/RawResources/Art/深入素材/素材C.png.meta index 01179f437..d0d833718 100644 --- a/Assets/RawResources/Art/深入素材/素材C.png.meta +++ b/Assets/RawResources/Art/深入素材/素材C.png.meta @@ -69,7 +69,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 4096 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 diff --git a/Assets/RawResources/Art/深入素材/素材D.png.meta b/Assets/RawResources/Art/深入素材/素材D.png.meta index 2e47624fc..f2c458d1a 100644 --- a/Assets/RawResources/Art/深入素材/素材D.png.meta +++ b/Assets/RawResources/Art/深入素材/素材D.png.meta @@ -69,7 +69,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 4096 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 diff --git a/Assets/RawResources/Art/深入素材/素材F.png.meta b/Assets/RawResources/Art/深入素材/素材F.png.meta index 06dcf4c1a..7632b8b33 100644 --- a/Assets/RawResources/Art/深入素材/素材F.png.meta +++ b/Assets/RawResources/Art/深入素材/素材F.png.meta @@ -69,7 +69,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 4096 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 diff --git a/Assets/RawResources/Art/深入素材/素材K.png.meta b/Assets/RawResources/Art/深入素材/素材K.png.meta index ba8c8d8a4..6676e693f 100644 --- a/Assets/RawResources/Art/深入素材/素材K.png.meta +++ b/Assets/RawResources/Art/深入素材/素材K.png.meta @@ -69,7 +69,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 4096 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 diff --git a/Assets/RawResources/Art/深入素材/素材e.png.meta b/Assets/RawResources/Art/深入素材/素材e.png.meta index 13fc233e6..15a422a34 100644 --- a/Assets/RawResources/Art/深入素材/素材e.png.meta +++ b/Assets/RawResources/Art/深入素材/素材e.png.meta @@ -69,7 +69,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 4096 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 diff --git a/Assets/RawResources/Art/深入素材/素材g.png.meta b/Assets/RawResources/Art/深入素材/素材g.png.meta index 606c05212..0c2df990f 100644 --- a/Assets/RawResources/Art/深入素材/素材g.png.meta +++ b/Assets/RawResources/Art/深入素材/素材g.png.meta @@ -69,7 +69,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 4096 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 diff --git a/Assets/RawResources/Art/深入素材/素材h.png.meta b/Assets/RawResources/Art/深入素材/素材h.png.meta index 1f1398997..c2cd6074b 100644 --- a/Assets/RawResources/Art/深入素材/素材h.png.meta +++ b/Assets/RawResources/Art/深入素材/素材h.png.meta @@ -69,7 +69,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 4096 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 diff --git a/Assets/RawResources/Art/深入素材/素材hongdeng.png.meta b/Assets/RawResources/Art/深入素材/素材hongdeng.png.meta index c07760b97..1608dfd30 100644 --- a/Assets/RawResources/Art/深入素材/素材hongdeng.png.meta +++ b/Assets/RawResources/Art/深入素材/素材hongdeng.png.meta @@ -69,7 +69,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 4096 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 diff --git a/Assets/RawResources/Art/深入素材/素材i.png.meta b/Assets/RawResources/Art/深入素材/素材i.png.meta index d76ed1ffd..9f4038f05 100644 --- a/Assets/RawResources/Art/深入素材/素材i.png.meta +++ b/Assets/RawResources/Art/深入素材/素材i.png.meta @@ -69,7 +69,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 4096 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 diff --git a/Assets/RawResources/Art/深入素材/素材j.png.meta b/Assets/RawResources/Art/深入素材/素材j.png.meta index 1e103d6d3..c18b19e81 100644 --- a/Assets/RawResources/Art/深入素材/素材j.png.meta +++ b/Assets/RawResources/Art/深入素材/素材j.png.meta @@ -69,7 +69,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 4096 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 diff --git a/Assets/RawResources/Art/深入素材/素材shexiangtou_.png.meta b/Assets/RawResources/Art/深入素材/素材shexiangtou_.png.meta index 834b33079..be7381885 100644 --- a/Assets/RawResources/Art/深入素材/素材shexiangtou_.png.meta +++ b/Assets/RawResources/Art/深入素材/素材shexiangtou_.png.meta @@ -69,7 +69,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 4096 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 diff --git a/Assets/RawResources/Aseprite/开头显示器.aseprite.meta b/Assets/RawResources/Aseprite/开头显示器.aseprite.meta index 24bafd313..a3b9bd51c 100644 --- a/Assets/RawResources/Aseprite/开头显示器.aseprite.meta +++ b/Assets/RawResources/Aseprite/开头显示器.aseprite.meta @@ -35,7 +35,7 @@ ScriptedImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 21.5 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 0 generateCubemap: 6 @@ -95,7 +95,7 @@ ScriptedImporter: addSortingGroup: 1 addShadowCasters: 0 importFileNodeState: 1 - platformSettingsDirtyTick: 0 + platformSettingsDirtyTick: 638827501839648236 textureAssetName: singleSpriteImportData: - name: @@ -158,7 +158,67 @@ ScriptedImporter: spriteId: ea2b6987e6fa1b4468df5b3681a0da76 linkedCells: [] parentIndex: -1 - platformSettings: [] + platformSettings: + - name: DefaultTexturePlatform + overridden: 0 + ignorePlatformSupport: 0 + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + forceMaximumCompressionQuality_BC6H_BC7: 0 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + androidETC2FallbackOverride: 0 + - name: Standalone + overridden: 0 + ignorePlatformSupport: 0 + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + forceMaximumCompressionQuality_BC6H_BC7: 0 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + androidETC2FallbackOverride: 0 + - name: Server + overridden: 0 + ignorePlatformSupport: 0 + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + forceMaximumCompressionQuality_BC6H_BC7: 0 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + androidETC2FallbackOverride: 0 + - name: Android + overridden: 0 + ignorePlatformSupport: 0 + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + forceMaximumCompressionQuality_BC6H_BC7: 0 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + androidETC2FallbackOverride: 0 + - name: WebGL + overridden: 0 + ignorePlatformSupport: 0 + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + forceMaximumCompressionQuality_BC6H_BC7: 0 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + androidETC2FallbackOverride: 0 secondarySpriteTextures: [] spritePackingTag: canvasSize: {x: 384, y: 216} diff --git a/Assets/RawResources/Aseprite/灯.aseprite.meta b/Assets/RawResources/Aseprite/灯.aseprite.meta index d81d5ecd8..4aef7afbe 100644 --- a/Assets/RawResources/Aseprite/灯.aseprite.meta +++ b/Assets/RawResources/Aseprite/灯.aseprite.meta @@ -35,7 +35,7 @@ ScriptedImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 43 + spritePixelsToUnits: 21.5 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 0 generateCubemap: 6 @@ -75,7 +75,7 @@ ScriptedImporter: importHiddenLayers: 0 layerImportMode: 1 defaultPivotSpace: 0 - defaultPivotAlignment: 7 + defaultPivotAlignment: 0 customPivotPosition: {x: 0.5, y: 0.5} spritePadding: 0 generateModelPrefab: 1 @@ -87,7 +87,7 @@ ScriptedImporter: importHiddenLayers: 0 layerImportMode: 1 defaultPivotSpace: 0 - defaultPivotAlignment: 7 + defaultPivotAlignment: 0 customPivotPosition: {x: 0.5, y: 0.5} spritePadding: 0 generateModelPrefab: 1 @@ -95,7 +95,7 @@ ScriptedImporter: addSortingGroup: 1 addShadowCasters: 0 importFileNodeState: 1 - platformSettingsDirtyTick: 638819673621850280 + platformSettingsDirtyTick: 638827502281956693 textureAssetName: singleSpriteImportData: - name: @@ -121,7 +121,7 @@ ScriptedImporter: animatedSpriteImportData: - name: "\u706F" originalName: - pivot: {x: 0.5, y: 0} + pivot: {x: 0.5, y: 0.5} alignment: 9 border: {x: 0, y: 0, z: 0, w: 0} rect: @@ -130,7 +130,7 @@ ScriptedImporter: y: 4 width: 384 height: 216 - spriteID: 286d7901d48d3df4ead75dbb00637af3 + spriteID: b6a250a256aa9d14caef2b614d3b1b43 spriteBone: [] spriteOutline: [] vertices: [] @@ -155,7 +155,7 @@ ScriptedImporter: y: 0 width: 384 height: 216 - spriteId: 286d7901d48d3df4ead75dbb00637af3 + spriteId: b6a250a256aa9d14caef2b614d3b1b43 linkedCells: [] parentIndex: -1 platformSettings: diff --git a/Assets/RawResources/Art/身体维修.psb b/Assets/RawResources/Aseprite/身体维修.psb similarity index 100% rename from Assets/RawResources/Art/身体维修.psb rename to Assets/RawResources/Aseprite/身体维修.psb diff --git a/Assets/RawResources/Art/身体维修.psb.meta b/Assets/RawResources/Aseprite/身体维修.psb.meta similarity index 100% rename from Assets/RawResources/Art/身体维修.psb.meta rename to Assets/RawResources/Aseprite/身体维修.psb.meta diff --git a/Assets/Scenes/OPTest.unity b/Assets/Scenes/OPTest.unity index 9132014fc..cd5fa59f6 100644 --- a/Assets/Scenes/OPTest.unity +++ b/Assets/Scenes/OPTest.unity @@ -217,7 +217,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 1134468525 m_SortingLayer: 10 - m_SortingOrder: 20 + m_SortingOrder: 22 m_Sprite: {fileID: -3648330076683815579, guid: fae0ab727b044c34b802ea93cca6c462, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -229,7 +229,7 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &46046729 +--- !u!1 &46929176 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -237,8 +237,55 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 46046730} - - component: {fileID: 46046731} + - component: {fileID: 46929177} + - component: {fileID: 46929178} + m_Layer: 0 + m_Name: LightRoom + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &46929177 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 46929176} + 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: + - {fileID: 1047472311} + - {fileID: 1214410564} + - {fileID: 1966555572} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &46929178 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 46929176} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 46dd8691ca2e18e46bfe764ce14ea847, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &724936450 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 724936451} + - component: {fileID: 724936452} m_Layer: 0 m_Name: Renderer1 m_TagString: Untagged @@ -246,13 +293,13 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &46046730 +--- !u!4 &724936451 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 46046729} + m_GameObject: {fileID: 724936450} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -261,13 +308,13 @@ Transform: m_Children: [] m_Father: {fileID: 2043595397} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &46046731 +--- !u!212 &724936452 SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 46046729} + m_GameObject: {fileID: 724936450} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -299,9 +346,9 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 + m_SortingLayerID: 1134468525 + m_SortingLayer: 10 + m_SortingOrder: 19 m_Sprite: {fileID: 21300000, guid: 2b9ab64eaef31264199b9cd3cdef0652, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -313,90 +360,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &348344971 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 348344972} - - component: {fileID: 348344973} - m_Layer: 0 - m_Name: Renderer2 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &348344972 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 348344971} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.01, y: 0.01, z: 0.01} - m_ConstrainProportionsScale: 1 - m_Children: [] - m_Father: {fileID: 2043595397} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &348344973 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 348344971} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: 1971bbfa20ea0d14e983e26011be594c, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1, y: 1} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &875433551 GameObject: m_ObjectHideFlags: 0 @@ -549,6 +512,90 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &1047472310 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1047472311} + - component: {fileID: 1047472312} + m_Layer: 0 + m_Name: Room + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1047472311 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1047472310} + 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: 46929177} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1047472312 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1047472310} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: 9ed971e806082b2448da93315c2f1dec, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 3.84, y: 2.16} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &1142087279 GameObject: m_ObjectHideFlags: 0 @@ -633,6 +680,101 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &1214410563 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1214410564} + - component: {fileID: 1214410565} + - component: {fileID: 1214410566} + m_Layer: 0 + m_Name: OnBtn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1214410564 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1214410563} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.85, y: -3.38, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 46929177} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &1214410565 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1214410563} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: -0.02306676, y: 0.030755758} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 1.8150284, y: 1.4613376} + m_EdgeRadius: 0 +--- !u!114 &1214410566 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1214410563} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0c4fbab01ad40c2449c849cd2a8c620f, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Delegates: + - eventID: 4 + callback: + m_PersistentCalls: + m_Calls: [] --- !u!1 &1409397677 GameObject: m_ObjectHideFlags: 0 @@ -643,13 +785,14 @@ GameObject: m_Component: - component: {fileID: 1409397678} - component: {fileID: 1409397679} + - component: {fileID: 1409397680} m_Layer: 0 m_Name: OpRoot m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &1409397678 Transform: m_ObjectHideFlags: 0 @@ -687,6 +830,22 @@ PlayableDirector: value: {fileID: 33555114} m_ExposedReferences: m_References: [] +--- !u!114 &1409397680 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1409397677} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e586e8aaf7a30074db21d1b7ef1f78f8, type: 3} + m_Name: + m_EditorClassIdentifier: + deepInClock: {fileID: 8781831196185115634} + fadeInPlayable: {fileID: 1409397679} + fadeInAnima: {fileID: 33555111} + deepIn: {fileID: 2043595398} --- !u!1 &1631142626 GameObject: m_ObjectHideFlags: 0 @@ -892,6 +1051,101 @@ MonoBehaviour: - {fileID: 21300000, guid: b9bc66b473fa0694ea435860b272e476, type: 3} - {fileID: 21300000, guid: 106d4594ed76dd5418987646aa7a61bb, type: 3} fadeRadio: 0.3 +--- !u!1 &1966555571 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1966555572} + - component: {fileID: 1966555573} + - component: {fileID: 1966555574} + m_Layer: 0 + m_Name: OffBtn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1966555572 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1966555571} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 1.09, y: -3.38, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 46929177} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &1966555573 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1966555571} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: -0.02306676, y: 0.030755758} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 1.8150284, y: 1.4613376} + m_EdgeRadius: 0 +--- !u!114 &1966555574 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1966555571} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0c4fbab01ad40c2449c849cd2a8c620f, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Delegates: + - eventID: 4 + callback: + m_PersistentCalls: + m_Calls: [] --- !u!1 &2043595396 GameObject: m_ObjectHideFlags: 0 @@ -902,13 +1156,14 @@ GameObject: m_Component: - component: {fileID: 2043595397} - component: {fileID: 2043595398} + - component: {fileID: 2043595399} m_Layer: 0 m_Name: DeepIn m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &2043595397 Transform: m_ObjectHideFlags: 0 @@ -922,8 +1177,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 46046730} - - {fileID: 348344972} + - {fileID: 724936451} m_Father: {fileID: 1409397678} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &2043595398 @@ -953,6 +1207,59 @@ MonoBehaviour: - {fileID: 21300000, guid: 66085339cceb37945ad68984ba1c36cf, type: 3} - {fileID: 21300000, guid: 46409852478e37948991147b3df33d09, type: 3} - {fileID: 21300000, guid: 9530e0a2f1a55cb4d9e08580d53e1505, type: 3} + duration: 1 +--- !u!212 &2043595399 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2043595396} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 1134468525 + m_SortingLayer: 10 + m_SortingOrder: 21 + m_Sprite: {fileID: 21300000, guid: 7052c85408cbb6941ac2d297f94a8110, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 17.860466, y: 10.046512} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!212 &17283047974486987 SpriteRenderer: m_ObjectHideFlags: 0 @@ -1652,7 +1959,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!114 &8781831196185115634 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1688,4 +1995,5 @@ SceneRoots: m_Roots: - {fileID: 1631142629} - {fileID: 1409397678} + - {fileID: 46929177} - {fileID: 875433554} diff --git a/Assets/Scripts/Framework/PlayKit/SpriteDeepIn.cs b/Assets/Scripts/Framework/PlayKit/SpriteDeepIn.cs index 0a4f2c53e..22e3a6aba 100644 --- a/Assets/Scripts/Framework/PlayKit/SpriteDeepIn.cs +++ b/Assets/Scripts/Framework/PlayKit/SpriteDeepIn.cs @@ -1,3 +1,6 @@ +using System; +using AibisDream.Kit; +using AibisDream.Utility; using DG.Tweening; using UnityEngine; @@ -5,26 +8,81 @@ namespace AibisDream { public class SpriteDeepIn : MonoBehaviour { + private const int TopLayer = 20; + private const int BottomLayer = 19; + private const string LayerName = "FixMiddle"; + public Sprite[] spriteArr; - public float duration = 10; + public float duration; + + public event Action OnFinished; private SpriteRenderer _renderer1; private SpriteRenderer _renderer2; private float _curProgress; + private int _curIndex; + private void Update() + { + if (Input.GetKeyDown(KeyCode.K)) + { + Play(); + } + } public void Play() { - DOTween.To(() => _curProgress, value => _curProgress = value, spriteArr.Length, duration) - .SetEase(Ease.Linear) - .OnUpdate(UpdateSprite); + _renderer2 = transform.Find("Renderer1").GetComponent(); + PlayNext(); + } + + private void PlayNext() + { + _curIndex++; + // 所有图片播放完毕则退出 + if (_curIndex >= spriteArr.Length) + { + OnFinished?.Invoke(); + return; + } + // 播放下一个图片 + InitNewSprite(_curIndex); + // 缩放 + _curProgress = 0.01f; + DOTween.To(() => _curProgress, value => _curProgress = value, 1, duration) + .SetEase(Ease.InQuad) + .OnUpdate(UpdateSprite) + .OnComplete(PlayNext); + } + + private void InitNewSprite(int index) + { + if (_renderer1) + { + Destroy(_renderer1.gameObject); + } + + _renderer1 = _renderer2; + _renderer2 = new GameObject().AddComponent(); + _renderer2.transform.SetParent(transform); + // 处理层级 + _renderer1.sortingLayerName = LayerName; + _renderer1.sortingOrder = BottomLayer; + _renderer2.sortingLayerName = LayerName; + _renderer2.sortingOrder = TopLayer; + _renderer2.transform.localScale = Vector3.one * 0.01f; + // 添加图片 + _renderer2.sprite = spriteArr[index]; } private void UpdateSprite() { - + // 大图片缩放 + _renderer1.transform.localScale = Vector3.one * (_curProgress * 100); + // 小图片缩放 + _renderer2.transform.localScale = Vector3.one * _curProgress; } } } \ No newline at end of file diff --git a/Assets/Scripts/SpecialPlay/DeepInClock.cs b/Assets/Scripts/SpecialPlay/DeepInClock.cs index b22166051..471ad6501 100644 --- a/Assets/Scripts/SpecialPlay/DeepInClock.cs +++ b/Assets/Scripts/SpecialPlay/DeepInClock.cs @@ -1,3 +1,4 @@ +using System; using AibisDream.Framework; using AibisDream.Kit; using DG.Tweening; @@ -15,6 +16,9 @@ namespace AibisDream private SpriteLooper _cityLooper; + public event Action OnClockReached; + public event Action OnClockEnd; + #endregion #region 参数 @@ -29,8 +33,10 @@ namespace AibisDream // 按分钟计算，全程1440分钟 private BindProperty _curTime; - private void Awake() + public void Enable() { + gameObject.SetActive(true); + _minHand = transform.Find("fenzhen").GetComponent(); _secondHand = transform.Find("miaozhen"); _hourHand = transform.Find("shizhen"); @@ -42,6 +48,8 @@ namespace AibisDream _minHand.OnMinHandReached += StartAutoRotate; _minHand.OnMinHandChanged += UpdateCurTime; + + _minHand.IsActive = true; } private void UpdateCityLooper(float curTime) @@ -59,8 +67,7 @@ namespace AibisDream if (_curTime.Value > 1200 && !_isReached) { _isReached = true; - // 播放旋转 - + OnClockReached?.Invoke(); } } @@ -78,6 +85,7 @@ namespace AibisDream private void OnRotateEnd() { gameObject.SetActive(false); + OnClockEnd?.Invoke(); } } } \ No newline at end of file diff --git a/Assets/Scripts/SpecialPlay/LightRoom.cs b/Assets/Scripts/SpecialPlay/LightRoom.cs new file mode 100644 index 000000000..b058d26ec --- /dev/null +++ b/Assets/Scripts/SpecialPlay/LightRoom.cs @@ -0,0 +1,35 @@ +using AibisDream.Framework; +using UnityEngine; +using UnityEngine.EventSystems; + +namespace AibisDream +{ + public class LightRoom : MonoBehaviour + { + #region 索引 + + private SpriteRenderer _room; + private EventTriggerEx _onTrigger; + private EventTriggerEx _offTrigger; + + #endregion + + private void Awake() + { + _room = transform.Find("Room").GetComponent(); + _onTrigger = transform.Find("OnBtn").GetComponent(); + _offTrigger = transform.Find("OffBtn").GetComponent(); + + _onTrigger.Register(EventTriggerType.PointerClick, OnBtnClick); + _offTrigger.Register(EventTriggerType.PointerClick, OffBtnClick); + } + + private void OnBtnClick(BaseEventData eventData) + { + } + + private void OffBtnClick(BaseEventData eventData) + { + } + } +} diff --git a/Assets/Scripts/SpecialPlay/LightRoom.cs.meta b/Assets/Scripts/SpecialPlay/LightRoom.cs.meta new file mode 100644 index 000000000..bd70ff4d4 --- /dev/null +++ b/Assets/Scripts/SpecialPlay/LightRoom.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 46dd8691ca2e18e46bfe764ce14ea847 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/SpecialPlay/MinHand.cs b/Assets/Scripts/SpecialPlay/MinHand.cs index 7fae0e763..8b8f8d436 100644 --- a/Assets/Scripts/SpecialPlay/MinHand.cs +++ b/Assets/Scripts/SpecialPlay/MinHand.cs @@ -30,7 +30,6 @@ namespace AibisDream _trigger.Register(EventTriggerType.Drag, OnDrag); EventSystemEx.Instance.isLocked = false; - IsActive = true; } private void OnDrag(BaseEventData data) @@ -78,7 +77,7 @@ namespace AibisDream #region 交互属性 - public bool IsActive { get; private set;} + public bool IsActive { get; set;} public bool IsAvailable => true; public GameObject GetGameObject() { diff --git a/Assets/Scripts/SpecialPlay/OpenSequence.cs b/Assets/Scripts/SpecialPlay/OpenSequence.cs new file mode 100644 index 000000000..d215b4a2e --- /dev/null +++ b/Assets/Scripts/SpecialPlay/OpenSequence.cs @@ -0,0 +1,59 @@ +using UnityEngine; +using UnityEngine.Playables; + +namespace AibisDream +{ + public class OpenSequence : MonoBehaviour + { + public DeepInClock deepInClock; + public PlayableDirector fadeInPlayable; + public GameObject fadeInAnima; + public SpriteDeepIn deepIn; + + private void Awake() + { + // 组装 + deepInClock.OnClockReached += PlayFadeIn; + fadeInPlayable.stopped += PlayDeepIn; + deepIn.OnFinished += Finished; + } + + private void Update() + { + if (Input.GetKeyDown(KeyCode.K)) + { + EnableClock(); + } + } + + private void OnDestroy() + { + deepInClock.OnClockReached -= PlayFadeIn; + fadeInPlayable.stopped -= PlayDeepIn; + deepIn.OnFinished -= Finished; + } + + public void EnableClock() + { + deepInClock.Enable(); + } + + private void PlayFadeIn() + { + fadeInAnima.SetActive(true); + fadeInPlayable.Play(); + } + + private void PlayDeepIn(PlayableDirector director) + { + fadeInAnima.SetActive(false); + deepIn.gameObject.SetActive(true); + deepIn.Play(); + } + + private void Finished() + { + Debug.Log("Open Finished"); + } + } +} diff --git a/Assets/Scripts/SpecialPlay/OpenSequence.cs.meta b/Assets/Scripts/SpecialPlay/OpenSequence.cs.meta new file mode 100644 index 000000000..2652066f5 --- /dev/null +++ b/Assets/Scripts/SpecialPlay/OpenSequence.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: e586e8aaf7a30074db21d1b7ef1f78f8 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: