合并融合

This commit is contained in:
taosuqi 2024-08-15 20:34:31 +08:00
commit b440a3f564
50 changed files with 22369 additions and 6612 deletions

Binary file not shown.

File diff suppressed because one or more lines are too long

View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 0ce8274bceb53be4c9edf516b2d5f403
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 215 B

View File

@ -0,0 +1,147 @@
fileFormatVersion: 2
guid: f52816d838dfa4a46b0432fae95318ee
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: 8192
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
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:

View File

Before

Width:  |  Height:  |  Size: 228 B

After

Width:  |  Height:  |  Size: 228 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 744 B

View File

@ -0,0 +1,147 @@
fileFormatVersion: 2
guid: d7fe67dd3685f0f4ea75d830d1967921
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: 8192
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
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.

After

Width:  |  Height:  |  Size: 40 KiB

View File

@ -0,0 +1,147 @@
fileFormatVersion: 2
guid: c440f35582c13154db88b809ccce0758
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: 8192
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
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:

View File

Before

Width:  |  Height:  |  Size: 155 B

After

Width:  |  Height:  |  Size: 155 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 32 KiB

View File

@ -0,0 +1,147 @@
fileFormatVersion: 2
guid: f8bc2fb25c8a5a84d9c0d9bd8151ccd9
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: 8192
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
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.

After

Width:  |  Height:  |  Size: 195 B

View File

@ -0,0 +1,147 @@
fileFormatVersion: 2
guid: 63cd4070754e8fd4da758c87db957b35
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: 8192
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
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:

View File

@ -105,7 +105,7 @@ MonoBehaviour:
m_BlockingObjects: 0 m_BlockingObjects: 0
m_BlockingMask: m_BlockingMask:
serializedVersion: 2 serializedVersion: 2
m_Bits: 4294967295 m_Bits: 119
--- !u!1 &8048042365574858632 --- !u!1 &8048042365574858632
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

View File

@ -1,6 +1,6 @@
%YAML 1.1 %YAML 1.1
%TAG !u! tag:unity3d.com,2011: %TAG !u! tag:unity3d.com,2011:
--- !u!1 &2453519075553746031 --- !u!1 &2288592950851579606
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
@ -8,9 +8,145 @@ GameObject:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
serializedVersion: 6 serializedVersion: 6
m_Component: m_Component:
- component: {fileID: 2475087902384423009} - component: {fileID: 8986047229568511319}
- component: {fileID: 3351482660580478946} - component: {fileID: 4721816915586039359}
- component: {fileID: 7407368608452950192} - component: {fileID: 7491023694202728592}
m_Layer: 5
m_Name: CountText
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &8986047229568511319
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2288592950851579606}
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: 3711049640330397891}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: -10, y: 12}
m_SizeDelta: {x: 20, y: 24}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4721816915586039359
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2288592950851579606}
m_CullTransparentMesh: 1
--- !u!114 &7491023694202728592
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2288592950851579606}
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: 10
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, 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: 16
m_fontSizeBase: 16
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 &7984153428917771150
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3711049640330397891}
- component: {fileID: 8078226639558209602}
- component: {fileID: 3944633717089808067}
- component: {fileID: 8050215455937781931}
m_Layer: 5 m_Layer: 5
m_Name: CheckMyselfItem m_Name: CheckMyselfItem
m_TagString: Untagged m_TagString: Untagged
@ -18,41 +154,43 @@ GameObject:
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 1
--- !u!224 &2475087902384423009 --- !u!224 &3711049640330397891
RectTransform: RectTransform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2453519075553746031} m_GameObject: {fileID: 7984153428917771150}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children:
- {fileID: 2341971459522957585}
- {fileID: 8986047229568511319}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0} m_SizeDelta: {x: 130, y: 130}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3351482660580478946 --- !u!222 &8078226639558209602
CanvasRenderer: CanvasRenderer:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2453519075553746031} m_GameObject: {fileID: 7984153428917771150}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 1
--- !u!114 &7407368608452950192 --- !u!114 &3944633717089808067
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2453519075553746031} m_GameObject: {fileID: 7984153428917771150}
m_Enabled: 1 m_Enabled: 1
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
@ -66,7 +204,7 @@ MonoBehaviour:
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_Sprite: {fileID: 0} m_Sprite: {fileID: 21300000, guid: c440f35582c13154db88b809ccce0758, type: 3}
m_Type: 0 m_Type: 0
m_PreserveAspect: 0 m_PreserveAspect: 0
m_FillCenter: 1 m_FillCenter: 1
@ -76,3 +214,168 @@ MonoBehaviour:
m_FillOrigin: 0 m_FillOrigin: 0
m_UseSpriteMesh: 0 m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1 m_PixelsPerUnitMultiplier: 1
--- !u!114 &8050215455937781931
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7984153428917771150}
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: 1
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: 0}
m_PressedSprite: {fileID: 0}
m_SelectedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_SelectedTrigger: Selected
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 3944633717089808067}
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!1 &8746938320234467046
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2341971459522957585}
- component: {fileID: 2534980939409269878}
- component: {fileID: 8192472674953986160}
- component: {fileID: 4871810231244820406}
m_Layer: 5
m_Name: ItemCloseBtn
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &2341971459522957585
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8746938320234467046}
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: 3711049640330397891}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 51, y: 46}
m_SizeDelta: {x: 14, y: 14}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2534980939409269878
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8746938320234467046}
m_CullTransparentMesh: 1
--- !u!114 &8192472674953986160
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8746938320234467046}
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: 63cd4070754e8fd4da758c87db957b35, 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 &4871810231244820406
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8746938320234467046}
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: 1
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: 0}
m_PressedSprite: {fileID: 0}
m_SelectedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_SelectedTrigger: Selected
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 8192472674953986160}
m_OnClick:
m_PersistentCalls:
m_Calls: []

View File

@ -36,7 +36,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1} m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -26, y: -20.2} m_AnchoredPosition: {x: -26, y: -23.9}
m_SizeDelta: {x: 25, y: 25} m_SizeDelta: {x: 25, y: 25}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4653781139987434636 --- !u!222 &4653781139987434636
@ -121,7 +121,7 @@ MonoBehaviour:
m_OnClick: m_OnClick:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
--- !u!1 &7846116637765011875 --- !u!1 &7905011564192279691
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
@ -129,24 +129,24 @@ GameObject:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
serializedVersion: 6 serializedVersion: 6
m_Component: m_Component:
- component: {fileID: 8123432539175774182} - component: {fileID: 6969410083864484755}
- component: {fileID: 2512763760536432132} - component: {fileID: 8848982036115677409}
- component: {fileID: 3921254533356523130} - component: {fileID: 318306058971955889}
m_Layer: 5 m_Layer: 5
m_Name: LeftItemText m_Name: Text (TMP)
m_TagString: Untagged m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 1
--- !u!224 &8123432539175774182 --- !u!224 &6969410083864484755
RectTransform: RectTransform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7846116637765011875} m_GameObject: {fileID: 7905011564192279691}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
@ -154,29 +154,29 @@ RectTransform:
m_Father: {fileID: 4937720538275173356} m_Father: {fileID: 4937720538275173356}
m_RootOrder: 1 m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 159, y: -20.323} m_AnchoredPosition: {x: -16.9, y: 0}
m_SizeDelta: {x: 320, y: 40.298} m_SizeDelta: {x: 370, y: 40}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2512763760536432132 --- !u!222 &8848982036115677409
CanvasRenderer: CanvasRenderer:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7846116637765011875} m_GameObject: {fileID: 7905011564192279691}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 1
--- !u!114 &3921254533356523130 --- !u!114 &318306058971955889
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7846116637765011875} m_GameObject: {fileID: 7905011564192279691}
m_Enabled: 1 m_Enabled: 1
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Material: {fileID: 0} m_Material: {fileID: 0}
@ -187,20 +187,75 @@ MonoBehaviour:
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_FontData: m_text: "\u5DE5\u4F5C\u524D\u5F00\u597D\u5F00\u5DE5\u4F1A\uFF0C\u5DE5\u4F5C\u8D1F\u8D23\u4EBA\u5411\u5DE5\u4F5C\u73ED\u6210\u5458\u4EA4\u4EE3\u5DE5\u4F5C\u5185\u5BB9\uFF0C\u5B89\u5168\u6CE8\u610F\u4E8B\u9879\u548C\u5371\u9669\u70B9"
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} m_isRightToLeft: 0
m_FontSize: 15 m_fontAsset: {fileID: 11400000, guid: f23cde0c3d86dad49bedc202ad993d21, type: 2}
m_FontStyle: 0 m_sharedMaterial: {fileID: -2120909647377011300, guid: f23cde0c3d86dad49bedc202ad993d21, type: 2}
m_BestFit: 0 m_fontSharedMaterials: []
m_MinSize: 1 m_fontMaterial: {fileID: 0}
m_MaxSize: 40 m_fontMaterials: []
m_Alignment: 0 m_fontColor32:
m_AlignByGeometry: 0 serializedVersion: 2
m_RichText: 1 rgba: 4294967295
m_HorizontalOverflow: 0 m_fontColor: {r: 1, g: 1, b: 1, a: 1}
m_VerticalOverflow: 0 m_enableVertexGradient: 0
m_LineSpacing: 1 m_colorMode: 3
m_Text: "\u5DE5\u4F5C" 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: 14
m_fontSizeBase: 14
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
m_HorizontalAlignment: 1
m_VerticalAlignment: 256
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 &8182243552293014081 --- !u!1 &8182243552293014081
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -232,14 +287,14 @@ RectTransform:
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:
- {fileID: 5794266781137433063} - {fileID: 5794266781137433063}
- {fileID: 8123432539175774182} - {fileID: 6969410083864484755}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -942.17523, y: -528.41003} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 400, y: 40} m_SizeDelta: {x: 422, y: 48}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1470794463991261557 --- !u!222 &1470794463991261557
CanvasRenderer: CanvasRenderer:

