DasGewehr il y a 9 ans
Parent
commit
7c3c09fb5f

+ 47 - 47
game/Assets/Prefabs/Enemy.prefab

@@ -121,9 +121,6 @@ GameObject:
   serializedVersion: 5
   m_Component:
   - component: {fileID: 4394077682102786}
-  - component: {fileID: 33906604915046486}
-  - component: {fileID: 136634788470214324}
-  - component: {fileID: 23851660916376582}
   - component: {fileID: 114575230278841902}
   - component: {fileID: 195082989610082518}
   m_Layer: 0
@@ -167,6 +164,23 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1317559223304850
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 4657609333133394}
+  - component: {fileID: 114593885084691842}
+  - component: {fileID: 136848187219270198}
+  m_Layer: 0
+  m_Name: Weapon
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1357424183928692
 GameObject:
   m_ObjectHideFlags: 1
@@ -472,10 +486,11 @@ Transform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1196849215294664}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 1, z: 0}
+  m_LocalPosition: {x: 18.913963, y: 1, z: -9.469598}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 4517153640541662}
+  - {fileID: 4657609333133394}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -548,6 +563,19 @@ Transform:
   m_Father: {fileID: 4517153640541662}
   m_RootOrder: 15
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!4 &4657609333133394
+Transform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1317559223304850}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0.5, z: 2.93}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 4394077682102786}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!4 &4662668278048652
 Transform:
   m_ObjectHideFlags: 1
@@ -1016,38 +1044,6 @@ MeshRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 0
---- !u!23 &23851660916376582
-MeshRenderer:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1196849215294664}
-  m_Enabled: 0
-  m_CastShadows: 1
-  m_ReceiveShadows: 1
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_Materials:
-  - {fileID: 2100000, guid: 0ea12aba3e1c33548b7a1cfefd9ac6e6, type: 2}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_PreserveUVs: 1
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  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
 --- !u!23 &23873012254844940
 MeshRenderer:
   m_ObjectHideFlags: 1
@@ -1281,13 +1277,6 @@ MeshFilter:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1057297446517172}
   m_Mesh: {fileID: 4300028, guid: e3361cd0f09938f408c722a0bc8509e7, type: 3}
---- !u!33 &33906604915046486
-MeshFilter:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1196849215294664}
-  m_Mesh: {fileID: 10208, guid: 0000000000000000e000000000000000, type: 0}
 --- !u!33 &33922287171654376
 MeshFilter:
   m_ObjectHideFlags: 1
@@ -1316,17 +1305,28 @@ MonoBehaviour:
   powerSuckDelay: 1
   powerDrop: {fileID: 1236734196835136, guid: 74eceab4a010bc340b3953e37f3e3678, type: 2}
   powerLevel: 0
---- !u!136 &136634788470214324
+--- !u!114 &114593885084691842
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1317559223304850}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3256c467d6d1a154783493eccb700526, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!136 &136848187219270198
 CapsuleCollider:
   m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1196849215294664}
+  m_GameObject: {fileID: 1317559223304850}
   m_Material: {fileID: 0}
   m_IsTrigger: 0
   m_Enabled: 1
-  m_Radius: 1
-  m_Height: 2
+  m_Radius: 0.3
+  m_Height: 3
   m_Direction: 1
   m_Center: {x: 0, y: 0, z: 0}
 --- !u!195 &195082989610082518

+ 1 - 1
game/Assets/Prefabs/Player.prefab

@@ -1000,7 +1000,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   powerLevel: 8
   movementDegenRate: 0.05
-  bulletDegenRate: 0.3
+  bulletDegenRate: 0.1
   startSpeed: 5
   lookSmoothingSeconds: 0.05
   cameraSmoothingSeconds: 1

+ 16 - 0
game/Assets/Scripts/Enemy/WeaponEnemy.cs

@@ -0,0 +1,16 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class WeaponEnemy : MonoBehaviour {
+
+	// Use this for initialization
+	void Start () {
+		
+	}
+	
+	// Update is called once per frame
+	void Update () {
+		
+	}
+}

+ 12 - 0
game/Assets/Scripts/Enemy/WeaponEnemy.cs.meta

@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: 3256c467d6d1a154783493eccb700526
+timeCreated: 1501438156
+licenseType: Free
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: