소스 검색

Merge branch 'master' of http://git.thirdlevel.gmbh:80/GameDevOS/LD39

Erik Wittkorn 9 년 전
부모
커밋
af548a64af

BIN
game/Assets/3DArt/Enemy.fbx


+ 60 - 0
game/Assets/3DArt/Enemy.fbx.meta

@@ -23,6 +23,18 @@ ModelImporter:
     100030: RightFrontEye.002
     100032: RightFrontLeg
     100034: Sting
+    100036: Eyes
+    100038: Indicator2
+    100040: Indicator3
+    100042: Indicator4
+    100044: Indicator5
+    100046: Indocator1
+    100048: LeftSolarCells
+    100050: LeftSolarCellsBase
+    100052: LeftSolarCellsHolder
+    100054: RightSolarCells
+    100056: RightSolarCellsBase
+    100058: RightSolarCellsHolder
     400000: Battery
     400002: BatteryHolder
     400004: Body
@@ -41,6 +53,18 @@ ModelImporter:
     400030: RightFrontEye.002
     400032: RightFrontLeg
     400034: Sting
+    400036: Eyes
+    400038: Indicator2
+    400040: Indicator3
+    400042: Indicator4
+    400044: Indicator5
+    400046: Indocator1
+    400048: LeftSolarCells
+    400050: LeftSolarCellsBase
+    400052: LeftSolarCellsHolder
+    400054: RightSolarCells
+    400056: RightSolarCellsBase
+    400058: RightSolarCellsHolder
     2300000: Battery
     2300002: BatteryHolder
     2300004: Body
@@ -58,6 +82,18 @@ ModelImporter:
     2300028: RightFrontEye.002
     2300030: RightFrontLeg
     2300032: Sting
+    2300034: Eyes
+    2300036: Indicator2
+    2300038: Indicator3
+    2300040: Indicator4
+    2300042: Indicator5
+    2300044: Indocator1
+    2300046: LeftSolarCells
+    2300048: LeftSolarCellsBase
+    2300050: LeftSolarCellsHolder
+    2300052: RightSolarCells
+    2300054: RightSolarCellsBase
+    2300056: RightSolarCellsHolder
     3300000: Battery
     3300002: BatteryHolder
     3300004: Body
@@ -75,6 +111,18 @@ ModelImporter:
     3300028: RightFrontEye.002
     3300030: RightFrontLeg
     3300032: Sting
+    3300034: Eyes
+    3300036: Indicator2
+    3300038: Indicator3
+    3300040: Indicator4
+    3300042: Indicator5
+    3300044: Indocator1
+    3300046: LeftSolarCells
+    3300048: LeftSolarCellsBase
+    3300050: LeftSolarCellsHolder
+    3300052: RightSolarCells
+    3300054: RightSolarCellsBase
+    3300056: RightSolarCellsHolder
     4300000: RightFrontEye.002
     4300002: RightFrontEye.001
     4300004: Cube
@@ -92,6 +140,18 @@ ModelImporter:
     4300028: LeftBackLeg
     4300030: LeftFrontLeg
     4300032: Body
+    4300034: RightSolarCellsBase
+    4300036: RightSolarCellsHolder
+    4300038: RightSolarCells
+    4300040: LeftSolarCells
+    4300042: LeftSolarCellsHolder
+    4300044: Eyes
+    4300046: LeftSolarCellsBase
+    4300048: Indicator5
+    4300050: Indicator4
+    4300052: Indicator3
+    4300054: Indicator2
+    4300056: Indocator1
   materials:
     importMaterials: 1
     materialName: 0

+ 9 - 0
game/Assets/3DArt/Materials/EnemyEnergy.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 07ed5c50c761bb449b23b1140dddfd74
+folderAsset: yes
+timeCreated: 1501443312
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 76 - 0
game/Assets/3DArt/Materials/EnemyEnergy/EnergyFull.mat

@@ -0,0 +1,76 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: EnergyFull
+  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_ShaderKeywords: _EMISSION
+  m_LightmapFlags: 0
+  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.5
+    - _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, g: 1, b: 0.17241383, a: 1}
+    - _EmissionColor: {r: 0, g: 1, b: 0.13103461, a: 1}