View File

@ -36,10 +36,10 @@ RectTransform:
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 382.5643, y: 38.7726} m_SizeDelta: {x: 422, y: 48}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &4122139132161196881 --- !u!114 &4122139132161196881
MonoBehaviour: MonoBehaviour:
@ -88,7 +88,7 @@ MonoBehaviour:
onValueChanged: onValueChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_IsOn: 1 m_IsOn: 0
--- !u!222 &6214454054620483043 --- !u!222 &6214454054620483043
CanvasRenderer: CanvasRenderer:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -137,7 +137,7 @@ GameObject:
m_Component: m_Component:
- component: {fileID: 1643028135073585909} - component: {fileID: 1643028135073585909}
- component: {fileID: 5916008016379382579} - component: {fileID: 5916008016379382579}
- component: {fileID: 3400572181519907392} - component: {fileID: 1420346593858721251}
m_Layer: 5 m_Layer: 5
m_Name: Label m_Name: Label
m_TagString: Untagged m_TagString: Untagged
@ -160,10 +160,10 @@ RectTransform:
m_Father: {fileID: 3942873543570284514} m_Father: {fileID: 3942873543570284514}
m_RootOrder: 1 m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 1, y: 1} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 13.0851, y: -0.5} m_AnchoredPosition: {x: 13.085098, y: -0.5}
m_SizeDelta: {x: -36.1702, y: -3} m_SizeDelta: {x: 369, y: 40}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5916008016379382579 --- !u!222 &5916008016379382579
CanvasRenderer: CanvasRenderer:
@ -173,7 +173,7 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1540113299397004097} m_GameObject: {fileID: 1540113299397004097}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 1
--- !u!114 &3400572181519907392 --- !u!114 &1420346593858721251
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
@ -182,7 +182,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1540113299397004097} m_GameObject: {fileID: 1540113299397004097}
m_Enabled: 1 m_Enabled: 1
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Material: {fileID: 0} m_Material: {fileID: 0}
@ -193,20 +193,75 @@ MonoBehaviour:
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_FontData: m_text: "\u5DE5\u4F5C\u524D\u5F00\u597D\u5F00\u5DE5\u4F1A\uFF0C\u5DE5\u4F5C\u8D1F\u8D23\u4EBA\u5411\u5DE5\u4F5C\u73ED\u6210\u5458\u4EA4\u4EE3\u5DE5\u4F5C\u5185\u5BB9\uFF0C\u5B89\u5168\u6CE8\u610F\u4E8B\u9879\u548C\u5371\u9669\u70B9"
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} m_isRightToLeft: 0
m_FontSize: 14 m_fontAsset: {fileID: 11400000, guid: f23cde0c3d86dad49bedc202ad993d21, type: 2}
m_FontStyle: 0 m_sharedMaterial: {fileID: -2120909647377011300, guid: f23cde0c3d86dad49bedc202ad993d21, type: 2}
m_BestFit: 0 m_fontSharedMaterials: []
m_MinSize: 10 m_fontMaterial: {fileID: 0}
m_MaxSize: 40 m_fontMaterials: []
m_Alignment: 0 m_fontColor32:
m_AlignByGeometry: 0 serializedVersion: 2
m_RichText: 1 rgba: 4294967295
m_HorizontalOverflow: 0 m_fontColor: {r: 1, g: 1, b: 1, a: 1}
m_VerticalOverflow: 0 m_enableVertexGradient: 0
m_LineSpacing: 1 m_colorMode: 3
m_Text: "\u5DE5\u4F5C" 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: 14
m_fontSizeBase: 14
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
m_HorizontalAlignment: 1
m_VerticalAlignment: 256
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 &4400471586503496451 --- !u!1 &4400471586503496451
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -243,7 +298,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 15, y: -19.3} m_AnchoredPosition: {x: 19.4, y: -25.5}
m_SizeDelta: {x: 20, y: 20} m_SizeDelta: {x: 20, y: 20}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4520933160009674142 --- !u!222 &4520933160009674142
@ -274,8 +329,8 @@ MonoBehaviour:
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} m_Sprite: {fileID: 21300000, guid: f52816d838dfa4a46b0432fae95318ee, type: 3}
m_Type: 1 m_Type: 0
m_PreserveAspect: 0 m_PreserveAspect: 0
m_FillCenter: 1 m_FillCenter: 1
m_FillMethod: 4 m_FillMethod: 4

View File

@ -1,6 +1,6 @@
%YAML 1.1 %YAML 1.1
%TAG !u! tag:unity3d.com,2011: %TAG !u! tag:unity3d.com,2011:
--- !u!1 &4239231589677207246 --- !u!1 &464744457135127127
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
@ -8,53 +8,54 @@ GameObject:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
serializedVersion: 6 serializedVersion: 6
m_Component: m_Component:
- component: {fileID: 4239231589677207247} - component: {fileID: 6574754484931438874}
- component: {fileID: 4239231589677207217} - component: {fileID: 1776058685440938395}
- component: {fileID: 4239231589677207216} - component: {fileID: 6773507116056973082}
- component: {fileID: 506215071228445042}
m_Layer: 5 m_Layer: 5
m_Name: ToolAndMeterialItem m_Name: ToolAndMaterlItem
m_TagString: Untagged m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 1
--- !u!224 &4239231589677207247 --- !u!224 &6574754484931438874
RectTransform: RectTransform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4239231589677207246} m_GameObject: {fileID: 464744457135127127}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:
- {fileID: 1103842610257818206} - {fileID: 5205643301997949128}
- {fileID: 8215525817944585444} - {fileID: 1803722018923938532}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0} m_SizeDelta: {x: 130, y: 130}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4239231589677207217 --- !u!222 &1776058685440938395
CanvasRenderer: CanvasRenderer:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4239231589677207246} m_GameObject: {fileID: 464744457135127127}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 1
--- !u!114 &4239231589677207216 --- !u!114 &6773507116056973082
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4239231589677207246} m_GameObject: {fileID: 464744457135127127}
m_Enabled: 1 m_Enabled: 1
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
@ -68,7 +69,7 @@ MonoBehaviour:
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_Sprite: {fileID: 0} m_Sprite: {fileID: 21300000, guid: c440f35582c13154db88b809ccce0758, type: 3}
m_Type: 0 m_Type: 0
m_PreserveAspect: 0 m_PreserveAspect: 0
m_FillCenter: 1 m_FillCenter: 1
@ -78,170 +79,13 @@ MonoBehaviour:
m_FillOrigin: 0 m_FillOrigin: 0
m_UseSpriteMesh: 0 m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1 m_PixelsPerUnitMultiplier: 1
--- !u!1 &4372117883866901743 --- !u!114 &506215071228445042
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1103842610257818206}
- component: {fileID: 4678192074515838294}
- component: {fileID: 3534060011449287153}
m_Layer: 5
m_Name: countText
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1103842610257818206
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4372117883866901743}
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: 4239231589677207247}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: -10.9, y: 10.5}
m_SizeDelta: {x: 20, y: 20}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4678192074515838294
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4372117883866901743}
m_CullTransparentMesh: 1
--- !u!114 &3534060011449287153
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4372117883866901743} m_GameObject: {fileID: 464744457135127127}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, 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_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_FontSize: 11
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 10
m_MaxSize: 40
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text:
--- !u!1 &7609248286363545378
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8215525817944585444}
- component: {fileID: 7822759280540398470}
- component: {fileID: 8247131394908315687}
- component: {fileID: 9144319166100695387}
m_Layer: 5
m_Name: deleteBtn
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &8215525817944585444
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7609248286363545378}
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: 4239231589677207247}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -10, y: -9.3}
m_SizeDelta: {x: 15, y: 15}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7822759280540398470
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7609248286363545378}
m_CullTransparentMesh: 1
--- !u!114 &8247131394908315687
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7609248286363545378}
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: 10905, guid: 0000000000000000f000000000000000, type: 0}
m_Type: 1
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 &9144319166100695387
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7609248286363545378}
m_Enabled: 1 m_Enabled: 1
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
@ -275,7 +119,263 @@ MonoBehaviour:
m_SelectedTrigger: Selected m_SelectedTrigger: Selected
m_DisabledTrigger: Disabled m_DisabledTrigger: Disabled
m_Interactable: 1 m_Interactable: 1
m_TargetGraphic: {fileID: 8247131394908315687} m_TargetGraphic: {fileID: 6773507116056973082}
m_OnClick: m_OnClick:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
--- !u!1 &1287235293540347711
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5205643301997949128}
- component: {fileID: 5444988397143885231}
- component: {fileID: 1805927906866143657}
- component: {fileID: 3108141478781955695}
m_Layer: 5
m_Name: ItemCloseBtn
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &5205643301997949128
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1287235293540347711}
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: 6574754484931438874}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 51, y: 46}
m_SizeDelta: {x: 14, y: 14}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5444988397143885231
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1287235293540347711}
m_CullTransparentMesh: 1
--- !u!114 &1805927906866143657
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1287235293540347711}
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: 63cd4070754e8fd4da758c87db957b35, 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 &3108141478781955695
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1287235293540347711}
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: 1
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: 0}
m_PressedSprite: {fileID: 0}
m_SelectedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_SelectedTrigger: Selected
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 1805927906866143657}
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!1 &4407067812886207628
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1803722018923938532}
- component: {fileID: 6213223470417886244}
- component: {fileID: 1255829598185336502}
m_Layer: 5
m_Name: CountText
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1803722018923938532
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4407067812886207628}
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: 6574754484931438874}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: -12.700012, y: 12.700012}
m_SizeDelta: {x: 20, y: 24}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6213223470417886244
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4407067812886207628}
m_CullTransparentMesh: 1
--- !u!114 &1255829598185336502
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4407067812886207628}
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: 10
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, 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: 16
m_fontSizeBase: 16
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}

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 2e27fc7afa0219549b3a44811d66c063 guid: 81b60d4c08d45534cbaaa26000888422
PrefabImporter: PrefabImporter:
externalObjects: {} externalObjects: {}
userData: userData:

View File

@ -33,9 +33,9 @@ RectTransform:
m_Father: {fileID: 2230491642635869173} m_Father: {fileID: 2230491642635869173}
m_RootOrder: 1 m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: -326, y: 0} m_AnchoredPosition: {x: 147, y: -25}
m_SizeDelta: {x: 200, y: 50} m_SizeDelta: {x: 200, y: 50}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &115346268 --- !u!222 &115346268
@ -171,11 +171,11 @@ RectTransform:
m_Father: {fileID: 4999506206623659068} m_Father: {fileID: 4999506206623659068}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 0, y: 29} m_AnchoredPosition: {x: 0, y: -289}
m_SizeDelta: {x: 900, y: 566} m_SizeDelta: {x: 1050, y: 644}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 1}
--- !u!222 &1572287660 --- !u!222 &1572287660
CanvasRenderer: CanvasRenderer:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -204,7 +204,7 @@ MonoBehaviour:
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_Sprite: {fileID: 21300000, guid: 0fa548697e3832d4db745f8b427238d6, type: 3} m_Sprite: {fileID: 21300000, guid: 89eec4c54eaf19b4eb4d780bc6450d7a, type: 3}
m_Type: 0 m_Type: 0
m_PreserveAspect: 0 m_PreserveAspect: 0
m_FillCenter: 1 m_FillCenter: 1
@ -309,7 +309,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5} m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: 0, y: 258} m_AnchoredPosition: {x: 0, y: 287}
m_SizeDelta: {x: 0, y: 50} m_SizeDelta: {x: 0, y: 50}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2230491642635869175 --- !u!222 &2230491642635869175
@ -357,7 +357,7 @@ RectTransform:
m_AnchorMin: {x: 1, y: 1} m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -29, y: -25} m_AnchoredPosition: {x: -29, y: -25}
m_SizeDelta: {x: 40, y: 40} m_SizeDelta: {x: 30, y: 30}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2230491642695118553 --- !u!222 &2230491642695118553
CanvasRenderer: CanvasRenderer:
@ -476,8 +476,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 223, y: -26} m_AnchoredPosition: {x: 348, y: -33}
m_SizeDelta: {x: 350, y: 450} m_SizeDelta: {x: 255, y: 489}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7112708151782283752 --- !u!222 &7112708151782283752
CanvasRenderer: CanvasRenderer:
@ -655,7 +655,7 @@ RectTransform:
m_GameObject: {fileID: 4884214998894982263} m_GameObject: {fileID: 4884214998894982263}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 0.3, y: 0.85, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:
- {fileID: 2575178156521307442} - {fileID: 2575178156521307442}
@ -664,8 +664,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0} m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -16, y: 0} m_AnchoredPosition: {x: -12.299988, y: -37.5}
m_SizeDelta: {x: 10, y: -17} m_SizeDelta: {x: 23.1141, y: -17}
m_Pivot: {x: 1, y: 1} m_Pivot: {x: 1, y: 1}
--- !u!222 &9088784353846653549 --- !u!222 &9088784353846653549
CanvasRenderer: CanvasRenderer:
@ -748,7 +748,7 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 1626200616171019350} m_TargetGraphic: {fileID: 1626200616171019350}
m_HandleRect: {fileID: 1722288688282409065} m_HandleRect: {fileID: 1722288688282409065}
m_Direction: 2 m_Direction: 2
m_Value: 0 m_Value: 1
m_Size: 1 m_Size: 1
m_NumberOfSteps: 0 m_NumberOfSteps: 0
m_OnValueChanged: m_OnValueChanged:
@ -790,10 +790,10 @@ RectTransform:
m_Father: {fileID: 1572287658} m_Father: {fileID: 1572287658}
m_RootOrder: 1 m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -33} m_AnchoredPosition: {x: 0, y: -39.85204}
m_SizeDelta: {x: 0, y: 500} m_SizeDelta: {x: 1050, y: 564.3}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4715000111845149035 --- !u!222 &4715000111845149035
CanvasRenderer: CanvasRenderer:
@ -810,7 +810,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4948901818511496158} m_GameObject: {fileID: 4948901818511496158}
m_Enabled: 1 m_Enabled: 0
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name: m_Name:
@ -1005,15 +1005,15 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Padding: m_Padding:
m_Left: 30 m_Left: 48
m_Right: 30 m_Right: 48
m_Top: 30 m_Top: 48
m_Bottom: 30 m_Bottom: 48
m_ChildAlignment: 0 m_ChildAlignment: 0
m_StartCorner: 0 m_StartCorner: 0
m_StartAxis: 0 m_StartAxis: 0
m_CellSize: {x: 80, y: 80} m_CellSize: {x: 130, y: 130}
m_Spacing: {x: 30, y: 30} m_Spacing: {x: 48, y: 48}
m_Constraint: 1 m_Constraint: 1
m_ConstraintCount: 4 m_ConstraintCount: 4
--- !u!114 &3586458768042929254 --- !u!114 &3586458768042929254

File diff suppressed because it is too large Load Diff

View File

@ -977,6 +977,9 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
ExpandSprite: {fileID: 21300000, guid: 4c690750a2bdfd846b732a727903f291, type: 3} ExpandSprite: {fileID: 21300000, guid: 4c690750a2bdfd846b732a727903f291, type: 3}
CollapseSprite: {fileID: 21300000, guid: 352fb2f67e1311f42a17d4be24bd51b6, type: 3} CollapseSprite: {fileID: 21300000, guid: 352fb2f67e1311f42a17d4be24bd51b6, type: 3}
countDown: 0
workOrderID: 5006
disassemblyAssemblyWorkOrderID: 5007
--- !u!1 &7034408565425647768 --- !u!1 &7034408565425647768
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

View File

@ -37,8 +37,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5} m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5}
m_AnchoredPosition: {x: -34, y: -7} m_AnchoredPosition: {x: -29, y: -65}
m_SizeDelta: {x: 40, y: 120} m_SizeDelta: {x: 52, y: 192}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &32001133 --- !u!222 &32001133
CanvasRenderer: CanvasRenderer:
@ -159,8 +159,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5} m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5}
m_AnchoredPosition: {x: -34, y: 141} m_AnchoredPosition: {x: -28, y: 146}
m_SizeDelta: {x: 40, y: 120} m_SizeDelta: {x: 52, y: 192}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &67948558 --- !u!222 &67948558
CanvasRenderer: CanvasRenderer:
@ -360,8 +360,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1} m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -29, y: -25} m_AnchoredPosition: {x: -40, y: -37}
m_SizeDelta: {x: 40, y: 40} m_SizeDelta: {x: 30, y: 30}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1079371125 --- !u!222 &1079371125
CanvasRenderer: CanvasRenderer:
@ -483,11 +483,11 @@ RectTransform:
m_Father: {fileID: 781378853607839230} m_Father: {fileID: 781378853607839230}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5} m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 1, y: 0.5} m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 0, y: 29} m_AnchoredPosition: {x: 41, y: -289}
m_SizeDelta: {x: -1020, y: 566} m_SizeDelta: {x: 1050, y: 644}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 1}
--- !u!222 &1154338907 --- !u!222 &1154338907
CanvasRenderer: CanvasRenderer:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -516,7 +516,7 @@ MonoBehaviour:
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_Sprite: {fileID: 21300000, guid: 0fa548697e3832d4db745f8b427238d6, type: 3} m_Sprite: {fileID: 21300000, guid: 89eec4c54eaf19b4eb4d780bc6450d7a, type: 3}
m_Type: 0 m_Type: 0
m_PreserveAspect: 0 m_PreserveAspect: 0
m_FillCenter: 1 m_FillCenter: 1
@ -639,10 +639,10 @@ RectTransform:
m_Father: {fileID: 1154338905} m_Father: {fileID: 1154338905}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: -333.3, y: 250.1} m_AnchoredPosition: {x: 115, y: -35}
m_SizeDelta: {x: 165.5863, y: 39.338} m_SizeDelta: {x: 93, y: 37}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2707361099775838549 --- !u!222 &2707361099775838549
CanvasRenderer: CanvasRenderer:
@ -699,7 +699,7 @@ MonoBehaviour:
m_faceColor: m_faceColor:
serializedVersion: 2 serializedVersion: 2
rgba: 4294967295 rgba: 4294967295
m_fontSize: 39.3 m_fontSize: 31
m_fontSizeBase: 36 m_fontSizeBase: 36
m_fontWeight: 400 m_fontWeight: 400
m_enableAutoSizing: 1 m_enableAutoSizing: 1
@ -1014,7 +1014,6 @@ GameObject:
m_Component: m_Component:
- component: {fileID: 211898822561483642} - component: {fileID: 211898822561483642}
- component: {fileID: 6889178989167968967} - component: {fileID: 6889178989167968967}
- component: {fileID: 2850438496995819425}
- component: {fileID: 2208361143543843439} - component: {fileID: 2208361143543843439}
m_Layer: 5 m_Layer: 5
m_Name: itemScrollView m_Name: itemScrollView
@ -1042,8 +1041,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5} m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: 0, y: -33} m_AnchoredPosition: {x: 0, y: -39.619}
m_SizeDelta: {x: 0, y: 500} m_SizeDelta: {x: 0, y: 564.76}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6889178989167968967 --- !u!222 &6889178989167968967
CanvasRenderer: CanvasRenderer:
@ -1053,36 +1052,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6510599427880491122} m_GameObject: {fileID: 6510599427880491122}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 1
--- !u!114 &2850438496995819425
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6510599427880491122}
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: 0.990566, g: 0.990566, b: 0.990566, a: 0.392}
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: 10907, guid: 0000000000000000f000000000000000, type: 0}
m_Type: 1
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 &2208361143543843439 --- !u!114 &2208361143543843439
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -1141,7 +1110,7 @@ RectTransform:
m_GameObject: {fileID: 6718381072746364891} m_GameObject: {fileID: 6718381072746364891}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 0.3, y: 0.85, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:
- {fileID: 4415940749880211102} - {fileID: 4415940749880211102}
@ -1150,8 +1119,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0} m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -16, y: 0} m_AnchoredPosition: {x: -10, y: -28}
m_SizeDelta: {x: 10, y: -17} m_SizeDelta: {x: 23.6565, y: -17}
m_Pivot: {x: 1, y: 1} m_Pivot: {x: 1, y: 1}
--- !u!222 &6977647453171120577 --- !u!222 &6977647453171120577
CanvasRenderer: CanvasRenderer:
@ -1297,17 +1266,17 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Padding: m_Padding:
m_Left: 30 m_Left: 48
m_Right: 30 m_Right: 48
m_Top: 30 m_Top: 48
m_Bottom: 30 m_Bottom: 30
m_ChildAlignment: 0 m_ChildAlignment: 0
m_StartCorner: 0 m_StartCorner: 0
m_StartAxis: 0 m_StartAxis: 0
m_CellSize: {x: 80, y: 80} m_CellSize: {x: 130, y: 130}
m_Spacing: {x: 30, y: 30} m_Spacing: {x: 70, y: 40}
m_Constraint: 1 m_Constraint: 1
m_ConstraintCount: 7 m_ConstraintCount: 5
--- !u!114 &3400751445455972298 --- !u!114 &3400751445455972298
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

View File

@ -30,12 +30,12 @@ public class JBQ_Test : MonoBehaviour
//}); //});
///4.工作票选择面板 ///4.工作票选择面板
//UIManager.Instance.ShowPanel<UI_SelectWorkTicketPanel>(E_UI_Layer.System, (panel) => UIManager.Instance.ShowPanel<UI_SelectWorkTicketPanel>(E_UI_Layer.System, (panel) =>
//{ {
// ProcessManager.Instance.mode = E_ModeType.Study; ProcessManager.Instance.mode = E_ModeType.Study;
// panel.Init(); panel.Init(4);
//}); });
///5.顶部提示面板 ///5.顶部提示面板
//UIManager.Instance.ShowPanel<UI_TopTipPanel>(E_UI_Layer.System, (panel) => //UIManager.Instance.ShowPanel<UI_TopTipPanel>(E_UI_Layer.System, (panel) =>
@ -65,11 +65,11 @@ public class JBQ_Test : MonoBehaviour
//}); //});
///8.电能计量装置装拆工单 ///8.电能计量装置装拆工单
UIManager.Instance.ShowPanel<UI_InstallAndDismantleTicketPanel>(E_UI_Layer.System, (panel) => //UIManager.Instance.ShowPanel<UI_InstallAndDismantleTicketPanel>(E_UI_Layer.System, (panel) =>
{ //{
//panel.Init(); // //panel.Init();
}); //});
} }
if (Input.GetKeyDown(KeyCode.L)) if (Input.GetKeyDown(KeyCode.L))

View File

@ -462,17 +462,13 @@ MonoBehaviour:
m_RequiresDepthTexture: 0 m_RequiresDepthTexture: 0
m_RequiresColorTexture: 0 m_RequiresColorTexture: 0
m_Version: 2 m_Version: 2
--- !u!1001 &2105969581 --- !u!1001 &961013237
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
serializedVersion: 2 serializedVersion: 2
m_Modification: m_Modification:
m_TransformParent: {fileID: 695398612} m_TransformParent: {fileID: 695398612}
m_Modifications: m_Modifications:
- target: {fileID: 1572287659, guid: ab2a29ecc1e97fc479dad73962e6c3b4, type: 3}
propertyPath: m_Enabled
value: 1
objectReference: {fileID: 0}
- target: {fileID: 576915134318820707, guid: ab2a29ecc1e97fc479dad73962e6c3b4, type: 3} - target: {fileID: 576915134318820707, guid: ab2a29ecc1e97fc479dad73962e6c3b4, type: 3}
propertyPath: m_Name propertyPath: m_Name
value: UI_CheckMyselfPanel value: UI_CheckMyselfPanel

View File

@ -123,111 +123,108 @@ NavMeshSettings:
debug: debug:
m_Flags: 0 m_Flags: 0
m_NavMeshData: {fileID: 0} m_NavMeshData: {fileID: 0}
--- !u!1001 &828156005 --- !u!1001 &278349793
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
serializedVersion: 2 serializedVersion: 2
m_Modification: m_Modification:
m_TransformParent: {fileID: 0} m_TransformParent: {fileID: 8048042365218946059}
m_Modifications: m_Modifications:
- target: {fileID: 8048042365323826983, guid: 8c6795f3cb689a240b528fa3d08f455e, type: 3} - target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
propertyPath: m_Pivot.x propertyPath: m_Pivot.x
value: 0 value: 0.5
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 8048042365323826983, guid: 8c6795f3cb689a240b528fa3d08f455e, type: 3} - target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
propertyPath: m_Pivot.y propertyPath: m_Pivot.y
value: 0 value: 0.5
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 8048042365323826983, guid: 8c6795f3cb689a240b528fa3d08f455e, type: 3} - target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 8048042365323826983, guid: 8c6795f3cb689a240b528fa3d08f455e, type: 3} - target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
propertyPath: m_AnchorMax.x propertyPath: m_AnchorMax.x
value: 0 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 8048042365323826983, guid: 8c6795f3cb689a240b528fa3d08f455e, type: 3} - target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
propertyPath: m_AnchorMax.y propertyPath: m_AnchorMax.y
value: 0 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 8048042365323826983, guid: 8c6795f3cb689a240b528fa3d08f455e, type: 3} - target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
propertyPath: m_AnchorMin.x propertyPath: m_AnchorMin.x
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 8048042365323826983, guid: 8c6795f3cb689a240b528fa3d08f455e, type: 3} - target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
propertyPath: m_AnchorMin.y propertyPath: m_AnchorMin.y
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 8048042365323826983, guid: 8c6795f3cb689a240b528fa3d08f455e, type: 3} - target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
propertyPath: m_SizeDelta.x propertyPath: m_SizeDelta.x
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 8048042365323826983, guid: 8c6795f3cb689a240b528fa3d08f455e, type: 3} - target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
propertyPath: m_SizeDelta.y propertyPath: m_SizeDelta.y
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 8048042365323826983, guid: 8c6795f3cb689a240b528fa3d08f455e, type: 3} - target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 8048042365323826983, guid: 8c6795f3cb689a240b528fa3d08f455e, type: 3} - target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
propertyPath: m_LocalPosition.y propertyPath: m_LocalPosition.y
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 8048042365323826983, guid: 8c6795f3cb689a240b528fa3d08f455e, type: 3} - target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
propertyPath: m_LocalPosition.z propertyPath: m_LocalPosition.z
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 8048042365323826983, guid: 8c6795f3cb689a240b528fa3d08f455e, type: 3} - target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
propertyPath: m_LocalRotation.w propertyPath: m_LocalRotation.w
value: 1 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 8048042365323826983, guid: 8c6795f3cb689a240b528fa3d08f455e, type: 3} - target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
propertyPath: m_LocalRotation.x propertyPath: m_LocalRotation.x
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 8048042365323826983, guid: 8c6795f3cb689a240b528fa3d08f455e, type: 3} - target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
propertyPath: m_LocalRotation.y propertyPath: m_LocalRotation.y
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 8048042365323826983, guid: 8c6795f3cb689a240b528fa3d08f455e, type: 3} - target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
propertyPath: m_LocalRotation.z propertyPath: m_LocalRotation.z
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 8048042365323826983, guid: 8c6795f3cb689a240b528fa3d08f455e, type: 3} - target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
propertyPath: m_AnchoredPosition.x propertyPath: m_AnchoredPosition.x
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 8048042365323826983, guid: 8c6795f3cb689a240b528fa3d08f455e, type: 3} - target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
propertyPath: m_AnchoredPosition.y propertyPath: m_AnchoredPosition.y
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 8048042365323826983, guid: 8c6795f3cb689a240b528fa3d08f455e, type: 3} - target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
propertyPath: m_LocalEulerAnglesHint.x propertyPath: m_LocalEulerAnglesHint.x
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 8048042365323826983, guid: 8c6795f3cb689a240b528fa3d08f455e, type: 3} - target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
propertyPath: m_LocalEulerAnglesHint.y propertyPath: m_LocalEulerAnglesHint.y
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 8048042365323826983, guid: 8c6795f3cb689a240b528fa3d08f455e, type: 3} - target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
propertyPath: m_LocalEulerAnglesHint.z propertyPath: m_LocalEulerAnglesHint.z
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 8048042365323827000, guid: 8c6795f3cb689a240b528fa3d08f455e, type: 3} - target: {fileID: 9212047459532377511, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
propertyPath: m_AdditionalShaderChannelsFlag
value: 25
objectReference: {fileID: 0}
- target: {fileID: 8048042365323827003, guid: 8c6795f3cb689a240b528fa3d08f455e, type: 3}
propertyPath: m_Name propertyPath: m_Name
value: Canvas value: UI_LowTensionWorkTicketPanel
objectReference: {fileID: 0}
- target: {fileID: 8048042366342728954, guid: 8c6795f3cb689a240b528fa3d08f455e, type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 8c6795f3cb689a240b528fa3d08f455e, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
--- !u!224 &793798410 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3}
m_PrefabInstance: {fileID: 278349793}
m_PrefabAsset: {fileID: 0}
--- !u!1 &845611926 --- !u!1 &845611926
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -461,149 +458,322 @@ Transform:
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 2 m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
--- !u!224 &1805964178 stripped --- !u!1 &8048042365218946058
RectTransform: GameObject:
m_CorrespondingSourceObject: {fileID: 8048042366342728953, guid: 8c6795f3cb689a240b528fa3d08f455e, type: 3}
m_PrefabInstance: {fileID: 828156005}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &1791497928855343172
PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
serializedVersion: 2 m_CorrespondingSourceObject: {fileID: 0}
m_Modification: m_PrefabInstance: {fileID: 0}
m_TransformParent: {fileID: 1805964178} m_PrefabAsset: {fileID: 0}
m_Modifications: serializedVersion: 6
- target: {fileID: 1811112673, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3} m_Component:
propertyPath: m_AnchorMax.x - component: {fileID: 8048042365218946059}
value: 0 m_Layer: 5
objectReference: {fileID: 0} m_Name: Top
- target: {fileID: 1811112673, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3} m_TagString: Untagged
propertyPath: m_AnchorMax.y m_Icon: {fileID: 0}
value: 0 m_NavMeshLayer: 0
objectReference: {fileID: 0} m_StaticEditorFlags: 0
- target: {fileID: 1811112673, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3} m_IsActive: 1
propertyPath: m_AnchorMin.y --- !u!224 &8048042365218946059
value: 0 RectTransform:
objectReference: {fileID: 0} m_ObjectHideFlags: 0
- target: {fileID: 349154382982398426, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3} m_CorrespondingSourceObject: {fileID: 0}
propertyPath: m_SizeDelta.x m_PrefabInstance: {fileID: 0}
value: 0 m_PrefabAsset: {fileID: 0}
objectReference: {fileID: 0} m_GameObject: {fileID: 8048042365218946058}
- target: {fileID: 349154382982398426, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
propertyPath: m_SizeDelta.y m_LocalPosition: {x: 0, y: 0, z: 0}
value: 0 m_LocalScale: {x: 1, y: 1, z: 1}
objectReference: {fileID: 0} m_ConstrainProportionsScale: 0
- target: {fileID: 2177821829111094747, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3} m_Children:
propertyPath: m_AnchorMax.x - {fileID: 793798410}
value: 0 m_Father: {fileID: 8048042365605609282}
objectReference: {fileID: 0} m_RootOrder: 2
- target: {fileID: 2177821829111094747, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
propertyPath: m_AnchorMax.y m_AnchorMin: {x: 0, y: 0}
value: 0 m_AnchorMax: {x: 1, y: 1}
objectReference: {fileID: 0} m_AnchoredPosition: {x: 0, y: 0}
- target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3} m_SizeDelta: {x: 0, y: 0}
propertyPath: m_Pivot.x m_Pivot: {x: 0.5, y: 0.5}
value: 0.5 --- !u!224 &8048042365287329682
objectReference: {fileID: 0} RectTransform:
- target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3} m_ObjectHideFlags: 0
propertyPath: m_Pivot.y m_CorrespondingSourceObject: {fileID: 0}
value: 0.5 m_PrefabInstance: {fileID: 0}
objectReference: {fileID: 0} m_PrefabAsset: {fileID: 0}
- target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3} m_GameObject: {fileID: 8048042365287329773}
propertyPath: m_RootOrder m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
value: 0 m_LocalPosition: {x: 0, y: 0, z: 0}
objectReference: {fileID: 0} m_LocalScale: {x: 1, y: 1, z: 1}
- target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3} m_ConstrainProportionsScale: 0
propertyPath: m_AnchorMax.x m_Children: []
value: 1 m_Father: {fileID: 8048042365605609282}
objectReference: {fileID: 0} m_RootOrder: 3
- target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
propertyPath: m_AnchorMax.y m_AnchorMin: {x: 0, y: 0}
value: 1 m_AnchorMax: {x: 1, y: 1}
objectReference: {fileID: 0} m_AnchoredPosition: {x: 0, y: 0}
- target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3} m_SizeDelta: {x: 0, y: 0}
propertyPath: m_AnchorMin.x m_Pivot: {x: 0.5, y: 0.5}
value: 0 --- !u!1 &8048042365287329773
objectReference: {fileID: 0} GameObject:
- target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3} m_ObjectHideFlags: 0
propertyPath: m_AnchorMin.y m_CorrespondingSourceObject: {fileID: 0}
value: 0 m_PrefabInstance: {fileID: 0}
objectReference: {fileID: 0} m_PrefabAsset: {fileID: 0}
- target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3} serializedVersion: 6
propertyPath: m_SizeDelta.x m_Component:
value: 0 - component: {fileID: 8048042365287329682}
objectReference: {fileID: 0} m_Layer: 5
- target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3} m_Name: System
propertyPath: m_SizeDelta.y m_TagString: Untagged
value: 0 m_Icon: {fileID: 0}
objectReference: {fileID: 0} m_NavMeshLayer: 0
- target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3} m_StaticEditorFlags: 0
propertyPath: m_LocalPosition.x m_IsActive: 1
value: 0 --- !u!224 &8048042365321468824
objectReference: {fileID: 0} RectTransform:
- target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3} m_ObjectHideFlags: 0
propertyPath: m_LocalPosition.y m_CorrespondingSourceObject: {fileID: 0}
value: 0 m_PrefabInstance: {fileID: 0}
objectReference: {fileID: 0} m_PrefabAsset: {fileID: 0}
- target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3} m_GameObject: {fileID: 8048042365321468827}
propertyPath: m_LocalPosition.z m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
value: 0 m_LocalPosition: {x: 0, y: 0, z: 0}
objectReference: {fileID: 0} m_LocalScale: {x: 1, y: 1, z: 1}
- target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3} m_ConstrainProportionsScale: 0
propertyPath: m_LocalRotation.w m_Children: []
value: 1 m_Father: {fileID: 8048042365605609282}
objectReference: {fileID: 0} m_RootOrder: 0
- target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
propertyPath: m_LocalRotation.x m_AnchorMin: {x: 0, y: 0}
value: 0 m_AnchorMax: {x: 1, y: 1}
objectReference: {fileID: 0} m_AnchoredPosition: {x: 0, y: 0}
- target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3} m_SizeDelta: {x: 0, y: 0}
propertyPath: m_LocalRotation.y m_Pivot: {x: 0.5, y: 0.5}
value: 0 --- !u!1 &8048042365321468827
objectReference: {fileID: 0} GameObject:
- target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3} m_ObjectHideFlags: 0
propertyPath: m_LocalRotation.z m_CorrespondingSourceObject: {fileID: 0}
value: 0 m_PrefabInstance: {fileID: 0}
objectReference: {fileID: 0} m_PrefabAsset: {fileID: 0}
- target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3} serializedVersion: 6
propertyPath: m_AnchoredPosition.x m_Component:
value: 0 - component: {fileID: 8048042365321468824}
objectReference: {fileID: 0} m_Layer: 5
- target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3} m_Name: Bot
propertyPath: m_AnchoredPosition.y m_TagString: Untagged
value: 0 m_Icon: {fileID: 0}
objectReference: {fileID: 0} m_NavMeshLayer: 0
- target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3} m_StaticEditorFlags: 0
propertyPath: m_LocalEulerAnglesHint.x m_IsActive: 1
value: 0 --- !u!224 &8048042365605609282
objectReference: {fileID: 0} RectTransform:
- target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3} m_ObjectHideFlags: 0
propertyPath: m_LocalEulerAnglesHint.y m_CorrespondingSourceObject: {fileID: 0}
value: 0 m_PrefabInstance: {fileID: 0}
objectReference: {fileID: 0} m_PrefabAsset: {fileID: 0}
- target: {fileID: 3654540742598116600, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3} m_GameObject: {fileID: 8048042365605609310}
propertyPath: m_LocalEulerAnglesHint.z m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
value: 0 m_LocalPosition: {x: 0, y: 0, z: 0}
objectReference: {fileID: 0} m_LocalScale: {x: 0, y: 0, z: 0}
- target: {fileID: 4829562738776111112, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3} m_ConstrainProportionsScale: 0
propertyPath: m_AnchorMax.x m_Children:
value: 0 - {fileID: 8048042365321468824}
objectReference: {fileID: 0} - {fileID: 8048042367136801948}
- target: {fileID: 4829562738776111112, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3} - {fileID: 8048042365218946059}
propertyPath: m_AnchorMax.y - {fileID: 8048042365287329682}
value: 0 - {fileID: 8048042367092629892}
objectReference: {fileID: 0} m_Father: {fileID: 0}
- target: {fileID: 8632911327012071035, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3} m_RootOrder: 0
propertyPath: m_SizeDelta.x m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
value: 0 m_AnchorMin: {x: 0, y: 0}
objectReference: {fileID: 0} m_AnchorMax: {x: 0, y: 0}
- target: {fileID: 8632911327012071035, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3} m_AnchoredPosition: {x: 0, y: 0}
propertyPath: m_SizeDelta.y m_SizeDelta: {x: 0, y: 0}
value: 0 m_Pivot: {x: 0, y: 0}
objectReference: {fileID: 0} --- !u!114 &8048042365605609308
- target: {fileID: 9212047459532377511, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3} MonoBehaviour:
propertyPath: m_Name m_ObjectHideFlags: 0
value: UI_LowTensionWorkTicketPanel m_CorrespondingSourceObject: {fileID: 0}
objectReference: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_RemovedComponents: [] m_PrefabAsset: {fileID: 0}
m_SourcePrefab: {fileID: 100100000, guid: 5879fb0201e6cf14d9e2bbe948d51a57, type: 3} m_GameObject: {fileID: 8048042365605609310}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
m_Name:
m_EditorClassIdentifier:
m_UiScaleMode: 1
m_ReferencePixelsPerUnit: 100
m_ScaleFactor: 1
m_ReferenceResolution: {x: 1920, y: 1080}
m_ScreenMatchMode: 0
m_MatchWidthOrHeight: 1
m_PhysicalUnit: 3
m_FallbackScreenDPI: 96
m_DefaultSpriteDPI: 96
m_DynamicPixelsPerUnit: 1
m_PresetInfoIsWorld: 0
--- !u!223 &8048042365605609309
Canvas:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8048042365605609310}
m_Enabled: 1
serializedVersion: 3
m_RenderMode: 0
m_Camera: {fileID: 0}
m_PlaneDistance: 100
m_PixelPerfect: 0
m_ReceivesEvents: 1
m_OverrideSorting: 0
m_OverridePixelPerfect: 0
m_SortingBucketNormalizedSize: 0
m_VertexColorAlwaysGammaSpace: 0
m_AdditionalShaderChannelsFlag: 25
m_SortingLayerID: 0
m_SortingOrder: 0
m_TargetDisplay: 0
--- !u!1 &8048042365605609310
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8048042365605609282}
- component: {fileID: 8048042365605609309}
- component: {fileID: 8048042365605609308}
- component: {fileID: 8048042365605609311}
m_Layer: 5
m_Name: Canvas
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &8048042365605609311
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8048042365605609310}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
m_Name:
m_EditorClassIdentifier:
m_IgnoreReversedGraphics: 1
m_BlockingObjects: 0
m_BlockingMask:
serializedVersion: 2
m_Bits: 119
--- !u!4 &8048042367092629892
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8048042367092629895}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -405, y: -331.5, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 8048042365605609282}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &8048042367092629893
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8048042367092629895}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3}
m_Name:
m_EditorClassIdentifier:
m_SendPointerHoverToParent: 1
m_HorizontalAxis: Horizontal
m_VerticalAxis: Vertical
m_SubmitButton: Submit
m_CancelButton: Cancel
m_InputActionsPerSecond: 10
m_RepeatDelay: 0.5
m_ForceModuleActive: 0
--- !u!1 &8048042367092629895
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8048042367092629892}
- component: {fileID: 8048042367092629898}
- component: {fileID: 8048042367092629893}
m_Layer: 0
m_Name: EventSystem
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &8048042367092629898
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8048042367092629895}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3}
m_Name:
m_EditorClassIdentifier:
m_FirstSelected: {fileID: 0}
m_sendNavigationEvents: 1
m_DragThreshold: 10
--- !u!224 &8048042367136801948
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8048042367136801951}
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: 8048042365605609282}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &8048042367136801951
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8048042367136801948}
m_Layer: 5
m_Name: Mid
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1

View File

@ -447,18 +447,6 @@ PrefabInstance:
propertyPath: m_AnchorMax.y propertyPath: m_AnchorMax.y
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 664557115506198354, guid: c589cfa8e2c0c004ca8727f8a9546ace, type: 3}
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 664557115506198354, guid: c589cfa8e2c0c004ca8727f8a9546ace, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 664557115506198354, guid: c589cfa8e2c0c004ca8727f8a9546ace, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 781378853607839230, guid: c589cfa8e2c0c004ca8727f8a9546ace, type: 3} - target: {fileID: 781378853607839230, guid: c589cfa8e2c0c004ca8727f8a9546ace, type: 3}
propertyPath: m_Pivot.x propertyPath: m_Pivot.x
value: 0.5 value: 0.5

View File

@ -241,6 +241,175 @@ MonoBehaviour:
m_RequiresDepthTexture: 0 m_RequiresDepthTexture: 0
m_RequiresColorTexture: 0 m_RequiresColorTexture: 0
m_Version: 2 m_Version: 2
--- !u!1 &293571869
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 293571873}
- component: {fileID: 293571872}
- component: {fileID: 293571871}
- component: {fileID: 293571870}
m_Layer: 5
m_Name: Canvas
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &293571870
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 293571869}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
m_Name:
m_EditorClassIdentifier:
m_IgnoreReversedGraphics: 1
m_BlockingObjects: 0
m_BlockingMask:
serializedVersion: 2
m_Bits: 119
--- !u!114 &293571871
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 293571869}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
m_Name:
m_EditorClassIdentifier:
m_UiScaleMode: 1
m_ReferencePixelsPerUnit: 100
m_ScaleFactor: 1
m_ReferenceResolution: {x: 1920, y: 1080}
m_ScreenMatchMode: 0
m_MatchWidthOrHeight: 0
m_PhysicalUnit: 3
m_FallbackScreenDPI: 96
m_DefaultSpriteDPI: 96
m_DynamicPixelsPerUnit: 1
m_PresetInfoIsWorld: 0
--- !u!223 &293571872
Canvas:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 293571869}
m_Enabled: 1
serializedVersion: 3
m_RenderMode: 0
m_Camera: {fileID: 0}
m_PlaneDistance: 100
m_PixelPerfect: 0
m_ReceivesEvents: 1
m_OverrideSorting: 0
m_OverridePixelPerfect: 0
m_SortingBucketNormalizedSize: 0
m_VertexColorAlwaysGammaSpace: 0
m_AdditionalShaderChannelsFlag: 25
m_SortingLayerID: 0
m_SortingOrder: 0
m_TargetDisplay: 0
--- !u!224 &293571873
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 293571869}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0, y: 0, z: 0}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 3
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: 0, y: 0}
m_Pivot: {x: 0, y: 0}
--- !u!1 &678380208
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 678380211}
- component: {fileID: 678380210}
- component: {fileID: 678380209}
m_Layer: 0
m_Name: EventSystem
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &678380209
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 678380208}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3}
m_Name:
m_EditorClassIdentifier:
m_SendPointerHoverToParent: 1
m_HorizontalAxis: Horizontal
m_VerticalAxis: Vertical
m_SubmitButton: Submit
m_CancelButton: Cancel
m_InputActionsPerSecond: 10
m_RepeatDelay: 0.5
m_ForceModuleActive: 0
--- !u!114 &678380210
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 678380208}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3}
m_Name:
m_EditorClassIdentifier:
m_FirstSelected: {fileID: 0}
m_sendNavigationEvents: 1
m_DragThreshold: 10
--- !u!4 &678380211
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 678380208}
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: 0}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &744736104 --- !u!1 &744736104
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

View File

@ -122,6 +122,7 @@ public class D_SubProcess : I_Enter, I_Exit
{ {
if (subProcessStepes[i].id == stepId) if (subProcessStepes[i].id == stepId)
{ {
subProcessStepes[i].GetTriggerID();
return subProcessStepes[i]; return subProcessStepes[i];
} }
} }

View File

@ -18,18 +18,20 @@ public class D_SubProcessStep : I_Enter, I_Exit
public string tipTitle; public string tipTitle;
public float score; public float score;
public List<int> triggersId = new List<int>(); public List<int> triggersId;
public void Init() public void Init()
{ {
GetToolID(); GetTriggerID();
ProcessManager.Instance.subProcessStepTriggerID = triggersId[0];
} }
/// <summary> /// <summary>
/// 获取目标ID, (后续 toolID 换成 targetID 应该更好点吧) /// 获取目标ID, (后续 toolID 换成 targetID 应该更好点吧)
/// </summary> /// </summary>
private void GetToolID() public void GetTriggerID()
{ {
triggersId = new List<int>();
if (string.IsNullOrEmpty(triggerID)) return; if (string.IsNullOrEmpty(triggerID)) return;
if (triggerID.Contains(',')) if (triggerID.Contains(','))
{ {
@ -40,7 +42,9 @@ public class D_SubProcessStep : I_Enter, I_Exit
} }
} }
else else
{
triggersId.Add(int.Parse(triggerID)); triggersId.Add(int.Parse(triggerID));
}
} }
@ -50,7 +54,7 @@ public class D_SubProcessStep : I_Enter, I_Exit
/// </summary> /// </summary>
public void Enter() public void Enter()
{ {
GetToolID(); //GetTriggerID();
UnityEngine.Debug.Log("进入当前子流程步骤:" + id + "_" + subProcessStepName); UnityEngine.Debug.Log("进入当前子流程步骤:" + id + "_" + subProcessStepName);
} }
/// <summary> /// <summary>
@ -58,7 +62,8 @@ public class D_SubProcessStep : I_Enter, I_Exit
/// </summary> /// </summary>
public void Exit() public void Exit()
{ {
triggersId.Clear(); //triggersId.Clear();
//triggersComplete.Clear();
UnityEngine.Debug.Log("退出当前子流程步骤:" + id + "_" + subProcessStepName); UnityEngine.Debug.Log("退出当前子流程步骤:" + id + "_" + subProcessStepName);
} }
} }

View File

@ -1,3 +1,4 @@
using HighlightPlus;
using System; using System;
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
@ -7,6 +8,11 @@ using UnityEngine;
/// </summary> /// </summary>
public class OfficeManager : MonoBehaviour public class OfficeManager : MonoBehaviour
{ {
public HighlightEffect[] _highlight;
public int currentProcessID;
public int currentSubProcessID;
public int currentSubProcessStepID;
public int currentSubProcessStepTriggerID;
// Start is called before the first frame update // Start is called before the first frame update
void Start() void Start()
{ {
@ -14,6 +20,9 @@ public class OfficeManager : MonoBehaviour
GameManager.EventMgr.AddEventListener(Enum_EventType.InitializationUI, InitializationUI); GameManager.EventMgr.AddEventListener(Enum_EventType.InitializationUI, InitializationUI);
} }
private void OfficeTimeLineOver() private void OfficeTimeLineOver()
{ {
GameManager.UIMgr.ShowPanel<UI_MaskPanel>(E_UI_Layer.System, (panel) => GameManager.UIMgr.ShowPanel<UI_MaskPanel>(E_UI_Layer.System, (panel) =>

View File

@ -47,7 +47,7 @@ public class ProcessManager : BaseManager<ProcessManager>
/// </summary> /// </summary>
public int subProcessStepId = -1; public int subProcessStepId = -1;
public int subProcessStepToolID = -1; public int subProcessStepTriggerID = -1;
/// <summary> /// <summary>
/// 倒计时,剩余时长 /// 倒计时,剩余时长
@ -115,23 +115,8 @@ public class ProcessManager : BaseManager<ProcessManager>
/// 切换 /// 切换
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
public bool CheckSubProcessSteps(int subProcessStepID, int subProcessStepTriggerID) public bool CheckSubProcessSteps(int subProcessStepID)
{ {
if (d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.triggersId.Count > 0)
{
int currentSubProcessStepsToolId = d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.triggersId[0];
if (d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStepId == subProcessStepID && subProcessStepTriggerID == currentSubProcessStepsToolId)
{
GameManager.EventMgr.EventTrigger<int>(Enum_EventType.SwitchSubProcessStepTriggerID, currentSubProcessStepsToolId);
d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.triggersId.RemoveAt(0);
return true;
}
else
{
Debug.Log("点击正确的操作");
return false;
}
}
if (d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStepId.Equals(subProcessStepID)) if (d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStepId.Equals(subProcessStepID))
{ {
int spStepID = subProcessStepId + 1; int spStepID = subProcessStepId + 1;
@ -140,6 +125,7 @@ public class ProcessManager : BaseManager<ProcessManager>
{ {
HandoverSubProcessStep(spStepID); HandoverSubProcessStep(spStepID);
GameManager.EventMgr.EventTrigger<int>(Enum_EventType.SwitchSubProcessStep, subProcessStepID); GameManager.EventMgr.EventTrigger<int>(Enum_EventType.SwitchSubProcessStep, subProcessStepID);
//GameManager.EventMgr.EventTrigger<int>(Enum_EventType.SwitchSubProcessStepTriggerID, subProcessStepTriggerID);
GameManager.UIMgr.ShowPanel<UI_TopTipPanel>(E_UI_Layer.System, (panel) => GameManager.UIMgr.ShowPanel<UI_TopTipPanel>(E_UI_Layer.System, (panel) =>
{ {
panel.Init($"{d_Scheme.CurrentProcess.processName}:<color=blue>{d_Scheme.CurrentProcess.CurrentSubProcess.subProcessName}</color>", $"{d_Scheme.CurrentProcess.CurrentSubProcess.tips}"); panel.Init($"{d_Scheme.CurrentProcess.processName}:<color=blue>{d_Scheme.CurrentProcess.CurrentSubProcess.subProcessName}</color>", $"{d_Scheme.CurrentProcess.CurrentSubProcess.tips}");
@ -154,9 +140,6 @@ public class ProcessManager : BaseManager<ProcessManager>
if (spID <= d_Scheme.CurrentProcess.subProcesses[spCount - 1].id) if (spID <= d_Scheme.CurrentProcess.subProcesses[spCount - 1].id)
{ {
HandoverSubProcess(spID, 0); HandoverSubProcess(spID, 0);
int currentSubProcessStepsToolId = d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.triggersId[0];
GameManager.EventMgr.EventTrigger<int>(Enum_EventType.SwitchSubProcessStepTriggerID, currentSubProcessStepsToolId);
d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.triggersId.RemoveAt(0);
GameManager.EventMgr.EventTrigger<int>(Enum_EventType.SwitchSubProcessStep, d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStepId); GameManager.EventMgr.EventTrigger<int>(Enum_EventType.SwitchSubProcessStep, d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStepId);
GameManager.EventMgr.EventTrigger<int>(Enum_EventType.SwitchSubProcess, d_Scheme.CurrentProcess.CurrentSubProcessId); GameManager.EventMgr.EventTrigger<int>(Enum_EventType.SwitchSubProcess, d_Scheme.CurrentProcess.CurrentSubProcessId);
GameManager.UIMgr.ShowPanel<UI_TopTipPanel>(E_UI_Layer.System, (panel) => GameManager.UIMgr.ShowPanel<UI_TopTipPanel>(E_UI_Layer.System, (panel) =>
@ -173,9 +156,6 @@ public class ProcessManager : BaseManager<ProcessManager>
if (pID <= d_Scheme.processes[pCount - 1].id) if (pID <= d_Scheme.processes[pCount - 1].id)
{ {
HandoverProcess(pID, 0, 0); HandoverProcess(pID, 0, 0);
int currentSubProcessStepsToolId = d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.triggersId[0];
GameManager.EventMgr.EventTrigger<int>(Enum_EventType.SwitchSubProcessStepTriggerID, currentSubProcessStepsToolId);
d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.triggersId.RemoveAt(0);
GameManager.EventMgr.EventTrigger<int>(Enum_EventType.SwitchSubProcessStep, d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStepId); GameManager.EventMgr.EventTrigger<int>(Enum_EventType.SwitchSubProcessStep, d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStepId);
GameManager.EventMgr.EventTrigger<int>(Enum_EventType.SwitchSubProcess, d_Scheme.CurrentProcess.CurrentSubProcessId); GameManager.EventMgr.EventTrigger<int>(Enum_EventType.SwitchSubProcess, d_Scheme.CurrentProcess.CurrentSubProcessId);
GameManager.UIMgr.ShowPanel<UI_TopTipPanel>(E_UI_Layer.System, (panel) => GameManager.UIMgr.ShowPanel<UI_TopTipPanel>(E_UI_Layer.System, (panel) =>
@ -206,6 +186,34 @@ public class ProcessManager : BaseManager<ProcessManager>
} }
/// <summary>
/// 0 正常1 不在当前步骤触发ID2 当前步骤没有触发ID了
/// </summary>
/// <param name="triggerID"></param>
/// <returns></returns>
public int IsRightSubProcessStepsTriggerID(int triggerID, bool isRemove)
{
if (d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.triggersId.Count > 0)
{
int currentSubProcessStepTriggerID = d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.triggersId[0];
if (triggerID == currentSubProcessStepTriggerID)
{
//GameManager.EventMgr.EventTrigger<int>(Enum_EventType.SwitchSubProcessStepTriggerID, currentSubProcessStepTriggerID);
if (isRemove)
d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.triggersId.RemoveAt(0);
return 0;
}
else
{
Debug.Log($"<color=red>currentSubProcessStepsToolId=={currentSubProcessStepTriggerID}</color>");
return 1;
}
}
else
{
return 2;
}
}
/// <summary> /// <summary>
/// 倒计时 /// 倒计时

View File

@ -22,6 +22,7 @@ public class RunModelMgr : BaseManager<RunModelMgr>
/// </summary> /// </summary>
public int deviceId; public int deviceId;
public E_ModeType ModeType public E_ModeType ModeType
{ {
get => modeType; get => modeType;

View File

@ -0,0 +1,9 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class DeviceTriggerBase : MonoBehaviour
{
public int triggerID;
public string triggerName;
}

View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 26c6b5bd2f9bf6a428459fce1c30cff5
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -8,13 +8,10 @@ using UnityEngine.EventSystems;
public class Device_Mobile : MonoBehaviour public class Device_Mobile : MonoBehaviour
{ {
public int downIndex = 0; public int downIndex = 0;
public int modelID = 5005; public int triggerID = 5005;
public int currentSubProcessStepID = -1;
//public List<int> subProcessStepID = new List<int>();
private HighlightEffect _highlight; private HighlightEffect _highlight;
private void Awake() private void Awake()
{ {
//subProcessStepID = GameManager.DataMgr.GetSubProcessStepIDByToolID(modelID);
_highlight = GetComponent<HighlightEffect>(); _highlight = GetComponent<HighlightEffect>();
} }
private void Start() private void Start()
@ -22,9 +19,10 @@ public class Device_Mobile : MonoBehaviour
GameManager.EventMgr.AddEventListener<int>(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID); GameManager.EventMgr.AddEventListener<int>(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID);
} }
private void SwitchSubProcessStepTriggerID(int arg0) private void SwitchSubProcessStepTriggerID(int arg0)
{ {
if (modelID == arg0) if (triggerID == arg0)
{ {
_highlight.highlighted = true; _highlight.highlighted = true;
Debug.Log("ÎÒÓ¦¸ÃÌáʾ"); Debug.Log("ÎÒÓ¦¸ÃÌáʾ");
@ -32,7 +30,6 @@ public class Device_Mobile : MonoBehaviour
} }
private void OnMouseDown() private void OnMouseDown()
{ {
if (EventSystem.current.IsPointerOverGameObject()) return; if (EventSystem.current.IsPointerOverGameObject()) return;
@ -40,19 +37,18 @@ public class Device_Mobile : MonoBehaviour
{ {
case 0: case 0:
_highlight.highlighted = false; _highlight.highlighted = false;
GameManager.UIMgr.ShowPanel<UI_ReceiveTaskPanel>(E_UI_Layer.Mid, (panel) => if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(triggerID, false) == 0)
{ {
panel.Init(modelID); GameManager.UIMgr.ShowPanel<UI_ReceiveTaskPanel>(E_UI_Layer.Mid, (panel) =>
}); {
downIndex++; panel.Init(triggerID);
});
downIndex++;
}
break; break;
case 1: case 1:
//GameManager.UIMgr.ShowPanel<UI_SelectWorkTicketPanel>(E_UI_Layer.Mid, (panel) => GameManager.ProcessMgr.CheckSubProcessSteps(GameManager.ProcessMgr.subProcessStepId);
//{
// panel.Init(modelID);
//});
GameManager.ProcessMgr.CheckSubProcessSteps(GameManager.ProcessMgr.subProcessStepId, modelID);
_highlight.highlighted = false; _highlight.highlighted = false;
downIndex = 0; downIndex = 0;
break; break;

View File

@ -10,7 +10,7 @@ public class UI_SubProcessItem : BaseItem
public int subProcessID; public int subProcessID;
public int subProcessStepID; public int subProcessStepID;
public void Init(D_SubProcess d_SubProcess,int subProcessID) public void Init(D_SubProcess d_SubProcess, int subProcessID)
{ {
this.processID = d_SubProcess.processId; this.processID = d_SubProcess.processId;
this.subProcessID = d_SubProcess.id; this.subProcessID = d_SubProcess.id;
@ -19,6 +19,7 @@ public class UI_SubProcessItem : BaseItem
gameObject.name = subProcessID.ToString(); gameObject.name = subProcessID.ToString();
SwitchSubProcess(subProcessID); SwitchSubProcess(subProcessID);
ShowMe(); ShowMe();
} }
public override void ShowMe() public override void ShowMe()

View File

@ -1,6 +1,8 @@
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using System.Timers;
using TMPro; using TMPro;
using Unity.VisualScripting;
using UnityEditor.VersionControl; using UnityEditor.VersionControl;
using UnityEngine; using UnityEngine;
using UnityEngine.UI; using UnityEngine.UI;
@ -8,13 +10,21 @@ using UnityEngine.UI;
public class UI_InstallAndDismantleTicketPanel : BasePanel public class UI_InstallAndDismantleTicketPanel : BasePanel
{ {
/// <summary> /// <summary>
/// 是否提交 /// 是否已经按确认提交
/// </summary> /// </summary>
private bool submite; private bool submit=false;
private Image Image_Mask; public int triggerID;
public void Init(int triggerID) public void Init(int triggerID)
{ {
this.triggerID = triggerID;
if (submit==true)
{
Submit();
}
else
{
NotSubmited();
}
} }
@ -27,12 +37,12 @@ public class UI_InstallAndDismantleTicketPanel : BasePanel
switch (btnName) switch (btnName)
{ {
case "Button_Confirm": case "Button_Confirm":
submite = true; submit = true;
Debug.Log(1); Debug.Log(submit);
Submit();
break; break;
case "Button_Close": case "Button_Close":
GameManager.UIMgr.HidePanel<UI_InstallAndDismantleTicketPanel>();
UIManager.Instance.HidePanel<UI_InstallAndDismantleTicketPanel>();
break; break;
} }
@ -49,14 +59,10 @@ public class UI_InstallAndDismantleTicketPanel : BasePanel
{ {
TMP_InputField inputField = child.GetComponent<TMP_InputField>(); TMP_InputField inputField = child.GetComponent<TMP_InputField>();
// 如果找到了TMP_InputField组件则禁用它
if (inputField != null) if (inputField != null)
{ {
inputField.enabled = false; inputField.enabled = false;
} }
DisableRecursiveInputFields(child); DisableRecursiveInputFields(child);
} }
} }
@ -73,7 +79,7 @@ public class UI_InstallAndDismantleTicketPanel : BasePanel
{ {
inputField.enabled = false; inputField.enabled = false;
} }
DisableRecursiveInputFields(child); // 递归调用 DisableRecursiveInputFields(child);
} }
} }
/// <summary> /// <summary>
@ -81,6 +87,31 @@ public class UI_InstallAndDismantleTicketPanel : BasePanel
/// </summary> /// </summary>
private void NotSubmited() private void NotSubmited()
{ {
GameObject viewport = GetControl<Image>("Viewport").gameObject;
if (viewport != null)
{
ClearInputFieldsInChildren(viewport.transform);
Debug.Log("找到了");
}
} }
/// <summary>
/// 递归函数用于遍历所有子物体并清空InputField
/// </summary>
/// <param name="parent"></param>
void ClearInputFieldsInChildren(Transform parent)
{
for (int i = 0; i < parent.childCount; i++)
{
Transform child = parent.GetChild(i);
TMP_InputField inputField = child.GetComponent<TMP_InputField>();
if (inputField != null)
{
inputField.text = "";
}
ClearInputFieldsInChildren(child);
}
}
} }

View File

@ -3,11 +3,11 @@ using UnityEngine;
public class UI_LowTensionWorkTicketPanel : BasePanel public class UI_LowTensionWorkTicketPanel : BasePanel
{ {
public int triggerID; public int triggerID = 5013;
public void Init(int triggerID) //public void Init(int triggerID)
{ //{
this.triggerID = triggerID; // this.triggerID = triggerID;
} //}
public override void ShowMe() public override void ShowMe()
{ {
@ -28,8 +28,11 @@ public class UI_LowTensionWorkTicketPanel : BasePanel
GameManager.UIMgr.HidePanel<UI_LowTensionWorkTicketPanel>(); GameManager.UIMgr.HidePanel<UI_LowTensionWorkTicketPanel>();
break; break;
case "ConfirmBtn": case "ConfirmBtn":
GameManager.ProcessMgr.CheckSubProcessSteps(GameManager.ProcessMgr.subProcessStepId, triggerID); if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(triggerID, true) == 0)
GameManager.UIMgr.HidePanel<UI_LowTensionWorkTicketPanel>(); {
GameManager.ProcessMgr.CheckSubProcessSteps(GameManager.ProcessMgr.subProcessStepId);
GameManager.UIMgr.HidePanel<UI_LowTensionWorkTicketPanel>();
}
break; break;
default: default:
break; break;

View File

@ -119,19 +119,25 @@ public class UI_MenuBar : BasePanel
SceneManager.LoadScene(""); SceneManager.LoadScene("");
break; break;
case "WorkOrderBtn": case "WorkOrderBtn":
GameManager.UIMgr.ShowPanel<UI_SelectWorkTicketPanel>(E_UI_Layer.Mid, (panel) => if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(workOrderID, false) == 0)
{ {
panel.Init(workOrderID); GameManager.UIMgr.ShowPanel<UI_SelectWorkTicketPanel>(E_UI_Layer.Mid, (panel) =>
}); {
panel.Init(workOrderID);
});
}
break; break;
case "WorkTicketBtn": case "WorkTicketBtn":
break; break;
case "DisassemblyAssemblyWorkOrderBtn": case "DisassemblyAssemblyWorkOrderBtn":
GameManager.UIMgr.ShowPanel<UI_InstallAndDismantleTicketPanel>(E_UI_Layer.Mid, (panel) => if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(disassemblyAssemblyWorkOrderID, false) == 0)
{
GameManager.UIMgr.ShowPanel<UI_InstallAndDismantleTicketPanel>(E_UI_Layer.Mid, (panel) =>
{ {
panel.Init(disassemblyAssemblyWorkOrderID); panel.Init(disassemblyAssemblyWorkOrderID);
}); });
}
break; break;
default: default:
break; break;

View File

@ -5,18 +5,21 @@ using UnityEngine.UI;
public class UI_ReceiveTaskPanel : BasePanel public class UI_ReceiveTaskPanel : BasePanel
{ {
public int toolID; public int triggerID;
public void Init(int toolID) public void Init(int triggerID)
{ {
this.toolID = toolID; this.triggerID = triggerID;
} }
protected override void OnClick(string btnName) protected override void OnClick(string btnName)
{ {
switch (btnName) switch (btnName)
{ {
case "Button_Accept": case "Button_Accept":
GameManager.ProcessMgr.CheckSubProcessSteps(GameManager.ProcessMgr.subProcessStepId, toolID); if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(triggerID, true) == 0)
GameManager.UIMgr.HidePanel<UI_ReceiveTaskPanel>(); {
GameManager.ProcessMgr.CheckSubProcessSteps(GameManager.ProcessMgr.subProcessStepId);
GameManager.UIMgr.HidePanel<UI_ReceiveTaskPanel>();
}
break; break;
} }
} }

View File

@ -35,8 +35,7 @@ public class UI_SelectWorkTicketPanel : BasePanel
UIManager.Instance.HidePanel<UI_SelectWorkTicketPanel>(); UIManager.Instance.HidePanel<UI_SelectWorkTicketPanel>();
GameManager.UIMgr.ShowPanel<UI_LowTensionWorkTicketPanel>(E_UI_Layer.Mid, (p) => GameManager.UIMgr.ShowPanel<UI_LowTensionWorkTicketPanel>(E_UI_Layer.Mid, (p) =>
{ {
p.Init(triggerID); GameManager.ProcessMgr.CheckSubProcessSteps(GameManager.ProcessMgr.subProcessStepId);
GameManager.ProcessMgr.CheckSubProcessSteps(ProcessManager.Instance.subProcessStepId, triggerID);
}); });
Debug.Log("选择了正确选项F进行下一个面板"); Debug.Log("选择了正确选项F进行下一个面板");
} }
@ -48,8 +47,7 @@ public class UI_SelectWorkTicketPanel : BasePanel
Debug.Log("错误三次了,直接进行下一个面板"); Debug.Log("错误三次了,直接进行下一个面板");
GameManager.UIMgr.ShowPanel<UI_LowTensionWorkTicketPanel>(E_UI_Layer.Mid, (p) => GameManager.UIMgr.ShowPanel<UI_LowTensionWorkTicketPanel>(E_UI_Layer.Mid, (p) =>
{ {
p.Init(triggerID); GameManager.ProcessMgr.CheckSubProcessSteps(GameManager.ProcessMgr.subProcessStepId);
GameManager.ProcessMgr.CheckSubProcessSteps(ProcessManager.Instance.subProcessStepId, triggerID);
}); });
} }
} }

View File

@ -30,15 +30,4 @@ public class UI_TaskListPanel : BasePanel
}); });
}); });
} }
//private void CreateSubProcessItem(UI_SubProcessItem sTemp)
//{
// D_Scheme d_Scheme = GameManager.ProcessMgr.d_Scheme;
// for (int i = 0; i < d_Scheme.processes.Count; i++)
// {
// var t = Instantiate(_processItem, _content);
// t.Init(d_Scheme.processes[i],sTemp);
// }
//}
} }

View File

@ -1,5 +1,14 @@
{ {
"dependencies": { "dependencies": {
"com.singularitygroup.hotreload": {
"version": "file:com.singularitygroup.hotreload",
"depth": 0,
"source": "embedded",
"dependencies": {
"com.unity.ugui": "1.0.0",
"com.unity.modules.unitywebrequest": "1.0.0"
}
},
"com.unity.2d.sprite": { "com.unity.2d.sprite": {
"version": "1.0.0", "version": "1.0.0",
"depth": 0, "depth": 0,