GJP/GlobalGameJame
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of https://git.steelants.cz/PragueGameJam/GlobalGameJame

Browse Source
This commit is contained in:
JonatanRek 2020-02-02 12:48:20 +01:00
commit 3420c0863e
7 changed files with 125 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
Assets/Materials/White.mat Normal file
View File

@ -0,0 +1,77 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: White
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 0}
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: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
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}
m_Floats:
- _BumpScale: 1
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _GlossMapScale: 1
- _Glossiness: 0.49
- _GlossyReflections: 1
- _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _UVSec: 0
- _ZWrite: 1
m_Colors:
- _Color: {r: 0.7075472, g: 0.7075472, b: 0.7075472, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}

8
Assets/Materials/White.mat.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 362f55bd6cc53b74dbd4f875ded5b5f1
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:

7
Assets/Models/radio.blend1.meta Normal file
View File

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

2
Assets/Prefabs/Part_Shoot_Weapon.prefab
View File

@ -51,7 +51,7 @@ ParticleSystemRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10302, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 2100000, guid: 362f55bd6cc53b74dbd4f875ded5b5f1, type: 2}
- {fileID: 0}
m_StaticBatchInfo:
firstSubMesh: 0

4
Assets/Prefabs/Part_Shoot_Weapon_3.prefab
View File

@ -51,7 +51,7 @@ ParticleSystemRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10302, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 2100000, guid: 362f55bd6cc53b74dbd4f875ded5b5f1, type: 2}
- {fileID: 0}
m_StaticBatchInfo:
firstSubMesh: 0
@ -286,7 +286,7 @@ ParticleSystem:
serializedVersion: 2
minMaxState: 0
minColor: {r: 1, g: 1, b: 1, a: 1}
maxColor: {r: 1, g: 1, b: 1, a: 1}
maxColor: {r: 0.7264151, g: 0.7264151, b: 0.7264151, a: 1}
maxGradient:
serializedVersion: 2
key0: {r: 1, g: 1, b: 1, a: 1}

10
Assets/Prefabs/Weapon_3.prefab
View File

@ -286,6 +286,11 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 3983516630253985952}
m_Modifications:
- target: {fileID: -6054058774237248251, guid: cbc33a01620116b4297cb35d378f0242,
type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: 362f55bd6cc53b74dbd4f875ded5b5f1, type: 2}
- target: {fileID: -4216859302048453862, guid: cbc33a01620116b4297cb35d378f0242,
type: 3}
propertyPath: m_LocalPosition.x
@ -356,6 +361,11 @@ PrefabInstance:
propertyPath: m_LocalScale.z
value: 0.08
objectReference: {fileID: 0}
- target: {fileID: -2397996973257786244, guid: cbc33a01620116b4297cb35d378f0242,
type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: 362f55bd6cc53b74dbd4f875ded5b5f1, type: 2}
- target: {fileID: -927199367670048503, guid: cbc33a01620116b4297cb35d378f0242,
type: 3}
propertyPath: m_Name

20
Assets/Scenes/PlayScene.unity
View File

@ -8005,6 +8005,11 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7843994914498914666, guid: d946f9dd565b97e49919fc8bd91aae4e,
type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: 362f55bd6cc53b74dbd4f875ded5b5f1, type: 2}
- target: {fileID: 8423879596285337014, guid: d946f9dd565b97e49919fc8bd91aae4e,
type: 3}
propertyPath: m_Name
@ -8571,6 +8576,21 @@ PrefabInstance:
propertyPath: m_StaticEditorFlags
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3224351627309651277, guid: 5322794fa1699704b8e50a14cef106b1,
type: 3}
propertyPath: m_Materials.Array.size
value: 2
objectReference: {fileID: 0}
- target: {fileID: 3224351627309651277, guid: 5322794fa1699704b8e50a14cef106b1,
type: 3}
propertyPath: m_Materials.Array.data[1]
value:
objectReference: {fileID: 2100000, guid: 427c5d2662e5f764484aeb5e62dd64ab, type: 2}
- target: {fileID: 3224351627309651277, guid: 5322794fa1699704b8e50a14cef106b1,
type: 3}
propertyPath: m_Materials.Array.data[2]
value:
objectReference: {fileID: 2100000, guid: 427c5d2662e5f764484aeb5e62dd64ab, type: 2}
- target: {fileID: 3259529005183415338, guid: 5322794fa1699704b8e50a14cef106b1,
type: 3}
propertyPath: audioSource