Merge branch 'master' of https://github.com/bedder/Telethreat

Conflicts: Assets/Prefab/Map/Objects/Obstacle.prefab
bedder · Nov 28, 2014 · 0d77012 · 0d77012
2 parents b8dd2b8 + 7f7d396
commit 0d77012
Show file tree

Hide file tree

Showing 30 changed files with 791 additions and 8,425 deletions.
diff --git a/Assets/Material/Weapons/BulletEnemy.mat → Assets/Material/Weapons/BulletHeavyAlien.mat b/Assets/Material/Weapons/BulletEnemy.mat → Assets/Material/Weapons/BulletHeavyAlien.mat
@@ -6,7 +6,7 @@ Material:
   m_ObjectHideFlags: 0
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 0}
-  m_Name: BulletEnemy
+  m_Name: BulletHeavyAlien
   m_Shader: {fileID: 10, guid: 0000000000000000f000000000000000, type: 0}
   m_ShaderKeywords: []
   m_CustomRenderQueue: -1
@@ -36,4 +36,4 @@ Material:
       data:
         first:
           name: _Color
-        second: {r: 1, g: 0, b: 0, a: 1}
+        second: {r: 1, g: .186206892, b: 0, a: 1}
diff --git a/Assets/Material/Weapons/BulletHeavyAlien.mat.meta b/Assets/Material/Weapons/BulletHeavyAlien.mat.meta
diff --git a/Assets/Material/Weapons/BulletLightAlien.mat b/Assets/Material/Weapons/BulletLightAlien.mat
@@ -0,0 +1,47 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 3
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: BulletLightAlien
+  m_Shader: {fileID: 10, guid: 0000000000000000f000000000000000, type: 0}
+  m_ShaderKeywords: []
+  m_CustomRenderQueue: -1
+  m_SavedProperties:
+    serializedVersion: 2
+    m_TexEnvs:
+      data:
+        first:
+          name: _MainTex
+        second:
+          m_Texture: {fileID: 0}
+          m_Scale: {x: 1, y: 1}
+          m_Offset: {x: 0, y: 0}
+      data:
+        first:
+          name: _Illum
+        second:
+          m_Texture: {fileID: 0}
+          m_Scale: {x: 1, y: 1}
+          m_Offset: {x: 0, y: 0}
+    m_Floats:
+      data:
+        first:
+          name: _EmissionLM
+        second: 0
+      data:
+        first:
+          name: _InvFade
+        second: 1
+    m_Colors:
+      data:
+        first:
+          name: _Color
+        second: {r: 1, g: .558620691, b: 0, a: 1}
+      data:
+        first:
+          name: _TintColor
+        second: {r: .5, g: .5, b: .5, a: .5}
diff --git a/Assets/Material/Weapons/BulletEnemy.mat.meta → ...aterial/Weapons/BulletLightAlien.mat.meta b/Assets/Material/Weapons/BulletEnemy.mat.meta → ...aterial/Weapons/BulletLightAlien.mat.meta
diff --git a/Assets/Prefab/Enemies/Enemy_HeavyAlien.prefab b/Assets/Prefab/Enemies/Enemy_HeavyAlien.prefab
@@ -1504,8 +1504,9 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 4fde0e18cdd23b64da68ca0fc5128cea, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  Bullet: {fileID: 5400000, guid: e5c6f0f3711b92747998afacb391be6c, type: 2}
+  Bullet: {fileID: 5400000, guid: 2e8f1d1568366f44d952c868f47e9920, type: 2}
   RechargeTime: 1
+  GunEnd: {fileID: 100018}
 --- !u!143 &14300000
 CharacterController:
   m_ObjectHideFlags: 1

diff --git a/Assets/Prefab/Enemies/Enemy_LightAlien.prefab b/Assets/Prefab/Enemies/Enemy_LightAlien.prefab
@@ -1504,8 +1504,9 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 4fde0e18cdd23b64da68ca0fc5128cea, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  Bullet: {fileID: 5400000, guid: e5c6f0f3711b92747998afacb391be6c, type: 2}
+  Bullet: {fileID: 5400000, guid: d7922b8886a5d61409d1d41f78068db0, type: 2}
   RechargeTime: 1