+ 9 - 0
game/Assets/3DArt/Materials/EnemyEnergy/EnergyFull.mat.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 696684e74728bda40ac5abfe6a560c55
+timeCreated: 1501443594
+licenseType: Free
+NativeFormatImporter:
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 76 - 0
game/Assets/3DArt/Materials/EnemyEnergy/EnergyHigh.mat

@@ -0,0 +1,76 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: EnergyHigh
+  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_ShaderKeywords: _EMISSION
+  m_LightmapFlags: 0
+  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.5
+    - _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.36551726, g: 1, b: 0, a: 1}
+    - _EmissionColor: {r: 0.36551726, g: 1, b: 0, a: 1}

+ 9 - 0
game/Assets/3DArt/Materials/EnemyEnergy/EnergyHigh.mat.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 2683e1abb9c868948b0e3b5befd2c270
+timeCreated: 1501443551
+licenseType: Free
+NativeFormatImporter:
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 76 - 0
game/Assets/3DArt/Materials/EnemyEnergy/EnergyLow.mat

@@ -0,0 +1,76 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: EnergyLow
+  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_ShaderKeywords: _EMISSION _GLOSSYREFLECTIONS_OFF _SPECULARHIGHLIGHTS_OFF
+  m_LightmapFlags: 0
+  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.5
+    - _GlossyReflections: 0
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 0
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 1
+    m_Colors:
+    - _Color: {r: 1, g: 0.7241379, b: 0, a: 1}
+    - _EmissionColor: {r: 1, g: 0.43448275, b: 0, a: 1}

+ 9 - 0
game/Assets/3DArt/Materials/EnemyEnergy/EnergyLow.mat.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 1f06101fdcd00e44d85d60b2fb0a466f
+timeCreated: 1501443330
+licenseType: Free
+NativeFormatImporter:
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 76 - 0
game/Assets/3DArt/Materials/EnemyEnergy/EnergyMedium.mat

@@ -0,0 +1,76 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: EnergyMedium
+  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_ShaderKeywords: _EMISSION
+  m_LightmapFlags: 0
+  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.5
+    - _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.6965518, g: 1, b: 0, a: 1}
+    - _EmissionColor: {r: 0.5724137, g: 1, b: 0, a: 1}

+ 9 - 0
game/Assets/3DArt/Materials/EnemyEnergy/EnergyMedium.mat.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 6001f9072713904469bd9805bad7ed7d
+timeCreated: 1501443507
+licenseType: Free
+NativeFormatImporter:
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 76 - 0
game/Assets/3DArt/Materials/EnemyEnergy/EnergyVeryLow.mat

@@ -0,0 +1,76 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: EnergyVeryLow
+  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_ShaderKeywords: _EMISSION _GLOSSYREFLECTIONS_OFF _SPECULARHIGHLIGHTS_OFF
+  m_LightmapFlags: 0
+  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.5
+    - _GlossyReflections: 0
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 0
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 1
+    m_Colors:
+    - _Color: {r: 1, g: 0.22758618, b: 0, a: 1}
+    - _EmissionColor: {r: 1, g: 0.31034485, b: 0, a: 1}

+ 9 - 0
game/Assets/3DArt/Materials/EnemyEnergy/EnergyVeryLow.mat.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: d54b47ce52bf94a42b7dd86b024e6d87
+timeCreated: 1501443434
+licenseType: Free
+NativeFormatImporter:
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 78 - 0
game/Assets/3DArt/Materials/ParticlesEnemyWeapon.mat

