diff --git a/Guardian of Silverkeep/Assets/New Terrain 1.asset b/Guardian of Silverkeep/Assets/New Terrain 1.asset index adc26d9..0d37b5f 100644 Binary files a/Guardian of Silverkeep/Assets/New Terrain 1.asset and b/Guardian of Silverkeep/Assets/New Terrain 1.asset differ diff --git a/Guardian of Silverkeep/Assets/New Terrain.asset b/Guardian of Silverkeep/Assets/New Terrain.asset index fef26b4..f174a10 100644 Binary files a/Guardian of Silverkeep/Assets/New Terrain.asset and b/Guardian of Silverkeep/Assets/New Terrain.asset differ diff --git a/Guardian of Silverkeep/Assets/Prefab/Hero_Attack_02.prefab b/Guardian of Silverkeep/Assets/Prefab/Hero_Attack_02.prefab index a656fa5..3aab311 100644 --- a/Guardian of Silverkeep/Assets/Prefab/Hero_Attack_02.prefab +++ b/Guardian of Silverkeep/Assets/Prefab/Hero_Attack_02.prefab @@ -13,6 +13,7 @@ GameObject: - 23: {fileID: 2300000} - 114: {fileID: 11400000} - 54: {fileID: 5400000} + - 114: {fileID: 11400002} m_Layer: 0 m_Name: Hero_Attack_02 m_TagString: Untagged @@ -20,6 +21,23 @@ GameObject: 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: Fire + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 --- !u!4 &400000 Transform: m_ObjectHideFlags: 1 @@ -27,10 +45,22 @@ Transform: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 100000} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: .718138218, y: 1.36321259, z: 17.171524} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] + m_LocalPosition: {x: -2.94949341, y: .224130511, z: -3.51627493} + m_LocalScale: {x: 1.00100005, y: 1, z: 1} + m_Children: + - {fileID: 400002} m_Father: {fileID: 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: .707106709} + m_LocalPosition: {x: -.025605917, y: -.109842815, z: .297522545} + m_LocalScale: {x: .100000001, y: .100000009, z: .100000009} + m_Children: [] + m_Father: {fileID: 400000} --- !u!23 &2300000 Renderer: m_ObjectHideFlags: 1 @@ -49,13 +79,38 @@ Renderer: m_UseLightProbes: 0 m_LightProbeAnchor: {fileID: 0} m_ScaleInLightmap: 1 +--- !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: 051b4fb2097d3441db7b700aa1a4bb8b, type: 2} + m_SubsetIndices: + m_StaticBatchRoot: {fileID: 0} + m_UseLightProbes: 0 + m_LightProbeAnchor: {fileID: 0} + m_ScaleInLightmap: 1 --- !u!33 &3300000 MeshFilter: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 100000} - m_Mesh: {fileID: 10208, guid: 0000000000000000e000000000000000, type: 0} + m_Mesh: {fileID: 0} +--- !u!33 &3300002 +MeshFilter: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 100002} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} --- !u!54 &5400000 Rigidbody: m_ObjectHideFlags: 1 @@ -83,6 +138,17 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: ProjectileSpeed: 15 +--- !u!114 &11400002 +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: 2d94b001577fb4600bea455d6b7e5d34, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!136 &13600000 CapsuleCollider: m_ObjectHideFlags: 1 diff --git a/Guardian of Silverkeep/Assets/Scene_Tianzhu/LVL1.unity b/Guardian of Silverkeep/Assets/Scene_Tianzhu/LVL1.unity index f5b18e3..34ee1d6 100644 --- a/Guardian of Silverkeep/Assets/Scene_Tianzhu/LVL1.unity +++ b/Guardian of Silverkeep/Assets/Scene_Tianzhu/LVL1.unity @@ -2696,6 +2696,61 @@ MeshFilter: m_PrefabInternal: {fileID: 56728018} m_GameObject: {fileID: 890751815} m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &905195796 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 100002, guid: ef077c06042504317ba49c4177a6e2f7, type: 2} + m_PrefabInternal: {fileID: 1263973170} + serializedVersion: 4 + m_Component: + - 4: {fileID: 905195800} + - 33: {fileID: 905195799} + - 23: {fileID: 905195797} + m_Layer: 0 + m_Name: Fire + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!23 &905195797 +Renderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 2300002, guid: ef077c06042504317ba49c4177a6e2f7, + type: 2} + m_PrefabInternal: {fileID: 1263973170} + m_GameObject: {fileID: 905195796} + 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: 051b4fb2097d3441db7b700aa1a4bb8b, type: 2} + m_SubsetIndices: + m_StaticBatchRoot: {fileID: 0} + m_UseLightProbes: 0 + m_LightProbeAnchor: {fileID: 0} + m_ScaleInLightmap: 1 +--- !u!33 &905195799 +MeshFilter: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 3300002, guid: ef077c06042504317ba49c4177a6e2f7, + type: 2} + m_PrefabInternal: {fileID: 1263973170} + m_GameObject: {fileID: 905195796} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &905195800 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 400002, guid: ef077c06042504317ba49c4177a6e2f7, type: 2} + m_PrefabInternal: {fileID: 1263973170} + m_GameObject: {fileID: 905195796} + m_LocalRotation: {x: .707106829, y: 0, z: 0, w: .707106709} + m_LocalPosition: {x: -.025605917, y: -.109842815, z: .297522545} + m_LocalScale: {x: .100000001, y: .100000009, z: .100000009} + m_Children: [] + m_Father: {fileID: 1039164293} --- !u!1 &930648081 GameObject: m_ObjectHideFlags: 0 @@ -3061,6 +3116,121 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2d94b001577fb4600bea455d6b7e5d34, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &1039164287 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 100000, guid: ef077c06042504317ba49c4177a6e2f7, type: 2} + m_PrefabInternal: {fileID: 1263973170} + serializedVersion: 4 + m_Component: + - 4: {fileID: 1039164293} + - 33: {fileID: 1039164292} + - 136: {fileID: 1039164291} + - 23: {fileID: 1039164290} + - 114: {fileID: 1039164289} + - 54: {fileID: 1039164288} + - 114: {fileID: 1039164294} + m_Layer: 0 + m_Name: Hero_Attack_02 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!54 &1039164288 +Rigidbody: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 5400000, guid: ef077c06042504317ba49c4177a6e2f7, + type: 2} + m_PrefabInternal: {fileID: 1263973170} + m_GameObject: {fileID: 1039164287} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: .0500000007 + m_UseGravity: 0 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!114 &1039164289 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11400000, guid: ef077c06042504317ba49c4177a6e2f7, + type: 2} + m_PrefabInternal: {fileID: 1263973170} + m_GameObject: {fileID: 1039164287} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0c92fb822cbb04c2dba3300303665d17, type: 3} + m_Name: + m_EditorClassIdentifier: + ProjectileSpeed: 15 +--- !u!23 &1039164290 +Renderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 2300000, guid: ef077c06042504317ba49c4177a6e2f7, + type: 2} + m_PrefabInternal: {fileID: 1263973170} + m_GameObject: {fileID: 1039164287} + 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: 3e8612626c50844ba8ccadd5cfd5f14b, type: 2} + m_SubsetIndices: + m_StaticBatchRoot: {fileID: 0} + m_UseLightProbes: 0 + m_LightProbeAnchor: {fileID: 0} + m_ScaleInLightmap: 1 +--- !u!136 &1039164291 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 13600000, guid: ef077c06042504317ba49c4177a6e2f7, + type: 2} + m_PrefabInternal: {fileID: 1263973170} + m_GameObject: {fileID: 1039164287} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + m_Radius: .5 + m_Height: 2 + m_Direction: 1 + m_Center: {x: 0, y: 0, z: 0} +--- !u!33 &1039164292 +MeshFilter: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 3300000, guid: ef077c06042504317ba49c4177a6e2f7, + type: 2} + m_PrefabInternal: {fileID: 1263973170} + m_GameObject: {fileID: 1039164287} + m_Mesh: {fileID: 0} +--- !u!4 &1039164293 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 400000, guid: ef077c06042504317ba49c4177a6e2f7, type: 2} + m_PrefabInternal: {fileID: 1263973170} + m_GameObject: {fileID: 1039164287} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -2.94949341, y: .224130511, z: -3.51627493} + m_LocalScale: {x: 1.00100005, y: 1, z: 1} + m_Children: + - {fileID: 905195800} + m_Father: {fileID: 0} +--- !u!114 &1039164294 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11400002, guid: ef077c06042504317ba49c4177a6e2f7, + type: 2} + m_PrefabInternal: {fileID: 1263973170} + m_GameObject: {fileID: 1039164287} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2d94b001577fb4600bea455d6b7e5d34, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1053758543 GameObject: m_ObjectHideFlags: 0 @@ -3664,6 +3834,46 @@ MeshFilter: m_PrefabInternal: {fileID: 944067170} m_GameObject: {fileID: 1202154115} m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1001 &1263973170 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 400000, guid: ef077c06042504317ba49c4177a6e2f7, type: 2} + propertyPath: m_LocalPosition.x + value: -2.94949341 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: ef077c06042504317ba49c4177a6e2f7, type: 2} + propertyPath: m_LocalPosition.y + value: .224130511 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: ef077c06042504317ba49c4177a6e2f7, type: 2} + propertyPath: m_LocalPosition.z + value: -3.51627493 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: ef077c06042504317ba49c4177a6e2f7, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: ef077c06042504317ba49c4177a6e2f7, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: ef077c06042504317ba49c4177a6e2f7, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: ef077c06042504317ba49c4177a6e2f7, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: ef077c06042504317ba49c4177a6e2f7, type: 2} + m_RootGameObject: {fileID: 1039164287} + m_IsPrefabParent: 0 + m_IsExploded: 1 --- !u!1 &1270393143 GameObject: m_ObjectHideFlags: 0 diff --git a/Guardian of Silverkeep/Assets/Scripts/FPS_HERO.cs b/Guardian of Silverkeep/Assets/Scripts/FPS_HERO.cs index 5abc86c..a3f344a 100644 --- a/Guardian of Silverkeep/Assets/Scripts/FPS_HERO.cs +++ b/Guardian of Silverkeep/Assets/Scripts/FPS_HERO.cs @@ -23,6 +23,7 @@ public class FPS_HERO: MonoBehaviour //for cooldown private float coolDownPeriodInSeconds = 0.4f; private float timeStamp; + private GameObject[] heroRef; enum State { @@ -48,6 +49,7 @@ public class FPS_HERO: MonoBehaviour { state = State.Playing; timeStamp = Time.time + coolDownPeriodInSeconds; + //heroRef = GameObject.FindGameObjectsWithTag("Player"); } @@ -153,7 +155,9 @@ public class FPS_HERO: MonoBehaviour Vector3 positionAttack = transform.position + this.gameObject.transform.forward * 3; if(attack == AttackState.Attack01) { - Instantiate(Hero_Attack_01_Prefab , positionAttack , Quaternion.identity); + GameObject cloneMeele = Instantiate(Hero_Attack_01_Prefab , positionAttack , Quaternion.identity) as GameObject; + cloneMeele.transform.parent = transform; + //heroRef.transform; //Hero_Attack_01_Prefab.rigidbody.AddForce(transform.forward * 400); } if (attack == AttackState.Attack02) diff --git a/Guardian of Silverkeep/Assets/Texture/Materials/Materials/fire.mat b/Guardian of Silverkeep/Assets/Texture/Materials/Materials/fire.mat new file mode 100644 index 0000000..59d06da --- /dev/null +++ b/Guardian of Silverkeep/Assets/Texture/Materials/Materials/fire.mat @@ -0,0 +1,27 @@ +%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: fire + m_Shader: {fileID: 30, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: [] + m_SavedProperties: + serializedVersion: 2 + m_TexEnvs: + data: + first: + name: _MainTex + second: + m_Texture: {fileID: 2800000, guid: 3fab6a1448482f84b853099be42bbace, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: {} + m_Colors: + data: + first: + name: _Color + second: {r: 1, g: 1, b: 1, a: 1} diff --git a/Guardian of Silverkeep/Assets/Texture/Materials/Materials/fire.mat.meta b/Guardian of Silverkeep/Assets/Texture/Materials/Materials/fire.mat.meta new file mode 100644 index 0000000..63c9ec3 --- /dev/null +++ b/Guardian of Silverkeep/Assets/Texture/Materials/Materials/fire.mat.meta @@ -0,0 +1,4 @@ +fileFormatVersion: 2 +guid: 051b4fb2097d3441db7b700aa1a4bb8b +NativeFormatImporter: + userData: