Bug fixes, screenshot feature, and other feature improvements

This commit is contained in:
tonyomendoza 2022-12-10 19:03:30 -08:00
parent e903ca0050
commit eba3a7e1ed
64 changed files with 10389 additions and 251 deletions

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 7ed5420d7678fe4479969b8e79d93c8e
guid: b72ae579dbcac50428824e2c8c8c3c4c
folderAsset: yes
DefaultImporter:
externalObjects: {}

Binary file not shown.

After

Width:  |  Height:  |  Size: 75 KiB

View File

@ -0,0 +1,104 @@
fileFormatVersion: 2
guid: 8e70d9fe64157c34496e86ff2518d6a5
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
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -100
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
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
applyGammaDecoding: 1
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: 1
- 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: 1
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 51 KiB

View File

@ -0,0 +1,104 @@
fileFormatVersion: 2
guid: 18ce130e947d42945a9a1c1dbe0820a8
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
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -100
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
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
applyGammaDecoding: 1
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: 1
- 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: 1
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 60 KiB

View File

@ -0,0 +1,104 @@
fileFormatVersion: 2
guid: 1f6e37aa3bb856242bbff6e4039eecd3
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
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -100
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
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
applyGammaDecoding: 1
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: 1
- 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: 1
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,394 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!181963792 &2655988077585873504
Preset:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: IconImporter
m_TargetType:
m_NativeTypeID: 1006
m_ManagedTypePPtr: {fileID: 0}
m_ManagedTypeFallback:
m_Properties:
- target: {fileID: 0}
propertyPath: m_ExternalObjects.Array.size
value: 0
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_MipMapMode
value: 0
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_EnableMipMap
value: 0
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_sRGBTexture
value: 1
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_LinearTexture
value: 0
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_FadeOut
value: 0
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_BorderMipMap
value: 0
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_MipMapsPreserveCoverage
value: 0
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_AlphaTestReferenceValue
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_MipMapFadeDistanceStart
value: 1
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_MipMapFadeDistanceEnd
value: 3
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_ConvertToNormalMap
value: 0
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_ExternalNormalMap
value: 0
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_HeightScale
value: 0.25
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_NormalMapFilter
value: 0
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_IsReadable
value: 0
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_StreamingMipmaps
value: 0
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_StreamingMipmapsPriority
value: 0
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_GrayScaleToAlpha
value: 0
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_GenerateCubemap
value: 6
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_CubemapConvolution
value: 0
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_SeamlessCubemap
value: 0
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_TextureFormat
value: 1
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_MaxTextureSize
value: 2048
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_TextureSettings.m_FilterMode
value: -1
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_TextureSettings.m_Aniso
value: -1
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_TextureSettings.m_MipBias
value: -100
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_TextureSettings.m_WrapU
value: 1
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_TextureSettings.m_WrapV
value: 1
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_TextureSettings.m_WrapW
value: -1
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_NPOTScale
value: 0
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_Lightmap
value: 0
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_CompressionQuality
value: 50
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_SpriteMode
value: 1
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_SpriteExtrude
value: 1
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_SpriteMeshType
value: 1
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_Alignment
value: 0
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_SpritePivot.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_SpritePivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_SpritePixelsToUnits
value: 100
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_SpriteBorder.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_SpriteBorder.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_SpriteBorder.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_SpriteBorder.w
value: 0
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_SpriteGenerateFallbackPhysicsShape
value: 1
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_AlphaUsage
value: 1
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_AlphaIsTransparency
value: 1
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_SpriteTessellationDetail
value: -1
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_TextureType
value: 8
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_TextureShape
value: 1
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_SingleChannelComponent
value: 0
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_MaxTextureSizeSet
value: 0
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_CompressionQualitySet
value: 0
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_TextureFormatSet
value: 0
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_ApplyGammaDecoding
value: 1
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_PlatformSettings.Array.size
value: 2
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_PlatformSettings.Array.data[0].m_BuildTarget
value: DefaultTexturePlatform
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_PlatformSettings.Array.data[0].m_MaxTextureSize
value: 2048
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_PlatformSettings.Array.data[0].m_ResizeAlgorithm
value: 0
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_PlatformSettings.Array.data[0].m_TextureFormat
value: -1
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_PlatformSettings.Array.data[0].m_TextureCompression
value: 1
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_PlatformSettings.Array.data[0].m_CompressionQuality
value: 50
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_PlatformSettings.Array.data[0].m_CrunchedCompression
value: 0
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_PlatformSettings.Array.data[0].m_AllowsAlphaSplitting
value: 0
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_PlatformSettings.Array.data[0].m_Overridden
value: 0
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_PlatformSettings.Array.data[0].m_AndroidETC2FallbackOverride
value: 0
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_PlatformSettings.Array.data[0].m_ForceMaximumCompressionQuality_BC6H_BC7
value: 1
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_PlatformSettings.Array.data[1].m_BuildTarget
value: Standalone
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_PlatformSettings.Array.data[1].m_MaxTextureSize
value: 2048
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_PlatformSettings.Array.data[1].m_ResizeAlgorithm
value: 0
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_PlatformSettings.Array.data[1].m_TextureFormat
value: -1
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_PlatformSettings.Array.data[1].m_TextureCompression
value: 1
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_PlatformSettings.Array.data[1].m_CompressionQuality
value: 50
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_PlatformSettings.Array.data[1].m_CrunchedCompression
value: 0
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_PlatformSettings.Array.data[1].m_AllowsAlphaSplitting
value: 0
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_PlatformSettings.Array.data[1].m_Overridden
value: 0
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_PlatformSettings.Array.data[1].m_AndroidETC2FallbackOverride
value: 0
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_PlatformSettings.Array.data[1].m_ForceMaximumCompressionQuality_BC6H_BC7
value: 1
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_SpriteSheet.m_Sprites.Array.size
value: 0
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_SpriteSheet.m_Outline.Array.size
value: 0
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_SpriteSheet.m_PhysicsShape.Array.size
value: 0
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_SpriteSheet.m_Bones.Array.size
value: 0
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_SpriteSheet.m_SpriteID
value: 5e97eb03825dee720800000000000000
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_SpriteSheet.m_InternalID
value: 0
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_SpriteSheet.m_Vertices.Array.size
value: 0
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_SpriteSheet.m_Indices.Array.size
value: 0
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_SpriteSheet.m_Edges.Array.size
value: 0
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_SpriteSheet.m_Weights.Array.size
value: 0
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_SpriteSheet.m_SecondaryTextures.Array.size
value: 0
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_SpritePackingTag
value:
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_PSDRemoveMatte
value: 0
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_PSDShowRemoveMatteOption
value: 0
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_UserData
value:
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_AssetBundleName
value:
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_AssetBundleVariant
value:
objectReference: {fileID: 0}

View File

@ -1,8 +1,8 @@
fileFormatVersion: 2
guid: 932332605b143de408257962fa7ff175
folderAsset: yes
DefaultImporter:
guid: 493e5663c9119d048abdb1e105ba1483
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 47 KiB

View File

@ -0,0 +1,104 @@
fileFormatVersion: 2
guid: 288e353ff5baf6c4abe57f7672864d4a
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
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -100
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
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
applyGammaDecoding: 1
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: 1
- 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: 1
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 57 KiB

View File

@ -0,0 +1,104 @@
fileFormatVersion: 2
guid: cb5ccc4ed6e7f2e4990a99858e55f470
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
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -100
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
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
applyGammaDecoding: 1
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: 1
- 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: 1
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 42 KiB

View File

@ -0,0 +1,104 @@
fileFormatVersion: 2
guid: dd6aac2100cf81147849128bbfa54880
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
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -100
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
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
applyGammaDecoding: 1
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: 1
- 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: 1
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

View File

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

View File

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

View File

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

View File

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

View File

@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: 9bd692981c3b41e4e9c65dd7cdb03cb8
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

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

File diff suppressed because it is too large Load Diff

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 7032d000d3add4948ae9729fff4b493a
guid: e34388da28d3051439e9bb6e57bb2c24
DefaultImporter:
externalObjects: {}
userData:

View File

@ -4204,6 +4204,11 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 2060037157}
m_Modifications:
- target: {fileID: 41448509920528289, guid: d8382154c724fca4a8ddc89666da0975,
type: 3}
propertyPath: m_Radius
value: 0.25
objectReference: {fileID: 0}
- target: {fileID: 41448509920528300, guid: d8382154c724fca4a8ddc89666da0975,
type: 3}
propertyPath: m_Name
@ -4473,7 +4478,7 @@ MonoBehaviour:
m_HandleRect: {fileID: 345355543}
m_Direction: 2
m_Value: 0.9999989
m_Size: 0.2979719
m_Size: 0.29797193
m_NumberOfSteps: 0
m_OnValueChanged:
m_PersistentCalls:
@ -8383,6 +8388,11 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 1464582468}
m_Modifications:
- target: {fileID: 41448509920528289, guid: d8382154c724fca4a8ddc89666da0975,
type: 3}
propertyPath: m_Radius
value: 0.25
objectReference: {fileID: 0}
- target: {fileID: 41448509920528300, guid: d8382154c724fca4a8ddc89666da0975,
type: 3}
propertyPath: m_Name
@ -8438,6 +8448,11 @@ PrefabInstance:
propertyPath: alterScale.z
value: 1.33
objectReference: {fileID: 0}
- target: {fileID: 41448509920528302, guid: d8382154c724fca4a8ddc89666da0975,
type: 3}
propertyPath: PlaceInContainerOfItemInSlot
value:
objectReference: {fileID: 5849743408828067761}
- target: {fileID: 41448509920528303, guid: d8382154c724fca4a8ddc89666da0975,
type: 3}
propertyPath: m_LocalPosition.x
@ -8908,7 +8923,8 @@ PrefabInstance:
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedComponents:
- {fileID: 114087706698447814, guid: bd2322c28a3b9384c863f6fed10d0554, type: 3}
m_SourcePrefab: {fileID: 100100000, guid: bd2322c28a3b9384c863f6fed10d0554, type: 3}
--- !u!1001 &390604694
PrefabInstance:
@ -10606,7 +10622,7 @@ MonoBehaviour:
itemUI: {fileID: 498874435}
pickUpRange: {fileID: 1933067162}
targetAttachment: {fileID: 0}
PlaceInContainerOfItemInSlot: {fileID: 0}
PlaceInContainerOfItemInSlot: {fileID: 5849743408828067761}
--- !u!135 &479204072
SphereCollider:
m_ObjectHideFlags: 0
@ -17174,6 +17190,11 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 224145751}
m_Modifications:
- target: {fileID: 41448509920528289, guid: d8382154c724fca4a8ddc89666da0975,
type: 3}
propertyPath: m_Radius
value: 0.25
objectReference: {fileID: 0}
- target: {fileID: 41448509920528300, guid: d8382154c724fca4a8ddc89666da0975,
type: 3}
propertyPath: m_Name
@ -17209,6 +17230,11 @@ PrefabInstance:
propertyPath: alterPosition.y
value: 0.185
objectReference: {fileID: 0}
- target: {fileID: 41448509920528302, guid: d8382154c724fca4a8ddc89666da0975,
type: 3}
propertyPath: PlaceInContainerOfItemInSlot
value:
objectReference: {fileID: 5849743408828067761}
- target: {fileID: 41448509920528303, guid: d8382154c724fca4a8ddc89666da0975,
type: 3}
propertyPath: m_LocalPosition.x
@ -18595,8 +18621,8 @@ RectTransform:
m_Father: {fileID: 1142080337}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 584.8999, y: 2500}
m_Pivot: {x: 0, y: 1}
@ -22459,6 +22485,57 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 1034226260}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1036302874
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1036302875}
- component: {fileID: 1036302876}
m_Layer: 0
m_Name: Display Message System
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1036302875
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1036302874}
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_Children: []
m_Father: {fileID: 1633528199}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1036302876
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1036302874}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: aafff61e86426934aa0e231391bfa4cd, type: 3}
m_Name:
m_EditorClassIdentifier:
displayMessages:
- message: {fileID: 1164520559}
displayState: 1
originalMessage:
- message: {fileID: 1733140602}
displayState: 2
originalMessage:
NameOfItemInWorldWithFocus:
--- !u!1001 &1037072336
PrefabInstance:
m_ObjectHideFlags: 0
@ -27762,6 +27839,11 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 1367057314}
m_Modifications:
- target: {fileID: 41448509920528289, guid: d8382154c724fca4a8ddc89666da0975,
type: 3}
propertyPath: m_Radius
value: 0.25
objectReference: {fileID: 0}
- target: {fileID: 41448509920528300, guid: d8382154c724fca4a8ddc89666da0975,
type: 3}
propertyPath: m_Name
@ -27817,6 +27899,11 @@ PrefabInstance:
propertyPath: alterScale.z
value: 1.04
objectReference: {fileID: 0}
- target: {fileID: 41448509920528302, guid: d8382154c724fca4a8ddc89666da0975,
type: 3}
propertyPath: PlaceInContainerOfItemInSlot
value:
objectReference: {fileID: 5849743408828067761}
- target: {fileID: 41448509920528303, guid: d8382154c724fca4a8ddc89666da0975,
type: 3}
propertyPath: m_LocalPosition.x
@ -28431,6 +28518,7 @@ RectTransform:
- {fileID: 1164520558}
- {fileID: 775051970}
- {fileID: 1381112304}
- {fileID: 1733140601}
m_Father: {fileID: 1633528199}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -28665,6 +28753,125 @@ MonoBehaviour:
m_ChildControlHeight: 0
m_ChildScaleWidth: 0
m_ChildScaleHeight: 0
--- !u!1 &1262384612
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1262384613}
- component: {fileID: 1262384616}
- component: {fileID: 1262384615}
- component: {fileID: 1262384614}
m_Layer: 5
m_Name: Drop
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1262384613
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1262384612}
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_Children:
- {fileID: 1930542458}
m_Father: {fileID: 5184929497788845982}
m_RootOrder: 1
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: 150, y: 30}
m_Pivot: {x: 0, y: 1}
--- !u!114 &1262384614
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1262384612}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
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: 1262384615}
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!114 &1262384615
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1262384612}
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_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!222 &1262384616
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1262384612}
m_CullTransparentMesh: 0
--- !u!1001 &1263612017
PrefabInstance:
m_ObjectHideFlags: 0
@ -32542,6 +32749,11 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 1128457984}
m_Modifications:
- target: {fileID: 41448509920528289, guid: d8382154c724fca4a8ddc89666da0975,
type: 3}
propertyPath: m_Radius
value: 0.25
objectReference: {fileID: 0}
- target: {fileID: 41448509920528300, guid: d8382154c724fca4a8ddc89666da0975,
type: 3}
propertyPath: m_Name
@ -32592,6 +32804,11 @@ PrefabInstance:
propertyPath: alterScale.y
value: 1.05
objectReference: {fileID: 0}
- target: {fileID: 41448509920528302, guid: d8382154c724fca4a8ddc89666da0975,
type: 3}
propertyPath: PlaceInContainerOfItemInSlot
value:
objectReference: {fileID: 5849743408828067761}
- target: {fileID: 41448509920528303, guid: d8382154c724fca4a8ddc89666da0975,
type: 3}
propertyPath: m_LocalPosition.x
@ -33471,8 +33688,8 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 942819874}
m_HandleRect: {fileID: 942819873}
m_Direction: 2
m_Value: 0.9999967
m_Size: 0.52640384
m_Value: 0.99999654
m_Size: 0.5264038
m_NumberOfSteps: 0
m_OnValueChanged:
m_PersistentCalls:
@ -37414,12 +37631,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 837ccd1b2c5ddff40944cdfedebde1a7, type: 3}
m_Name:
m_EditorClassIdentifier:
RaritySystemUnits: []
weightSystemUnits:
-
-
currencySystemUnits: []
currencySystemUnitsSymbols: []
inventoryUI: {fileID: 1020312531}
playerUI: {fileID: 1246781797}
InventoryMenuUI: {fileID: 1079848284}
@ -37428,7 +37639,8 @@ MonoBehaviour:
rotateKey: 114
menuKey: 105
interactKey: 102
dropItemKey: 113
dropItemKey: 304
equipItemKey: 306
DefaultWidthOnGrid: 75
DefaultHeightOnGrid: 75
DefaultSizeOnGrid:
@ -37444,6 +37656,19 @@ MonoBehaviour:
TagSlotPairings:
- itemTag: 12
slot: {fileID: 5849743408828067761}
raritiesList:
- rarityType: 0
color: {r: 0.6, g: 0.6, b: 0.6, a: 0}
- rarityType: 1
color: {r: 0.5764706, g: 0.7686275, b: 0.4901961, a: 0}
- rarityType: 2
color: {r: 0.427451, g: 0.61960787, b: 0.9215687, a: 0}
- rarityType: 3
color: {r: 0.5568628, g: 0.48627454, b: 0.76470596, a: 0}
- rarityType: 4
color: {r: 1, g: 0.85098046, b: 0.40000004, a: 0}
ItemBackdropTransparency: 0.5
CurrentState: 0
--- !u!4 &1633528199
Transform:
m_ObjectHideFlags: 0
@ -37457,6 +37682,7 @@ Transform:
m_Children:
- {fileID: 1020312532}
- {fileID: 1246781798}
- {fileID: 1036302875}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -38400,7 +38626,7 @@ MonoBehaviour:
m_HandleRect: {fileID: 1584996881}
m_Direction: 0
m_Value: 1
m_Size: 0.99999994
m_Size: 1
m_NumberOfSteps: 0
m_OnValueChanged:
m_PersistentCalls:
@ -39368,6 +39594,139 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 1717236486}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1733140600
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1733140601}
- component: {fileID: 1733140603}
- component: {fileID: 1733140602}
m_Layer: 5
m_Name: Pick Up Message
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &1733140601
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1733140600}
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_Children: []
m_Father: {fileID: 1246781798}
m_RootOrder: 3
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: 0, y: -160}
m_SizeDelta: {x: 1022, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1733140602
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1733140600}
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_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: Press {key:interactKey} to Pick Up {item:name}
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: 36
m_fontSizeBase: 36
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: 1
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: -0.9425049, 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!222 &1733140603
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1733140600}
m_CullTransparentMesh: 0
--- !u!1001 &1735162179
PrefabInstance:
m_ObjectHideFlags: 0
@ -40837,7 +41196,7 @@ MonoBehaviour:
m_HandleRect: {fileID: 1186388952}
m_Direction: 0
m_Value: 0
m_Size: 0.9999999
m_Size: 1
m_NumberOfSteps: 0
m_OnValueChanged:
m_PersistentCalls:
@ -43686,6 +44045,141 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 1929932650}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1930542457
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1930542458}
- component: {fileID: 1930542460}
- component: {fileID: 1930542459}
m_Layer: 5
m_Name: Text (TMP)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1930542458
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1930542457}
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_Children: []
m_Father: {fileID: 1262384613}
m_RootOrder: 0
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!114 &1930542459
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1930542457}
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_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: 'Drop
'
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: 4281479730
m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, 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: 24
m_fontSizeBase: 24
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: 1
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!222 &1930542460
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1930542457}
m_CullTransparentMesh: 0
--- !u!1 &1933067159
GameObject:
m_ObjectHideFlags: 0
@ -50045,6 +50539,7 @@ RectTransform:
m_LocalScale: {x: 0.56997854, y: 0.56997854, z: 0.56997854}
m_Children:
- {fileID: 191364541}
- {fileID: 1262384613}
m_Father: {fileID: 475178573}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -50065,6 +50560,7 @@ GameObject:
- component: {fileID: 5184929497788845979}
- component: {fileID: 5184929497788845980}
- component: {fileID: 5184929497788845984}
- component: {fileID: 5184929497788845985}
m_Layer: 5
m_Name: Context Menu
m_TagString: Untagged
@ -50097,6 +50593,18 @@ MonoBehaviour:
m_ChildControlHeight: 0
m_ChildScaleWidth: 0
m_ChildScaleHeight: 0
--- !u!225 &5184929497788845985
CanvasGroup:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5184929497788845983}
m_Enabled: 1
m_Alpha: 1
m_Interactable: 1
m_BlocksRaycasts: 1
m_IgnoreParentGroups: 0
--- !u!224 &5418865952030348250
RectTransform:
m_ObjectHideFlags: 0

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 966f087d5cf369a4c96575a74dab0902
guid: 5d76a55b1d68fa643ad22772f05b2426
folderAsset: yes
DefaultImporter:
externalObjects: {}