@@ -0,0 +1,78 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: ParticlesEnemyWeapon
+  m_Shader: {fileID: 203, 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: 10300, guid: 0000000000000000f000000000000000, type: 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.5
+    - _GlossyReflections: 1
+    - _InvFade: 1
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 1
+    m_Colors:
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _TintColor: {r: 1, g: 0.93103445, b: 0, a: 0.162}

+ 9 - 0
game/Assets/3DArt/Materials/ParticlesEnemyWeapon.mat.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 06c41fb062e1f2e4a9927369b3c2bd92
+timeCreated: 1501440574
+licenseType: Free
+NativeFormatImporter:
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 3 - 3
game/Assets/3DArt/Materials/PowerDrop.mat

@@ -8,8 +8,8 @@ Material:
   m_PrefabInternal: {fileID: 0}
   m_Name: PowerDrop
   m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
-  m_ShaderKeywords: _ALPHAPREMULTIPLY_ON
-  m_LightmapFlags: 4
+  m_ShaderKeywords: _ALPHAPREMULTIPLY_ON _EMISSION
+  m_LightmapFlags: 0
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: 3000
@@ -74,4 +74,4 @@ Material:
     - _ZWrite: 0
     m_Colors:
     - _Color: {r: 1, g: 0.9724138, b: 0, a: 0.578}
-    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _EmissionColor: {r: 0.94482756, g: 1, b: 0, a: 1}

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 4267 - 357
game/Assets/Prefabs/Enemy.prefab


+ 49 - 24
game/Assets/Scenes/Main.unity

@@ -172,7 +172,7 @@ Prefab:
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_LocalPosition.y
-      value: -4.386077
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_LocalPosition.z
@@ -419,7 +419,7 @@ Prefab:
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_LocalPosition.y
-      value: -4.386077
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_LocalPosition.z
@@ -470,7 +470,7 @@ Prefab:
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_LocalPosition.y
-      value: -4.386077
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_LocalPosition.z
@@ -521,7 +521,7 @@ Prefab:
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_LocalPosition.y
-      value: -4.386077
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_LocalPosition.z
@@ -634,7 +634,18 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 444914467}
   m_OnClick:
     m_PersistentCalls:
-      m_Calls: []
+      m_Calls:
+      - m_Target: {fileID: 241635330}
+        m_MethodName: LoadMainMenu
+        m_Mode: 1
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
     m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
       Culture=neutral, PublicKeyToken=null
 --- !u!114 &444914467
@@ -683,7 +694,7 @@ Prefab:
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_LocalPosition.y
-      value: -4.386077
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_LocalPosition.z
@@ -734,7 +745,7 @@ Prefab:
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_LocalPosition.y
-      value: -4.386077
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_LocalPosition.z
@@ -864,7 +875,7 @@ Prefab:
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_LocalPosition.y
-      value: -4.386077
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_LocalPosition.z
@@ -911,7 +922,7 @@ Prefab:
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_LocalPosition.y
-      value: -4.386077
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_LocalPosition.z
@@ -962,7 +973,7 @@ Prefab:
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_LocalPosition.y
-      value: -4.386077
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_LocalPosition.z
@@ -1134,7 +1145,7 @@ Prefab:
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_LocalPosition.y
-      value: -4.386077
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_LocalPosition.z
@@ -1269,7 +1280,7 @@ Prefab:
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_LocalPosition.y
-      value: -4.386077
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_LocalPosition.z
@@ -1320,7 +1331,7 @@ Prefab:
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_LocalPosition.y
-      value: -4.386077
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_LocalPosition.z
@@ -1367,7 +1378,7 @@ Prefab:
     m_Modifications:
     - target: {fileID: 4531056758406446, guid: 577edfe1bc6758a4d9b91d58d990d07e, type: 2}
       propertyPath: m_LocalPosition.x
-      value: -4.65
+      value: -15.1
       objectReference: {fileID: 0}
     - target: {fileID: 4531056758406446, guid: 577edfe1bc6758a4d9b91d58d990d07e, type: 2}
       propertyPath: m_LocalPosition.y
@@ -1413,7 +1424,7 @@ Prefab:
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_LocalPosition.y
-      value: -4.386077
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_LocalPosition.z
@@ -1594,7 +1605,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: ff26db721962cdf4a8edcdfa9a767d2a, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  profile: {fileID: 0}
 --- !u!1001 &1387540009
 Prefab:
   m_ObjectHideFlags: 0
