diff --git a/Assets/ArtRes/Excel/Config.xlsx b/Assets/ArtRes/Excel/Config.xlsx index 263d1da..79b46b0 100644 Binary files a/Assets/ArtRes/Excel/Config.xlsx and b/Assets/ArtRes/Excel/Config.xlsx differ diff --git a/Assets/Resources/Materials/CharacterEquip/Cancel/安全帽.mat b/Assets/Resources/Materials/CharacterEquip/Cancel/国网安全帽.mat similarity index 98% rename from Assets/Resources/Materials/CharacterEquip/Cancel/安全帽.mat rename to Assets/Resources/Materials/CharacterEquip/Cancel/国网安全帽.mat index 4afb61a..a441422 100644 --- a/Assets/Resources/Materials/CharacterEquip/Cancel/安全帽.mat +++ b/Assets/Resources/Materials/CharacterEquip/Cancel/国网安全帽.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: "\u5B89\u5168\u5E3D" + m_Name: "\u56FD\u7F51\u5B89\u5168\u5E3D" m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT diff --git a/Assets/Resources/Materials/CharacterEquip/Cancel/安全帽.mat.meta b/Assets/Resources/Materials/CharacterEquip/Cancel/国网安全帽.mat.meta similarity index 100% rename from Assets/Resources/Materials/CharacterEquip/Cancel/安全帽.mat.meta rename to Assets/Resources/Materials/CharacterEquip/Cancel/国网安全帽.mat.meta diff --git a/Assets/Resources/Materials/CharacterEquip/Cancel/纱布手套.mat b/Assets/Resources/Materials/CharacterEquip/Cancel/绝缘手套.mat similarity index 98% rename from Assets/Resources/Materials/CharacterEquip/Cancel/纱布手套.mat rename to Assets/Resources/Materials/CharacterEquip/Cancel/绝缘手套.mat index e9bb6b1..ed65b46 100644 --- a/Assets/Resources/Materials/CharacterEquip/Cancel/纱布手套.mat +++ b/Assets/Resources/Materials/CharacterEquip/Cancel/绝缘手套.mat @@ -20,7 +20,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: "\u7EB1\u5E03\u624B\u5957" + m_Name: "\u7EDD\u7F18\u624B\u5957" m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_ValidKeywords: - _EMISSION diff --git a/Assets/Resources/Materials/CharacterEquip/Cancel/纱布手套.mat.meta b/Assets/Resources/Materials/CharacterEquip/Cancel/绝缘手套.mat.meta similarity index 100% rename from Assets/Resources/Materials/CharacterEquip/Cancel/纱布手套.mat.meta rename to Assets/Resources/Materials/CharacterEquip/Cancel/绝缘手套.mat.meta diff --git a/Assets/Resources/Materials/CharacterEquip/Wear/安全帽.mat b/Assets/Resources/Materials/CharacterEquip/Wear/国网安全帽.mat similarity index 99% rename from Assets/Resources/Materials/CharacterEquip/Wear/安全帽.mat rename to Assets/Resources/Materials/CharacterEquip/Wear/国网安全帽.mat index de4c0ef..082a384 100644 --- a/Assets/Resources/Materials/CharacterEquip/Wear/安全帽.mat +++ b/Assets/Resources/Materials/CharacterEquip/Wear/国网安全帽.mat @@ -20,7 +20,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: "\u5B89\u5168\u5E3D" + m_Name: "\u56FD\u7F51\u5B89\u5168\u5E3D" m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_ValidKeywords: - _EMISSION diff --git a/Assets/Resources/Materials/CharacterEquip/Wear/安全帽.mat.meta b/Assets/Resources/Materials/CharacterEquip/Wear/国网安全帽.mat.meta similarity index 100% rename from Assets/Resources/Materials/CharacterEquip/Wear/安全帽.mat.meta rename to Assets/Resources/Materials/CharacterEquip/Wear/国网安全帽.mat.meta diff --git a/Assets/Resources/Materials/CharacterEquip/Wear/纱布手套.mat b/Assets/Resources/Materials/CharacterEquip/Wear/绝缘手套.mat similarity index 99% rename from Assets/Resources/Materials/CharacterEquip/Wear/纱布手套.mat rename to Assets/Resources/Materials/CharacterEquip/Wear/绝缘手套.mat index 5fc0ca0..1c8a0b6 100644 --- a/Assets/Resources/Materials/CharacterEquip/Wear/纱布手套.mat +++ b/Assets/Resources/Materials/CharacterEquip/Wear/绝缘手套.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: "\u7EB1\u5E03\u624B\u5957" + m_Name: "\u7EDD\u7F18\u624B\u5957" m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_ValidKeywords: - _EMISSION diff --git a/Assets/Resources/Materials/CharacterEquip/Wear/纱布手套.mat.meta b/Assets/Resources/Materials/CharacterEquip/Wear/绝缘手套.mat.meta similarity index 100% rename from Assets/Resources/Materials/CharacterEquip/Wear/纱布手套.mat.meta rename to Assets/Resources/Materials/CharacterEquip/Wear/绝缘手套.mat.meta diff --git a/Assets/Resources/Sprites/ToolAndmaterial/l型集中器.png b/Assets/Resources/Sprites/ToolAndmaterial/l型集中器.png new file mode 100644 index 0000000..809e783 Binary files /dev/null and b/Assets/Resources/Sprites/ToolAndmaterial/l型集中器.png differ diff --git a/Assets/Resources/Sprites/ToolAndmaterial/l型集中器.png.meta b/Assets/Resources/Sprites/ToolAndmaterial/l型集中器.png.meta new file mode 100644 index 0000000..678fee0 --- /dev/null +++ b/Assets/Resources/Sprites/ToolAndmaterial/l型集中器.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 22e76df6fa3aea34198edefbf5fc1803 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 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 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/ToolAndmaterial/万用表.png b/Assets/Resources/Sprites/ToolAndmaterial/万用表.png deleted file mode 100644 index 627cca0..0000000 Binary files a/Assets/Resources/Sprites/ToolAndmaterial/万用表.png and /dev/null differ diff --git a/Assets/Resources/Sprites/ToolAndmaterial/剥线钳.png b/Assets/Resources/Sprites/ToolAndmaterial/剥线钳.png new file mode 100644 index 0000000..ebd94fb Binary files /dev/null and b/Assets/Resources/Sprites/ToolAndmaterial/剥线钳.png differ diff --git a/Assets/Resources/Sprites/ToolAndmaterial/剥线钳.png.meta b/Assets/Resources/Sprites/ToolAndmaterial/剥线钳.png.meta new file mode 100644 index 0000000..1babd2b --- /dev/null +++ b/Assets/Resources/Sprites/ToolAndmaterial/剥线钳.png.meta @@ -0,0 +1,114 @@ +fileFormatVersion: 2 +guid: 8c4371c622cdd964b99e7860e226d7c9 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 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 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/ToolAndmaterial/国网安全帽.png b/Assets/Resources/Sprites/ToolAndmaterial/国网安全帽.png new file mode 100644 index 0000000..9f0617c Binary files /dev/null and b/Assets/Resources/Sprites/ToolAndmaterial/国网安全帽.png differ diff --git a/Assets/Resources/Sprites/ToolAndmaterial/国网安全帽.png.meta b/Assets/Resources/Sprites/ToolAndmaterial/国网安全帽.png.meta new file mode 100644 index 0000000..dc56fcc --- /dev/null +++ b/Assets/Resources/Sprites/ToolAndmaterial/国网安全帽.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: 02ad1c744b71e974a983621579c393d5 +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: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + 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: 2048 + 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: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + 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: diff --git a/Assets/Resources/Sprites/ToolAndmaterial/工作服.png b/Assets/Resources/Sprites/ToolAndmaterial/工作服.png new file mode 100644 index 0000000..3818776 Binary files /dev/null and b/Assets/Resources/Sprites/ToolAndmaterial/工作服.png differ diff --git a/Assets/Resources/Sprites/ToolAndmaterial/万用表.png.meta b/Assets/Resources/Sprites/ToolAndmaterial/工作服.png.meta similarity index 92% rename from Assets/Resources/Sprites/ToolAndmaterial/万用表.png.meta rename to Assets/Resources/Sprites/ToolAndmaterial/工作服.png.meta index c5031be..7470dbf 100644 --- a/Assets/Resources/Sprites/ToolAndmaterial/万用表.png.meta +++ b/Assets/Resources/Sprites/ToolAndmaterial/工作服.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6346632192b53b04d8a62f4e07d4aeb0 +guid: 1a9dea6a9b4942943b4cfa27b07817fd TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -20,7 +20,7 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 - isReadable: 0 + isReadable: 1 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 @@ -33,8 +33,8 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 0 - aniso: 2 + filterMode: 1 + aniso: 1 mipBias: 0 wrapU: 1 wrapV: 1 @@ -61,13 +61,13 @@ TextureImporter: maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 - ignorePngGamma: 1 + ignorePngGamma: 0 applyGammaDecoding: 0 cookieLightType: 0 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 8192 + maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 @@ -79,7 +79,7 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Standalone - maxTextureSize: 8192 + maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 @@ -90,8 +90,8 @@ TextureImporter: androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 - buildTarget: iPhone - maxTextureSize: 8192 + buildTarget: Server + maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 @@ -103,19 +103,7 @@ TextureImporter: 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 + maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 @@ -127,7 +115,19 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: WebGL - maxTextureSize: 8192 + maxTextureSize: 2048 + 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: 2048 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 diff --git a/Assets/Resources/Sprites/ToolAndmaterial/工作证.png b/Assets/Resources/Sprites/ToolAndmaterial/工作证.png new file mode 100644 index 0000000..55c133d Binary files /dev/null and b/Assets/Resources/Sprites/ToolAndmaterial/工作证.png differ diff --git a/Assets/Resources/Sprites/ToolAndmaterial/工作证.png.meta b/Assets/Resources/Sprites/ToolAndmaterial/工作证.png.meta new file mode 100644 index 0000000..5f13250 --- /dev/null +++ b/Assets/Resources/Sprites/ToolAndmaterial/工作证.png.meta @@ -0,0 +1,114 @@ +fileFormatVersion: 2 +guid: 435a309f2d67f2a48af9467c71761403 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 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 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/ToolAndmaterial/梯子.png b/Assets/Resources/Sprites/ToolAndmaterial/梯子.png new file mode 100644 index 0000000..44a6f50 Binary files /dev/null and b/Assets/Resources/Sprites/ToolAndmaterial/梯子.png differ diff --git a/Assets/Resources/Sprites/ToolAndmaterial/梯子.png.meta b/Assets/Resources/Sprites/ToolAndmaterial/梯子.png.meta new file mode 100644 index 0000000..31dc575 --- /dev/null +++ b/Assets/Resources/Sprites/ToolAndmaterial/梯子.png.meta @@ -0,0 +1,159 @@ +fileFormatVersion: 2 +guid: 7c523260eeaf8df4ebde03b71e4052e8 +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: 1 + 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: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 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: 2048 + 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: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Windows Store Apps + maxTextureSize: 2048 + 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: diff --git a/Assets/Resources/Sprites/ToolAndmaterial/盒装封印.png b/Assets/Resources/Sprites/ToolAndmaterial/盒装封印.png new file mode 100644 index 0000000..3d13fbb Binary files /dev/null and b/Assets/Resources/Sprites/ToolAndmaterial/盒装封印.png differ diff --git a/Assets/Resources/Sprites/ToolAndmaterial/盒装封印.png.meta b/Assets/Resources/Sprites/ToolAndmaterial/盒装封印.png.meta new file mode 100644 index 0000000..6352a80 --- /dev/null +++ b/Assets/Resources/Sprites/ToolAndmaterial/盒装封印.png.meta @@ -0,0 +1,114 @@ +fileFormatVersion: 2 +guid: 089acb8c93fb38a49827209b1c559858 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 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 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/ToolAndmaterial/绝缘手套.png b/Assets/Resources/Sprites/ToolAndmaterial/绝缘手套.png new file mode 100644 index 0000000..8786fec Binary files /dev/null and b/Assets/Resources/Sprites/ToolAndmaterial/绝缘手套.png differ diff --git a/Assets/Resources/Sprites/ToolAndmaterial/绝缘手套.png.meta b/Assets/Resources/Sprites/ToolAndmaterial/绝缘手套.png.meta new file mode 100644 index 0000000..6b81631 --- /dev/null +++ b/Assets/Resources/Sprites/ToolAndmaterial/绝缘手套.png.meta @@ -0,0 +1,159 @@ +fileFormatVersion: 2 +guid: 7e216cd292e7bf746a7a8ed0125257f2 +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: 1 + 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: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 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: 2048 + 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: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Windows Store Apps + maxTextureSize: 2048 + 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: diff --git a/Assets/Resources/Sprites/ToolAndmaterial/绝缘胶带.png b/Assets/Resources/Sprites/ToolAndmaterial/绝缘胶带.png new file mode 100644 index 0000000..1ba15f1 Binary files /dev/null and b/Assets/Resources/Sprites/ToolAndmaterial/绝缘胶带.png differ diff --git a/Assets/Resources/Sprites/ToolAndmaterial/绝缘胶带.png.meta b/Assets/Resources/Sprites/ToolAndmaterial/绝缘胶带.png.meta new file mode 100644 index 0000000..ec2989f --- /dev/null +++ b/Assets/Resources/Sprites/ToolAndmaterial/绝缘胶带.png.meta @@ -0,0 +1,114 @@ +fileFormatVersion: 2 +guid: c8815026736105b4abd82f58274098e3 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 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 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/ToolAndmaterial/绝缘螺丝刀.png b/Assets/Resources/Sprites/ToolAndmaterial/绝缘螺丝刀.png new file mode 100644 index 0000000..ce40acf Binary files /dev/null and b/Assets/Resources/Sprites/ToolAndmaterial/绝缘螺丝刀.png differ diff --git a/Assets/Resources/Sprites/ToolAndmaterial/绝缘螺丝刀.png.meta b/Assets/Resources/Sprites/ToolAndmaterial/绝缘螺丝刀.png.meta new file mode 100644 index 0000000..0370017 --- /dev/null +++ b/Assets/Resources/Sprites/ToolAndmaterial/绝缘螺丝刀.png.meta @@ -0,0 +1,114 @@ +fileFormatVersion: 2 +guid: 8cc7a1450034d974cbdabddc2cd0c579 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 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 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/ToolAndmaterial/绝缘靴.png b/Assets/Resources/Sprites/ToolAndmaterial/绝缘靴.png new file mode 100644 index 0000000..5a1f2b5 Binary files /dev/null and b/Assets/Resources/Sprites/ToolAndmaterial/绝缘靴.png differ diff --git a/Assets/Resources/Sprites/ToolAndmaterial/绝缘靴.png.meta b/Assets/Resources/Sprites/ToolAndmaterial/绝缘靴.png.meta new file mode 100644 index 0000000..09c08f5 --- /dev/null +++ b/Assets/Resources/Sprites/ToolAndmaterial/绝缘靴.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: 2a9f1a7f20f367d4f8650f3a6afb2b73 +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: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + 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: 2048 + 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: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + 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: diff --git a/Assets/Resources/Sprites/ToolAndmaterial/集中器无盖模型.png b/Assets/Resources/Sprites/ToolAndmaterial/集中器无盖模型.png new file mode 100644 index 0000000..822e397 Binary files /dev/null and b/Assets/Resources/Sprites/ToolAndmaterial/集中器无盖模型.png differ diff --git a/Assets/Resources/Sprites/ToolAndmaterial/集中器无盖模型.png.meta b/Assets/Resources/Sprites/ToolAndmaterial/集中器无盖模型.png.meta new file mode 100644 index 0000000..f3689a9 --- /dev/null +++ b/Assets/Resources/Sprites/ToolAndmaterial/集中器无盖模型.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 12c83a4685638194a920f5d109cf2030 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 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 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/ToolAndmaterial/集中器盖子模型.png b/Assets/Resources/Sprites/ToolAndmaterial/集中器盖子模型.png new file mode 100644 index 0000000..5be7d4c Binary files /dev/null and b/Assets/Resources/Sprites/ToolAndmaterial/集中器盖子模型.png differ diff --git a/Assets/Resources/Sprites/ToolAndmaterial/集中器盖子模型.png.meta b/Assets/Resources/Sprites/ToolAndmaterial/集中器盖子模型.png.meta new file mode 100644 index 0000000..77b8b8a --- /dev/null +++ b/Assets/Resources/Sprites/ToolAndmaterial/集中器盖子模型.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 7a2156ed2900f9347abbc92e01304b95 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 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 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/ToolAndmaterial/验电笔.png b/Assets/Resources/Sprites/ToolAndmaterial/验电笔.png new file mode 100644 index 0000000..6e99df1 Binary files /dev/null and b/Assets/Resources/Sprites/ToolAndmaterial/验电笔.png differ diff --git a/Assets/Resources/Sprites/ToolAndmaterial/验电笔.png.meta b/Assets/Resources/Sprites/ToolAndmaterial/验电笔.png.meta new file mode 100644 index 0000000..008541d --- /dev/null +++ b/Assets/Resources/Sprites/ToolAndmaterial/验电笔.png.meta @@ -0,0 +1,120 @@ +fileFormatVersion: 2 +guid: b9eac654d2da97b4890ea371436f02e8 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 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 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + 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: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + 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: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/UI/UI_Item/UI_CheckMyselfPanel/UI_CheckMyselfItem.prefab b/Assets/Resources/UI/UI_Item/UI_CheckMyselfPanel/UI_CheckMyselfItem.prefab index d0c7488..9c07035 100644 --- a/Assets/Resources/UI/UI_Item/UI_CheckMyselfPanel/UI_CheckMyselfItem.prefab +++ b/Assets/Resources/UI/UI_Item/UI_CheckMyselfPanel/UI_CheckMyselfItem.prefab @@ -248,7 +248,7 @@ GameObject: - component: {fileID: 8192472674953986160} - component: {fileID: 4871810231244820406} m_Layer: 5 - m_Name: IconBtn + m_Name: iconBtn m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/Assets/Resources/UI/UI_Item/UI_ToolAndMaterialPanel/UI_ToolOrMaterialsOrDeviceItem.prefab b/Assets/Resources/UI/UI_Item/UI_ToolAndMaterialPanel/UI_ToolOrMaterialsOrDeviceItem.prefab index 58b953a..5b2e454 100644 --- a/Assets/Resources/UI/UI_Item/UI_ToolAndMaterialPanel/UI_ToolOrMaterialsOrDeviceItem.prefab +++ b/Assets/Resources/UI/UI_Item/UI_ToolAndMaterialPanel/UI_ToolOrMaterialsOrDeviceItem.prefab @@ -11,7 +11,6 @@ GameObject: - component: {fileID: 6574754484931438874} - component: {fileID: 1776058685440938395} - component: {fileID: 6773507116056973082} - - component: {fileID: 506215071228445042} - component: {fileID: -1117560601412896751} m_Layer: 5 m_Name: UI_ToolOrMaterialsOrDeviceItem @@ -65,7 +64,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: @@ -81,50 +80,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!114 &506215071228445042 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 464744457135127127} - 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: 6773507116056973082} - m_OnClick: - m_PersistentCalls: - m_Calls: [] --- !u!114 &-1117560601412896751 MonoBehaviour: m_ObjectHideFlags: 0 @@ -137,6 +92,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ad9f843a32e8ae64589a09a12c9665b8, type: 3} m_Name: m_EditorClassIdentifier: + itemInfo: [] + itemCloseBtn: {fileID: 3108141478781955695} --- !u!1 &1287235293540347711 GameObject: m_ObjectHideFlags: 0 @@ -150,7 +107,7 @@ GameObject: - component: {fileID: 1805927906866143657} - component: {fileID: 3108141478781955695} m_Layer: 5 - m_Name: ItemCloseBtn + m_Name: itemCloseBtn m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -269,8 +226,9 @@ GameObject: - component: {fileID: 1719955248074856253} - component: {fileID: 2364628853574207159} - component: {fileID: 1820065850620537813} + - component: {fileID: 8537736727955055804} m_Layer: 5 - m_Name: icon + m_Name: iconBtn m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -318,7 +276,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 + m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: @@ -334,6 +292,50 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!114 &8537736727955055804 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2413592278185539435} + 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: 1820065850620537813} + m_OnClick: + m_PersistentCalls: + m_Calls: [] --- !u!1 &4407067812886207628 GameObject: m_ObjectHideFlags: 0 @@ -346,7 +348,7 @@ GameObject: - component: {fileID: 6213223470417886244} - component: {fileID: 1255829598185336502} m_Layer: 5 - m_Name: CountText + m_Name: countText m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/Assets/Scenes/03_OfficeScene.unity b/Assets/Scenes/03_OfficeScene.unity index 69ac3dc..8551ebd 100644 --- a/Assets/Scenes/03_OfficeScene.unity +++ b/Assets/Scenes/03_OfficeScene.unity @@ -310,7 +310,6 @@ GameObject: m_Component: - component: {fileID: 772251465} - component: {fileID: 772251464} - - component: {fileID: 772251463} - component: {fileID: 772251466} - component: {fileID: 772251467} m_Layer: 0 @@ -320,14 +319,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!81 &772251463 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 772251462} - m_Enabled: 1 --- !u!20 &772251464 Camera: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/04_ToolMaterialScene.unity b/Assets/Scenes/04_ToolMaterialScene.unity index 60c422f..1593ac2 100644 --- a/Assets/Scenes/04_ToolMaterialScene.unity +++ b/Assets/Scenes/04_ToolMaterialScene.unity @@ -230,7 +230,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8155783817937420856, guid: bfda44a00cab89b47bde668b2b482a26, type: 3} propertyPath: m_LocalPosition.y - value: -0.40200007 + value: -0.394 objectReference: {fileID: 0} - target: {fileID: 8155783817937420856, guid: bfda44a00cab89b47bde668b2b482a26, type: 3} propertyPath: m_LocalPosition.z @@ -626,7 +626,7 @@ PrefabInstance: - target: {fileID: 8782376414673638281, guid: 69e264891bba88c4b87f73112f0b3c84, type: 3} propertyPath: m_Materials.Array.data[0] value: - objectReference: {fileID: 2100000, guid: bf6b11f1a7c512745a24503e6af14f44, type: 2} + objectReference: {fileID: 2100000, guid: 5636cb61d4933e446ac7bf2ddecabf95, type: 2} - target: {fileID: 8803340364929241480, guid: 69e264891bba88c4b87f73112f0b3c84, type: 3} propertyPath: m_Layer value: 6 @@ -654,6 +654,21 @@ Transform: m_CorrespondingSourceObject: {fileID: 1584437988020157986, guid: 69e264891bba88c4b87f73112f0b3c84, type: 3} m_PrefabInstance: {fileID: 810725974} m_PrefabAsset: {fileID: 0} +--- !u!4 &810725976 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4268823935262762977, guid: 69e264891bba88c4b87f73112f0b3c84, type: 3} + m_PrefabInstance: {fileID: 810725974} + m_PrefabAsset: {fileID: 0} +--- !u!4 &810725977 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2575655662766773950, guid: 69e264891bba88c4b87f73112f0b3c84, type: 3} + m_PrefabInstance: {fileID: 810725974} + m_PrefabAsset: {fileID: 0} +--- !u!4 &810725978 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 9023546900043378599, guid: 69e264891bba88c4b87f73112f0b3c84, type: 3} + m_PrefabInstance: {fileID: 810725974} + m_PrefabAsset: {fileID: 0} --- !u!1001 &860489968 PrefabInstance: m_ObjectHideFlags: 0 @@ -1041,7 +1056,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2528995886889388087, guid: c26cb815ef7c52f4790cfe113ed6566f, type: 3} propertyPath: m_Name - value: "\u5DE5\u4F5C\u670D (1)" + value: "\u5DE5\u4F5C\u670D" objectReference: {fileID: 0} - target: {fileID: 2528995886889388087, guid: c26cb815ef7c52f4790cfe113ed6566f, type: 3} propertyPath: m_IsActive @@ -1452,10 +1467,9 @@ MonoBehaviour: - {fileID: 4762243372118872815} - {fileID: 1943116163} - {fileID: 1510720948} - headSlot: {fileID: 0} - bodySlot: {fileID: 0} - HandSlot: {fileID: 0} - isChange: 0 + headSlot: {fileID: 810725978} + bodySlot: {fileID: 810725977} + HandSlot: {fileID: 810725976} --- !u!1 &2090806849 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Project/Manager/TooRoomlMannger.cs b/Assets/Scripts/Project/Manager/TooRoomlMannger.cs index 94f1fc7..7c3d795 100644 --- a/Assets/Scripts/Project/Manager/TooRoomlMannger.cs +++ b/Assets/Scripts/Project/Manager/TooRoomlMannger.cs @@ -1,9 +1,10 @@ +using System; using System.Collections; using System.Collections.Generic; using System.Linq; using UnityEngine; -public class TooRoomlMannger : MonoBehaviour +public class TooRoomlMannger : SingletonMono { public BaseToolOrDevice[] allTMDs; public Transform headSlot; @@ -11,7 +12,6 @@ public class TooRoomlMannger : MonoBehaviour public Transform HandSlot; private List _cancel; //δ private List _wear; // - public bool isChange = false; // Start is called before the first frame update void Start() { @@ -25,9 +25,11 @@ public class TooRoomlMannger : MonoBehaviour tmd.GetInfo(); } } - public void Wear(string equipName) + + + + public void Wear(string equipName,bool isChange) { - isChange = !isChange; Material ma = null; if (isChange) { @@ -40,15 +42,18 @@ public class TooRoomlMannger : MonoBehaviour switch (equipName) { - case "ȫñ": + case "ȫñ": headSlot.GetComponent().material = ma; break; case "": bodySlot.GetComponent().material = ma; break; - case "ɴ": + case "Ե": HandSlot.GetComponent().material = ma; break; + case "Եѥ": + Debug.Log("ѥ"); + break; } } diff --git a/Assets/Scripts/Project/Objects/Other/MirrorController.cs b/Assets/Scripts/Project/Objects/Other/MirrorController.cs index e9f13b5..02416b7 100644 --- a/Assets/Scripts/Project/Objects/Other/MirrorController.cs +++ b/Assets/Scripts/Project/Objects/Other/MirrorController.cs @@ -7,11 +7,10 @@ public class MirrorController : PermanentTriggerBase protected override void OnMDown() { base.OnMDown(); - GameManager.UIMgr.ShowPanel(E_UI_Layer.Mid, (p) => + if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(triggerID, true) == 0) { - - }); - + GameManager.UIMgr.ShowPanel(E_UI_Layer.Mid); + } } diff --git a/Assets/Scripts/Project/UI/UI_Item/UI_CheckMyselfItem.cs b/Assets/Scripts/Project/UI/UI_Item/UI_CheckMyselfItem.cs index f66b719..78019da 100644 --- a/Assets/Scripts/Project/UI/UI_Item/UI_CheckMyselfItem.cs +++ b/Assets/Scripts/Project/UI/UI_Item/UI_CheckMyselfItem.cs @@ -1,7 +1,9 @@ +using System; using System.Collections; using System.Collections.Generic; using TMPro; using UnityEngine; +using UnityEngine.UI; public class UI_CheckMyselfItem : BaseItem { @@ -11,11 +13,12 @@ public class UI_CheckMyselfItem : BaseItem public void Init(ItemInfo _itemInfo) { itemInfo = _itemInfo; - if(PacksackBagMgr.Instance.wearDic.ContainsKey(itemInfo.toolId)) + if (PacksackBagMgr.Instance.wearDic.ContainsKey(itemInfo.toolId)) { isOn = true; tips.text = isOn ? "װ" : ""; } + GetControl("iconBtn").sprite = Resources.Load(Const.LoadToolAndMaterialPath + _itemInfo.toolName); } protected override void OnClick(string btnName) @@ -23,10 +26,14 @@ public class UI_CheckMyselfItem : BaseItem base.OnClick(btnName); switch (btnName) { - case "IconBtn": - isOn = !isOn; - tips.text = isOn ? "װ" : ""; - PacksackBagMgr.Instance.WearItemState(itemInfo, isOn); + case "iconBtn": + if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(itemInfo.triggerID, true) == 0) + { + isOn = !isOn; + tips.text = isOn ? "װ" : ""; + PacksackBagMgr.Instance.WearItemState(itemInfo, isOn); + TooRoomlMannger.Instance.Wear(itemInfo.toolName, isOn); + } Debug.Log("IconBtn"); break; case "UI_CheckMyselfItem": diff --git a/Assets/Scripts/Project/UI/UI_Item/UI_ToolOrMaterialsOrDeviceItem.cs b/Assets/Scripts/Project/UI/UI_Item/UI_ToolOrMaterialsOrDeviceItem.cs index c705fe1..ad06c6c 100644 --- a/Assets/Scripts/Project/UI/UI_Item/UI_ToolOrMaterialsOrDeviceItem.cs +++ b/Assets/Scripts/Project/UI/UI_Item/UI_ToolOrMaterialsOrDeviceItem.cs @@ -3,15 +3,28 @@ using System.Collections.Generic; using Sirenix.OdinInspector; using TMPro; using UnityEngine; +using UnityEngine.UI; public class UI_ToolOrMaterialsOrDeviceItem : BaseItem { - public List itemInfo; - + public List itemInfoList; + public Button itemCloseBtn; + private ItemInfo currentItem; public void Init(List _itemInfo) { - GetControl("CountText").text = _itemInfo.Count.ToString(); - itemInfo = _itemInfo; + itemInfoList = _itemInfo; + currentItem = itemInfoList[0]; + if (GameManager.RunModelMgr.ModeType == E_ModeType.Study) + { + itemCloseBtn.gameObject.SetActive(false); + } + if (GameManager.RunModelMgr.SceneType != E_SceneType.Site) + { + GetControl("iconBtn").enabled = false; + } + GetControl("countText").text = _itemInfo.Count.ToString(); + GetControl("iconBtn").sprite = Resources.Load(Const.LoadToolAndMaterialPath + currentItem.toolName); + } protected override void OnClick(string btnName) @@ -19,28 +32,27 @@ public class UI_ToolOrMaterialsOrDeviceItem : BaseItem base.OnClick(btnName); switch (btnName) { - case "ItemCloseBtn": - if (GameManager.RunModelMgr.ModeType == E_ModeType.Study) + case "itemCloseBtn": + int counts = 0; ; + if (itemInfoList.Count > 1) { - int counts = 0; ; - if (itemInfo.Count > 1) - { - counts = itemInfo.Count - 1; - } - - GameObject obj = Instantiate(itemInfo[counts].objPrefab); - obj.transform.position = itemInfo[counts].selfPosInToolRoom; - obj.name = itemInfo[counts].toolName; - obj.GetComponent().itemInfo = itemInfo[counts]; - GameManager.PacksackBagMgr.RemoveOneToolOrMater(itemInfo[counts]); - itemInfo.Remove(itemInfo[counts]); - GetControl("CountText").text = itemInfo.Count.ToString(); - if (itemInfo.Count == 0) - Destroy(gameObject); + counts = itemInfoList.Count - 1; } + GameObject obj = Instantiate(itemInfoList[counts].objPrefab); + obj.transform.position = itemInfoList[counts].selfPosInToolRoom; + obj.name = itemInfoList[counts].toolName; + obj.GetComponent().itemInfo = itemInfoList[counts]; + GameManager.PacksackBagMgr.RemoveOneToolOrMater(itemInfoList[counts]); + itemInfoList.Remove(itemInfoList[counts]); + GetControl("CountText").text = itemInfoList.Count.ToString(); + if (itemInfoList.Count == 0) + Destroy(gameObject); break; - case "UI_ToolOrMaterialsOrDeviceItem": - Debug.Log("ICon"); + case "iconBtn": + GameManager.UIMgr.HidePanel(); + GameObject currentTool = Instantiate(currentItem.objPrefab); + currentTool.name = currentItem.toolName; + currentTool.transform.position = Camera.main.transform.position + Camera.main.transform.forward * 1f; break; } } diff --git a/Assets/Scripts/Project/UI/UI_Panel/UI_MenuBar.cs b/Assets/Scripts/Project/UI/UI_Panel/UI_MenuBar.cs index e4adda0..d20f6a0 100644 --- a/Assets/Scripts/Project/UI/UI_Panel/UI_MenuBar.cs +++ b/Assets/Scripts/Project/UI/UI_Panel/UI_MenuBar.cs @@ -122,7 +122,16 @@ public class UI_MenuBar : BasePanel }); break; case "SiteBtn": - + GameManager.UIMgr.ShowPanel(E_UI_Layer.System, (panel) => + { + panel.Init(); + GameManager.EventMgr.EventTrigger(Enum_EventType.UpdateProgress, 0.1f); + GameManager.ScenesMgr.LoadSceneAsyn("05_LiveScene", () => + { + GameManager.EventMgr.EventTrigger(Enum_EventType.UpdateProgress, 0.9f); + GameManager.EventMgr.EventTrigger(Enum_EventType.SwitchScene, GameManager.RunModelMgr.SceneType); + }); + }); break; case "WorkOrderBtn": if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(workOrderID, false) == 0) diff --git a/Assets/Scripts/ProjectBase/BaseManager/SingletonMono.cs b/Assets/Scripts/ProjectBase/BaseManager/SingletonMono.cs index 658d4d1..08a58c4 100644 --- a/Assets/Scripts/ProjectBase/BaseManager/SingletonMono.cs +++ b/Assets/Scripts/ProjectBase/BaseManager/SingletonMono.cs @@ -20,6 +20,6 @@ public class SingletonMono : MonoBehaviour where T : MonoBehaviour instance = this as T; //ǹؼ̳иõģʽĽű ĶʱͲᱻƳ //ͿԱ֤Ϸж - DontDestroyOnLoad(instance.gameObject); + //DontDestroyOnLoad(instance.gameObject); } } diff --git a/Assets/Scripts/ProjectBase/Const/Const.cs b/Assets/Scripts/ProjectBase/Const/Const.cs index f82817e..e841a54 100644 --- a/Assets/Scripts/ProjectBase/Const/Const.cs +++ b/Assets/Scripts/ProjectBase/Const/Const.cs @@ -10,7 +10,9 @@ public class Const /// 加载背景图 /// public const string LoadBGPath = "Sprites/UI_LoadingBG/"; - + /// + /// 加载工具icon + /// public const string LoadToolAndMaterialPath = "Sprites/ToolAndMaterial/"; public const string UI_SelectDevicePanel = "Sprites/UI_SelectDevicePanel/";//需要动态加载该方案的所有设备图片 public const string UI_MainTitlePanel = "Sprites/UI_MainTitlePanel/";//需要动态加载该方案的所有标题图片 diff --git a/Assets/Scripts/ProjectBase/EventCenter/EventCenter.cs b/Assets/Scripts/ProjectBase/EventCenter/EventCenter.cs index 4cdf47c..94552d9 100644 --- a/Assets/Scripts/ProjectBase/EventCenter/EventCenter.cs +++ b/Assets/Scripts/ProjectBase/EventCenter/EventCenter.cs @@ -217,6 +217,17 @@ public class EventCenter : BaseManager } } + /// + /// 触发有参事件 + /// + public void EventTrigger(string eventName, T info) + { + if (eventDic.ContainsKey(eventName)) + { + (eventDic[eventName] as EventInfo).actions?.Invoke(info); + } + } + /// /// 清空所有事件监听 /// diff --git a/Assets/StreamingAssets/BinaryData/TB_SubProcessStep.binary b/Assets/StreamingAssets/BinaryData/TB_SubProcessStep.binary index a6ec16b..ffbf4a2 100644 Binary files a/Assets/StreamingAssets/BinaryData/TB_SubProcessStep.binary and b/Assets/StreamingAssets/BinaryData/TB_SubProcessStep.binary differ