+  GunEnd: {fileID: 100022}
 --- !u!143 &14300000
 CharacterController:
   m_ObjectHideFlags: 1

diff --git a/Assets/Prefab/Enemies/Enemy_Robot.prefab b/Assets/Prefab/Enemies/Enemy_Robot.prefab
@@ -878,9 +878,10 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 1a153aa058d6cb746b177e7a06c98a4e, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  AttackRechargeTime: 5
+  AttackRechargeTime: 3
   AttackDamage: 60
   AttackRange: 5
+  AttackPoint: {fileID: 100024}
 --- !u!114 &11400002
 MonoBehaviour:
   m_ObjectHideFlags: 1

diff --git a/Assets/Prefab/Enemies/Enemy_Zombie.prefab b/Assets/Prefab/Enemies/Enemy_Zombie.prefab
@@ -767,6 +767,7 @@ MonoBehaviour:
   AttackRechargeTime: 1
   AttackDamage: 20
   AttackRange: 5
+  AttackPoint: {fileID: 100016}
 --- !u!114 &11400002
 MonoBehaviour:
   m_ObjectHideFlags: 1

diff --git a/Assets/Prefab/Weapons/HeavyAlien_Bullet.prefab b/Assets/Prefab/Weapons/HeavyAlien_Bullet.prefab
@@ -0,0 +1,149 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &100000
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 4
+  m_Component:
+  - 4: {fileID: 400000}
+  - 33: {fileID: 3300000}
+  - 135: {fileID: 13500000}
+  - 114: {fileID: 11400000}
+  - 54: {fileID: 5400000}
+  m_Layer: 8
+  m_Name: HeavyAlien_Bullet
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!1 &100002
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 4
+  m_Component:
+  - 4: {fileID: 400002}
+  - 33: {fileID: 3300002}
+  - 23: {fileID: 2300002}
+  m_Layer: 0
+  m_Name: HeavyAlien_BulletBody
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &400000
+Transform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 100000}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: .200000003, y: .200000003, z: .200000003}
+  m_Children:
+  - {fileID: 400002}
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+--- !u!4 &400002
+Transform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 100002}
+  m_LocalRotation: {x: .707106829, y: 0, z: 0, w: .707106829}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: .300000012, y: 1, z: .300000012}
+  m_Children: []
+  m_Father: {fileID: 400000}
+  m_RootOrder: 0
+--- !u!23 &2300002
+Renderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 100002}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_LightmapIndex: 255
+  m_LightmapTilingOffset: {x: 1, y: 1, z: 0, w: 0}
+  m_Materials:
+  - {fileID: 2100000, guid: 14b8565752709ae4c949fc60d13538e4, type: 2}
+  m_SubsetIndices: 
+  m_StaticBatchRoot: {fileID: 0}
+  m_UseLightProbes: 0
+  m_LightProbeAnchor: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_SortingLayerID: 0
+  m_SortingOrder: 0
+--- !u!33 &3300000
+MeshFilter:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 100000}
+  m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!33 &3300002
+MeshFilter:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 100002}
+  m_Mesh: {fileID: 10208, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!54 &5400000
+Rigidbody:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 100000}
+  serializedVersion: 2
+  m_Mass: 1
+  m_Drag: 0
+  m_AngularDrag: .0500000007
+  m_UseGravity: 0
+  m_IsKinematic: 0
+  m_Interpolate: 1
+  m_Constraints: 0
+  m_CollisionDetection: 1
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 100000}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 348b44c9d2122a643902d1d7fa1e0288, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  lifespan: 5
+  damage: 40
+--- !u!135 &13500000
+SphereCollider:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 100000}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Radius: .5
+  m_Center: {x: 0, y: 0, z: 1}
+--- !u!1001 &100100000
+Prefab:
+  m_ObjectHideFlags: 1
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications: []
+    m_RemovedComponents: []
+  m_ParentPrefab: {fileID: 0}
+  m_RootGameObject: {fileID: 100000}
+  m_IsPrefabParent: 1
+  m_IsExploded: 1
diff --git a/Assets/Prefab/Weapons/HeavyAlien_Bullet.prefab.meta b/Assets/Prefab/Weapons/HeavyAlien_Bullet.prefab.meta