View File

@ -0,0 +1,36 @@
using System.IO;
using UnityEditor;
using UnityEditor.Presets;
public class PresetsPerFolder : AssetPostprocessor
{
void OnPreprocessAsset()
{
// Make sure we are applying presets the first time an asset is imported.
if (assetImporter.importSettingsMissing)
{
// Get the current imported asset folder.
var path = Path.GetDirectoryName(assetPath);
while (!string.IsNullOrEmpty(path))
{
// Find all Preset assets in this folder.
var presetGuids = AssetDatabase.FindAssets("t:Preset", new[] { path });
foreach (var presetGuid in presetGuids)
{
// Make sure we are not testing Presets in a subfolder.
string presetPath = AssetDatabase.GUIDToAssetPath(presetGuid);
if (Path.GetDirectoryName(presetPath) == path)
{
// Load the Preset and try to apply it to the importer.
var preset = AssetDatabase.LoadAssetAtPath<Preset>(presetPath);
if (preset.ApplyTo(assetImporter))
return;
}
}
// Try again in the parent folder.
path = Path.GetDirectoryName(path);
}
}
}
}

View File

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

View File

@ -52,7 +52,9 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: cc11508cb979f8b4b8253855ce8a0bc5, type: 3}
m_Name:
m_EditorClassIdentifier:
itemName: 3 Day Pack
image: {fileID: 8715477176133586257}
backdropImage: {fileID: 0}
canvas: {fileID: 0}
width: 5
height: 6
@ -64,6 +66,8 @@ MonoBehaviour:
type: 3}
itemPrefab: {fileID: 0}
Equipped: 0
rarity: 3
interactable: 1
StackLimit: 1
PickedUpOnFrame: 0
ContextWindows: []
@ -104,7 +108,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.5568628, g: 0.48627454, b: 0.76470596, a: 1}
m_Color: {r: 1, g: 1, b: 1, a: 0.39215687}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
@ -184,7 +188,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: b738c3a9c2d50b949a159d636ea22b92, type: 3}
m_Sprite: {fileID: 21300000, guid: 8e70d9fe64157c34496e86ff2518d6a5, type: 3}
m_Type: 0
m_PreserveAspect: 1
m_FillCenter: 1

View File

@ -187,7 +187,9 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: cc11508cb979f8b4b8253855ce8a0bc5, type: 3}
m_Name:
m_EditorClassIdentifier:
itemName: Ammo - Sniper
image: {fileID: 0}
backdropImage: {fileID: 0}
canvas: {fileID: 0}
width: 1
height: 1
@ -198,6 +200,7 @@ MonoBehaviour:
containerUIPrefab: {fileID: 0}
itemPrefab: {fileID: 0}
Equipped: 0
rarity: 0
StackLimit: 60
PickedUpOnFrame: 0
ContextWindows: []
@ -238,7 +241,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 0.124526225, b: 0, a: 1}
m_Color: {r: 1, g: 1, b: 1, a: 0.39215687}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:

View File

@ -52,7 +52,9 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: cc11508cb979f8b4b8253855ce8a0bc5, type: 3}
m_Name:
m_EditorClassIdentifier:
itemName: Assault Backpack
image: {fileID: 8715477176133586257}
backdropImage: {fileID: 0}
canvas: {fileID: 0}
width: 5
height: 7
@ -64,6 +66,7 @@ MonoBehaviour:
type: 3}
itemPrefab: {fileID: 0}
Equipped: 0
rarity: 3
StackLimit: 1
PickedUpOnFrame: 0
ContextWindows: []
@ -104,7 +107,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.5568628, g: 0.48627454, b: 0.76470596, a: 1}
m_Color: {r: 1, g: 1, b: 1, a: 0.39215687}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:

View File

@ -52,7 +52,9 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: cc11508cb979f8b4b8253855ce8a0bc5, type: 3}
m_Name:
m_EditorClassIdentifier:
itemName: Backpack
image: {fileID: 8715477176133586257}
backdropImage: {fileID: 0}
canvas: {fileID: 0}
width: 4
height: 5
@ -64,6 +66,8 @@ MonoBehaviour:
type: 3}
itemPrefab: {fileID: 0}
Equipped: 0
rarity: 2
interactable: 1
StackLimit: 1
PickedUpOnFrame: 0
ContextWindows: []
@ -104,7 +108,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.427451, g: 0.61960787, b: 0.9215687, a: 1}
m_Color: {r: 1, g: 1, b: 1, a: 0.39215687}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
@ -184,7 +188,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: b738c3a9c2d50b949a159d636ea22b92, type: 3}
m_Sprite: {fileID: 21300000, guid: 18ce130e947d42945a9a1c1dbe0820a8, type: 3}
m_Type: 0
m_PreserveAspect: 1
m_FillCenter: 1

View File

@ -52,7 +52,9 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: cc11508cb979f8b4b8253855ce8a0bc5, type: 3}
m_Name:
m_EditorClassIdentifier:
itemName: Battlepack
image: {fileID: 8715477176133586257}
backdropImage: {fileID: 0}
canvas: {fileID: 0}
width: 5
height: 5
@ -64,6 +66,8 @@ MonoBehaviour:
type: 3}
itemPrefab: {fileID: 0}
Equipped: 0
rarity: 2
interactable: 1
StackLimit: 1
PickedUpOnFrame: 0
ContextWindows: []
@ -104,7 +108,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.427451, g: 0.61960787, b: 0.9215687, a: 1}
m_Color: {r: 1, g: 1, b: 1, a: 0.39215687}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
@ -184,7 +188,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: b738c3a9c2d50b949a159d636ea22b92, type: 3}
m_Sprite: {fileID: 21300000, guid: 1f6e37aa3bb856242bbff6e4039eecd3, type: 3}
m_Type: 0
m_PreserveAspect: 1
m_FillCenter: 1

