Compare commits
No commits in common. "4cd46bb0956b9dfe240a8811643da5f34fb3105f" and "08ea738577cf5f2d2358f97e0aa86ace8b94b96e" have entirely different histories.
4cd46bb095
...
08ea738577
Binary file not shown.
File diff suppressed because one or more lines are too long
File diff suppressed because it is too large
Load Diff
Binary file not shown.
|
Before Width: | Height: | Size: 14 KiB |
|
|
@ -1,159 +0,0 @@
|
||||||
fileFormatVersion: 2
|
|
||||||
guid: 0a628bc32b389064892fa76fdbffed39
|
|
||||||
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
|
|
||||||
isReadable: 0
|
|
||||||
streamingMipmaps: 0
|
|
||||||
streamingMipmapsPriority: 0
|
|
||||||
vTOnly: 0
|
|
||||||
ignoreMasterTextureLimit: 0
|
|
||||||
grayScaleToAlpha: 0
|
|
||||||
generateCubemap: 6
|
|
||||||
cubemapConvolution: 0
|
|
||||||
seamlessCubemap: 0
|
|
||||||
textureFormat: 1
|
|
||||||
maxTextureSize: 2048
|
|
||||||
textureSettings:
|
|
||||||
serializedVersion: 2
|
|
||||||
filterMode: 1
|
|
||||||
aniso: 2
|
|
||||||
mipBias: 0
|
|
||||||
wrapU: 1
|
|
||||||
wrapV: 1
|
|
||||||
wrapW: 0
|
|
||||||
nPOTScale: 0
|
|
||||||
lightmap: 0
|
|
||||||
compressionQuality: 50
|
|
||||||
spriteMode: 1
|
|
||||||
spriteExtrude: 1
|
|
||||||
spriteMeshType: 1
|
|
||||||
alignment: 0
|
|
||||||
spritePivot: {x: 0.5, y: 0.5}
|
|
||||||
spritePixelsToUnits: 100
|
|
||||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
|
||||||
spriteGenerateFallbackPhysicsShape: 1
|
|
||||||
alphaUsage: 1
|
|
||||||
alphaIsTransparency: 1
|
|
||||||
spriteTessellationDetail: -1
|
|
||||||
textureType: 8
|
|
||||||
textureShape: 1
|
|
||||||
singleChannelComponent: 0
|
|
||||||
flipbookRows: 1
|
|
||||||
flipbookColumns: 1
|
|
||||||
maxTextureSizeSet: 0
|
|
||||||
compressionQualitySet: 0
|
|
||||||
textureFormatSet: 0
|
|
||||||
ignorePngGamma: 0
|
|
||||||
applyGammaDecoding: 0
|
|
||||||
cookieLightType: 0
|
|
||||||
platformSettings:
|
|
||||||
- serializedVersion: 3
|
|
||||||
buildTarget: DefaultTexturePlatform
|
|
||||||
maxTextureSize: 512
|
|
||||||
resizeAlgorithm: 0
|
|
||||||
textureFormat: -1
|
|
||||||
textureCompression: 1
|
|
||||||
compressionQuality: 50
|
|
||||||
crunchedCompression: 0
|
|
||||||
allowsAlphaSplitting: 0
|
|
||||||
overridden: 0
|
|
||||||
androidETC2FallbackOverride: 0
|
|
||||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
|
||||||
- serializedVersion: 3
|
|
||||||
buildTarget: Standalone
|
|
||||||
maxTextureSize: 8192
|
|
||||||
resizeAlgorithm: 0
|
|
||||||
textureFormat: -1
|
|
||||||
textureCompression: 1
|
|
||||||
compressionQuality: 50
|
|
||||||
crunchedCompression: 0
|
|
||||||
allowsAlphaSplitting: 0
|
|
||||||
overridden: 0
|
|
||||||
androidETC2FallbackOverride: 0
|
|
||||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
|
||||||
- serializedVersion: 3
|
|
||||||
buildTarget: iPhone
|
|
||||||
maxTextureSize: 8192
|
|
||||||
resizeAlgorithm: 0
|
|
||||||
textureFormat: -1
|
|
||||||
textureCompression: 1
|
|
||||||
compressionQuality: 50
|
|
||||||
crunchedCompression: 0
|
|
||||||
allowsAlphaSplitting: 0
|
|
||||||
overridden: 0
|
|
||||||
androidETC2FallbackOverride: 0
|
|
||||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
|
||||||
- serializedVersion: 3
|
|
||||||
buildTarget: Android
|
|
||||||
maxTextureSize: 8192
|
|
||||||
resizeAlgorithm: 0
|
|
||||||
textureFormat: -1
|
|
||||||
textureCompression: 1
|
|
||||||
compressionQuality: 50
|
|
||||||
crunchedCompression: 0
|
|
||||||
allowsAlphaSplitting: 0
|
|
||||||
overridden: 0
|
|
||||||
androidETC2FallbackOverride: 0
|
|
||||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
|
||||||
- serializedVersion: 3
|
|
||||||
buildTarget: Windows Store Apps
|
|
||||||
maxTextureSize: 8192
|
|
||||||
resizeAlgorithm: 0
|
|
||||||
textureFormat: -1
|
|
||||||
textureCompression: 1
|
|
||||||
compressionQuality: 50
|
|
||||||
crunchedCompression: 0
|
|
||||||
allowsAlphaSplitting: 0
|
|
||||||
overridden: 0
|
|
||||||
androidETC2FallbackOverride: 0
|
|
||||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
|
||||||
- serializedVersion: 3
|
|
||||||
buildTarget: WebGL
|
|
||||||
maxTextureSize: 8192
|
|
||||||
resizeAlgorithm: 0
|
|
||||||
textureFormat: -1
|
|
||||||
textureCompression: 1
|
|
||||||
compressionQuality: 50
|
|
||||||
crunchedCompression: 0
|
|
||||||
allowsAlphaSplitting: 0
|
|
||||||
overridden: 0
|
|
||||||
androidETC2FallbackOverride: 0
|
|
||||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
|
||||||
spriteSheet:
|
|
||||||
serializedVersion: 2
|
|
||||||
sprites: []
|
|
||||||
outline: []
|
|
||||||
physicsShape: []
|
|
||||||
bones: []
|
|
||||||
spriteID: 5e97eb03825dee720800000000000000
|
|
||||||
internalID: 0
|
|
||||||
vertices: []
|
|
||||||
indices:
|
|
||||||
edges: []
|
|
||||||
weights: []
|
|
||||||
secondaryTextures: []
|
|
||||||
nameFileIdTable: {}
|
|
||||||
spritePackingTag:
|
|
||||||
pSDRemoveMatte: 0
|
|
||||||
pSDShowRemoveMatteOption: 0
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 18 KiB |
|
|
@ -1,159 +0,0 @@
|
||||||
fileFormatVersion: 2
|
|
||||||
guid: e0f000e1a7461c14b891110e726a2f07
|
|
||||||
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
|
|
||||||
isReadable: 0
|
|
||||||
streamingMipmaps: 0
|
|
||||||
streamingMipmapsPriority: 0
|
|
||||||
vTOnly: 0
|
|
||||||
ignoreMasterTextureLimit: 0
|
|
||||||
grayScaleToAlpha: 0
|
|
||||||
generateCubemap: 6
|
|
||||||
cubemapConvolution: 0
|
|
||||||
seamlessCubemap: 0
|
|
||||||
textureFormat: 1
|
|
||||||
maxTextureSize: 2048
|
|
||||||
textureSettings:
|
|
||||||
serializedVersion: 2
|
|
||||||
filterMode: 1
|
|
||||||
aniso: 2
|
|
||||||
mipBias: 0
|
|
||||||
wrapU: 1
|
|
||||||
wrapV: 1
|
|
||||||
wrapW: 0
|
|
||||||
nPOTScale: 0
|
|
||||||
lightmap: 0
|
|
||||||
compressionQuality: 50
|
|
||||||
spriteMode: 1
|
|
||||||
spriteExtrude: 1
|
|
||||||
spriteMeshType: 1
|
|
||||||
alignment: 0
|
|
||||||
spritePivot: {x: 0.5, y: 0.5}
|
|
||||||
spritePixelsToUnits: 100
|
|
||||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
|
||||||
spriteGenerateFallbackPhysicsShape: 1
|
|
||||||
alphaUsage: 1
|
|
||||||
alphaIsTransparency: 1
|
|
||||||
spriteTessellationDetail: -1
|
|
||||||
textureType: 8
|
|
||||||
textureShape: 1
|
|
||||||
singleChannelComponent: 0
|
|
||||||
flipbookRows: 1
|
|
||||||
flipbookColumns: 1
|
|
||||||
maxTextureSizeSet: 0
|
|
||||||
compressionQualitySet: 0
|
|
||||||
textureFormatSet: 0
|
|
||||||
ignorePngGamma: 0
|
|
||||||
applyGammaDecoding: 0
|
|
||||||
cookieLightType: 0
|
|
||||||
platformSettings:
|
|
||||||
- serializedVersion: 3
|
|
||||||
buildTarget: DefaultTexturePlatform
|
|
||||||
maxTextureSize: 512
|
|
||||||
resizeAlgorithm: 0
|
|
||||||
textureFormat: -1
|
|
||||||
textureCompression: 1
|
|
||||||
compressionQuality: 50
|
|
||||||
crunchedCompression: 0
|
|
||||||
allowsAlphaSplitting: 0
|
|
||||||
overridden: 0
|
|
||||||
androidETC2FallbackOverride: 0
|
|
||||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
|
||||||
- serializedVersion: 3
|
|
||||||
buildTarget: Standalone
|
|
||||||
maxTextureSize: 8192
|
|
||||||
resizeAlgorithm: 0
|
|
||||||
textureFormat: -1
|
|
||||||
textureCompression: 1
|
|
||||||
compressionQuality: 50
|
|
||||||
crunchedCompression: 0
|
|
||||||
allowsAlphaSplitting: 0
|
|
||||||
overridden: 0
|
|
||||||
androidETC2FallbackOverride: 0
|
|
||||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
|
||||||
- serializedVersion: 3
|
|
||||||
buildTarget: iPhone
|
|
||||||
maxTextureSize: 8192
|
|
||||||
resizeAlgorithm: 0
|
|
||||||
textureFormat: -1
|
|
||||||
textureCompression: 1
|
|
||||||
compressionQuality: 50
|
|
||||||
crunchedCompression: 0
|
|
||||||
allowsAlphaSplitting: 0
|
|
||||||
overridden: 0
|
|
||||||
androidETC2FallbackOverride: 0
|
|
||||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
|
||||||
- serializedVersion: 3
|
|
||||||
buildTarget: Android
|
|
||||||
maxTextureSize: 8192
|
|
||||||
resizeAlgorithm: 0
|
|
||||||
textureFormat: -1
|
|
||||||
textureCompression: 1
|
|
||||||
compressionQuality: 50
|
|
||||||
crunchedCompression: 0
|
|
||||||
allowsAlphaSplitting: 0
|
|
||||||
overridden: 0
|
|
||||||
androidETC2FallbackOverride: 0
|
|
||||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
|
||||||
- serializedVersion: 3
|
|
||||||
buildTarget: Windows Store Apps
|
|
||||||
maxTextureSize: 8192
|
|
||||||
resizeAlgorithm: 0
|
|
||||||
textureFormat: -1
|
|
||||||
textureCompression: 1
|
|
||||||
compressionQuality: 50
|
|
||||||
crunchedCompression: 0
|
|
||||||
allowsAlphaSplitting: 0
|
|
||||||
overridden: 0
|
|
||||||
androidETC2FallbackOverride: 0
|
|
||||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
|
||||||
- serializedVersion: 3
|
|
||||||
buildTarget: WebGL
|
|
||||||
maxTextureSize: 8192
|
|
||||||
resizeAlgorithm: 0
|
|
||||||
textureFormat: -1
|
|
||||||
textureCompression: 1
|
|
||||||
compressionQuality: 50
|
|
||||||
crunchedCompression: 0
|
|
||||||
allowsAlphaSplitting: 0
|
|
||||||
overridden: 0
|
|
||||||
androidETC2FallbackOverride: 0
|
|
||||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
|
||||||
spriteSheet:
|
|
||||||
serializedVersion: 2
|
|
||||||
sprites: []
|
|
||||||
outline: []
|
|
||||||
physicsShape: []
|
|
||||||
bones: []
|
|
||||||
spriteID: 5e97eb03825dee720800000000000000
|
|
||||||
internalID: 0
|
|
||||||
vertices: []
|
|
||||||
indices:
|
|
||||||
edges: []
|
|
||||||
weights: []
|
|
||||||
secondaryTextures: []
|
|
||||||
nameFileIdTable: {}
|
|
||||||
spritePackingTag:
|
|
||||||
pSDRemoveMatte: 0
|
|
||||||
pSDShowRemoveMatteOption: 0
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 17 KiB |
|
|
@ -1,159 +0,0 @@
|
||||||
fileFormatVersion: 2
|
|
||||||
guid: bdabd1f32d7b9494fb110756dfecba05
|
|
||||||
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
|
|
||||||
isReadable: 0
|
|
||||||
streamingMipmaps: 0
|
|
||||||
streamingMipmapsPriority: 0
|
|
||||||
vTOnly: 0
|
|
||||||
ignoreMasterTextureLimit: 0
|
|
||||||
grayScaleToAlpha: 0
|
|
||||||
generateCubemap: 6
|
|
||||||
cubemapConvolution: 0
|
|
||||||
seamlessCubemap: 0
|
|
||||||
textureFormat: 1
|
|
||||||
maxTextureSize: 2048
|
|
||||||
textureSettings:
|
|
||||||
serializedVersion: 2
|
|
||||||
filterMode: 1
|
|
||||||
aniso: 2
|
|
||||||
mipBias: 0
|
|
||||||
wrapU: 1
|
|
||||||
wrapV: 1
|
|
||||||
wrapW: 0
|
|
||||||
nPOTScale: 0
|
|
||||||
lightmap: 0
|
|
||||||
compressionQuality: 50
|
|
||||||
spriteMode: 1
|
|
||||||
spriteExtrude: 1
|
|
||||||
spriteMeshType: 1
|
|
||||||
alignment: 0
|
|
||||||
spritePivot: {x: 0.5, y: 0.5}
|
|
||||||
spritePixelsToUnits: 100
|
|
||||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
|
||||||
spriteGenerateFallbackPhysicsShape: 1
|
|
||||||
alphaUsage: 1
|
|
||||||
alphaIsTransparency: 1
|
|
||||||
spriteTessellationDetail: -1
|
|
||||||
textureType: 8
|
|
||||||
textureShape: 1
|
|
||||||
singleChannelComponent: 0
|
|
||||||
flipbookRows: 1
|
|
||||||
flipbookColumns: 1
|
|
||||||
maxTextureSizeSet: 0
|
|
||||||
compressionQualitySet: 0
|
|
||||||
textureFormatSet: 0
|
|
||||||
ignorePngGamma: 0
|
|
||||||
applyGammaDecoding: 0
|
|
||||||
cookieLightType: 0
|
|
||||||
platformSettings:
|
|
||||||
- serializedVersion: 3
|
|
||||||
buildTarget: DefaultTexturePlatform
|
|
||||||
maxTextureSize: 512
|
|
||||||
resizeAlgorithm: 0
|
|
||||||
textureFormat: -1
|
|
||||||
textureCompression: 1
|
|
||||||
compressionQuality: 50
|
|
||||||
crunchedCompression: 0
|
|
||||||
allowsAlphaSplitting: 0
|
|
||||||
overridden: 0
|
|
||||||
androidETC2FallbackOverride: 0
|
|
||||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
|
||||||
- serializedVersion: 3
|
|
||||||
buildTarget: Standalone
|
|
||||||
maxTextureSize: 8192
|
|
||||||
resizeAlgorithm: 0
|
|
||||||
textureFormat: -1
|
|
||||||
textureCompression: 1
|
|
||||||
compressionQuality: 50
|
|
||||||
crunchedCompression: 0
|
|
||||||
allowsAlphaSplitting: 0
|
|
||||||
overridden: 0
|
|
||||||
androidETC2FallbackOverride: 0
|
|
||||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
|
||||||
- serializedVersion: 3
|
|
||||||
buildTarget: iPhone
|
|
||||||
maxTextureSize: 8192
|
|
||||||
resizeAlgorithm: 0
|
|
||||||
textureFormat: -1
|
|
||||||
textureCompression: 1
|
|
||||||
compressionQuality: 50
|
|
||||||
crunchedCompression: 0
|
|
||||||
allowsAlphaSplitting: 0
|
|
||||||
overridden: 0
|
|
||||||
androidETC2FallbackOverride: 0
|
|
||||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
|
||||||
- serializedVersion: 3
|
|
||||||
buildTarget: Android
|
|
||||||
maxTextureSize: 8192
|
|
||||||
resizeAlgorithm: 0
|
|
||||||
textureFormat: -1
|
|
||||||
textureCompression: 1
|
|
||||||
compressionQuality: 50
|
|
||||||
crunchedCompression: 0
|
|
||||||
allowsAlphaSplitting: 0
|
|
||||||
overridden: 0
|
|
||||||
androidETC2FallbackOverride: 0
|
|
||||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
|
||||||
- serializedVersion: 3
|
|
||||||
buildTarget: Windows Store Apps
|
|
||||||
maxTextureSize: 8192
|
|
||||||
resizeAlgorithm: 0
|
|
||||||
textureFormat: -1
|
|
||||||
textureCompression: 1
|
|
||||||
compressionQuality: 50
|
|
||||||
crunchedCompression: 0
|
|
||||||
allowsAlphaSplitting: 0
|
|
||||||
overridden: 0
|
|
||||||
androidETC2FallbackOverride: 0
|
|
||||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
|
||||||
- serializedVersion: 3
|
|
||||||
buildTarget: WebGL
|
|
||||||
maxTextureSize: 8192
|
|
||||||
resizeAlgorithm: 0
|
|
||||||
textureFormat: -1
|
|
||||||
textureCompression: 1
|
|
||||||
compressionQuality: 50
|
|
||||||
crunchedCompression: 0
|
|
||||||
allowsAlphaSplitting: 0
|
|
||||||
overridden: 0
|
|
||||||
androidETC2FallbackOverride: 0
|
|
||||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
|
||||||
spriteSheet:
|
|
||||||
serializedVersion: 2
|
|
||||||
sprites: []
|
|
||||||
outline: []
|
|
||||||
physicsShape: []
|
|
||||||
bones: []
|
|
||||||
spriteID: 5e97eb03825dee720800000000000000
|
|
||||||
internalID: 0
|
|
||||||
vertices: []
|
|
||||||
indices:
|
|
||||||
edges: []
|
|
||||||
weights: []
|
|
||||||
secondaryTextures: []
|
|
||||||
nameFileIdTable: {}
|
|
||||||
spritePackingTag:
|
|
||||||
pSDRemoveMatte: 0
|
|
||||||
pSDShowRemoveMatteOption: 0
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
||||||
|
|
@ -23620,7 +23620,6 @@ MonoBehaviour:
|
||||||
m_Script: {fileID: 11500000, guid: 76f4632e8ab8503449aff2395203d2c2, type: 3}
|
m_Script: {fileID: 11500000, guid: 76f4632e8ab8503449aff2395203d2c2, type: 3}
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
triggerName:
|
|
||||||
--- !u!1 &5092569754032104682
|
--- !u!1 &5092569754032104682
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
|
||||||
|
|
@ -405,141 +405,6 @@ MonoBehaviour:
|
||||||
m_hasFontAssetChanged: 0
|
m_hasFontAssetChanged: 0
|
||||||
m_baseMaterial: {fileID: 0}
|
m_baseMaterial: {fileID: 0}
|
||||||
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
|
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
|
||||||
--- !u!1 &628344417
|
|
||||||
GameObject:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
serializedVersion: 6
|
|
||||||
m_Component:
|
|
||||||
- component: {fileID: 628344418}
|
|
||||||
- component: {fileID: 628344420}
|
|
||||||
- component: {fileID: 628344419}
|
|
||||||
m_Layer: 5
|
|
||||||
m_Name: Text (TMP) (6)
|
|
||||||
m_TagString: Untagged
|
|
||||||
m_Icon: {fileID: 0}
|
|
||||||
m_NavMeshLayer: 0
|
|
||||||
m_StaticEditorFlags: 0
|
|
||||||
m_IsActive: 1
|
|
||||||
--- !u!224 &628344418
|
|
||||||
RectTransform:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 628344417}
|
|
||||||
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: 1825054918}
|
|
||||||
m_RootOrder: 0
|
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
|
||||||
m_AnchorMin: {x: 0.5, y: 0}
|
|
||||||
m_AnchorMax: {x: 0.5, y: 0}
|
|
||||||
m_AnchoredPosition: {x: 0, y: -37.5}
|
|
||||||
m_SizeDelta: {x: 90.923, y: 27.863}
|
|
||||||
m_Pivot: {x: 0.5, y: 0}
|
|
||||||
--- !u!222 &628344420
|
|
||||||
CanvasRenderer:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 628344417}
|
|
||||||
m_CullTransparentMesh: 1
|
|
||||||
--- !u!114 &628344419
|
|
||||||
MonoBehaviour:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 628344417}
|
|
||||||
m_Enabled: 1
|
|
||||||
m_EditorHideFlags: 0
|
|
||||||
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
|
|
||||||
m_Name:
|
|
||||||
m_EditorClassIdentifier:
|
|
||||||
m_Material: {fileID: 0}
|
|
||||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
|
||||||
m_RaycastTarget: 1
|
|
||||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
|
||||||
m_Maskable: 1
|
|
||||||
m_OnCullStateChanged:
|
|
||||||
m_PersistentCalls:
|
|
||||||
m_Calls: []
|
|
||||||
m_text: "\u544A\u77E5\u5355"
|
|
||||||
m_isRightToLeft: 0
|
|
||||||
m_fontAsset: {fileID: 11400000, guid: 9ea913af302bbdf42a9f003451c70e02, type: 2}
|
|
||||||
m_sharedMaterial: {fileID: 4239875615288461448, guid: 9ea913af302bbdf42a9f003451c70e02, type: 2}
|
|
||||||
m_fontSharedMaterials: []
|
|
||||||
m_fontMaterial: {fileID: 0}
|
|
||||||
m_fontMaterials: []
|
|
||||||
m_fontColor32:
|
|
||||||
serializedVersion: 2
|
|
||||||
rgba: 4294967295
|
|
||||||
m_fontColor: {r: 1, g: 1, b: 1, a: 1}
|
|
||||||
m_enableVertexGradient: 0
|
|
||||||
m_colorMode: 3
|
|
||||||
m_fontColorGradient:
|
|
||||||
topLeft: {r: 1, g: 1, b: 1, a: 1}
|
|
||||||
topRight: {r: 1, g: 1, b: 1, a: 1}
|
|
||||||
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
|
|
||||||
bottomRight: {r: 1, g: 1, b: 1, a: 1}
|
|
||||||
m_fontColorGradientPreset: {fileID: 0}
|
|
||||||
m_spriteAsset: {fileID: 0}
|
|
||||||
m_tintAllSprites: 0
|
|
||||||
m_StyleSheet: {fileID: 0}
|
|
||||||
m_TextStyleHashCode: -1183493901
|
|
||||||
m_overrideHtmlColors: 0
|
|
||||||
m_faceColor:
|
|
||||||
serializedVersion: 2
|
|
||||||
rgba: 4294967295
|
|
||||||
m_fontSize: 18
|
|
||||||
m_fontSizeBase: 18
|
|
||||||
m_fontWeight: 400
|
|
||||||
m_enableAutoSizing: 0
|
|
||||||
m_fontSizeMin: 18
|
|
||||||
m_fontSizeMax: 72
|
|
||||||
m_fontStyle: 0
|
|
||||||
m_HorizontalAlignment: 2
|
|
||||||
m_VerticalAlignment: 512
|
|
||||||
m_textAlignment: 65535
|
|
||||||
m_characterSpacing: 0
|
|
||||||
m_wordSpacing: 0
|
|
||||||
m_lineSpacing: 0
|
|
||||||
m_lineSpacingMax: 0
|
|
||||||
m_paragraphSpacing: 0
|
|
||||||
m_charWidthMaxAdj: 0
|
|
||||||
m_enableWordWrapping: 1
|
|
||||||
m_wordWrappingRatios: 0.4
|
|
||||||
m_overflowMode: 0
|
|
||||||
m_linkedTextComponent: {fileID: 0}
|
|
||||||
parentLinkedComponent: {fileID: 0}
|
|
||||||
m_enableKerning: 1
|
|
||||||
m_enableExtraPadding: 0
|
|
||||||
checkPaddingRequired: 0
|
|
||||||
m_isRichText: 1
|
|
||||||
m_parseCtrlCharacters: 1
|
|
||||||
m_isOrthographic: 1
|
|
||||||
m_isCullingEnabled: 0
|
|
||||||
m_horizontalMapping: 0
|
|
||||||
m_verticalMapping: 0
|
|
||||||
m_uvLineOffset: 0
|
|
||||||
m_geometrySortingOrder: 0
|
|
||||||
m_IsTextObjectScaleStatic: 0
|
|
||||||
m_VertexBufferAutoSizeReduction: 0
|
|
||||||
m_useMaxVisibleDescender: 1
|
|
||||||
m_pageToDisplay: 1
|
|
||||||
m_margin: {x: 0, y: 0, z: 0, w: 0}
|
|
||||||
m_isUsingLegacyAnimationComponent: 0
|
|
||||||
m_isVolumetricText: 0
|
|
||||||
m_hasFontAssetChanged: 0
|
|
||||||
m_baseMaterial: {fileID: 0}
|
|
||||||
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
|
|
||||||
--- !u!1 &813768312
|
--- !u!1 &813768312
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -810,128 +675,6 @@ MonoBehaviour:
|
||||||
m_hasFontAssetChanged: 0
|
m_hasFontAssetChanged: 0
|
||||||
m_baseMaterial: {fileID: 0}
|
m_baseMaterial: {fileID: 0}
|
||||||
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
|
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
|
||||||
--- !u!1 &1825054917
|
|
||||||
GameObject:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
serializedVersion: 6
|
|
||||||
m_Component:
|
|
||||||
- component: {fileID: 1825054918}
|
|
||||||
- component: {fileID: 1825054921}
|
|
||||||
- component: {fileID: 1825054920}
|
|
||||||
- component: {fileID: 1825054919}
|
|
||||||
m_Layer: 5
|
|
||||||
m_Name: NotifyBtn
|
|
||||||
m_TagString: Untagged
|
|
||||||
m_Icon: {fileID: 0}
|
|
||||||
m_NavMeshLayer: 0
|
|
||||||
m_StaticEditorFlags: 0
|
|
||||||
m_IsActive: 1
|
|
||||||
--- !u!224 &1825054918
|
|
||||||
RectTransform:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 1825054917}
|
|
||||||
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: 628344418}
|
|
||||||
m_Father: {fileID: 4389028462961679179}
|
|
||||||
m_RootOrder: 7
|
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
|
||||||
m_AnchorMin: {x: 0, y: 0}
|
|
||||||
m_AnchorMax: {x: 0, y: 0}
|
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
|
||||||
m_SizeDelta: {x: 60, y: 60}
|
|
||||||
m_Pivot: {x: 0, y: 0}
|
|
||||||
--- !u!222 &1825054921
|
|
||||||
CanvasRenderer:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 1825054917}
|
|
||||||
m_CullTransparentMesh: 1
|
|
||||||
--- !u!114 &1825054920
|
|
||||||
MonoBehaviour:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 1825054917}
|
|
||||||
m_Enabled: 1
|
|
||||||
m_EditorHideFlags: 0
|
|
||||||
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
|
||||||
m_Name:
|
|
||||||
m_EditorClassIdentifier:
|
|
||||||
m_Material: {fileID: 0}
|
|
||||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
|
||||||
m_RaycastTarget: 1
|
|
||||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
|
||||||
m_Maskable: 1
|
|
||||||
m_OnCullStateChanged:
|
|
||||||
m_PersistentCalls:
|
|
||||||
m_Calls: []
|
|
||||||
m_Sprite: {fileID: 21300000, guid: 0a628bc32b389064892fa76fdbffed39, type: 3}
|
|
||||||
m_Type: 0
|
|
||||||
m_PreserveAspect: 0
|
|
||||||
m_FillCenter: 1
|
|
||||||
m_FillMethod: 4
|
|
||||||
m_FillAmount: 1
|
|
||||||
m_FillClockwise: 1
|
|
||||||
m_FillOrigin: 0
|
|
||||||
m_UseSpriteMesh: 0
|
|
||||||
m_PixelsPerUnitMultiplier: 1
|
|
||||||
--- !u!114 &1825054919
|
|
||||||
MonoBehaviour:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 1825054917}
|
|
||||||
m_Enabled: 1
|
|
||||||
m_EditorHideFlags: 0
|
|
||||||
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
|
|
||||||
m_Name:
|
|
||||||
m_EditorClassIdentifier:
|
|
||||||
m_Navigation:
|
|
||||||
m_Mode: 3
|
|
||||||
m_WrapAround: 0
|
|
||||||
m_SelectOnUp: {fileID: 0}
|
|
||||||
m_SelectOnDown: {fileID: 0}
|
|
||||||
m_SelectOnLeft: {fileID: 0}
|
|
||||||
m_SelectOnRight: {fileID: 0}
|
|
||||||
m_Transition: 2
|
|
||||||
m_Colors:
|
|
||||||
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
|
|
||||||
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
|
||||||
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
|
|
||||||
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
|
||||||
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
|
|
||||||
m_ColorMultiplier: 1
|
|
||||||
m_FadeDuration: 0.1
|
|
||||||
m_SpriteState:
|
|
||||||
m_HighlightedSprite: {fileID: 21300000, guid: e0f000e1a7461c14b891110e726a2f07, type: 3}
|
|
||||||
m_PressedSprite: {fileID: 21300000, guid: bdabd1f32d7b9494fb110756dfecba05, type: 3}
|
|
||||||
m_SelectedSprite: {fileID: 0}
|
|
||||||
m_DisabledSprite: {fileID: 21300000, guid: 0a628bc32b389064892fa76fdbffed39, type: 3}
|
|
||||||
m_AnimationTriggers:
|
|
||||||
m_NormalTrigger: Normal
|
|
||||||
m_HighlightedTrigger: Highlighted
|
|
||||||
m_PressedTrigger: Pressed
|
|
||||||
m_SelectedTrigger: Selected
|
|
||||||
m_DisabledTrigger: Disabled
|
|
||||||
m_Interactable: 1
|
|
||||||
m_TargetGraphic: {fileID: 1825054920}
|
|
||||||
m_OnClick:
|
|
||||||
m_PersistentCalls:
|
|
||||||
m_Calls: []
|
|
||||||
--- !u!1 &1852792901
|
--- !u!1 &1852792901
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -2192,7 +1935,6 @@ MonoBehaviour:
|
||||||
siteName: "\u73B0\u573A\u6309\u94AE"
|
siteName: "\u73B0\u573A\u6309\u94AE"
|
||||||
officeName: "\u529E\u516C\u5BA4\u6309\u94AE"
|
officeName: "\u529E\u516C\u5BA4\u6309\u94AE"
|
||||||
toolRoomName: "\u5DE5\u5177\u95F4\u6309\u94AE"
|
toolRoomName: "\u5DE5\u5177\u95F4\u6309\u94AE"
|
||||||
notifyName: "\u544A\u77E5\u5355\u6309\u94AE"
|
|
||||||
--- !u!1 &7034408565425647768
|
--- !u!1 &7034408565425647768
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -2351,7 +2093,6 @@ RectTransform:
|
||||||
- {fileID: 693336442933373083}
|
- {fileID: 693336442933373083}
|
||||||
- {fileID: 6866356856278355658}
|
- {fileID: 6866356856278355658}
|
||||||
- {fileID: 1852792902}
|
- {fileID: 1852792902}
|
||||||
- {fileID: 1825054918}
|
|
||||||
m_Father: {fileID: 6616835143412438853}
|
m_Father: {fileID: 6616835143412438853}
|
||||||
m_RootOrder: 1
|
m_RootOrder: 1
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
|
|
||||||
|
|
@ -3108,7 +3108,6 @@ GameObject:
|
||||||
- component: {fileID: 991594638}
|
- component: {fileID: 991594638}
|
||||||
- component: {fileID: 991594637}
|
- component: {fileID: 991594637}
|
||||||
- component: {fileID: 991594640}
|
- component: {fileID: 991594640}
|
||||||
- component: {fileID: 991594641}
|
|
||||||
m_Layer: 0
|
m_Layer: 0
|
||||||
m_Name: "\u6742\u7269"
|
m_Name: "\u6742\u7269"
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
|
|
@ -3207,181 +3206,9 @@ MonoBehaviour:
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
triggerID: 0
|
triggerID: 0
|
||||||
triggerName: "\u5783\u573E"
|
triggerName:
|
||||||
_highlight: {fileID: 0}
|
_highlight: {fileID: 0}
|
||||||
deviceType: 3
|
deviceType: 3
|
||||||
--- !u!114 &991594641
|
|
||||||
MonoBehaviour:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 991594635}
|
|
||||||
m_Enabled: 1
|
|
||||||
m_EditorHideFlags: 0
|
|
||||||
m_Script: {fileID: 11500000, guid: 888380afc233049ce9e618f9f36c8ba8, type: 3}
|
|
||||||
m_Name:
|
|
||||||
m_EditorClassIdentifier:
|
|
||||||
profile: {fileID: 0}
|
|
||||||
profileSync: 0
|
|
||||||
camerasLayerMask:
|
|
||||||
serializedVersion: 2
|
|
||||||
m_Bits: 4294967295
|
|
||||||
effectGroup: 0
|
|
||||||
effectGroupLayer:
|
|
||||||
serializedVersion: 2
|
|
||||||
m_Bits: 4294967295
|
|
||||||
effectNameFilter:
|
|
||||||
combineMeshes: 0
|
|
||||||
alphaCutOff: 0
|
|
||||||
cullBackFaces: 1
|
|
||||||
ignoreObjectVisibility: 0
|
|
||||||
reflectionProbes: 0
|
|
||||||
GPUInstancing: 1
|
|
||||||
optimizeSkinnedMesh: 1
|
|
||||||
depthClip: 0
|
|
||||||
cameraDistanceFade: 0
|
|
||||||
cameraDistanceFadeNear: 0
|
|
||||||
cameraDistanceFadeFar: 1000
|
|
||||||
normalsOption: 0
|
|
||||||
ignore: 0
|
|
||||||
_highlighted: 0
|
|
||||||
fadeInDuration: 0
|
|
||||||
fadeOutDuration: 0
|
|
||||||
flipY: 0
|
|
||||||
constantWidth: 1
|
|
||||||
subMeshMask: -1
|
|
||||||
overlay: 0
|
|
||||||
overlayMode: 0
|
|
||||||
overlayColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
|
|
||||||
overlayAnimationSpeed: 1
|
|
||||||
overlayMinIntensity: 0.5
|
|
||||||
overlayBlending: 1
|
|
||||||
overlayTexture: {fileID: 0}
|
|
||||||
overlayTextureUVSpace: 0
|
|
||||||
overlayTextureScale: 1
|
|
||||||
overlayVisibility: 0
|
|
||||||
outline: 1
|
|
||||||
outlineColor: {r: 0.8080046, g: 1.6417967, b: 0.36961916, a: 1}
|
|
||||||
outlineColorStyle: 0
|
|
||||||
outlineGradient:
|
|
||||||
serializedVersion: 2
|
|
||||||
key0: {r: 1, g: 1, b: 1, a: 1}
|
|
||||||
key1: {r: 1, g: 1, b: 1, a: 1}
|
|
||||||
key2: {r: 0, g: 0, b: 0, a: 0}
|
|
||||||
key3: {r: 0, g: 0, b: 0, a: 0}
|
|
||||||
key4: {r: 0, g: 0, b: 0, a: 0}
|
|
||||||
key5: {r: 0, g: 0, b: 0, a: 0}
|
|
||||||
key6: {r: 0, g: 0, b: 0, a: 0}
|
|
||||||
key7: {r: 0, g: 0, b: 0, a: 0}
|
|
||||||
ctime0: 0
|
|
||||||
ctime1: 65535
|
|
||||||
ctime2: 0
|
|
||||||
ctime3: 0
|
|
||||||
ctime4: 0
|
|
||||||
ctime5: 0
|
|
||||||
ctime6: 0
|
|
||||||
ctime7: 0
|
|
||||||
atime0: 0
|
|
||||||
atime1: 65535
|
|
||||||
atime2: 0
|
|
||||||
atime3: 0
|
|
||||||
atime4: 0
|
|
||||||
atime5: 0
|
|
||||||
atime6: 0
|
|
||||||
atime7: 0
|
|
||||||
m_Mode: 0
|
|
||||||
m_NumColorKeys: 2
|
|
||||||
m_NumAlphaKeys: 2
|
|
||||||
outlineGradientInLocalSpace: 0
|
|
||||||
outlineWidth: 0.45
|
|
||||||
outlineBlurPasses: 2
|
|
||||||
outlineQuality: 3
|
|
||||||
outlineEdgeMode: 0
|
|
||||||
outlineEdgeThreshold: 0.995
|
|
||||||
outlineDownsampling: 2
|
|
||||||
outlineVisibility: 0
|
|
||||||
glowBlendMode: 0
|
|
||||||
outlineBlitDebug: 0
|
|
||||||
outlineIndependent: 0
|
|
||||||
outlineContourStyle: 0
|
|
||||||
glow: 0.48
|
|
||||||
glowWidth: 0.4
|
|
||||||
glowQuality: 3
|
|
||||||
glowBlurMethod: 0
|
|
||||||
glowDownsampling: 2
|
|
||||||
glowHQColor: {r: 0.64, g: 1, b: 0, a: 1}
|
|
||||||
glowDithering: 1
|
|
||||||
glowMagicNumber1: 0.75
|
|
||||||
glowMagicNumber2: 0.5
|
|
||||||
glowAnimationSpeed: 1
|
|
||||||
glowVisibility: 0
|
|
||||||
glowBlitDebug: 0
|
|
||||||
glowBlendPasses: 1
|
|
||||||
glowPasses:
|
|
||||||
- offset: 4
|
|
||||||
alpha: 0.1
|
|
||||||
color: {r: 0.64, g: 1, b: 0, a: 1}
|
|
||||||
- offset: 3
|
|
||||||
alpha: 0.2
|
|
||||||
color: {r: 0.64, g: 1, b: 0, a: 1}
|
|
||||||
- offset: 2
|
|
||||||
alpha: 0.3
|
|
||||||
color: {r: 0.64, g: 1, b: 0, a: 1}
|
|
||||||
- offset: 1
|
|
||||||
alpha: 0.4
|
|
||||||
color: {r: 0.64, g: 1, b: 0, a: 1}
|
|
||||||
glowIgnoreMask: 0
|
|
||||||
innerGlow: 0
|
|
||||||
innerGlowWidth: 1
|
|
||||||
innerGlowColor: {r: 1, g: 1, b: 1, a: 1}
|
|
||||||
innerGlowBlendMode: 0
|
|
||||||
innerGlowVisibility: 0
|
|
||||||
targetFX: 0
|
|
||||||
targetFXTexture: {fileID: 0}
|
|
||||||
targetFXColor: {r: 1, g: 1, b: 1, a: 1}
|
|
||||||
targetFXCenter: {fileID: 0}
|
|
||||||
targetFXRotationSpeed: 50
|
|
||||||
targetFXInitialScale: 4
|
|
||||||
targetFXEndScale: 1.5
|
|
||||||
targetFXScaleToRenderBounds: 1
|
|
||||||
targetFXAlignToGround: 0
|
|
||||||
targetFXFadePower: 32
|
|
||||||
targetFXGroundMaxDistance: 10
|
|
||||||
targetFXGroundLayerMask:
|
|
||||||
serializedVersion: 2
|
|
||||||
m_Bits: 4294967295
|
|
||||||
targetFXTransitionDuration: 0.5
|
|
||||||
targetFXStayDuration: 1.5
|
|
||||||
targetFXVisibility: 1
|
|
||||||
seeThrough: 2
|
|
||||||
seeThroughOccluderMask:
|
|
||||||
serializedVersion: 2
|
|
||||||
m_Bits: 4294967295
|
|
||||||
seeThroughOccluderThreshold: 0.3
|
|
||||||
seeThroughOccluderMaskAccurate: 0
|
|
||||||
seeThroughOccluderCheckInterval: 1
|
|
||||||
seeThroughOccluderCheckIndividualObjects: 0
|
|
||||||
seeThroughDepthOffset: 0
|
|
||||||
seeThroughMaxDepth: 0
|
|
||||||
seeThroughIntensity: 0.8
|
|
||||||
seeThroughTintAlpha: 0.5
|
|
||||||
seeThroughTintColor: {r: 1, g: 0, b: 0, a: 1}
|
|
||||||
seeThroughNoise: 1
|
|
||||||
seeThroughBorder: 0
|
|
||||||
seeThroughBorderColor: {r: 0, g: 0, b: 0, a: 1}
|
|
||||||
seeThroughBorderOnly: 0
|
|
||||||
seeThroughBorderWidth: 0.45
|
|
||||||
seeThroughOrdered: 0
|
|
||||||
seeThroughTexture: {fileID: 0}
|
|
||||||
seeThroughTextureUVSpace: 0
|
|
||||||
seeThroughTextureScale: 1
|
|
||||||
rmsCount: 1
|
|
||||||
hitFxInitialIntensity: 0
|
|
||||||
hitFxMode: 0
|
|
||||||
hitFxFadeOutDuration: 0.25
|
|
||||||
hitFxColor: {r: 1, g: 1, b: 1, a: 1}
|
|
||||||
hitFxRadius: 0.5
|
|
||||||
--- !u!1 &1065811548
|
--- !u!1 &1065811548
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
|
||||||
|
|
@ -4,21 +4,5 @@ using UnityEngine;
|
||||||
|
|
||||||
public class UI_DisassemblyAssemblyNoticePanel : BasePanel
|
public class UI_DisassemblyAssemblyNoticePanel : BasePanel
|
||||||
{
|
{
|
||||||
public string triggerName;
|
|
||||||
public void Init(string _triggerName)
|
|
||||||
{
|
|
||||||
triggerName = _triggerName;
|
|
||||||
}
|
|
||||||
|
|
||||||
protected override void OnClick(string btnName)
|
|
||||||
{
|
|
||||||
base.OnClick(btnName);
|
|
||||||
switch (btnName)
|
|
||||||
{
|
|
||||||
case "Button_Close":
|
|
||||||
GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(triggerName, true);
|
|
||||||
GameManager.UIMgr.HidePanel<UI_DisassemblyAssemblyNoticePanel>();
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,7 @@ public class UI_MenuBar : BasePanel
|
||||||
{
|
{
|
||||||
[SerializeField]
|
[SerializeField]
|
||||||
private Sprite ExpandSprite, CollapseSprite;
|
private Sprite ExpandSprite, CollapseSprite;
|
||||||
private Button closeDefaultBtn, toolRoomBtn, siteBtn, workOrderBtn, missionBtn, officeBtn, disassemblyAssemblyWorkOrderBtn, toolKitBtn, notifyBtn;
|
private Button closeDefaultBtn, toolRoomBtn, siteBtn, workOrderBtn, missionBtn, officeBtn, disassemblyAssemblyWorkOrderBtn, toolKitBtn;
|
||||||
public int countDown = 0;
|
public int countDown = 0;
|
||||||
|
|
||||||
private int time;
|
private int time;
|
||||||
|
|
@ -29,8 +29,7 @@ public class UI_MenuBar : BasePanel
|
||||||
public string officeName;
|
public string officeName;
|
||||||
[Header("工具间按钮")]
|
[Header("工具间按钮")]
|
||||||
public string toolRoomName;
|
public string toolRoomName;
|
||||||
[Header("¸æÖªµ¥°´Å¥")]
|
|
||||||
public string notifyName;
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 记录倒计时的协程
|
/// 记录倒计时的协程
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|
@ -47,7 +46,6 @@ public class UI_MenuBar : BasePanel
|
||||||
officeBtn = GetControl<Button>("OfficeBtn");
|
officeBtn = GetControl<Button>("OfficeBtn");
|
||||||
toolKitBtn = GetControl<Button>("ToolKitBtn");
|
toolKitBtn = GetControl<Button>("ToolKitBtn");
|
||||||
disassemblyAssemblyWorkOrderBtn = GetControl<Button>("DisassemblyAssemblyWorkOrderBtn");
|
disassemblyAssemblyWorkOrderBtn = GetControl<Button>("DisassemblyAssemblyWorkOrderBtn");
|
||||||
notifyBtn = GetControl<Button>("NotifyBtn");
|
|
||||||
}
|
}
|
||||||
public override void ShowMe()
|
public override void ShowMe()
|
||||||
{
|
{
|
||||||
|
|
@ -60,6 +58,7 @@ public class UI_MenuBar : BasePanel
|
||||||
if (triggerID == workOrderName)
|
if (triggerID == workOrderName)
|
||||||
{
|
{
|
||||||
GameManager.UIMgr.imageTips.ShowTips(workOrderBtn.GetComponent<RectTransform>());
|
GameManager.UIMgr.imageTips.ShowTips(workOrderBtn.GetComponent<RectTransform>());
|
||||||
|
|
||||||
}
|
}
|
||||||
else if (triggerID == disassemblyAssemblyWorkOrderName)
|
else if (triggerID == disassemblyAssemblyWorkOrderName)
|
||||||
{
|
{
|
||||||
|
|
@ -81,10 +80,6 @@ public class UI_MenuBar : BasePanel
|
||||||
{
|
{
|
||||||
GameManager.UIMgr.imageTips.ShowTips(toolRoomBtn.GetComponent<RectTransform>());
|
GameManager.UIMgr.imageTips.ShowTips(toolRoomBtn.GetComponent<RectTransform>());
|
||||||
}
|
}
|
||||||
else if (triggerID == notifyName)
|
|
||||||
{
|
|
||||||
GameManager.UIMgr.imageTips.ShowTips(notifyBtn.GetComponent<RectTransform>());
|
|
||||||
}
|
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
GameManager.UIMgr.imageTips.HideTips();
|
GameManager.UIMgr.imageTips.HideTips();
|
||||||
|
|
@ -106,12 +101,11 @@ public class UI_MenuBar : BasePanel
|
||||||
}
|
}
|
||||||
toolRoomBtn.gameObject.SetActive(type != E_SceneType.ToolRoom);
|
toolRoomBtn.gameObject.SetActive(type != E_SceneType.ToolRoom);
|
||||||
siteBtn.gameObject.SetActive(type == E_SceneType.ToolRoom);
|
siteBtn.gameObject.SetActive(type == E_SceneType.ToolRoom);
|
||||||
workOrderBtn.gameObject.SetActive(type == E_SceneType.Office);
|
workOrderBtn.gameObject.SetActive(type == E_SceneType.Office || type == E_SceneType.Site);
|
||||||
missionBtn.gameObject.SetActive(type == E_SceneType.Office || type == E_SceneType.ToolRoom || type == E_SceneType.Site);
|
missionBtn.gameObject.SetActive(type == E_SceneType.Office || type == E_SceneType.ToolRoom || type == E_SceneType.Site);
|
||||||
officeBtn.gameObject.SetActive(type == E_SceneType.ToolRoom);
|
officeBtn.gameObject.SetActive(type == E_SceneType.ToolRoom);
|
||||||
disassemblyAssemblyWorkOrderBtn.gameObject.SetActive(type == E_SceneType.Office);
|
disassemblyAssemblyWorkOrderBtn.gameObject.SetActive(type == E_SceneType.Office);
|
||||||
toolKitBtn.gameObject.SetActive(type != E_SceneType.Office);
|
toolKitBtn.gameObject.SetActive(type != E_SceneType.Office);
|
||||||
notifyBtn.gameObject.SetActive(type == E_SceneType.Site);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -228,15 +222,6 @@ public class UI_MenuBar : BasePanel
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case "NotifyBtn":
|
|
||||||
if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(notifyName, false) == 0)
|
|
||||||
{
|
|
||||||
GameManager.UIMgr.ShowPanel<UI_DisassemblyAssemblyNoticePanel>(E_UI_Layer.Mid, (p) =>
|
|
||||||
{
|
|
||||||
p.Init(notifyName);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue