more console errors cleared
@ -237,6 +237,7 @@ MonoBehaviour:
|
||||
canJump: 1
|
||||
canCrouch: 1
|
||||
canUseHeadbob: 1
|
||||
canLean: 1
|
||||
sprintKey: 304
|
||||
jumpKey: 32
|
||||
crouchKey: 99
|
||||
@ -250,8 +251,13 @@ MonoBehaviour:
|
||||
lookSpeedY: 2
|
||||
upperLookLimit: 80
|
||||
lowerLookLimit: 80
|
||||
toggleLeaning: 1
|
||||
leanLeftKey: 113
|
||||
leanRightKey: 101
|
||||
maxLeaningAngle: 30
|
||||
jumpForce: 8
|
||||
gravity: 30
|
||||
crouchHeightInterval: 0.1
|
||||
crouchHeight: 0.5
|
||||
standingHeight: 2
|
||||
timeToCrouch: 0.25
|
||||
|
Before Width: | Height: | Size: 6.7 KiB After Width: | Height: | Size: 7.4 KiB |
Before Width: | Height: | Size: 21 KiB After Width: | Height: | Size: 24 KiB |
Before Width: | Height: | Size: 18 KiB After Width: | Height: | Size: 21 KiB |
Before Width: | Height: | Size: 6.7 KiB After Width: | Height: | Size: 7.4 KiB |
Before Width: | Height: | Size: 21 KiB After Width: | Height: | Size: 24 KiB |
Before Width: | Height: | Size: 6.7 KiB After Width: | Height: | Size: 7.4 KiB |
Before Width: | Height: | Size: 21 KiB After Width: | Height: | Size: 24 KiB |
Before Width: | Height: | Size: 6.2 KiB After Width: | Height: | Size: 7.1 KiB |
Before Width: | Height: | Size: 19 KiB After Width: | Height: | Size: 22 KiB |
Before Width: | Height: | Size: 17 KiB After Width: | Height: | Size: 19 KiB |
Before Width: | Height: | Size: 6.2 KiB After Width: | Height: | Size: 7.1 KiB |
Before Width: | Height: | Size: 19 KiB After Width: | Height: | Size: 22 KiB |
Before Width: | Height: | Size: 6.2 KiB After Width: | Height: | Size: 7.2 KiB |
Before Width: | Height: | Size: 19 KiB After Width: | Height: | Size: 22 KiB |
Before Width: | Height: | Size: 50 KiB After Width: | Height: | Size: 52 KiB |
Before Width: | Height: | Size: 29 KiB After Width: | Height: | Size: 31 KiB |
Before Width: | Height: | Size: 51 KiB After Width: | Height: | Size: 54 KiB |
Before Width: | Height: | Size: 33 KiB After Width: | Height: | Size: 45 KiB |
Before Width: | Height: | Size: 50 KiB After Width: | Height: | Size: 52 KiB |
Before Width: | Height: | Size: 66 KiB After Width: | Height: | Size: 69 KiB |
Before Width: | Height: | Size: 68 KiB After Width: | Height: | Size: 70 KiB |
Before Width: | Height: | Size: 52 KiB After Width: | Height: | Size: 54 KiB |
Before Width: | Height: | Size: 42 KiB After Width: | Height: | Size: 43 KiB |
Before Width: | Height: | Size: 66 KiB After Width: | Height: | Size: 69 KiB |
Before Width: | Height: | Size: 24 KiB After Width: | Height: | Size: 25 KiB |
Before Width: | Height: | Size: 63 KiB After Width: | Height: | Size: 65 KiB |
Before Width: | Height: | Size: 47 KiB After Width: | Height: | Size: 47 KiB |
Before Width: | Height: | Size: 65 KiB After Width: | Height: | Size: 67 KiB |
Before Width: | Height: | Size: 34 KiB After Width: | Height: | Size: 46 KiB |
Before Width: | Height: | Size: 46 KiB After Width: | Height: | Size: 49 KiB |
Before Width: | Height: | Size: 47 KiB After Width: | Height: | Size: 50 KiB |
After Width: | Height: | Size: 153 KiB |
@ -0,0 +1,127 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 5fb2b09c0fa814d41a42973ec86ea610
|
||||
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: 1
|
||||
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: Server
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 5e97eb03825dee720800000000000000
|
||||
internalID: 0
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
secondaryTextures: []
|
||||
nameFileIdTable: {}
|
||||
mipmapLimitGroupName:
|
||||
pSDRemoveMatte: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
After Width: | Height: | Size: 151 KiB |
@ -0,0 +1,127 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 33a86a447577d77478f3a329c2536781
|
||||
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: 1
|
||||
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: Server
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 5e97eb03825dee720800000000000000
|
||||
internalID: 0
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
secondaryTextures: []
|
||||
nameFileIdTable: {}
|
||||
mipmapLimitGroupName:
|
||||
pSDRemoveMatte: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
After Width: | Height: | Size: 151 KiB |
@ -0,0 +1,127 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 6b7100b35f3da694c8fad552d617a233
|
||||
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: 1
|
||||
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: Server
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 5e97eb03825dee720800000000000000
|
||||
internalID: 0
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
secondaryTextures: []
|
||||
nameFileIdTable: {}
|
||||
mipmapLimitGroupName:
|
||||
pSDRemoveMatte: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
Before Width: | Height: | Size: 58 KiB After Width: | Height: | Size: 91 KiB |
Before Width: | Height: | Size: 83 KiB After Width: | Height: | Size: 90 KiB |
Before Width: | Height: | Size: 32 KiB After Width: | Height: | Size: 45 KiB |
Before Width: | Height: | Size: 60 KiB After Width: | Height: | Size: 62 KiB |
Before Width: | Height: | Size: 33 KiB After Width: | Height: | Size: 12 KiB |
Before Width: | Height: | Size: 30 KiB After Width: | Height: | Size: 31 KiB |
Before Width: | Height: | Size: 55 KiB After Width: | Height: | Size: 57 KiB |
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 15 KiB |
Before Width: | Height: | Size: 51 KiB After Width: | Height: | Size: 53 KiB |
Before Width: | Height: | Size: 25 KiB After Width: | Height: | Size: 25 KiB |
Before Width: | Height: | Size: 55 KiB After Width: | Height: | Size: 57 KiB |
Before Width: | Height: | Size: 62 KiB After Width: | Height: | Size: 64 KiB |
Before Width: | Height: | Size: 58 KiB After Width: | Height: | Size: 60 KiB |
Before Width: | Height: | Size: 46 KiB After Width: | Height: | Size: 66 KiB |
Before Width: | Height: | Size: 50 KiB After Width: | Height: | Size: 52 KiB |
Before Width: | Height: | Size: 37 KiB After Width: | Height: | Size: 39 KiB |
Before Width: | Height: | Size: 30 KiB After Width: | Height: | Size: 42 KiB |
Before Width: | Height: | Size: 45 KiB After Width: | Height: | Size: 77 KiB |
Before Width: | Height: | Size: 41 KiB After Width: | Height: | Size: 42 KiB |
Before Width: | Height: | Size: 25 KiB After Width: | Height: | Size: 26 KiB |
Before Width: | Height: | Size: 59 KiB After Width: | Height: | Size: 61 KiB |
Before Width: | Height: | Size: 67 KiB After Width: | Height: | Size: 71 KiB |
Before Width: | Height: | Size: 65 KiB After Width: | Height: | Size: 68 KiB |
Before Width: | Height: | Size: 67 KiB After Width: | Height: | Size: 70 KiB |
Before Width: | Height: | Size: 65 KiB After Width: | Height: | Size: 68 KiB |
Before Width: | Height: | Size: 49 KiB After Width: | Height: | Size: 50 KiB |
Before Width: | Height: | Size: 25 KiB After Width: | Height: | Size: 26 KiB |
Before Width: | Height: | Size: 47 KiB After Width: | Height: | Size: 49 KiB |
Before Width: | Height: | Size: 70 KiB After Width: | Height: | Size: 72 KiB |
Before Width: | Height: | Size: 42 KiB After Width: | Height: | Size: 44 KiB |
Before Width: | Height: | Size: 46 KiB After Width: | Height: | Size: 56 KiB |
Before Width: | Height: | Size: 55 KiB After Width: | Height: | Size: 57 KiB |
Before Width: | Height: | Size: 42 KiB After Width: | Height: | Size: 43 KiB |
Before Width: | Height: | Size: 58 KiB After Width: | Height: | Size: 60 KiB |
Before Width: | Height: | Size: 84 KiB After Width: | Height: | Size: 87 KiB |
Before Width: | Height: | Size: 72 KiB After Width: | Height: | Size: 75 KiB |
Before Width: | Height: | Size: 55 KiB After Width: | Height: | Size: 56 KiB |
Before Width: | Height: | Size: 66 KiB After Width: | Height: | Size: 69 KiB |
Before Width: | Height: | Size: 36 KiB After Width: | Height: | Size: 21 KiB |
Before Width: | Height: | Size: 48 KiB After Width: | Height: | Size: 50 KiB |
Before Width: | Height: | Size: 48 KiB After Width: | Height: | Size: 50 KiB |
Before Width: | Height: | Size: 34 KiB After Width: | Height: | Size: 46 KiB |
Before Width: | Height: | Size: 35 KiB After Width: | Height: | Size: 36 KiB |
Before Width: | Height: | Size: 37 KiB After Width: | Height: | Size: 38 KiB |
Before Width: | Height: | Size: 37 KiB After Width: | Height: | Size: 40 KiB |
Before Width: | Height: | Size: 25 KiB After Width: | Height: | Size: 27 KiB |
Before Width: | Height: | Size: 62 KiB After Width: | Height: | Size: 64 KiB |
Before Width: | Height: | Size: 43 KiB After Width: | Height: | Size: 52 KiB |
Before Width: | Height: | Size: 25 KiB After Width: | Height: | Size: 40 KiB |
@ -1,8 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 82fca1cd2ecc8f843b671f2cd615bd26
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
@ -22,7 +22,7 @@ public class MouseOrbitImproved : MonoBehaviour
|
||||
public float distanceMin = .5f;
|
||||
public float distanceMax = 15f;
|
||||
|
||||
private Rigidbody rigidbody;
|
||||
private new Rigidbody rigidbody;
|
||||
|
||||
float x = 0.0f;
|
||||
float y = 0.0f;
|
||||
|
@ -11,7 +11,7 @@ using UnityEngine.UI;
|
||||
public class Photoshoot : MonoBehaviour
|
||||
{
|
||||
public string OutputPath;
|
||||
public Camera camera;
|
||||
public new Camera camera;
|
||||
public GameObject items;
|
||||
|
||||
private void Awake()
|
||||
|
@ -70,7 +70,8 @@ namespace SimpleInventorySystem
|
||||
private RectTransform rectTransform;
|
||||
public RectTransform RectTransform { get { return rectTransform; } }
|
||||
private CanvasGroup canvasGroup;
|
||||
private float scale = 1f;
|
||||
//TO-DO Add Scaling Image
|
||||
//private float scale = 1f;
|
||||
private SlotUI slot;
|
||||
private Cell[] cells;
|
||||
private bool isDragging;
|
||||
|
@ -20690,12 +20690,6 @@ PrefabInstance:
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: ca43743b90308104aa0ce8f04d1692b8, type: 3}
|
||||
--- !u!224 &1005383685 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 1877044253, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 2770326605231792848}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &1008424396 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 4597676352484500, guid: fa9977b69f980364989f85633bee4aa6,
|
||||
@ -41078,33 +41072,10 @@ PrefabInstance:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications:
|
||||
- target: {fileID: 614559560, guid: 9f005685dc17f4643b4a1156970fe2f6, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: -13.46
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 614559560, guid: 9f005685dc17f4643b4a1156970fe2f6, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: -1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 614559560, guid: 9f005685dc17f4643b4a1156970fe2f6, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: -0.98
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1082071285, guid: 9f005685dc17f4643b4a1156970fe2f6, type: 3}
|
||||
propertyPath: _displayAnchor
|
||||
value:
|
||||
objectReference: {fileID: 1005383685}
|
||||
- target: {fileID: 1284900580, guid: 9f005685dc17f4643b4a1156970fe2f6, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: -873.89
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1284900580, guid: 9f005685dc17f4643b4a1156970fe2f6, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: -532.72
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1284900580, guid: 9f005685dc17f4643b4a1156970fe2f6, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: -63.63
|
||||
- target: {fileID: 51727583602948897, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
||||
type: 3}
|
||||
propertyPath: m_Value
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 52681282418728116, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
||||
type: 3}
|
||||
@ -41241,11 +41212,6 @@ PrefabInstance:
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2770326605036912737, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2770326605244884164, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
@ -41456,11 +41422,6 @@ PrefabInstance:
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2770326605623600441, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2770326605625768898, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
@ -41526,11 +41487,6 @@ PrefabInstance:
|
||||
propertyPath: m_Name
|
||||
value: Inventory System
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2770326605790841686, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
||||
type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 2
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2770326605790841686, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
@ -41581,56 +41537,6 @@ PrefabInstance:
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2770326605790841687, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
||||
type: 3}
|
||||
propertyPath: TagSlotGridPairings.Array.size
|
||||
value: 6
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2770326605790841687, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
||||
type: 3}
|
||||
propertyPath: TagSlotGridPairings.Array.data[1].referenceType
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2770326605790841687, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
||||
type: 3}
|
||||
propertyPath: TagSlotGridPairings.Array.data[5].referenceType
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2770326605790841687, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
||||
type: 3}
|
||||
propertyPath: TagSlotGridPairings.Array.data[1].ReferencedGrid
|
||||
value:
|
||||
objectReference: {fileID: 2770326605231792853}
|
||||
- target: {fileID: 2770326605790841687, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
||||
type: 3}
|
||||
propertyPath: TagSlotGridPairings.Array.data[2].ReferencedGrid
|
||||
value:
|
||||
objectReference: {fileID: 2770326605231792852}
|
||||
- target: {fileID: 2770326605790841687, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
||||
type: 3}
|
||||
propertyPath: TagSlotGridPairings.Array.data[3].ReferencedGrid
|
||||
value:
|
||||
objectReference: {fileID: 2770326605231792851}
|
||||
- target: {fileID: 2770326605790841687, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
||||
type: 3}
|
||||
propertyPath: TagSlotGridPairings.Array.data[4].ReferencedGrid
|
||||
value:
|
||||
objectReference: {fileID: 2770326605231792850}
|
||||
- target: {fileID: 2770326605790841687, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
||||
type: 3}
|
||||
propertyPath: TagSlotGridPairings.Array.data[5].ReferencedGrid
|
||||
value:
|
||||
objectReference: {fileID: 2770326605231792849}
|
||||
- target: {fileID: 2770326605790841688, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
||||
type: 3}
|
||||
propertyPath: m_Enabled
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2770326605790841688, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
||||
type: 3}
|
||||
propertyPath: pauseMenu
|
||||
value:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2770326605801885315, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
@ -41774,7 +41680,7 @@ PrefabInstance:
|
||||
- target: {fileID: 2770326606141421692, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -0.000061035156
|
||||
value: 0.000061035156
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2770326606150301029, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
||||
type: 3}
|
||||
@ -42146,6 +42052,11 @@ PrefabInstance:
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2770326606805154120, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
||||
type: 3}
|
||||
propertyPath: m_Size
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2770326606810438967, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
@ -42156,6 +42067,11 @@ PrefabInstance:
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3684466523276116297, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
||||
type: 3}
|
||||
propertyPath: m_Size
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4508597830310062939, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
@ -42176,36 +42092,6 @@ PrefabInstance:
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 9f005685dc17f4643b4a1156970fe2f6, type: 3}
|
||||
--- !u!1 &2770326605231792849 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 2770326605807543572, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 2770326605231792848}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &2770326605231792850 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 2770326604921404281, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 2770326605231792848}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &2770326605231792851 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 2770326605995264619, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 2770326605231792848}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &2770326605231792852 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 2770326606686766473, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 2770326605231792848}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &2770326605231792853 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 2770326604769037581, guid: 9f005685dc17f4643b4a1156970fe2f6,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 2770326605231792848}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1660057539 &9223372036854775807
|
||||
SceneRoots:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -75,7 +75,7 @@ public class FirstPersonController : MonoBehaviour
|
||||
private float currentCrouchHeight;
|
||||
private float minCrouchHeight = 0.5f; // Minimum crouch height
|
||||
private bool isCrouchKeyHeld;
|
||||
private bool crouchHeightAdjustmentEnabled; // Flag to enable crouch height adjustment
|
||||
//private bool crouchHeightAdjustmentEnabled; // Flag to enable crouch height adjustment
|
||||
|
||||
[Header("Headbob Parameters")]
|
||||
[SerializeField] private float walkBobSpeed = 14f;
|
||||
@ -165,7 +165,7 @@ public class FirstPersonController : MonoBehaviour
|
||||
{
|
||||
isCrouchKeyHeld = true;
|
||||
tempCrouchHeight = currentCrouchHeight;
|
||||
crouchHeightAdjustmentEnabled = true; // Enable crouch height adjustment
|
||||
//crouchHeightAdjustmentEnabled = true; // Enable crouch height adjustment
|
||||
}
|
||||
|
||||
if (Input.GetKeyUp(crouchKey) && isCrouchKeyHeld)
|
||||
|