View File

@ -52,7 +52,9 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: cc11508cb979f8b4b8253855ce8a0bc5, type: 3}
m_Name:
m_EditorClassIdentifier:
itemName: Body Armor
image: {fileID: 8715477176133586257}
backdropImage: {fileID: 0}
canvas: {fileID: 0}
width: 2
height: 2
@ -63,6 +65,7 @@ MonoBehaviour:
containerUIPrefab: {fileID: 0}
itemPrefab: {fileID: 0}
Equipped: 0
rarity: 0
StackLimit: 1
PickedUpOnFrame: 0
ContextWindows: []
@ -103,7 +106,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 0.124526225, b: 0, a: 1}
m_Color: {r: 1, g: 1, b: 1, a: 0.39215687}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:

View File

@ -52,7 +52,9 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: cc11508cb979f8b4b8253855ce8a0bc5, type: 3}
m_Name:
m_EditorClassIdentifier:
itemName: Helmet
image: {fileID: 8715477176133586257}
backdropImage: {fileID: 0}
canvas: {fileID: 0}
width: 2
height: 2
@ -63,6 +65,7 @@ MonoBehaviour:
containerUIPrefab: {fileID: 0}
itemPrefab: {fileID: 0}
Equipped: 0
rarity: 0
StackLimit: 1
PickedUpOnFrame: 0
ContextWindows: []
@ -103,7 +106,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.8773585, g: 0, b: 0, a: 1}
m_Color: {r: 1, g: 1, b: 1, a: 0.39215687}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:

View File

@ -52,7 +52,9 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: cc11508cb979f8b4b8253855ce8a0bc5, type: 3}
m_Name:
m_EditorClassIdentifier:
itemName: Mini Backpack
image: {fileID: 8715477176133586257}
backdropImage: {fileID: 0}
canvas: {fileID: 0}
width: 4
height: 4
@ -64,6 +66,8 @@ MonoBehaviour:
type: 3}
itemPrefab: {fileID: 0}
Equipped: 0
rarity: 1
interactable: 1
StackLimit: 1
PickedUpOnFrame: 0
ContextWindows: []
@ -104,7 +108,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.5764706, g: 0.7686275, b: 0.4901961, a: 1}
m_Color: {r: 1, g: 1, b: 1, a: 0.39215687}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
@ -184,7 +188,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: b738c3a9c2d50b949a159d636ea22b92, type: 3}
m_Sprite: {fileID: 21300000, guid: 288e353ff5baf6c4abe57f7672864d4a, type: 3}
m_Type: 0
m_PreserveAspect: 1
m_FillCenter: 1

View File

@ -52,7 +52,9 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: cc11508cb979f8b4b8253855ce8a0bc5, type: 3}
m_Name:
m_EditorClassIdentifier:
itemName: Mini Bag
image: {fileID: 8715477176133586257}
backdropImage: {fileID: 0}
canvas: {fileID: 0}
width: 4
height: 3
@ -64,6 +66,8 @@ MonoBehaviour:
type: 3}
itemPrefab: {fileID: 0}
Equipped: 0
rarity: 1
interactable: 1
StackLimit: 1
PickedUpOnFrame: 0
ContextWindows: []
@ -104,7 +108,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.5764706, g: 0.7686275, b: 0.4901961, a: 1}
m_Color: {r: 1, g: 1, b: 1, a: 0.39215687}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
@ -184,7 +188,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: b738c3a9c2d50b949a159d636ea22b92, type: 3}
m_Sprite: {fileID: 21300000, guid: cb5ccc4ed6e7f2e4990a99858e55f470, type: 3}
m_Type: 0
m_PreserveAspect: 1
m_FillCenter: 1

View File

@ -52,7 +52,9 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: cc11508cb979f8b4b8253855ce8a0bc5, type: 3}
m_Name:
m_EditorClassIdentifier:
itemName: Plate Carrier
image: {fileID: 0}
backdropImage: {fileID: 0}
canvas: {fileID: 0}
width: 2
height: 2
@ -64,6 +66,7 @@ MonoBehaviour:
type: 3}
itemPrefab: {fileID: 0}
Equipped: 0
rarity: 0
StackLimit: 1
PickedUpOnFrame: 0
ContextWindows: []
@ -104,7 +107,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 0.124526225, b: 0, a: 1}
m_Color: {r: 1, g: 1, b: 1, a: 0.39215687}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:

View File

@ -52,7 +52,9 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: cc11508cb979f8b4b8253855ce8a0bc5, type: 3}
m_Name:
m_EditorClassIdentifier:
itemName: Pouch 1x1
image: {fileID: 8715477176133586257}
backdropImage: {fileID: 0}
canvas: {fileID: 0}
width: 1
height: 1
@ -64,6 +66,8 @@ MonoBehaviour:
type: 3}
itemPrefab: {fileID: 0}
Equipped: 0
rarity: 0
interactable: 1
StackLimit: 1
PickedUpOnFrame: 0
ContextWindows: []
@ -104,7 +108,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.6, g: 0.6, b: 0.6, a: 1}
m_Color: {r: 1, g: 1, b: 1, a: 0.39215687}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
@ -184,7 +188,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: c5854e3b7cbf22a4d82d614fec06012e, type: 3}
m_Sprite: {fileID: 21300000, guid: dd6aac2100cf81147849128bbfa54880, type: 3}
m_Type: 0
m_PreserveAspect: 1
m_FillCenter: 1

View File

@ -52,7 +52,9 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: cc11508cb979f8b4b8253855ce8a0bc5, type: 3}
m_Name:
m_EditorClassIdentifier:
itemName: Pouch 2x1
image: {fileID: 8715477176133586257}
backdropImage: {fileID: 0}
canvas: {fileID: 0}
width: 1
height: 2
@ -64,6 +66,7 @@ MonoBehaviour:
type: 3}
itemPrefab: {fileID: 0}
Equipped: 0
rarity: 1
StackLimit: 1
PickedUpOnFrame: 0
ContextWindows: []
@ -104,7 +107,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.5764706, g: 0.7686275, b: 0.4901961, a: 1}
m_Color: {r: 1, g: 1, b: 1, a: 0.39215687}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:

View File

@ -52,7 +52,9 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: cc11508cb979f8b4b8253855ce8a0bc5, type: 3}
m_Name:
m_EditorClassIdentifier:
itemName: Pouch 2x2
image: {fileID: 8715477176133586257}
backdropImage: {fileID: 0}
canvas: {fileID: 0}
width: 2
height: 2
@ -64,6 +66,7 @@ MonoBehaviour:
type: 3}
itemPrefab: {fileID: 0}
Equipped: 0
rarity: 3
StackLimit: 1
PickedUpOnFrame: 0
ContextWindows: []
@ -104,7 +107,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.5568628, g: 0.48627454, b: 0.76470596, a: 1}
m_Color: {r: 1, g: 1, b: 1, a: 0.39215687}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:

View File

@ -52,7 +52,9 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: cc11508cb979f8b4b8253855ce8a0bc5, type: 3}
m_Name:
m_EditorClassIdentifier:
itemName: Pouch 3x1
image: {fileID: 8715477176133586257}
backdropImage: {fileID: 0}
canvas: {fileID: 0}
width: 1
height: 3
@ -64,6 +66,7 @@ MonoBehaviour:
type: 3}
itemPrefab: {fileID: 0}
Equipped: 0
rarity: 2
StackLimit: 1
PickedUpOnFrame: 0
ContextWindows: []
@ -104,7 +107,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.427451, g: 0.61960787, b: 0.9215687, a: 1}
m_Color: {r: 1, g: 1, b: 1, a: 0.39215687}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:

View File

@ -52,7 +52,9 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: cc11508cb979f8b4b8253855ce8a0bc5, type: 3}
m_Name:
m_EditorClassIdentifier:
itemName: Raid Backpack
image: {fileID: 8715477176133586257}
backdropImage: {fileID: 0}
canvas: {fileID: 0}
width: 5
height: 8
@ -64,6 +66,7 @@ MonoBehaviour:
type: 3}
itemPrefab: {fileID: 0}
Equipped: 0
rarity: 4
StackLimit: 1
PickedUpOnFrame: 0
ContextWindows: []
@ -104,7 +107,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 0.85098046, b: 0.40000004, a: 1}
m_Color: {r: 1, g: 1, b: 1, a: 0.39215687}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:

View File

@ -52,7 +52,9 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: cc11508cb979f8b4b8253855ce8a0bc5, type: 3}
m_Name:
m_EditorClassIdentifier:
itemName: Rifle
image: {fileID: 8715477176133586257}
backdropImage: {fileID: 0}
canvas: {fileID: 0}
width: 4
height: 2
@ -63,6 +65,7 @@ MonoBehaviour:
containerUIPrefab: {fileID: 0}
itemPrefab: {fileID: 0}
Equipped: 0
rarity: 0
StackLimit: 1
PickedUpOnFrame: 0
ContextWindows: []
@ -103,7 +106,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 0.124526225, b: 0, a: 1}
m_Color: {r: 1, g: 1, b: 1, a: 0.39215687}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:

