adding a gun and pickup
This commit is contained in:
Sc0rch-thinks
parent
4961094c89
commit
77e4b75e4f
2610
Assets/Fire.vfx
Normal file
2610
Assets/Fire.vfx
Normal file
File diff suppressed because it is too large
Load diff
|
|
@ -1,8 +1,7 @@
|
|||
fileFormatVersion: 2
|
||||
guid: c50185fdb838a9049a0fe16ba659df2a
|
||||
NativeFormatImporter:
|
||||
guid: f2a4ceea6b76ec14fbdd380df5d90fd9
|
||||
VisualEffectImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 15600000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
47
Assets/Materials/Lit Variant.mat
Normal file
47
Assets/Materials/Lit Variant.mat
Normal file
|
|
@ -0,0 +1,47 @@
|
|||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!21 &2100000
|
||||
Material:
|
||||
serializedVersion: 8
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: Lit Variant
|
||||
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
|
||||
m_Parent: {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2}
|
||||
m_ModifiedSerializedProperties: 2
|
||||
m_ValidKeywords:
|
||||
- _EMISSION
|
||||
m_InvalidKeywords: []
|
||||
m_LightmapFlags: 2
|
||||
m_EnableInstancingVariants: 0
|
||||
m_DoubleSidedGI: 0
|
||||
m_CustomRenderQueue: -1
|
||||
stringTagMap:
|
||||
RenderType: Opaque
|
||||
disabledShaderPasses: []
|
||||
m_LockedProperties:
|
||||
m_SavedProperties:
|
||||
serializedVersion: 3
|
||||
m_TexEnvs: []
|
||||
m_Ints: []
|
||||
m_Floats: []
|
||||
m_Colors:
|
||||
- _BaseColor: {r: 1, g: 0, b: 0, a: 1}
|
||||
- _Color: {r: 1, g: 0, b: 0, a: 1}
|
||||
- _EmissionColor: {r: 1, g: 0, b: 0, a: 1}
|
||||
m_BuildTextureStacks: []
|
||||
--- !u!114 &6308755810132430971
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 11
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
version: 7
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 23b62f6b82547e64ba10c297ccd42ed0
|
||||
guid: 951aa804207d8f24296d25c12d548a31
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 15600000
|
||||
mainObjectFileID: 2100000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -24,11 +24,13 @@ Material:
|
|||
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
|
||||
m_Parent: {fileID: 0}
|
||||
m_ModifiedSerializedProperties: 0
|
||||
m_ValidKeywords: []
|
||||
m_ValidKeywords:
|
||||
- _METALLICSPECGLOSSMAP
|
||||
- _NORMALMAP
|
||||
m_InvalidKeywords: []
|
||||
m_LightmapFlags: 4
|
||||
m_EnableInstancingVariants: 0
|
||||
m_DoubleSidedGI: 0
|
||||
m_DoubleSidedGI: 1
|
||||
m_CustomRenderQueue: -1
|
||||
stringTagMap:
|
||||
RenderType: Opaque
|
||||
|
|
@ -38,11 +40,11 @@ Material:
|
|||
serializedVersion: 3
|
||||
m_TexEnvs:
|
||||
- _BaseMap:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Texture: {fileID: 2800000, guid: 9b11fd6fc7efc5c42ba774a928bd42c9, type: 3}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _BumpMap:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Texture: {fileID: 2800000, guid: eb176bf7d5a82b640b05ce9b242e0920, type: 3}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _DetailAlbedoMap:
|
||||
|
|
@ -62,11 +64,11 @@ Material:
|
|||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _MainTex:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Texture: {fileID: 2800000, guid: 9b11fd6fc7efc5c42ba774a928bd42c9, type: 3}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _MetallicGlossMap:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Texture: {fileID: 2800000, guid: 26f9b3e7e659f2b40b7c5308b90208f1, type: 3}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _OcclusionMap:
|
||||
|
|
@ -102,7 +104,7 @@ Material:
|
|||
- _BumpScale: 1
|
||||
- _ClearCoatMask: 0
|
||||
- _ClearCoatSmoothness: 0
|
||||
- _Cull: 2
|
||||
- _Cull: 0
|
||||
- _Cutoff: 0.5
|
||||
- _DetailAlbedoMapScale: 1
|
||||
- _DetailNormalMapScale: 1
|
||||
|
|
|
|||
8
Assets/Materials/Textures/PEWPEW.meta
Normal file
8
Assets/Materials/Textures/PEWPEW.meta
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 67f6ec9409bd98c449f6dcfc7ce1bb73
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
BIN
Assets/Materials/Textures/PEWPEW/gun_1001_AlbedoTransparency.png
(Stored with Git LFS)
Normal file
BIN
Assets/Materials/Textures/PEWPEW/gun_1001_AlbedoTransparency.png
(Stored with Git LFS)
Normal file
Binary file not shown.
|
|
@ -0,0 +1,114 @@
|
|||
fileFormatVersion: 2
|
||||
guid: e340d6881a3c653418995c16c68be2df
|
||||
TextureImporter:
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
serializedVersion: 13
|
||||
mipmaps:
|
||||
mipMapMode: 0
|
||||
enableMipMap: 1
|
||||
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: 0
|
||||
wrapV: 0
|
||||
wrapW: 0
|
||||
nPOTScale: 1
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 0
|
||||
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: 0
|
||||
spriteTessellationDetail: -1
|
||||
textureType: 0
|
||||
textureShape: 1
|
||||
singleChannelComponent: 0
|
||||
flipbookRows: 1
|
||||
flipbookColumns: 1
|
||||
maxTextureSizeSet: 0
|
||||
compressionQualitySet: 0
|
||||
textureFormatSet: 0
|
||||
ignorePngGamma: 0
|
||||
applyGammaDecoding: 0
|
||||
swizzle: 50462976
|
||||
cookieLightType: 0
|
||||
platformSettings:
|
||||
- serializedVersion: 3
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 3
|
||||
buildTarget: Standalone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID:
|
||||
internalID: 0
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
secondaryTextures: []
|
||||
nameFileIdTable: {}
|
||||
mipmapLimitGroupName:
|
||||
pSDRemoveMatte: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
BIN
Assets/Materials/Textures/PEWPEW/gun_1001_MetallicSmoothness.png
(Stored with Git LFS)
Normal file
BIN
Assets/Materials/Textures/PEWPEW/gun_1001_MetallicSmoothness.png
(Stored with Git LFS)
Normal file
Binary file not shown.
|
|
@ -0,0 +1,114 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 008c8c33c0651a24aa9d92efafbf7e41
|
||||
TextureImporter:
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
serializedVersion: 13
|
||||
mipmaps:
|
||||
mipMapMode: 0
|
||||
enableMipMap: 1
|
||||
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: 0
|
||||
wrapV: 0
|
||||
wrapW: 0
|
||||
nPOTScale: 1
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 0
|
||||
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: 0
|
||||
spriteTessellationDetail: -1
|
||||
textureType: 0
|
||||
textureShape: 1
|
||||
singleChannelComponent: 0
|
||||
flipbookRows: 1
|
||||
flipbookColumns: 1
|
||||
maxTextureSizeSet: 0
|
||||
compressionQualitySet: 0
|
||||
textureFormatSet: 0
|
||||
ignorePngGamma: 0
|
||||
applyGammaDecoding: 0
|
||||
swizzle: 50462976
|
||||
cookieLightType: 0
|
||||
platformSettings:
|
||||
- serializedVersion: 3
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 3
|
||||
buildTarget: Standalone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID:
|
||||
internalID: 0
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
secondaryTextures: []
|
||||
nameFileIdTable: {}
|
||||
mipmapLimitGroupName:
|
||||
pSDRemoveMatte: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
BIN
Assets/Materials/Textures/PEWPEW/gun_1001_Normal.png
(Stored with Git LFS)
Normal file
BIN
Assets/Materials/Textures/PEWPEW/gun_1001_Normal.png
(Stored with Git LFS)
Normal file
Binary file not shown.
114
Assets/Materials/Textures/PEWPEW/gun_1001_Normal.png.meta
Normal file
114
Assets/Materials/Textures/PEWPEW/gun_1001_Normal.png.meta
Normal file
|
|
@ -0,0 +1,114 @@
|
|||
fileFormatVersion: 2
|
||||
guid: e87bb975f78123e4a9e818bde030bf63
|
||||
TextureImporter:
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
serializedVersion: 13
|
||||
mipmaps:
|
||||
mipMapMode: 0
|
||||
enableMipMap: 1
|
||||
sRGBTexture: 0
|
||||
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: 0
|
||||
wrapV: 0
|
||||
wrapW: 0
|
||||
nPOTScale: 1
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 0
|
||||
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: 0
|
||||
spriteTessellationDetail: -1
|
||||
textureType: 1
|
||||
textureShape: 1
|
||||
singleChannelComponent: 0
|
||||
flipbookRows: 1
|
||||
flipbookColumns: 1
|
||||
maxTextureSizeSet: 0
|
||||
compressionQualitySet: 0
|
||||
textureFormatSet: 0
|
||||
ignorePngGamma: 0
|
||||
applyGammaDecoding: 0
|
||||
swizzle: 50462976
|
||||
cookieLightType: 0
|
||||
platformSettings:
|
||||
- serializedVersion: 3
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 3
|
||||
buildTarget: Standalone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID:
|
||||
internalID: 0
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
secondaryTextures: []
|
||||
nameFileIdTable: {}
|
||||
mipmapLimitGroupName:
|
||||
pSDRemoveMatte: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
8
Assets/Materials/Textures/ship.meta
Normal file
8
Assets/Materials/Textures/ship.meta
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: a5e611ab98f71e04b9ae81559de28809
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
BIN
Assets/Materials/Textures/ship/spaceship_1001_AlbedoTransparency.png
(Stored with Git LFS)
Normal file
BIN
Assets/Materials/Textures/ship/spaceship_1001_AlbedoTransparency.png
(Stored with Git LFS)
Normal file
Binary file not shown.
|
|
@ -0,0 +1,114 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 9b11fd6fc7efc5c42ba774a928bd42c9
|
||||
TextureImporter:
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
serializedVersion: 13
|
||||
mipmaps:
|
||||
mipMapMode: 0
|
||||
enableMipMap: 1
|
||||
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: 0
|
||||
wrapV: 0
|
||||
wrapW: 0
|
||||
nPOTScale: 1
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 0
|
||||
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: 0
|
||||
spriteTessellationDetail: -1
|
||||
textureType: 0
|
||||
textureShape: 1
|
||||
singleChannelComponent: 0
|
||||
flipbookRows: 1
|
||||
flipbookColumns: 1
|
||||
maxTextureSizeSet: 0
|
||||
compressionQualitySet: 0
|
||||
textureFormatSet: 0
|
||||
ignorePngGamma: 0
|
||||
applyGammaDecoding: 0
|
||||
swizzle: 50462976
|
||||
cookieLightType: 0
|
||||
platformSettings:
|
||||
- serializedVersion: 3
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 3
|
||||
buildTarget: Standalone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID:
|
||||
internalID: 0
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
secondaryTextures: []
|
||||
nameFileIdTable: {}
|
||||
mipmapLimitGroupName:
|
||||
pSDRemoveMatte: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
BIN
Assets/Materials/Textures/ship/spaceship_1001_MetallicSmoothness.png
(Stored with Git LFS)
Normal file
BIN
Assets/Materials/Textures/ship/spaceship_1001_MetallicSmoothness.png
(Stored with Git LFS)
Normal file
Binary file not shown.
|
|
@ -0,0 +1,114 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 26f9b3e7e659f2b40b7c5308b90208f1
|
||||
TextureImporter:
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
serializedVersion: 13
|
||||
mipmaps:
|
||||
mipMapMode: 0
|
||||
enableMipMap: 1
|
||||
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: 0
|
||||
wrapV: 0
|
||||
wrapW: 0
|
||||
nPOTScale: 1
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 0
|
||||
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: 0
|
||||
spriteTessellationDetail: -1
|
||||
textureType: 0
|
||||
textureShape: 1
|
||||
singleChannelComponent: 0
|
||||
flipbookRows: 1
|
||||
flipbookColumns: 1
|
||||
maxTextureSizeSet: 0
|
||||
compressionQualitySet: 0
|
||||
textureFormatSet: 0
|
||||
ignorePngGamma: 0
|
||||
applyGammaDecoding: 0
|
||||
swizzle: 50462976
|
||||
cookieLightType: 0
|
||||
platformSettings:
|
||||
- serializedVersion: 3
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 3
|
||||
buildTarget: Standalone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID:
|
||||
internalID: 0
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
secondaryTextures: []
|
||||
nameFileIdTable: {}
|
||||
mipmapLimitGroupName:
|
||||
pSDRemoveMatte: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
BIN
Assets/Materials/Textures/ship/spaceship_1001_Normal.png
(Stored with Git LFS)
Normal file
BIN
Assets/Materials/Textures/ship/spaceship_1001_Normal.png
(Stored with Git LFS)
Normal file
Binary file not shown.
114
Assets/Materials/Textures/ship/spaceship_1001_Normal.png.meta
Normal file
114
Assets/Materials/Textures/ship/spaceship_1001_Normal.png.meta
Normal file
|
|
@ -0,0 +1,114 @@
|
|||
fileFormatVersion: 2
|
||||
guid: eb176bf7d5a82b640b05ce9b242e0920
|
||||
TextureImporter:
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
serializedVersion: 13
|
||||
mipmaps:
|
||||
mipMapMode: 0
|
||||
enableMipMap: 1
|
||||
sRGBTexture: 0
|
||||
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: 0
|
||||
wrapV: 0
|
||||
wrapW: 0
|
||||
nPOTScale: 1
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 0
|
||||
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: 0
|
||||
spriteTessellationDetail: -1
|
||||
textureType: 1
|
||||
textureShape: 1
|
||||
singleChannelComponent: 0
|
||||
flipbookRows: 1
|
||||
flipbookColumns: 1
|
||||
maxTextureSizeSet: 0
|
||||
compressionQualitySet: 0
|
||||
textureFormatSet: 0
|
||||
ignorePngGamma: 0
|
||||
applyGammaDecoding: 0
|
||||
swizzle: 50462976
|
||||
cookieLightType: 0
|
||||
platformSettings:
|
||||
- serializedVersion: 3
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 3
|
||||
buildTarget: Standalone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID:
|
||||
internalID: 0
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
secondaryTextures: []
|
||||
nameFileIdTable: {}
|
||||
mipmapLimitGroupName:
|
||||
pSDRemoveMatte: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -101,7 +101,7 @@ Material:
|
|||
m_Floats:
|
||||
- _AlphaClip: 0
|
||||
- _AlphaToMask: 0
|
||||
- _Blend: 2
|
||||
- _Blend: 0
|
||||
- _BlendModePreserveSpecular: 1
|
||||
- _BumpScale: 1
|
||||
- _ClearCoatMask: 0
|
||||
|
|
@ -110,8 +110,8 @@ Material:
|
|||
- _Cutoff: 0.5
|
||||
- _DetailAlbedoMapScale: 1
|
||||
- _DetailNormalMapScale: 1
|
||||
- _DstBlend: 1
|
||||
- _DstBlendAlpha: 1
|
||||
- _DstBlend: 10
|
||||
- _DstBlendAlpha: 10
|
||||
- _EnvironmentReflections: 1
|
||||
- _GlossMapScale: 0
|
||||
- _Glossiness: 0
|
||||
|
|
@ -130,8 +130,8 @@ Material:
|
|||
- _WorkflowMode: 1
|
||||
- _ZWrite: 0
|
||||
m_Colors:
|
||||
- _BaseColor: {r: 0.5568628, g: 0.6901961, b: 0.7568628, a: 1}
|
||||
- _Color: {r: 0.5568628, g: 0.6901961, b: 0.7568628, a: 1}
|
||||
- _BaseColor: {r: 0.75686276, g: 0.5568628, b: 0.5740802, a: 0.15686275}
|
||||
- _Color: {r: 0.75686276, g: 0.5568628, b: 0.57408017, a: 0.15686275}
|
||||
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
||||
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
|
||||
m_BuildTextureStacks: []
|
||||
|
|
|
|||
135
Assets/Materials/gun.mat
Normal file
135
Assets/Materials/gun.mat
Normal file
|
|
@ -0,0 +1,135 @@
|
|||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!21 &2100000
|
||||
Material:
|
||||
serializedVersion: 8
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: gun
|
||||
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
|
||||
m_Parent: {fileID: 0}
|
||||
m_ModifiedSerializedProperties: 0
|
||||
m_ValidKeywords:
|
||||
- _METALLICSPECGLOSSMAP
|
||||
- _NORMALMAP
|
||||
m_InvalidKeywords: []
|
||||
m_LightmapFlags: 4
|
||||
m_EnableInstancingVariants: 0
|
||||
m_DoubleSidedGI: 0
|
||||
m_CustomRenderQueue: -1
|
||||
stringTagMap:
|
||||
RenderType: Opaque
|
||||
disabledShaderPasses: []
|
||||
m_LockedProperties:
|
||||
m_SavedProperties:
|
||||
serializedVersion: 3
|
||||
m_TexEnvs:
|
||||
- _BaseMap:
|
||||
m_Texture: {fileID: 2800000, guid: e340d6881a3c653418995c16c68be2df, type: 3}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _BumpMap:
|
||||
m_Texture: {fileID: 2800000, guid: e87bb975f78123e4a9e818bde030bf63, type: 3}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _DetailAlbedoMap:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _DetailMask:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _DetailNormalMap:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _EmissionMap:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _MainTex:
|
||||
m_Texture: {fileID: 2800000, guid: e340d6881a3c653418995c16c68be2df, type: 3}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _MetallicGlossMap:
|
||||
m_Texture: {fileID: 2800000, guid: 008c8c33c0651a24aa9d92efafbf7e41, type: 3}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _OcclusionMap:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _ParallaxMap:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _SpecGlossMap:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- unity_Lightmaps:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- unity_LightmapsInd:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- unity_ShadowMasks:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
m_Ints: []
|
||||
m_Floats:
|
||||
- _AlphaClip: 0
|
||||
- _AlphaToMask: 0
|
||||
- _Blend: 0
|
||||
- _BlendModePreserveSpecular: 1
|
||||
- _BumpScale: 1
|
||||
- _ClearCoatMask: 0
|
||||
- _ClearCoatSmoothness: 0
|
||||
- _Cull: 2
|
||||
- _Cutoff: 0.5
|
||||
- _DetailAlbedoMapScale: 1
|
||||
- _DetailNormalMapScale: 1
|
||||
- _DstBlend: 0
|
||||
- _DstBlendAlpha: 0
|
||||
- _EnvironmentReflections: 1
|
||||
- _GlossMapScale: 0
|
||||
- _Glossiness: 0
|
||||
- _GlossyReflections: 0
|
||||
- _Metallic: 0
|
||||
- _OcclusionStrength: 1
|
||||
- _Parallax: 0.005
|
||||
- _QueueOffset: 0
|
||||
- _ReceiveShadows: 1
|
||||
- _Smoothness: 0.5
|
||||
- _SmoothnessTextureChannel: 0
|
||||
- _SpecularHighlights: 1
|
||||
- _SrcBlend: 1
|
||||
- _SrcBlendAlpha: 1
|
||||
- _Surface: 0
|
||||
- _WorkflowMode: 1
|
||||
- _ZWrite: 1
|
||||
m_Colors:
|
||||
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
- _Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
||||
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
|
||||
m_BuildTextureStacks: []
|
||||
--- !u!114 &3302505441563547477
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 11
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
version: 7
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: b2c28609dca198a469926cb39f030549
|
||||
guid: 92bd7f3ca4f2e4b43b51c23af0bba5ff
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 15600000
|
||||
mainObjectFileID: 2100000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
BIN
Assets/Models/gun.fbx
(Stored with Git LFS)
BIN
Assets/Models/gun.fbx
(Stored with Git LFS)
Binary file not shown.
|
|
@ -3,7 +3,12 @@ guid: 9aedb11bd32d30c469b7cf68dc632490
|
|||
ModelImporter:
|
||||
serializedVersion: 22200
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
externalObjects:
|
||||
- first:
|
||||
type: UnityEngine:Material
|
||||
assembly: UnityEngine.CoreModule
|
||||
name: lambert1
|
||||
second: {fileID: 2100000, guid: 92bd7f3ca4f2e4b43b51c23af0bba5ff, type: 2}
|
||||
materials:
|
||||
materialImportMode: 2
|
||||
materialName: 0
|
||||
|
|
@ -35,7 +40,7 @@ ModelImporter:
|
|||
isReadable: 0
|
||||
meshes:
|
||||
lODScreenPercentages: []
|
||||
globalScale: 1
|
||||
globalScale: 15
|
||||
meshCompression: 0
|
||||
addColliders: 0
|
||||
useSRGBMaterialColor: 1
|
||||
|
|
@ -48,7 +53,7 @@ ModelImporter:
|
|||
nodeNameCollisionStrategy: 1
|
||||
fileIdsGeneration: 2
|
||||
swapUVChannels: 0
|
||||
generateSecondaryUV: 0
|
||||
generateSecondaryUV: 1
|
||||
useFileUnits: 1
|
||||
keepQuads: 0
|
||||
weldVertices: 1
|
||||
|
|
@ -90,7 +95,7 @@ ModelImporter:
|
|||
armStretch: 0.05
|
||||
legStretch: 0.05
|
||||
feetSpacing: 0
|
||||
globalScale: 1
|
||||
globalScale: 15
|
||||
rootMotionBoneName:
|
||||
hasTranslationDoF: 0
|
||||
hasExtraRoot: 0
|
||||
|
|
|
|||
BIN
Assets/Models/spaceship.fbx
(Stored with Git LFS)
BIN
Assets/Models/spaceship.fbx
(Stored with Git LFS)
Binary file not shown.
|
|
@ -4,11 +4,31 @@ ModelImporter:
|
|||
serializedVersion: 22200
|
||||
internalIDToNameTable: []
|
||||
externalObjects:
|
||||
- first:
|
||||
type: UnityEngine:Material
|
||||
assembly: UnityEngine.CoreModule
|
||||
name: doors
|
||||
second: {fileID: 2100000, guid: de57c2f2de4d8a74a99eec2a9324890b, type: 2}
|
||||
- first:
|
||||
type: UnityEngine:Material
|
||||
assembly: UnityEngine.CoreModule
|
||||
name: glass
|
||||
second: {fileID: 2100000, guid: 46f90cff2f256714d89ff40c8c175eb7, type: 2}
|
||||
- first:
|
||||
type: UnityEngine:Material
|
||||
assembly: UnityEngine.CoreModule
|
||||
name: glass1
|
||||
second: {fileID: 2100000, guid: 46f90cff2f256714d89ff40c8c175eb7, type: 2}
|
||||
- first:
|
||||
type: UnityEngine:Material
|
||||
assembly: UnityEngine.CoreModule
|
||||
name: inside
|
||||
second: {fileID: 2100000, guid: de57c2f2de4d8a74a99eec2a9324890b, type: 2}
|
||||
- first:
|
||||
type: UnityEngine:Material
|
||||
assembly: UnityEngine.CoreModule
|
||||
name: lambert1
|
||||
second: {fileID: 2100000, guid: de57c2f2de4d8a74a99eec2a9324890b, type: 2}
|
||||
materials:
|
||||
materialImportMode: 2
|
||||
materialName: 0
|
||||
|
|
|
|||
135
Assets/Prefabs/Bullet.prefab
Normal file
135
Assets/Prefabs/Bullet.prefab
Normal file
|
|
@ -0,0 +1,135 @@
|
|||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1 &634305283682154916
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 6131618513195726046}
|
||||
- component: {fileID: 8439297563556095349}
|
||||
- component: {fileID: 6916749199650078309}
|
||||
- component: {fileID: 2578125575657415053}
|
||||
- component: {fileID: 6778915936728483955}
|
||||
m_Layer: 0
|
||||
m_Name: Bullet
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &6131618513195726046
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 634305283682154916}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 633.4157, y: 53.3995, z: 714.2978}
|
||||
m_LocalScale: {x: 0.07078012, y: 0.07078012, z: 0.223917}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!33 &8439297563556095349
|
||||
MeshFilter:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 634305283682154916}
|
||||
m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
|
||||
--- !u!23 &6916749199650078309
|
||||
MeshRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 634305283682154916}
|
||||
m_Enabled: 1
|
||||
m_CastShadows: 1
|
||||
m_ReceiveShadows: 1
|
||||
m_DynamicOccludee: 1
|
||||
m_StaticShadowCaster: 0
|
||||
m_MotionVectors: 1
|
||||
m_LightProbeUsage: 1
|
||||
m_ReflectionProbeUsage: 1
|
||||
m_RayTracingMode: 2
|
||||
m_RayTraceProcedural: 0
|
||||
m_RenderingLayerMask: 1
|
||||
m_RendererPriority: 0
|
||||
m_Materials:
|
||||
- {fileID: 2100000, guid: 951aa804207d8f24296d25c12d548a31, type: 2}
|
||||
m_StaticBatchInfo:
|
||||
firstSubMesh: 0
|
||||
subMeshCount: 0
|
||||
m_StaticBatchRoot: {fileID: 0}
|
||||
m_ProbeAnchor: {fileID: 0}
|
||||
m_LightProbeVolumeOverride: {fileID: 0}
|
||||
m_ScaleInLightmap: 1
|
||||
m_ReceiveGI: 1
|
||||
m_PreserveUVs: 0
|
||||
m_IgnoreNormalsForChartDetection: 0
|
||||
m_ImportantGI: 0
|
||||
m_StitchLightmapSeams: 1
|
||||
m_SelectedEditorRenderState: 3
|
||||
m_MinimumChartSize: 4
|
||||
m_AutoUVMaxDistance: 0.5
|
||||
m_AutoUVMaxAngle: 89
|
||||
m_LightmapParameters: {fileID: 0}
|
||||
m_SortingLayerID: 0
|
||||
m_SortingLayer: 0
|
||||
m_SortingOrder: 0
|
||||
m_AdditionalVertexStreams: {fileID: 0}
|
||||
--- !u!135 &2578125575657415053
|
||||
SphereCollider:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 634305283682154916}
|
||||
m_Material: {fileID: 0}
|
||||
m_IncludeLayers:
|
||||
serializedVersion: 2
|
||||
m_Bits: 0
|
||||
m_ExcludeLayers:
|
||||
serializedVersion: 2
|
||||
m_Bits: 0
|
||||
m_LayerOverridePriority: 0
|
||||
m_IsTrigger: 0
|
||||
m_ProvidesContacts: 0
|
||||
m_Enabled: 1
|
||||
serializedVersion: 3
|
||||
m_Radius: 0.5
|
||||
m_Center: {x: 0, y: 0, z: 0}
|
||||
--- !u!54 &6778915936728483955
|
||||
Rigidbody:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 634305283682154916}
|
||||
serializedVersion: 4
|
||||
m_Mass: 1
|
||||
m_Drag: 0
|
||||
m_AngularDrag: 0.05
|
||||
m_CenterOfMass: {x: 0, y: 0, z: 0}
|
||||
m_InertiaTensor: {x: 1, y: 1, z: 1}
|
||||
m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_IncludeLayers:
|
||||
serializedVersion: 2
|
||||
m_Bits: 0
|
||||
m_ExcludeLayers:
|
||||
serializedVersion: 2
|
||||
m_Bits: 0
|
||||
m_ImplicitCom: 1
|
||||
m_ImplicitTensor: 1
|
||||
m_UseGravity: 0
|
||||
m_IsKinematic: 0
|
||||
m_Interpolate: 0
|
||||
m_Constraints: 0
|
||||
m_CollisionDetection: 0
|
||||
7
Assets/Prefabs/Bullet.prefab.meta
Normal file
7
Assets/Prefabs/Bullet.prefab.meta
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 0cdcaff5ba3a0694d9c72b9d52a715b2
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
1346
Assets/Prefabs/gun.prefab
Normal file
1346
Assets/Prefabs/gun.prefab
Normal file
File diff suppressed because it is too large
Load diff
7
Assets/Prefabs/gun.prefab.meta
Normal file
7
Assets/Prefabs/gun.prefab.meta
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
fileFormatVersion: 2
|
||||
guid: fcc3124eb1a35354d8faf61ffa67d814
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
1007
Assets/Prefabs/spaceship.prefab
Normal file
1007
Assets/Prefabs/spaceship.prefab
Normal file
File diff suppressed because it is too large
Load diff
7
Assets/Prefabs/spaceship.prefab.meta
Normal file
7
Assets/Prefabs/spaceship.prefab.meta
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 5fb943f0c37a29e4ab9d29553d613711
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
File diff suppressed because it is too large
Load diff
91
Assets/Scripts/CharactorControl.cs
Normal file
91
Assets/Scripts/CharactorControl.cs
Normal file
|
|
@ -0,0 +1,91 @@
|
|||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using System.Dynamic;
|
||||
using Unity.VisualScripting;
|
||||
using UnityEngine;
|
||||
|
||||
public class CharacterControl : MonoBehaviour
|
||||
{
|
||||
[SerializeField]
|
||||
Transform playerCamera;
|
||||
|
||||
[SerializeField]
|
||||
float seeDistance;
|
||||
Interactable curretInteractable;
|
||||
Pickable currentPickable;
|
||||
Gun CurrentGun=null;
|
||||
public RaycastHit hitInfo;
|
||||
public static bool handsFull;
|
||||
|
||||
[SerializeField]
|
||||
private GameObject hand;
|
||||
|
||||
void Update()
|
||||
{
|
||||
bool Raycast = Physics.Raycast(
|
||||
playerCamera.position,
|
||||
playerCamera.TransformDirection(Vector3.forward),
|
||||
out hitInfo,
|
||||
seeDistance
|
||||
);
|
||||
Debug.DrawRay(
|
||||
playerCamera.position,
|
||||
playerCamera.TransformDirection(Vector3.forward) * seeDistance,
|
||||
Color.green
|
||||
);
|
||||
if (Raycast)
|
||||
{
|
||||
Debug.Log(hitInfo.transform.name);
|
||||
if (hitInfo.transform.TryGetComponent<Interactable>(out curretInteractable)) { }
|
||||
else if (hitInfo.transform.TryGetComponent<Pickable>(out currentPickable))
|
||||
{
|
||||
if (hitInfo.transform.TryGetComponent<Gun>(out CurrentGun)) { }
|
||||
}
|
||||
else
|
||||
{
|
||||
curretInteractable = null;
|
||||
currentPickable = null;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
curretInteractable = null;
|
||||
currentPickable = null;
|
||||
}
|
||||
}
|
||||
|
||||
void OnInteract()
|
||||
{
|
||||
if (curretInteractable != null)
|
||||
{
|
||||
curretInteractable.Interact();
|
||||
}
|
||||
if (currentPickable != null)
|
||||
{
|
||||
currentPickable.PickUp();
|
||||
}
|
||||
}
|
||||
|
||||
void OnShoot()
|
||||
{
|
||||
Debug.Log("Shoot");
|
||||
if (CurrentGun != null)
|
||||
{
|
||||
|
||||
CurrentGun.Shoot();
|
||||
}
|
||||
}
|
||||
|
||||
void OnReload()
|
||||
{
|
||||
if (CurrentGun != null)
|
||||
{
|
||||
CurrentGun.Reload();
|
||||
}
|
||||
}
|
||||
|
||||
void OnDrop()
|
||||
{
|
||||
CurrentGun.transform.GetComponent<Pickable>().Drop();
|
||||
}
|
||||
}
|
||||
|
|
@ -18,4 +18,5 @@ void Awake()
|
|||
Destroy(gameObject);
|
||||
}
|
||||
}
|
||||
public int playerHealth = 100;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,16 +5,17 @@
|
|||
|
||||
public class Gun : MonoBehaviour
|
||||
{
|
||||
public GameObject bullet;
|
||||
|
||||
/// <summary>
|
||||
/// gun stats
|
||||
/// </summary>
|
||||
public int magSize;
|
||||
public int damage;
|
||||
public float fireRate;
|
||||
public float timeBtwShots;
|
||||
public float range;
|
||||
public float reloadTime;
|
||||
public int bulletsPerFire;
|
||||
public float timeBetweenShots;
|
||||
public bool automaticFire;
|
||||
|
||||
/// <summary>
|
||||
|
|
@ -24,21 +25,88 @@ public class Gun : MonoBehaviour
|
|||
private bool shooting;
|
||||
private bool readyToShot;
|
||||
private int bulletsLeft;
|
||||
private int bulletsShot;
|
||||
|
||||
/// <summary>
|
||||
/// Refrencing
|
||||
/// </summary>
|
||||
[SerializeField]
|
||||
Camera fpsCam;
|
||||
public Transform bulletSpawn;
|
||||
public TextMeshProUGUI bulletCounter;
|
||||
public bool allowInvoke = true;
|
||||
|
||||
void Start() {
|
||||
bulletsLeft=magSize;
|
||||
readyToShot=true;
|
||||
}
|
||||
void onShoot()
|
||||
[SerializeField]
|
||||
private GameObject mag;
|
||||
|
||||
void Awake()
|
||||
{
|
||||
bulletsLeft = magSize;
|
||||
readyToShot = true;
|
||||
}
|
||||
|
||||
public void Shoot()
|
||||
{
|
||||
if (readyToShot && !reloading && bulletsLeft > 0)
|
||||
{
|
||||
Debug.Log("Bang");
|
||||
Ray ray = fpsCam.ViewportPointToRay(new Vector3(0.5f, 0.5f, 0));
|
||||
RaycastHit hit;
|
||||
Vector3 targetPoint;
|
||||
if (Physics.Raycast(ray, out hit))
|
||||
{targetPoint = hit.point;}
|
||||
else
|
||||
{targetPoint = ray.GetPoint(150);}
|
||||
|
||||
Vector3 direction = targetPoint - bulletSpawn.position;
|
||||
GameObject currentBullet = Instantiate(
|
||||
bullet,
|
||||
bulletSpawn.position,
|
||||
Quaternion.identity
|
||||
);
|
||||
currentBullet.transform.forward = direction.normalized;
|
||||
currentBullet
|
||||
.GetComponent<Rigidbody>()
|
||||
.AddForce(direction.normalized * range, ForceMode.Impulse);
|
||||
bulletsLeft--;
|
||||
if (allowInvoke)
|
||||
{
|
||||
Invoke("ResetShot", timeBtwShots);
|
||||
allowInvoke = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void Update()
|
||||
{
|
||||
if(bulletsLeft == 0)
|
||||
{
|
||||
Reload();
|
||||
}
|
||||
}
|
||||
private void ResetShot()
|
||||
{
|
||||
//Allow shooting and invoking again
|
||||
readyToShot = true;
|
||||
allowInvoke = true;
|
||||
}
|
||||
|
||||
public void Reload()
|
||||
{
|
||||
if (bulletsLeft < magSize && !reloading)
|
||||
{
|
||||
Debug.Log("reload");
|
||||
reloading = true;
|
||||
readyToShot = false;
|
||||
Invoke("Reloaded", reloadTime);
|
||||
mag.SetActive(false);
|
||||
}
|
||||
}
|
||||
|
||||
void Reloaded()
|
||||
{
|
||||
reloading = false;
|
||||
readyToShot = true;
|
||||
bulletsLeft = magSize;
|
||||
mag.SetActive(true);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
38
Assets/Scripts/GunPickable.cs
Normal file
38
Assets/Scripts/GunPickable.cs
Normal file
|
|
@ -0,0 +1,38 @@
|
|||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
|
||||
public class GunPickable : Pickable
|
||||
{
|
||||
private bool InHand;
|
||||
|
||||
public override void Start()
|
||||
{
|
||||
base.Start();
|
||||
gameObject.GetComponent<Gun>().enabled = false;
|
||||
}
|
||||
|
||||
public override void PickUp()
|
||||
{
|
||||
base.PickUp();
|
||||
gameObject.GetComponent<Gun>().enabled = true;
|
||||
InHand = true;
|
||||
}
|
||||
|
||||
public override void Drop()
|
||||
{
|
||||
base.Drop();
|
||||
gameObject.GetComponent<Gun>().enabled = false;
|
||||
InHand = false;
|
||||
}
|
||||
|
||||
public void Update()
|
||||
{
|
||||
if (InHand)
|
||||
{
|
||||
Vector3 currentRotation = transform.eulerAngles;
|
||||
currentRotation.x = Camera.transform.eulerAngles.x;
|
||||
transform.eulerAngles = currentRotation;
|
||||
}
|
||||
}
|
||||
}
|
||||
11
Assets/Scripts/GunPickable.cs.meta
Normal file
11
Assets/Scripts/GunPickable.cs.meta
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 85d71d4a54240884ea3c623364a66536
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
49
Assets/Scripts/Pickable.cs
Normal file
49
Assets/Scripts/Pickable.cs
Normal file
|
|
@ -0,0 +1,49 @@
|
|||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
|
||||
public class Pickable : MonoBehaviour
|
||||
{
|
||||
[SerializeField]
|
||||
private Transform HandPosition;
|
||||
|
||||
[SerializeField]
|
||||
protected Transform player;
|
||||
|
||||
[SerializeField]
|
||||
protected Transform Camera;
|
||||
|
||||
[SerializeField]
|
||||
private float force;
|
||||
private Rigidbody rb;
|
||||
|
||||
public virtual void Start()
|
||||
{
|
||||
rb = gameObject.GetComponent<Rigidbody>();
|
||||
}
|
||||
|
||||
public virtual void PickUp()
|
||||
{
|
||||
CharacterControl.handsFull = true;
|
||||
rb.isKinematic = true;
|
||||
gameObject.GetComponent<BoxCollider>().isTrigger = true;
|
||||
transform.SetParent(HandPosition);
|
||||
transform.localRotation = Quaternion.Euler(Vector3.zero);
|
||||
transform.localPosition = Vector3.zero;
|
||||
transform.localScale = Vector3.one;
|
||||
|
||||
Debug.Log("Picked up");
|
||||
}
|
||||
|
||||
public virtual void Drop()
|
||||
{
|
||||
CharacterControl.handsFull = false;
|
||||
rb.isKinematic = false;
|
||||
gameObject.GetComponent<BoxCollider>().isTrigger = false;
|
||||
transform.SetParent(null);
|
||||
rb.velocity = player.GetComponent<Rigidbody>().velocity;
|
||||
rb.AddForce(Camera.forward * force, ForceMode.Impulse);
|
||||
float random = Random.Range(-1f, 1f);
|
||||
rb.AddTorque(new Vector3(random, random, random) * 10);
|
||||
}
|
||||
}
|
||||
11
Assets/Scripts/Pickable.cs.meta
Normal file
11
Assets/Scripts/Pickable.cs.meta
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 6fb47712e3152d147a2f1618b3262eea
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -1,50 +0,0 @@
|
|||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
|
||||
public class Raycasting : MonoBehaviour
|
||||
{
|
||||
[SerializeField]
|
||||
Transform playerCamera;
|
||||
|
||||
[SerializeField]
|
||||
float seeDistance;
|
||||
Interactable curretInteractable;
|
||||
|
||||
void Update()
|
||||
{
|
||||
bool Raycast = Physics.Raycast(
|
||||
playerCamera.position,
|
||||
playerCamera.TransformDirection(Vector3.forward),
|
||||
out RaycastHit hitInfo,
|
||||
seeDistance
|
||||
);
|
||||
Debug.DrawRay(
|
||||
playerCamera.position,
|
||||
playerCamera.TransformDirection(Vector3.forward) * seeDistance,
|
||||
Color.green
|
||||
);
|
||||
if (Raycast)
|
||||
{
|
||||
Debug.Log(hitInfo.transform.name);
|
||||
if (hitInfo.transform.TryGetComponent<Interactable>(out curretInteractable)) { }
|
||||
else
|
||||
{
|
||||
curretInteractable = null;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
curretInteractable = null;
|
||||
}
|
||||
}
|
||||
void OnInteract()
|
||||
{
|
||||
if(curretInteractable!=null)
|
||||
{
|
||||
curretInteractable.Interact();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -7,105 +7,95 @@
|
|||
public class SlideDoor : Interactable
|
||||
{
|
||||
bool IsOpen = false;
|
||||
bool opening=false;
|
||||
[SerializeField]
|
||||
private GameObject RightDoor;
|
||||
Vector3 RightDoorStart;
|
||||
Vector3 RightDoorEnd;
|
||||
bool opening = false;
|
||||
bool closing = false;
|
||||
float currentDuration;
|
||||
|
||||
[SerializeField]
|
||||
private GameObject LeftDoor;
|
||||
|
||||
private GameObject rightDoor;
|
||||
Vector3 rightDoorStart;
|
||||
Vector3 rightDoorEnd;
|
||||
|
||||
[SerializeField]
|
||||
private float LerpSpeed;
|
||||
private GameObject leftDoor;
|
||||
Vector3 leftDoorStart;
|
||||
Vector3 leftDoorEnd;
|
||||
|
||||
[SerializeField]
|
||||
private float lerpTime;
|
||||
[SerializeField]
|
||||
private AnimationCurve Curve;
|
||||
|
||||
|
||||
|
||||
public void Start()
|
||||
{
|
||||
RightDoorStart=RightDoor.transform.position;
|
||||
Debug.Log(RightDoorStart);
|
||||
RightDoorEnd= RightDoor.transform.position;
|
||||
RightDoorEnd.z += 2;
|
||||
Debug.Log(RightDoorEnd);
|
||||
|
||||
|
||||
// RightDoorEnd = RightDoor.transform.position;
|
||||
// RightDoorEnd.z += 2;
|
||||
// RightDoorEnd = RightDoor.transform.position;
|
||||
// Debug.Log(RightDoorEnd);
|
||||
// RightDoorStart = RightDoor.transform.position;
|
||||
// Debug.Log(RightDoorStart);
|
||||
// LeftDoorEnd = LeftDoor.transform.position;
|
||||
// LeftDoorEnd.z += 2;
|
||||
// LeftDoorEnd = LeftDoor.transform.position;
|
||||
// LeftDoorStart = LeftDoor.transform.position;
|
||||
// Debug.Log("done ini");
|
||||
rightDoorStart = rightDoor.transform.position;
|
||||
Debug.Log(rightDoorStart);
|
||||
rightDoorEnd = rightDoor.transform.position;
|
||||
rightDoorEnd.z += 2;
|
||||
Debug.Log(rightDoorEnd);
|
||||
leftDoorStart = leftDoor.transform.position;
|
||||
Debug.Log(leftDoorStart);
|
||||
leftDoorEnd = leftDoor.transform.position;
|
||||
leftDoorEnd.z -= 2;
|
||||
Debug.Log(leftDoorEnd);
|
||||
}
|
||||
|
||||
void Update()
|
||||
{
|
||||
if(opening)
|
||||
if (opening)
|
||||
{
|
||||
currentDuration += Time.deltaTime;
|
||||
float t = currentDuration / lerpTime;
|
||||
rightDoor.transform.position = Vector3.Lerp(rightDoorStart, rightDoorEnd, Curve.Evaluate(t));
|
||||
leftDoor.transform.position = Vector3.Lerp(leftDoorStart, leftDoorEnd, Curve.Evaluate(t));
|
||||
|
||||
if (currentDuration >= lerpTime)
|
||||
{
|
||||
currentDuration = 0;
|
||||
opening = false;
|
||||
rightDoor.transform.position = rightDoorEnd;
|
||||
leftDoor.transform.position = leftDoorEnd;
|
||||
IsOpen = true;
|
||||
Debug.Log("Door opened");
|
||||
}
|
||||
}
|
||||
void SlideRight()
|
||||
else if (closing)
|
||||
{
|
||||
if (!IsOpen)
|
||||
{
|
||||
float time = 0;
|
||||
currentDuration += Time.deltaTime;
|
||||
float t = currentDuration / lerpTime;
|
||||
rightDoor.transform.position = Vector3.Lerp(rightDoorEnd, rightDoorStart, Curve.Evaluate(t));
|
||||
leftDoor.transform.position = Vector3.Lerp(leftDoorEnd, leftDoorStart, Curve.Evaluate(t));
|
||||
|
||||
while (time < 1)
|
||||
if (currentDuration >= lerpTime)
|
||||
{
|
||||
RightDoor.transform.position = Vector3.Lerp(RightDoorStart, RightDoorEnd, time);
|
||||
time += Time.deltaTime * LerpSpeed;
|
||||
currentDuration = 0;
|
||||
closing = false;
|
||||
rightDoor.transform.position = rightDoorStart;
|
||||
leftDoor.transform.position = leftDoorStart;
|
||||
IsOpen = false;
|
||||
Debug.Log("Door closed");
|
||||
}
|
||||
// Vector3 currentPosition = RightDoor.transform.position;
|
||||
// currentPosition.z += 2;
|
||||
// RightDoor.transform.position = currentPosition;
|
||||
}
|
||||
else
|
||||
{
|
||||
float time = 0;
|
||||
|
||||
while (time < 1)
|
||||
{
|
||||
RightDoor.transform.position = Vector3.Lerp( RightDoorEnd,RightDoorStart, time);
|
||||
time += Time.deltaTime * LerpSpeed;
|
||||
}
|
||||
// Vector3 currentPosition = RightDoor.transform.position;
|
||||
// currentPosition.z -= 2;
|
||||
// RightDoor.transform.position = currentPosition;
|
||||
}
|
||||
}
|
||||
|
||||
void SlideLeft()
|
||||
{
|
||||
if (!IsOpen)
|
||||
{
|
||||
Vector3 currentPosition = LeftDoor.transform.position;
|
||||
currentPosition.z -= 2;
|
||||
LeftDoor.transform.position = currentPosition;
|
||||
}
|
||||
else
|
||||
{
|
||||
Vector3 currentPosition = LeftDoor.transform.position;
|
||||
currentPosition.z += 2;
|
||||
LeftDoor.transform.position = currentPosition;
|
||||
}
|
||||
}
|
||||
|
||||
public override void Interact()
|
||||
{
|
||||
opening=true;
|
||||
// SlideRight();
|
||||
// SlideLeft();
|
||||
if (IsOpen)
|
||||
if (!closing && !opening && !IsOpen)
|
||||
{
|
||||
IsOpen = false;
|
||||
opening = true;
|
||||
}
|
||||
else
|
||||
else if (!closing && !opening && IsOpen)
|
||||
{
|
||||
IsOpen = true;
|
||||
closing = true;
|
||||
}
|
||||
}
|
||||
void OnTriggerExit(Collider other)
|
||||
{
|
||||
if(other.tag == "Player"&& IsOpen&& !opening)
|
||||
{
|
||||
closing=true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -51,13 +51,31 @@
|
|||
"initialStateCheck": false
|
||||
},
|
||||
{
|
||||
"name": "shoot",
|
||||
"name": "Shoot",
|
||||
"type": "Button",
|
||||
"id": "57289eca-61fe-4ccf-82db-009aa86d3bdb",
|
||||
"expectedControlType": "Button",
|
||||
"processors": "",
|
||||
"interactions": "",
|
||||
"initialStateCheck": false
|
||||
},
|
||||
{
|
||||
"name": "Reload",
|
||||
"type": "Button",
|
||||
"id": "098a6518-d8c0-4bfd-8e79-605f226651f4",
|
||||
"expectedControlType": "Button",
|
||||
"processors": "",
|
||||
"interactions": "",
|
||||
"initialStateCheck": false
|
||||
},
|
||||
{
|
||||
"name": "Drop",
|
||||
"type": "Button",
|
||||
"id": "cc3794c8-637f-4fb4-aae2-2f3eb9e09308",
|
||||
"expectedControlType": "Button",
|
||||
"processors": "",
|
||||
"interactions": "",
|
||||
"initialStateCheck": false
|
||||
}
|
||||
],
|
||||
"bindings": [
|
||||
|
|
@ -255,7 +273,29 @@
|
|||
"interactions": "",
|
||||
"processors": "",
|
||||
"groups": "",
|
||||
"action": "shoot",
|
||||
"action": "Shoot",
|
||||
"isComposite": false,
|
||||
"isPartOfComposite": false
|
||||
},
|
||||
{
|
||||
"name": "",
|
||||
"id": "fea4f269-66d7-4a44-9814-03127a726991",
|
||||
"path": "<Keyboard>/r",
|
||||
"interactions": "",
|
||||
"processors": "",
|
||||
"groups": "",
|
||||
"action": "Reload",
|
||||
"isComposite": false,
|
||||
"isPartOfComposite": false
|
||||
},
|
||||
{
|
||||
"name": "",
|
||||
"id": "dd5c0487-8312-44e9-8f8a-e13c054f6683",
|
||||
"path": "<Keyboard>/g",
|
||||
"interactions": "",
|
||||
"processors": "",
|
||||
"groups": "",
|
||||
"action": "Drop",
|
||||
"isComposite": false,
|
||||
"isPartOfComposite": false
|
||||
}
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -1,5 +1,6 @@
|
|||
{
|
||||
"dependencies": {
|
||||
"com.unity.ai.navigation": "1.1.5",
|
||||
"com.unity.cinemachine": "2.10.0",
|
||||
"com.unity.collab-proxy": "2.3.1",
|
||||
"com.unity.formats.fbx": "4.2.1",
|
||||
|
|
|
|||
|
|
@ -7,6 +7,15 @@
|
|||
"dependencies": {},
|
||||
"url": "https://packages.unity.com"
|
||||
},
|
||||
"com.unity.ai.navigation": {
|
||||
"version": "1.1.5",
|
||||
"depth": 0,
|
||||
"source": "registry",
|
||||
"dependencies": {
|
||||
"com.unity.modules.ai": "1.0.0"
|
||||
},
|
||||
"url": "https://packages.unity.com"
|
||||
},
|
||||
"com.unity.burst": {
|
||||
"version": "1.8.13",
|
||||
"depth": 1,
|
||||
|
|
|
|||
|
|
@ -96,6 +96,11 @@
|
|||
"key": "meshImporter.smoothing",
|
||||
"value": "{\"m_Value\":true}"
|
||||
},
|
||||
{
|
||||
"type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
|
||||
"key": "editor.showEditorNotifications",
|
||||
"value": "{\"m_Value\":false}"
|
||||
},
|
||||
{
|
||||
"type": "UnityEngine.ProBuilder.SelectMode, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
|
||||
"key": "editor.selectMode",
|
||||
|
|
@ -139,7 +144,7 @@
|
|||
{
|
||||
"type": "UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
|
||||
"key": "ShapeBuilder.LastSize",
|
||||
"value": "{\"m_Value\":{\"x\":-26.2215576171875,\"y\":21.601959228515626,\"z\":57.2421875}}"
|
||||
"value": "{\"m_Value\":{\"x\":-3.08355712890625,\"y\":2.8395957946777345,\"z\":6.7841796875}}"
|
||||
},
|
||||
{
|
||||
"type": "UnityEngine.Quaternion, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
|
||||
|
|
@ -190,6 +195,11 @@
|
|||
"type": "System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
|
||||
"key": "meshImporter.smoothingAngle",
|
||||
"value": "{\"m_Value\":1.0}"
|
||||
},
|
||||
{
|
||||
"type": "UnityEngine.ProBuilder.ExtrudeMethod, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
|
||||
"key": "editor.extrudeMethod",
|
||||
"value": "{\"m_Value\":2}"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,7 +3,8 @@
|
|||
--- !u!78 &1
|
||||
TagManager:
|
||||
serializedVersion: 2
|
||||
tags: []
|
||||
tags:
|
||||
- CinemachineTarget
|
||||
layers:
|
||||
- Default
|
||||
- TransparentFX
|
||||
|
|
@ -11,7 +12,7 @@ TagManager:
|
|||
-
|
||||
- Water
|
||||
- UI
|
||||
-
|
||||
- isInteractable
|
||||
-
|
||||
-
|
||||
-
|
||||
|
|
|
|||
Loading…
Reference in a new issue