@@ -1608,7 +1618,7 @@ Prefab:
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_LocalPosition.y
-      value: -4.386077
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_LocalPosition.z
@@ -1659,7 +1669,7 @@ Prefab:
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_LocalPosition.y
-      value: -4.386077
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_LocalPosition.z
@@ -1772,7 +1782,7 @@ Prefab:
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_LocalPosition.y
-      value: -4.386077
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_LocalPosition.z
@@ -1829,7 +1839,7 @@ Prefab:
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_LocalPosition.y
-      value: -4.386077
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_LocalPosition.z
@@ -1880,7 +1890,7 @@ Prefab:
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_LocalPosition.y
-      value: -4.386077
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_LocalPosition.z
@@ -1957,6 +1967,21 @@ Prefab:
       propertyPath: m_RootOrder
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 114806071709842584, guid: 673629bba9f02458cacf9d13115e1078,
+        type: 2}
+      propertyPath: NightColor.r
+      value: 0.3602941
+      objectReference: {fileID: 0}
+    - target: {fileID: 114806071709842584, guid: 673629bba9f02458cacf9d13115e1078,
+        type: 2}
+      propertyPath: NightColor.g
+      value: 0.3602941
+      objectReference: {fileID: 0}
+    - target: {fileID: 114806071709842584, guid: 673629bba9f02458cacf9d13115e1078,
+        type: 2}
+      propertyPath: NightColor.b
+      value: 1
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_ParentPrefab: {fileID: 100100000, guid: 673629bba9f02458cacf9d13115e1078, type: 2}
   m_IsPrefabParent: 0
@@ -1979,7 +2004,7 @@ Prefab:
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_LocalPosition.y
-      value: -4.386077
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_LocalPosition.z
@@ -2040,7 +2065,7 @@ Transform:
   m_PrefabInternal: {fileID: 0}
   m_GameObject: {fileID: 1967258211}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 1.5, y: 4.386077, z: -2}
+  m_LocalPosition: {x: 1.5, y: 0, z: -2}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 580045342}
@@ -2090,7 +2115,7 @@ Prefab:
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_LocalPosition.y
-      value: -4.386077
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_LocalPosition.z

+ 45 - 12
game/Assets/Scripts/Enemy/Enemy.cs