View File

@ -52,7 +52,9 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: cc11508cb979f8b4b8253855ce8a0bc5, type: 3}
m_Name:
m_EditorClassIdentifier:
itemName: Tactical Rig
image: {fileID: 8715477176133586257}
backdropImage: {fileID: 0}
canvas: {fileID: 0}
width: 2
height: 2
@ -64,6 +66,7 @@ MonoBehaviour:
type: 3}
itemPrefab: {fileID: 0}
Equipped: 0
rarity: 0
StackLimit: 1
PickedUpOnFrame: 0
ContextWindows: []
@ -104,7 +107,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 0.124526225, b: 0, a: 1}
m_Color: {r: 1, g: 1, b: 1, a: 0.39215687}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:

View File

@ -64,7 +64,7 @@ SphereCollider:
m_IsTrigger: 1
m_Enabled: 1
serializedVersion: 2
m_Radius: 1
m_Radius: 0.25
m_Center: {x: 0, y: 0, z: 0}
--- !u!1 &41448510249244382
GameObject:

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: b5400487aa01ac143bc9efa53dce97c5
guid: 1abc3e3eb012c884a96dd70c56e96562
folderAsset: yes
DefaultImporter:
externalObjects: {}

View File

@ -0,0 +1,41 @@
using System;
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEditor;
[CustomEditor(typeof(Photoshoot))]
public class PhotoshootEditor : Editor
{
public override void OnInspectorGUI()
{
base.OnInspectorGUI();
Photoshoot photoshoot = (Photoshoot)target;
if (String.IsNullOrWhiteSpace(photoshoot.OutputPath))
{
Debug.LogError("Output Path should not be empty");
}
if (photoshoot.items == null)
{
Debug.LogError("Items should not be null and must contain child Game Objects.");
}
/*if (GUILayout.Button("Say Cheese 📸"))
{
photoshoot.ProcessScreenshots();
}*/
if (GUILayout.Button("Say Cheese! 📸"))
{
photoshoot.ProcessScreenshotsFaster();
}
}
}
/**/

View File

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

View File

@ -0,0 +1,91 @@
using System;
using System.Collections;
using System.Collections.Generic;
using TMPro;
using UnityEngine;
namespace SimpleInventorySystem
{
public class DisplayMessageSystem : MonoBehaviour
{
public static DisplayMessageSystem instance;
public DisplayMessage[] displayMessages;
protected InventorySystem.States currentState;
[HideInInspector] public string NameOfItemInWorldWithFocus;
private void Awake()
{
instance = this;
}
// Start is called before the first frame update
void Start()
{
foreach (DisplayMessage displayMessage in displayMessages)
{
TextMeshProUGUI message = displayMessage.message;
if (displayMessage != null && message != null)
{
string text = message.text;
if (text.Contains("{key:interactKey}"))
message.text = message.text.Replace("{key:interactKey}", "[ " + InventorySystem.instance.interactKey.ToString() + " ]");
}
displayMessage.SetOriginalMessage();
}
}
// Update is called once per frame
void Update()
{
if(currentState != InventorySystem.instance.CurrentState)
{
currentState = InventorySystem.instance.CurrentState;
foreach (DisplayMessage displayMessage in displayMessages)
{
if (currentState == InventorySystem.States.Undefined)
{
displayMessage.message.gameObject.SetActive(false);
}
else if (currentState == displayMessage.displayState)
{
displayMessage.message.gameObject.SetActive(true);
}
else
{
displayMessage.message.gameObject.SetActive(false);
}
}
}
//if(NameOfItemInWorldWithFocus != )
foreach (DisplayMessage displayMessage in displayMessages)
{
TextMeshProUGUI message = displayMessage.message;
if (displayMessage != null && message != null && displayMessage.originalMessage.Contains("{item:name}"))
{
message.text = displayMessage.originalMessage.Replace("{item:name}", NameOfItemInWorldWithFocus);
}
}
}
}
[Serializable]
public class DisplayMessage
{
public TextMeshProUGUI message;
public InventorySystem.States displayState;
[HideInInspector] public string originalMessage;
public DisplayMessage()
{
}
public void SetOriginalMessage()
{
originalMessage = message.text;
}
}
}

View File

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

View File

@ -7,7 +7,6 @@ using UnityEngine.EventSystems;
// TODO: Expand for other measurement systems later
namespace SimpleInventorySystem
{
public enum Orientation { Portrait, Landscape };
@ -82,15 +81,10 @@ namespace SimpleInventorySystem
public class InventorySystem : MonoBehaviour, IPointerClickHandler
{
[SerializeField] private string[] RaritySystemUnits;
private string[] weightSystemUnitsSymbols;
[SerializeField] private string[] weightSystemUnits;
[SerializeField] private float[] currencySystemUnits;
[SerializeField] private string[] currencySystemUnitsSymbols;
public static InventorySystem instance;
public Canvas inventoryUI;
public Canvas playerUI;
private TextMeshProUGUI lootMessage;
///private TextMeshProUGUI lootMessage;
public GameObject InventoryMenuUI;
public GameObject LootMenuUI;
public GameObject StatsMenuUI;
@ -98,10 +92,12 @@ namespace SimpleInventorySystem
public KeyCode menuKey;
public KeyCode interactKey;
public KeyCode dropItemKey;
public KeyCode equipItemKey;
protected KeyInput rotationKeyInput;
protected KeyInput menuKeyInput;
protected KeyInput interactKeyInput;
protected KeyInput dropItemKeyInput;
protected KeyInput equipItemKeyInput;
[SerializeField] private int DefaultWidthOnGrid = 100;
[SerializeField] private int DefaultHeightOnGrid = 100;
public Size DefaultSizeOnGrid;
@ -115,6 +111,11 @@ namespace SimpleInventorySystem
public static List<GameObject> hoverResults;
public Player_IS player;
public List<TagSlotPairing> TagSlotPairings;
public List<Rarity> raritiesList;
[Range(0, 1)] public float ItemBackdropTransparency = .5f;
public enum States { Undefined, Loot, PickUp };
public States CurrentState = States.Undefined;
private void Awake()
{
@ -133,18 +134,27 @@ namespace SimpleInventorySystem
menuKeyInput = new KeyInput(menuKey);
interactKeyInput = new KeyInput(interactKey);
dropItemKeyInput = new KeyInput(dropItemKey);
lootMessage = playerUI.transform.Find("Loot Message").GetComponent<TextMeshProUGUI>();
if (lootMessage != null)
{
string text = lootMessage.text;
if (text.Contains("{key:interactKey}"))
lootMessage.text = lootMessage.text.Replace("{key:interactKey}", "[ " + interactKey.ToString() + " ]");
}
equipItemKeyInput = new KeyInput(equipItemKey);
toolbarEvents = EventsObject.transform.Find("Toolbar").gameObject;
}
public Rarity GetRarityFromList(RarityType rarityType)
{
foreach(Rarity rarity in raritiesList)
{
if(rarity.rarityType == rarityType)
{
return rarity;
}
}
return null;
}
public void SetPlayerMessageToLoot()
{
}
// Start is called before the first frame update
void Start()
{
@ -158,6 +168,7 @@ namespace SimpleInventorySystem
menuKeyInput.Update();
interactKeyInput.Update();
dropItemKeyInput.Update();
equipItemKeyInput.Update();
//else
{
@ -267,6 +278,8 @@ namespace SimpleInventorySystem
private void DetectObject()
{
CurrentState = States.Undefined;
if (playerCamera == null)
{
//Debug.Log("Uh OHHH. No camera detected");
@ -275,13 +288,17 @@ namespace SimpleInventorySystem
{
//Debug.Log("Detecting...");
}
Ray ray = playerCamera.ScreenPointToRay(new Vector2(Screen.width / 2, Screen.height / 2));//controls.Mouse.Position.ReadValue<Vector2>());
RaycastHit hit;
if (Physics.Raycast(ray, out hit))
//Ray ray = playerCamera.ScreenPointToRay(new Vector2(Screen.width / 2, Screen.height / 2));//controls.Mouse.Position.ReadValue<Vector2>());
Vector3 direction = Vector3.forward;
Ray ray = new Ray(playerCamera.transform.position, playerCamera.transform.TransformDirection(direction * 200));
Debug.DrawRay(playerCamera.transform.position, playerCamera.transform.TransformDirection(direction * 200), Color.red);
//RaycastHit hit;
/*if (Physics.Raycast(ray, out hit))
{
// for single hits, i guess...
}
}*/
RaycastHit[] hits = Physics.RaycastAll(ray, 200);
for(int i = 0; i < hits.Length; i++)
@ -292,13 +309,14 @@ namespace SimpleInventorySystem
}
if (hit.collider != null)// && hit.transform.parent.parent.parent != null)
if (hits[i].collider != null)// && hit.transform.parent.parent.parent != null)
{
PickUp response_pickUp = hit.collider.transform.GetComponent<PickUp>();
PickUp response_pickUp = hits[i].collider.transform.GetComponent<PickUp>();
if (response_pickUp && !InventorySystem.instance.IsUsingInventoryMenuUI())
{
//Debug.Log("Detecting");
lootMessage.gameObject.SetActive(true);
Debug.Log("Detecting");
CurrentState = States.PickUp;
DisplayMessageSystem.instance.NameOfItemInWorldWithFocus = response_pickUp.itemUI.itemName;
if (interactKeyInput.pressedKey)
player.HandlePickup(response_pickUp);
@ -307,21 +325,21 @@ namespace SimpleInventorySystem
}
else
{
lootMessage.gameObject.SetActive(false);
CurrentState = States.Undefined;
}
//Debug.Log("3D Hit: " + hit.collider.transform.name);
// TODO: functionality here
Inventory response_inventory = hit.collider.transform.GetComponent<Inventory>();
Inventory response_inventory = hits[i].collider.transform.GetComponent<Inventory>();
if(response_inventory == player.inventory)
{
continue; // ignore self
}
if (response_inventory != null && !InventorySystem.instance.IsUsingInventoryMenuUI())
/*if (response_inventory != null && !InventorySystem.instance.IsUsingInventoryMenuUI())
{
Debug.Log("Opening Inventory");
if (interactKeyInput.PressedKey(true))
@ -329,19 +347,19 @@ namespace SimpleInventorySystem
OpenInventory();
LootMenuUI.SetActive(true);
StatsMenuUI.SetActive(false);
lootMessage.gameObject.SetActive(false);
CurrentState = States.Undefined;
}
else if (!InventorySystem.instance.IsUsingInventoryMenuUI())
{
lootMessage.gameObject.SetActive(true);
CurrentState = States.Loot;
}
}
else if(!InventorySystem.instance.IsUsingInventoryMenuUI())
{
lootMessage.gameObject.SetActive(false);
CurrentState = States.Undefined;
LootMenuUI.SetActive(false);
StatsMenuUI.SetActive(true);
}
}*/
}
}
@ -369,13 +387,23 @@ namespace SimpleInventorySystem
{
return rotationKeyInput.PressedKey(singlePress);
}
public bool PressedDropItemKey(bool singlePress)
{
return dropItemKeyInput.PressedKey(singlePress);
return dropItemKeyInput.PressedKey(singlePress) && Input.GetMouseButton(0);
}
public bool PressedEquipItemKey(bool singlePress)
{
return equipItemKeyInput.PressedKey(singlePress) && Input.GetMouseButton(0);
}
public void OnPointerClick(PointerEventData eventData)
{
if(eventData.button == PointerEventData.InputButton.Left && !ContextMenuManagerUI.instance.ItemInspectMenuHasFocus() && ContextMenuManagerUI.instance.IsInspectingItem())
{
ContextMenuManagerUI.instance.CloseContextMenu();
}
}
}
}

View File

@ -1,4 +1,5 @@
using System.Collections;
using System;
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
@ -31,6 +32,22 @@ namespace SimpleInventorySystem
ShotgunRounds
}
public enum RarityType
{
Uncommon,
Common,
Rare,
Epic,
Legendary
}
[Serializable]
public class Rarity
{
public RarityType rarityType;
public Color color;
}
public class InventorySystemPreferences
{

View File

@ -95,32 +95,26 @@ namespace SimpleInventorySystem
{
if (!HadPickedUp)
{
foreach (TagSlotPairing tsp in InventorySystem.instance.TagSlotPairings)
if (itemUI.Equip())
{
if (!tsp.HasSlotOccupied())
itemUI.transform.localRotation = Quaternion.Euler(new Vector3());
itemUI.transform.localScale = new Vector3(1, 1, 1);
HadPickedUp = true;
// TODO: Handle changing transform here
//ItemGameObject.GetComponent<>;
if (InventorySystem.instance.player.AttachItemGameObject(ItemGameObject, itemUI.ItemTag, itemUI))
{
bool dropped = tsp.slot.DropOntoSlot(itemUI.gameObject);
if (dropped)
{
itemUI.transform.localRotation = Quaternion.Euler(new Vector3());
itemUI.transform.localScale = new Vector3(1, 1, 1);
HadPickedUp = true;
// TODO: Handle changing transform here
//ItemGameObject.GetComponent<>;
if(InventorySystem.instance.player.AttachItemGameObject(ItemGameObject, itemUI.ItemTag, itemUI))
{
pickUpCollider.enabled = false;
pickUpRange.GetComponent<Collider>().enabled = false;
}
}
pickUpCollider.enabled = false;
pickUpRange.GetComponent<Collider>().enabled = false;
}
}
// assume there is no tsp, then try to drop in most available backpack slot
if (PlaceInContainerOfItemInSlot != null)
else if (PlaceInContainerOfItemInSlot != null)
{
Debug.Log("Pickup: Trying to placing in container of item in slot");
if (PlaceInContainerOfItemInSlot.GetItemUI() != null && PlaceInContainerOfItemInSlot.GetItemUI().container != null)
{
GridUI grid = PlaceInContainerOfItemInSlot.GetItemUI().container.GetComponent<GridUI>();
@ -131,6 +125,10 @@ namespace SimpleInventorySystem
Debug.Log("PickUp: Placed in grid.");
HadPickedUp = true;
itemUI.transform.localPosition = new Vector3(0, 0, 0);
itemUI.transform.localRotation = Quaternion.Euler(new Vector3(0, 0, 0));
itemUI.transform.localScale = new Vector3(1, 1, 1);
// TODO: Handle changing transform here
//ItemGameObject.GetComponent<>;

View File

@ -7,17 +7,5 @@ namespace SimpleInventorySystem
public class PickUpRange : MonoBehaviour
{
[HideInInspector] public PickUp pickUp;
// Start is called before the first frame update
void Start()
{
}
// Update is called once per frame
void Update()
{
}
}
}

View File

@ -54,7 +54,7 @@ namespace SimpleInventorySystem
}
itemGameObject = null;
// TODO: Most likely, implement drop here.
go.transform.SetParent(null);
go.transform.SetParent(null, true);
go.transform.localRotation = Quaternion.Euler(oldRotation);
}
}

View File

@ -0,0 +1,206 @@
using System;
using System.Collections;
using System.Collections.Generic;
using UnityEditor;
using UnityEngine;
using SimpleInventorySystem;
using UnityEngine.UI;
public class Photoshoot : MonoBehaviour
{
public string OutputPath;
public string itemPrefabPath;
public Camera camera;
public GameObject items;
private void Awake()
{
if (camera == null)
{
camera = GetComponent<Camera>();
}
if (String.IsNullOrEmpty(OutputPath))
{
Debug.LogError("Output Path should not be empty");
}
}
private void OnValidate()
{
}
public void ProcessScreenshots()
{
StartCoroutine(Screenshot());
}
public void ProcessScreenshotsFaster()
{
ScreenshotFaster();
}
private IEnumerator Screenshot()
{
List<GameObject> gameObjects = new List<GameObject>();
List<GameObject> activeGameObjects = new List<GameObject>();
for (int i = 0; i < items.transform.childCount; i++)
{
GameObject obj = items.transform.GetChild(i).gameObject;
ItemUI item = obj.GetComponentInChildren<ItemUI>();
if (obj.activeSelf)
{
activeGameObjects.Add(obj);
}
obj.SetActive(false);
if (item != null)
{
gameObjects.Add(obj);
}
}
int count = gameObjects.Count;
Debug.Log($"Screenshot: Found {count} items.");
for (int i = 0; i < gameObjects.Count; i++)
{
GameObject obj = gameObjects[i];
ItemUI item = gameObjects[i].GetComponentInChildren<ItemUI>();
obj.gameObject.SetActive(true);
yield return null;
TakeScreenshot($"{Application.dataPath}/{OutputPath}/{item.itemName}_icon.png");
yield return null;
obj.gameObject.SetActive(false);
Sprite s = AssetDatabase.LoadAssetAtPath<Sprite>($"Assets/{OutputPath}/{item.itemName}_icon.png");
if (s != null)
{
item.image.sprite = s;
EditorUtility.SetDirty(item);
}
Debug.Log($"Screenshot: {i + 1}/{count}");
yield return null;
}
for (int i = 0; i < activeGameObjects.Count; i++)
{
GameObject obj = activeGameObjects[i];
obj.SetActive(true);
}
Debug.Log($"Screenshot: Complete");
}
private void ScreenshotFaster()
{
List<GameObject> gameObjects = new List<GameObject>();
List<GameObject> activeGameObjects = new List<GameObject>();
for (int i = 0; i < items.transform.childCount; i++)
{
GameObject obj = items.transform.GetChild(i).gameObject;
ItemUI item = obj.GetComponentInChildren<ItemUI>();
if (obj.activeSelf)
{
activeGameObjects.Add(obj);
}
obj.SetActive(false);
if (item != null)
{
gameObjects.Add(obj);
}
}
int count = gameObjects.Count;
Debug.Log($"Screenshot: Found {count} items.");
for (int i = 0; i < gameObjects.Count; i++)
{
GameObject obj = gameObjects[i];
ItemUI item = gameObjects[i].GetComponentInChildren<ItemUI>();
TakeScreenshotFaster($"{Application.dataPath}/{OutputPath}/{item.itemName}_icon.png", obj);
// TODO: Hopefully find a way to automatically assign to prefab
/* Sprite s = AssetDatabase.LoadAssetAtPath<Sprite>($"Assets/{OutputPath}/{item.itemName}_icon.png");
if (s != null)
{
item.transform.Find("Image").GetComponent<UnityEngine.UI.Image>().sprite = s;
EditorUtility.SetDirty(item);
}
Debug.Log($"Screenshot: {i + 1}/{count}");*/
}
for (int i = 0; i < activeGameObjects.Count; i++)
{
GameObject obj = activeGameObjects[i];
obj.SetActive(true);
}
Debug.Log($"Screenshot: Complete");
}
void TakeScreenshotFaster(string fullPath, GameObject obj)
{
obj.SetActive(true);
RenderTexture rt = new RenderTexture(256, 256, 24);
camera.targetTexture = rt;
Texture2D screenShot = new Texture2D(256, 256, TextureFormat.RGBA32, false);
camera.Render();
RenderTexture.active = rt;
screenShot.ReadPixels(new Rect(0, 0, 256, 256), 0, 0);
camera.targetTexture = null;
RenderTexture.active = null;
if (Application.isEditor)
{
DestroyImmediate(rt);
}
else
{
Destroy(rt);
}
byte[] bytes = screenShot.EncodeToPNG();
System.IO.File.WriteAllBytes(fullPath, bytes);
#if UNITY_EDITOR
AssetDatabase.Refresh();
#endif
obj.SetActive(false);
}
void TakeScreenshot(string fullPath)
{
RenderTexture rt = new RenderTexture(256, 256, 24);
camera.targetTexture = rt;
Texture2D screenShot = new Texture2D(256, 256, TextureFormat.RGBA32, false);
camera.Render();
RenderTexture.active = rt;
screenShot.ReadPixels(new Rect(0, 0, 256, 256), 0, 0);
camera.targetTexture = null;
RenderTexture.active = null;
if (Application.isEditor)
{
DestroyImmediate(rt);
}
else
{
Destroy(rt);
}
byte[] bytes = screenShot.EncodeToPNG();
System.IO.File.WriteAllBytes(fullPath, bytes);
#if UNITY_EDITOR
AssetDatabase.Refresh();
#endif
}
}

View File

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

View File

@ -7,17 +7,33 @@ namespace SimpleInventorySystem
{
public class ContextMenuManagerUI : MonoBehaviour
{
public static ContextMenuManagerUI instance;
public GameObject itemInspectMenu;
[HideInInspector] public ItemUI inspectItem;
public GameObject TacticalRigInspectionWindow;
private void Awake()
{
instance = this;
}
public bool IsInspectingItem()
{
return inspectItem != null;
}
public bool ItemInspectMenuHasFocus()
{
return InventorySystem.IsMouseOverUI(itemInspectMenu);
}
public void OpenContextMenu(ItemUI uiContext)
{
if(inspectItem != null)
{
CloseContextMenu();
}
//ContextMenuUI.transform.SetParent(uiContext, false);
itemInspectMenu.SetActive(true);
itemInspectMenu.transform.position = uiContext.transform.position;
@ -25,6 +41,7 @@ namespace SimpleInventorySystem
//ContextMenuUI.transform.localScale = new Vector3(1, 1, 1);
Button inspectButton = itemInspectMenu.transform.Find("Inspect").GetComponent<Button>();
uiContext.SetInteractable(false);
Debug.Log("ContextMenuManager: " + inspectButton);
if (inspectButton != null)
{
@ -44,6 +61,16 @@ namespace SimpleInventorySystem
}
}
public void DropItem()
{
Debug.Log("Drop");
if (inspectItem != null)
{
inspectItem.DropItemOntoSlot();
CloseContextMenu();
}
}
public void CloseContextMenu()
{
if(inspectItem != null)
@ -53,6 +80,7 @@ namespace SimpleInventorySystem
{
inspectButton.onClick.RemoveListener(OpenInspectionWindow);
}
inspectItem.SetInteractable(true);
}
inspectItem = null;
itemInspectMenu.SetActive(false);

View File

@ -0,0 +1,10 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
namespace SimpleInventorySystem
{
public class ContextMenuUI : MonoBehaviour
{
}
}

View File

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

View File

@ -33,13 +33,17 @@ namespace SimpleInventorySystem
private void Awake()
{
gridLayout = GetComponent<GridLayoutGroup>();
SetUpCellsArray();
if(cells == null)
{
SetUpCellsArray();
}
}
private bool cellsInitialized;
void SetUpCellsArray()
{
gridLayout = GetComponent<GridLayoutGroup>();
if (gridSize.Width == 0 && gridLayout.constraint == GridLayoutGroup.Constraint.FixedColumnCount)
{
gridSize.Width = gridLayout.constraintCount;
@ -95,6 +99,7 @@ namespace SimpleInventorySystem
//}
}
}
cellsInitialized = true;
if (cells != null && cells[0, 0] != null && testItem != null)
{
@ -159,6 +164,7 @@ namespace SimpleInventorySystem
if (item != null)
{
int i = 0;
int limit = 100000;
int x = (int)nextAvailableCellCoords.x, y = (int)nextAvailableCellCoords.y;
bool dropped = false;
try
@ -168,6 +174,20 @@ namespace SimpleInventorySystem
x = i % gridSize.Width;
y = i / gridSize.Width;
if (cells == null)
{
if (generateCells)
{
GenerateCells();
}
else if (!cellsInitialized)
{
SetUpCellsArray();
LocateSlotsForCells();
}
}
Debug.Log($"GridUI: Is Slot null? {cells[y, x] == null}");
dropped = cells[y, x].slot.DropOntoSlot(item);
if (!dropped)
@ -181,7 +201,11 @@ namespace SimpleInventorySystem
return true;
}
i++;
} while (!dropped); // TODO: perhaps add a check to make sure i has not exceeded the total number of slots
if(i == limit)
{
Debug.Log("Limit reached");
}
} while (!dropped && i < cells.Length && i < limit); // TODO: perhaps add a check to make sure i has not exceeded the total number of slots
}
catch (IndexOutOfRangeException err)
{
@ -203,42 +227,9 @@ namespace SimpleInventorySystem
{
if (!generateCells)
{
//if (slots != null)
for (int i = 0; i < gridLayout.transform.childCount; i++)
if (!cellsInitialized)
{
int x = i % gridSize.Width;
int y = (i - x) / gridSize.Width;
if (cells[y, x] != null)
{
continue;
}
Transform child = gridLayout.transform.GetChild(i);
SlotUI slot = child.GetComponentInChildren<SlotUI>();
if (slot != null)
{
cells[y, x] = new Cell(x, y, slot, true);
slot.SetCell(cells[y, x]);
slot.grid = this;
if (slot.width > 1 || slot.height > 1)
{
for (int j = 0; j < slot.height; j++)
{
for (int k = 1; k < slot.width; k++)
{
cells[y + j, x + k] = new Cell(x + k, y + j, slot, false);
}
}
}
Debug.Log("START: " + (slot.cell == null));
}
else
{
cells[y, x] = null;// new Cell(null, false, false); // Setting null so that we can reserve memory
}
LocateSlotsForCells();
}
}
else
@ -247,6 +238,48 @@ namespace SimpleInventorySystem
}
}
void LocateSlotsForCells()
{
//if (slots != null)
for (int i = 0; i < gridLayout.transform.childCount; i++)
{
int x = i % gridSize.Width;
int y = (i - x) / gridSize.Width;
if (cells[y, x] != null)
{
continue;
}
Transform child = gridLayout.transform.GetChild(i);
SlotUI slot = child.GetComponentInChildren<SlotUI>();
if (slot != null)
{
cells[y, x] = new Cell(x, y, slot, true);
slot.SetCell(cells[y, x]);
slot.grid = this;
if (slot.width > 1 || slot.height > 1)
{
for (int j = 0; j < slot.height; j++)
{
for (int k = 1; k < slot.width; k++)
{
cells[y + j, x + k] = new Cell(x + k, y + j, slot, false);
}
}
}
Debug.Log("START: " + (slot.cell == null));
}
else
{
cells[y, x] = null;// new Cell(null, false, false); // Setting null so that we can reserve memory
}
}
cellsInitialized = true;
}
internal void HideSlotsOfItem(ItemUI itemDrop)
{
if(itemDrop != null)

View File

@ -11,8 +11,10 @@ namespace SimpleInventorySystem
[RequireComponent(typeof(RectTransform), typeof(CanvasGroup))]
public class ItemUI : MonoBehaviour, IPointerEnterHandler, IPointerExitHandler
{
public string itemName;
private RectTransform rectTransform;
public Image image;
public Image backdropImage;
[HideInInspector] public Canvas canvas;
private CanvasGroup canvasGroup;
private float scale = 1f;
@ -33,6 +35,8 @@ namespace SimpleInventorySystem
[HideInInspector] public bool Equipped;
private Vector2 oldImageSizeDelta;
private Vector2 oldSizeDelta;
public RarityType rarity;
[HideInInspector] public bool interactable = true;
public bool Stackable
{
@ -68,11 +72,12 @@ namespace SimpleInventorySystem
[HideInInspector] public TargetAttachment targetAttachment;
//public Item item;
private void Awake()
{
rectTransform = GetComponent<RectTransform>();
if(image == null)
if (image == null)
{
Image[] images = transform.GetComponentsInChildren<Image>();
for(int i = 0; i < images.Length; i++)
@ -88,7 +93,7 @@ namespace SimpleInventorySystem
if(image == null)
{
Debug.LogError("ItemUI: Item needs an Image component.");
Debug.LogError("ItemUI: Item needs a child with an Image component.");
}
canvasGroup = GetComponent<CanvasGroup>();
@ -120,6 +125,12 @@ namespace SimpleInventorySystem
//InstantiateItem();
}
public Rarity GetRarity()
{
Debug.Log(rarity);
return InventorySystem.instance.GetRarityFromList(rarity);
}
/// <summary>
/// Returns an integer number if it has a container with a GridUI. the number returned is either -1 if no gridUI exists, or the capacity in terms of 1x1 cells.
/// </summary>
@ -168,7 +179,26 @@ namespace SimpleInventorySystem
//rectTransform.localPosition = new Vector3(0, 0);
}
public void Drop()
public bool Equip()
{
foreach (TagSlotPairing tsp in InventorySystem.instance.TagSlotPairings)
{
if (!tsp.HasSlotOccupied())
{
UnsetSlot();
bool value = tsp.slot.DropOntoSlot(gameObject);
if (!value)
{
ReturnToSlot();
}
return value;
}
}
return false;
}
public void DropItemOntoSlot()
{
//Debug.Log("OnEndDrag");
if (image != null)
@ -195,7 +225,7 @@ namespace SimpleInventorySystem
public void GrabAndDragItem()
{
if (!isDragging)
if (!isDragging && interactable)
{
Debug.Log("GRAB AND DRAG");
//Debug.Log("OnPointerDown");
@ -209,33 +239,10 @@ namespace SimpleInventorySystem
rectTransform.SetSizeWithCurrentAnchors(RectTransform.Axis.Horizontal, oldSizeDelta.x);
rectTransform.SetSizeWithCurrentAnchors(RectTransform.Axis.Vertical, oldSizeDelta.y);
if (slot != null)
previousSlot = slot;
transform.SetParent(canvas.transform);
//rectTransform.pivot = new Vector2(.5f, .5f);
//rectTransform.position += new Vector3(50, -50, 0);
if (slot != null)
{
slot.RemoveDragDropItem();
slot = null;
}
if (cells != null)
{
foreach (Cell c in cells)
{
if (c != null)
{
c.inUse = false;
//c.overlapped = false;
//s.ShowImage();
if (c.GetSlot() != null && c.GetSlot() != this.slot)
{
c.GetSlot().UnsetCell();// RemoveDragDropItem(true);
}
}
}
cells = null;
}
UnsetSlot();
isDragging = true;
InventorySystem.instance.DraggedItem = this;
PickedUpOnFrame = true;
@ -248,6 +255,33 @@ namespace SimpleInventorySystem
ContextWindows.Clear();
}
}
public void UnsetSlot()
{
if (slot != null)
{
previousSlot = slot;
slot.RemoveDragDropItem();
slot = null;
}
if (cells != null)
{
foreach (Cell c in cells)
{
if (c != null)
{
c.inUse = false;
//c.overlapped = false;
//s.ShowImage();
if (c.GetSlot() != null && c.GetSlot() != this.slot)
{
c.GetSlot().UnsetCell();// RemoveDragDropItem(true);
}
}
}
cells = null;
}
}
public void AddToContainedItems(ItemUI item)
{
@ -338,6 +372,22 @@ namespace SimpleInventorySystem
Count = 1;
}
SetRenderItemUIPropertyValue();
Rarity r = GetRarity();
if (backdropImage == null)
{
backdropImage = transform.GetComponent<Image>();
}
if (backdropImage == null)
{
Debug.LogError("ItemUI: Item needs at least an Image component.");
}
else if (r != null)
{
backdropImage.color = new Color(r.color.r, r.color.g, r.color.b, InventorySystem.instance.ItemBackdropTransparency);
}
}
public Orientation ImageOrientation()
@ -443,6 +493,20 @@ namespace SimpleInventorySystem
// TODO: fix this
rectTransform.position = InventorySystem.instance.MouseInCanvasPosition;
}
if (PointerIsHoveredOver && InventorySystem.instance.PressedEquipItemKey(false))
{
Equip();
// TODO: see if more needs to be implemented here.
return;
}
if (PointerIsHoveredOver && InventorySystem.instance.PressedDropItemKey(false))
{
DropItemAway();
return;
}
if (PointerIsHoveredOver && InventorySystem.instance.DraggedItem == null)
{
if (Input.GetMouseButtonDown(0) && !isDragging && InventorySystem.instance.DraggedItem == null && !slot.DroppedOnFrame)
@ -455,7 +519,7 @@ namespace SimpleInventorySystem
InventorySystem.instance.OpenContextMenu(this);
}
}
if (Input.GetMouseButtonUp(0))
{
PickedUpOnFrame = false;
@ -477,7 +541,7 @@ namespace SimpleInventorySystem
switch (eulerAngle)
{
case -90:
rectTransform.pivot = new Vector2(0,0);
rectTransform.pivot = new Vector2(0, 0);
rectTransform.Rotate(new Vector3(0, 0, 1), -90);
imageOrientation = (width > height) ? Orientation.Portrait : Orientation.Landscape;
break;
@ -499,22 +563,30 @@ namespace SimpleInventorySystem
break;
}
}
if (InventorySystem.instance.PressedDropItemKey(true))
{
if(pickUp == null)
{
// TODO: Create a new pickup for items without a gameobject attached
throw new NotImplementedException();
}
isDragging = false;
InventorySystem.instance.DraggedItem = null;
InventorySystem.instance.player.DetachItemGameObject(pickUp.ItemGameObject, this);
}
}
}
public void DropItemAway()
{
if (pickUp == null)
{
// TODO: Create a new pickup for items without a gameobject attached
Debug.LogError("No in-world gameobject previously attached with itemUI");
}
else
{
InventorySystem.instance.player.DetachItemGameObject(pickUp.ItemGameObject, this);
}
isDragging = false;
InventorySystem.instance.DraggedItem = null;
UnsetSlot();
}
public void SetInteractable(bool value)
{
interactable = value;
}
public void OnPointerExit(PointerEventData eventData)
{
//PointerIsHoveredOver = false;

View File

@ -198,7 +198,7 @@ namespace SimpleInventorySystem
Debug.Log("SlotUI:Drop:" + itemUI + ", " + itemDrop);
itemUI.Drop();
itemUI.DropItemOntoSlot();
if (itemUI.Stackable)
{
@ -497,6 +497,11 @@ namespace SimpleInventorySystem
// Update is called once per frame
void Update()
{
if (InventorySystem.instance.PressedDropItemKey(false) || InventorySystem.instance.PressedEquipItemKey(false))
{
return;
}
if (PointerIsHoveredOver)
{
ItemUI droppedItem = InventorySystem.instance.DraggedItem;
@ -574,6 +579,11 @@ namespace SimpleInventorySystem
public void OnPointerDown(PointerEventData eventData)
{
if(InventorySystem.instance.PressedDropItemKey(false) || InventorySystem.instance.PressedEquipItemKey(false))
{
return;
}
ItemUI droppedItem = InventorySystem.instance.DraggedItem;
if (droppedItem != null && !droppedItem.PickedUpOnFrame)
{

View File

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