@@ -2,23 +2,36 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-public class Enemy : MonoBehaviour 
+public class Enemy : MonoBehaviour
 {
     [SerializeField]
     private GameObject powerDrop;
     [SerializeField]
     private PowerLevels powerLevel;
+    [SerializeField]
+    private GameObject IndicatorCoverVeryLow;
+    [SerializeField]
+    private GameObject IndicatorCoverLow;
+    [SerializeField]
+    private GameObject IndicatorCoverMedium;
+    [SerializeField]
+    private GameObject IndicatorCoverHigh;
+    [SerializeField]
+    private GameObject IndicatorCoverFull;
+
     private float power = 1.0f;
-    private enum PowerLevels { VeryLow, Low, Medium, High, Full}
+    private enum PowerLevels { VeryLow, Low, Medium, High, Full }
     private EnemyAI.BehaviorController behaviorController;
     private DayTimeManager dayTimeManager;
     private bool dead = false;
 
     private DayTimeLabel lastCharging;
 
+
+
     void OnCollisionEnter(Collision collision)
     {
-        if(!dead)
+        if (!dead)
         {
             if (collision.collider.tag == "Bullet")
             {
@@ -27,17 +40,17 @@ public class Enemy : MonoBehaviour
         }
     }
 
-	// Use this for initialization
-	void Start () 
+    // Use this for initialization
+    void Start()
     {
         dayTimeManager = GameObject.FindObjectOfType<DayTimeManager>();
 
         behaviorController = new EnemyAI.BehaviorController();
         behaviorController.blackboard.navMeshAgent = GetComponent<UnityEngine.AI.NavMeshAgent>();
-	}
-	
-	// Update is called once per frame
-	void Update () 
+    }
+
+    // Update is called once per frame
+    void Update()
     {
         if (!dead)
         {
@@ -50,7 +63,7 @@ public class Enemy : MonoBehaviour
             else
             {
                 blackboard.Night = false;
-            }            
+            }
             blackboard.PlayerPosition = GameObject.FindGameObjectWithTag("Player").transform.position;
             blackboard.EnemyPosition = transform.position;
 
@@ -60,31 +73,51 @@ public class Enemy : MonoBehaviour
             if (dayTimeManager.dayTimeLabel != lastCharging)
             {
                 switch (dayTimeManager.dayTimeLabel)
-                { 
+                {
                     case (DayTimeLabel.Night):
                         powerLevel = PowerLevels.Full;
                         power = 16;
                         lastCharging = dayTimeManager.dayTimeLabel;
+                        IndicatorCoverVeryLow.SetActive(false);
+                        IndicatorCoverLow.SetActive(false);
+                        IndicatorCoverMedium.SetActive(false);
+                        IndicatorCoverHigh.SetActive(false);
+                        IndicatorCoverFull.SetActive(false);
                         break;
                     case (DayTimeLabel.Morning):
                         powerLevel = PowerLevels.VeryLow;
                         power = 1;
                         lastCharging = dayTimeManager.dayTimeLabel;
+                        IndicatorCoverVeryLow.SetActive(false);
+                        IndicatorCoverLow.SetActive(true);
+                        IndicatorCoverMedium.SetActive(true);
+                        IndicatorCoverHigh.SetActive(true);
+                        IndicatorCoverFull.SetActive(true);
                         break;
                     case (DayTimeLabel.Noon):
                         powerLevel = PowerLevels.Low;
                         power = 2;
                         lastCharging = dayTimeManager.dayTimeLabel;
+                        IndicatorCoverVeryLow.SetActive(false);
+                        IndicatorCoverLow.SetActive(false);
+                        IndicatorCoverMedium.SetActive(true);
+                        IndicatorCoverHigh.SetActive(true);
+                        IndicatorCoverFull.SetActive(true);
                         break;
                     case (DayTimeLabel.Evening):
                         powerLevel = PowerLevels.Medium;
                         power = 4;
                         lastCharging = dayTimeManager.dayTimeLabel;
+                        IndicatorCoverVeryLow.SetActive(false);
+                        IndicatorCoverLow.SetActive(false);
+                        IndicatorCoverMedium.SetActive(false);
+                        IndicatorCoverHigh.SetActive(true);
+                        IndicatorCoverFull.SetActive(true);
                         break;
                 }
             }
         }
-	}
+    }
 
     private void Death()
     {

+ 18 - 7
game/Assets/Scripts/Enemy/WeaponEnemy.cs

@@ -4,24 +4,35 @@ using UnityEngine;
 
 public class WeaponEnemy : MonoBehaviour
 {
-    public float powerSuckDelay = 1;
+    public float powerSuckDelay = 0.3f;
     private IEnumerator drainCoroutine;
 
-    void OnCollisionEnter(Collision collision)
+    ParticleSystem particles;
+
+    void Awake()
     {
-        if (collision.collider.tag == "Player")
+        particles = GetComponent<ParticleSystem>();
+    }
+
+    void OnTriggerEnter(Collider other)
+    {
+        if (other.tag == "Player")
         {
-            drainCoroutine = DrainPower(collision.collider.GetComponent<Player>());
+            drainCoroutine = DrainPower(other.GetComponent<Player>());
             StartCoroutine(drainCoroutine);
+            particles.Play();
+            particles.Emit(15);
         }
     }
 
-    void OnCollisionExit(Collision collision)
+    void OnTriggerExit(Collider other)
     {
-        if (collision.collider.tag == "Player")
+        if (other.tag == "Player")
         {
             if (drainCoroutine != null)
                 StopCoroutine(drainCoroutine);
+
+            particles.Stop();
         }
     }
 
@@ -31,7 +42,7 @@ public class WeaponEnemy : MonoBehaviour
         {
             yield return new WaitForSeconds(powerSuckDelay);
 
-            player.PowerLevel -= 2.5f;
+            player.PowerLevel -= 1.0f;
         }
     }
 

+ 5 - 1
game/Assets/Scripts/WinOrLose.cs

@@ -32,6 +32,10 @@ public class WinOrLose : MonoBehaviour
             textfield.text = "You ran out of power!";
             disAndEnableObject.SetActive(true);
         }
-
 	}
+
+    public void LoadMainMenu()
+    {
+        UnityEngine.SceneManagement.SceneManager.LoadScene("MenuScreen");
+    }
 }

BIN
game/Enemy.blend