diff --git a/unity_project/Assets/BeatEmUp_GameTemplate3D/01_Game.unity b/unity_project/Assets/BeatEmUp_GameTemplate3D/01_Game.unity index 9b2ebcc..8be4d9a 100644 --- a/unity_project/Assets/BeatEmUp_GameTemplate3D/01_Game.unity +++ b/unity_project/Assets/BeatEmUp_GameTemplate3D/01_Game.unity @@ -403,7 +403,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!114 &70844872 MonoBehaviour: m_ObjectHideFlags: 0 @@ -546,6 +546,12 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 90743863} m_Mesh: {fileID: 4300000, guid: b9d64e7020ef663429b25d163f2bc0e6, type: 3} +--- !u!1 &110099301 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1027917220076984, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + m_PrefabInstance: {fileID: 957587828} + m_PrefabAsset: {fileID: 0} --- !u!1 &117391444 GameObject: m_ObjectHideFlags: 0 @@ -645,7 +651,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} propertyPath: m_LocalPosition.x - value: -2.41 + value: -1.1800001 objectReference: {fileID: 0} - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} propertyPath: m_LocalPosition.y @@ -766,13 +772,17 @@ PrefabInstance: propertyPath: m_Name value: Enemy1.1 objectReference: {fileID: 0} + - target: {fileID: 1363018927459058, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} propertyPath: m_RootOrder value: 0 objectReference: {fileID: 0} - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} propertyPath: m_LocalPosition.x - value: -0.31 + value: 0.92 objectReference: {fileID: 0} - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} propertyPath: m_LocalPosition.y @@ -884,6 +894,11 @@ PrefabInstance: propertyPath: spawnChance value: 100 objectReference: {fileID: 0} + - target: {fileID: 114225313807016428, guid: b8fcdd73fd0d4bc4d9d961b61d541181, + type: 3} + propertyPath: destroyOnHit + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b8fcdd73fd0d4bc4d9d961b61d541181, type: 3} --- !u!4 &215887392 stripped @@ -974,7 +989,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} propertyPath: m_RootOrder - value: 18 + value: 21 objectReference: {fileID: 0} - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} propertyPath: m_LocalPosition.x @@ -1053,6 +1068,12 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 228273776} m_PrefabAsset: {fileID: 0} +--- !u!1 &231636337 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1027917220076984, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + m_PrefabInstance: {fileID: 1570948415} + m_PrefabAsset: {fileID: 0} --- !u!1 &235924739 GameObject: m_ObjectHideFlags: 0 @@ -1737,18 +1758,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 884257844} m_PrefabAsset: {fileID: 0} ---- !u!1 &360835531 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1027917220076984, guid: 7d5feb6af67f18d43974e399da3c03b1, - type: 3} - m_PrefabInstance: {fileID: 403460543} - m_PrefabAsset: {fileID: 0} ---- !u!4 &360835536 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, - type: 3} - m_PrefabInstance: {fileID: 403460543} - m_PrefabAsset: {fileID: 0} --- !u!1 &361158207 GameObject: m_ObjectHideFlags: 0 @@ -1973,6 +1982,7 @@ Transform: - {fileID: 215887392} - {fileID: 2102502827} - {fileID: 980647185} + - {fileID: 1635576748} m_Father: {fileID: 0} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2127,86 +2137,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 398195730} m_Mesh: {fileID: 4300018, guid: 56a9e5d3ec4e1d045ad05d326d5980ef, type: 3} ---- !u!1001 &403460543 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1760454241} - m_Modifications: - - target: {fileID: 1027917220076984, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} - propertyPath: m_Name - value: Enemy3.2 - objectReference: {fileID: 0} - - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} - propertyPath: m_RootOrder - value: 12 - objectReference: {fileID: 0} - - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} - propertyPath: m_LocalPosition.x - value: -22.63 - objectReference: {fileID: 0} - - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} - propertyPath: m_LocalPosition.z - value: 1.77 - objectReference: {fileID: 0} - - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, - type: 3} - propertyPath: enemyName - value: Winkie Guard - objectReference: {fileID: 0} - - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, - type: 3} - propertyPath: defendChance - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, - type: 3} - propertyPath: sightDistance - value: 10 - objectReference: {fileID: 0} - - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, - type: 3} - propertyPath: pickARandomName - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, - type: 3} - propertyPath: AttackPlayerAirborne - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, - type: 3} - propertyPath: canDefendDuringAttack - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, - type: 3} - propertyPath: canHitDestroyableObjects - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} --- !u!1 &445455583 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1027917220076984, guid: 7d5feb6af67f18d43974e399da3c03b1, @@ -2606,7 +2536,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} propertyPath: m_RootOrder - value: 17 + value: 20 objectReference: {fileID: 0} - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} propertyPath: m_LocalPosition.x @@ -2770,6 +2700,12 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 515970362} m_Mesh: {fileID: 4300020, guid: 56a9e5d3ec4e1d045ad05d326d5980ef, type: 3} +--- !u!1 &523604658 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1027917220076984, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + m_PrefabInstance: {fileID: 716466603} + m_PrefabAsset: {fileID: 0} --- !u!4 &528272137 stripped Transform: m_CorrespondingSourceObject: {fileID: 4510081284054304, guid: 0d88cc715b7cb424d91d86a5e738f4f6, @@ -3762,7 +3698,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} propertyPath: m_LocalPosition.x - value: -2.73 + value: -1.5 objectReference: {fileID: 0} - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} propertyPath: m_LocalPosition.y @@ -3853,7 +3789,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!114 &695471182 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4016,7 +3952,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} propertyPath: m_RootOrder - value: 13 + value: 17 objectReference: {fileID: 0} - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} propertyPath: m_LocalPosition.x @@ -4083,6 +4019,122 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} +--- !u!1001 &716466603 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1760454241} + m_Modifications: + - target: {fileID: 1027917220076984, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} + propertyPath: m_Name + value: EnemyCharger2.1 (1) + objectReference: {fileID: 0} + - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} + propertyPath: m_RootOrder + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} + propertyPath: m_LocalPosition.x + value: -8.53 + objectReference: {fileID: 0} + - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} + propertyPath: m_LocalPosition.z + value: -2.41 + objectReference: {fileID: 0} + - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + propertyPath: enemyName + value: Winkie Charger + objectReference: {fileID: 0} + - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + propertyPath: walkSpeed + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + propertyPath: enemyTactic + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + propertyPath: defendChance + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + propertyPath: pickARandomName + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + propertyPath: PickRandomAttack + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + propertyPath: AttackPlayerAirborne + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + propertyPath: AttackList.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + propertyPath: canDefendDuringAttack + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + propertyPath: canHitDestroyableObjects + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + propertyPath: AttackList.Array.data[0].damage + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + propertyPath: AttackList.Array.data[0].knockBackForce + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 137230289712191612, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + propertyPath: m_Materials.Array.data[1] + value: + objectReference: {fileID: 2100000, guid: b038eb787a00fa744bef0acb43773fc2, type: 2} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} +--- !u!4 &716466604 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + m_PrefabInstance: {fileID: 716466603} + m_PrefabAsset: {fileID: 0} --- !u!4 &726203641 stripped Transform: m_CorrespondingSourceObject: {fileID: 4279449019447086, guid: eded051879df4c147b9010199d240258, @@ -4206,7 +4258,7 @@ Transform: m_LocalScale: {x: 1, y: 10, z: 10} m_Children: [] m_Father: {fileID: 1760454241} - m_RootOrder: 10 + m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &770867463 GameObject: @@ -4391,7 +4443,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} propertyPath: m_RootOrder - value: 7 + value: 9 objectReference: {fileID: 0} - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} propertyPath: m_LocalPosition.x @@ -4527,146 +4579,54 @@ Transform: m_Father: {fileID: 737104404} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &837268736 +--- !u!1001 &884257844 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 1760454241} + m_TransformParent: {fileID: 1273008839} m_Modifications: - - target: {fileID: 1027917220076984, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} + - target: {fileID: 1148613061152340, guid: eded051879df4c147b9010199d240258, type: 3} propertyPath: m_Name - value: Enemy3.5 + value: tree_1 (15) objectReference: {fileID: 0} - - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} + - target: {fileID: 4279449019447086, guid: eded051879df4c147b9010199d240258, type: 3} propertyPath: m_RootOrder - value: 15 + value: 14 objectReference: {fileID: 0} - - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} + - target: {fileID: 4279449019447086, guid: eded051879df4c147b9010199d240258, type: 3} + propertyPath: m_LocalScale.x + value: 0.40310785 + objectReference: {fileID: 0} + - target: {fileID: 4279449019447086, guid: eded051879df4c147b9010199d240258, type: 3} + propertyPath: m_LocalScale.y + value: 0.40310785 + objectReference: {fileID: 0} + - target: {fileID: 4279449019447086, guid: eded051879df4c147b9010199d240258, type: 3} + propertyPath: m_LocalScale.z + value: 0.40310785 + objectReference: {fileID: 0} + - target: {fileID: 4279449019447086, guid: eded051879df4c147b9010199d240258, type: 3} propertyPath: m_LocalPosition.x - value: -20.27 + value: -20.296452 objectReference: {fileID: 0} - - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} + - target: {fileID: 4279449019447086, guid: eded051879df4c147b9010199d240258, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: -2.3363488 objectReference: {fileID: 0} - - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} + - target: {fileID: 4279449019447086, guid: eded051879df4c147b9010199d240258, type: 3} propertyPath: m_LocalPosition.z - value: -1.67 + value: 7.5499964 objectReference: {fileID: 0} - - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} + - target: {fileID: 4279449019447086, guid: eded051879df4c147b9010199d240258, type: 3} propertyPath: m_LocalRotation.w - value: 1 + value: 0.7845568 objectReference: {fileID: 0} - - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} + - target: {fileID: 4279449019447086, guid: eded051879df4c147b9010199d240258, type: 3} propertyPath: m_LocalRotation.x value: -0 objectReference: {fileID: 0} - - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, - type: 3} - propertyPath: enemyName - value: Winkie Guard - objectReference: {fileID: 0} - - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, - type: 3} - propertyPath: defendChance - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, - type: 3} - propertyPath: sightDistance - value: 10 - objectReference: {fileID: 0} - - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, - type: 3} - propertyPath: pickARandomName - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, - type: 3} - propertyPath: AttackPlayerAirborne - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, - type: 3} - propertyPath: canDefendDuringAttack - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, - type: 3} - propertyPath: canHitDestroyableObjects - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} ---- !u!4 &837268737 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, - type: 3} - m_PrefabInstance: {fileID: 837268736} - m_PrefabAsset: {fileID: 0} ---- !u!1 &837268738 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1027917220076984, guid: 7d5feb6af67f18d43974e399da3c03b1, - type: 3} - m_PrefabInstance: {fileID: 837268736} - m_PrefabAsset: {fileID: 0} ---- !u!1001 &884257844 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1273008839} - m_Modifications: - - target: {fileID: 1148613061152340, guid: eded051879df4c147b9010199d240258, type: 3} - propertyPath: m_Name - value: tree_1 (15) - objectReference: {fileID: 0} - - target: {fileID: 4279449019447086, guid: eded051879df4c147b9010199d240258, type: 3} - propertyPath: m_RootOrder - value: 14 - objectReference: {fileID: 0} - - target: {fileID: 4279449019447086, guid: eded051879df4c147b9010199d240258, type: 3} - propertyPath: m_LocalScale.x - value: 0.40310785 - objectReference: {fileID: 0} - - target: {fileID: 4279449019447086, guid: eded051879df4c147b9010199d240258, type: 3} - propertyPath: m_LocalScale.y - value: 0.40310785 - objectReference: {fileID: 0} - - target: {fileID: 4279449019447086, guid: eded051879df4c147b9010199d240258, type: 3} - propertyPath: m_LocalScale.z - value: 0.40310785 - objectReference: {fileID: 0} - - target: {fileID: 4279449019447086, guid: eded051879df4c147b9010199d240258, type: 3} - propertyPath: m_LocalPosition.x - value: -20.296452 - objectReference: {fileID: 0} - - target: {fileID: 4279449019447086, guid: eded051879df4c147b9010199d240258, type: 3} - propertyPath: m_LocalPosition.y - value: -2.3363488 - objectReference: {fileID: 0} - - target: {fileID: 4279449019447086, guid: eded051879df4c147b9010199d240258, type: 3} - propertyPath: m_LocalPosition.z - value: 7.5499964 - objectReference: {fileID: 0} - - target: {fileID: 4279449019447086, guid: eded051879df4c147b9010199d240258, type: 3} - propertyPath: m_LocalRotation.w - value: 0.7845568 - objectReference: {fileID: 0} - - target: {fileID: 4279449019447086, guid: eded051879df4c147b9010199d240258, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4279449019447086, guid: eded051879df4c147b9010199d240258, type: 3} + - target: {fileID: 4279449019447086, guid: eded051879df4c147b9010199d240258, type: 3} propertyPath: m_LocalRotation.y value: 0.620057 objectReference: {fileID: 0} @@ -4701,7 +4661,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} propertyPath: m_RootOrder - value: 11 + value: 14 objectReference: {fileID: 0} - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} propertyPath: m_LocalPosition.x @@ -4917,6 +4877,168 @@ Transform: m_Father: {fileID: 158731297} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &957587828 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1760454241} + m_Modifications: + - target: {fileID: 1027917220076984, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} + propertyPath: m_Name + value: EnemyRanged3.1 + objectReference: {fileID: 0} + - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} + propertyPath: m_RootOrder + value: 16 + objectReference: {fileID: 0} + - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} + propertyPath: m_LocalScale.x + value: 1.4707 + objectReference: {fileID: 0} + - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} + propertyPath: m_LocalScale.y + value: 0.80563 + objectReference: {fileID: 0} + - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} + propertyPath: m_LocalScale.z + value: 1.2279 + objectReference: {fileID: 0} + - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} + propertyPath: m_LocalPosition.x + value: -23.95 + objectReference: {fileID: 0} + - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} + propertyPath: m_LocalPosition.y + value: 0.13 + objectReference: {fileID: 0} + - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} + propertyPath: m_LocalPosition.z + value: -2.02 + objectReference: {fileID: 0} + - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4368425269854844, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} + propertyPath: m_LocalPosition.x + value: 2.02 + objectReference: {fileID: 0} + - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + propertyPath: ranged + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + propertyPath: enemyName + value: Winkie Crossbowman + objectReference: {fileID: 0} + - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + propertyPath: walkSpeed + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + propertyPath: enemyTactic + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + propertyPath: defendChance + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + propertyPath: pickARandomName + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + propertyPath: PickRandomAttack + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + propertyPath: rangedDamage.damage + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + propertyPath: AttackPlayerAirborne + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + propertyPath: AttackList.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + propertyPath: canDefendDuringAttack + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + propertyPath: rangedDamage.knockDown + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + propertyPath: canHitDestroyableObjects + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + propertyPath: rangedDamage.forwardForce + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + propertyPath: rangedDamage.knockBackForce + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + propertyPath: AttackList.Array.data[0].damage + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + propertyPath: AttackList.Array.data[0].duration + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + propertyPath: AttackList.Array.data[0].knockBackForce + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 137230289712191612, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + propertyPath: m_Materials.Array.data[1] + value: + objectReference: {fileID: 2100000, guid: 7f0ad4a5c05085a439a31b106679890f, type: 2} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} +--- !u!4 &957587829 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + m_PrefabInstance: {fileID: 957587828} + m_PrefabAsset: {fileID: 0} --- !u!1 &959466894 GameObject: m_ObjectHideFlags: 0 @@ -5087,25 +5209,147 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 963742937} m_Mesh: {fileID: 4300012, guid: 56a9e5d3ec4e1d045ad05d326d5980ef, type: 3} ---- !u!1 &974342745 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1027917220076984, guid: 7d5feb6af67f18d43974e399da3c03b1, - type: 3} - m_PrefabInstance: {fileID: 715244658} - m_PrefabAsset: {fileID: 0} ---- !u!4 &974342750 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, - type: 3} - m_PrefabInstance: {fileID: 715244658} - m_PrefabAsset: {fileID: 0} ---- !u!1 &975520488 -GameObject: +--- !u!1001 &966116619 +PrefabInstance: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 100018, guid: 56a9e5d3ec4e1d045ad05d326d5980ef, - type: 3} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1760454241} + m_Modifications: + - target: {fileID: 1027917220076984, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} + propertyPath: m_Name + value: EnemyCharger1.1 (2) + objectReference: {fileID: 0} + - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} + propertyPath: m_LocalPosition.x + value: 0.1 + objectReference: {fileID: 0} + - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} + propertyPath: m_LocalPosition.z + value: 1.38 + objectReference: {fileID: 0} + - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + propertyPath: enemyName + value: Winkie Charger + objectReference: {fileID: 0} + - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + propertyPath: walkSpeed + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + propertyPath: enemyTactic + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + propertyPath: defendChance + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + propertyPath: pickARandomName + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + propertyPath: PickRandomAttack + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + propertyPath: AttackPlayerAirborne + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + propertyPath: AttackList.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + propertyPath: canDefendDuringAttack + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + propertyPath: canHitDestroyableObjects + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + propertyPath: AttackList.Array.data[0].damage + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + propertyPath: AttackList.Array.data[0].knockBackForce + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 137230289712191612, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + propertyPath: m_Materials.Array.data[1] + value: + objectReference: {fileID: 2100000, guid: b038eb787a00fa744bef0acb43773fc2, type: 2} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} +--- !u!4 &966116620 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + m_PrefabInstance: {fileID: 966116619} + m_PrefabAsset: {fileID: 0} +--- !u!1 &966116621 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1027917220076984, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + m_PrefabInstance: {fileID: 966116619} + m_PrefabAsset: {fileID: 0} +--- !u!1 &974342745 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1027917220076984, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + m_PrefabInstance: {fileID: 715244658} + m_PrefabAsset: {fileID: 0} +--- !u!4 &974342750 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + m_PrefabInstance: {fileID: 715244658} + m_PrefabAsset: {fileID: 0} +--- !u!1 &975520488 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 100018, guid: 56a9e5d3ec4e1d045ad05d326d5980ef, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 975520489} @@ -5323,6 +5567,11 @@ PrefabInstance: propertyPath: spawnChance value: 100 objectReference: {fileID: 0} + - target: {fileID: 114225313807016428, guid: b8fcdd73fd0d4bc4d9d961b61d541181, + type: 3} + propertyPath: destroyOnHit + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b8fcdd73fd0d4bc4d9d961b61d541181, type: 3} --- !u!4 &980647185 stripped @@ -5379,7 +5628,12 @@ PrefabInstance: - target: {fileID: 114391388185752594, guid: 1676eecd56dc30e418def89fe88d4d46, type: 3} propertyPath: spawnChance - value: 25 + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 114391388185752594, guid: 1676eecd56dc30e418def89fe88d4d46, + type: 3} + propertyPath: destroyOnHit + value: 1 objectReference: {fileID: 0} - target: {fileID: 199199703959827192, guid: 1676eecd56dc30e418def89fe88d4d46, type: 3} @@ -5587,7 +5841,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} propertyPath: m_RootOrder - value: 9 + value: 11 objectReference: {fileID: 0} - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} propertyPath: m_LocalPosition.x @@ -5952,6 +6206,12 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1086449192 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1027917220076984, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + m_PrefabInstance: {fileID: 1667995989} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1090182440 PrefabInstance: m_ObjectHideFlags: 0 @@ -6155,133 +6415,295 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1127738570} m_PrefabAsset: {fileID: 0} ---- !u!1 &1144900971 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 100022, guid: 56a9e5d3ec4e1d045ad05d326d5980ef, - type: 3} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1144900972} - - component: {fileID: 1144900974} - - component: {fileID: 1144900973} - m_Layer: 0 - m_Name: Rubble6 (1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1144900972 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 400022, guid: 56a9e5d3ec4e1d045ad05d326d5980ef, - type: 3} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1144900971} - m_LocalRotation: {x: -4.4721382e-10, y: -0.37818554, z: 0.000000021851129, w: 0.9257299} - m_LocalPosition: {x: 11.046, y: 0, z: -4.291} - m_LocalScale: {x: 1.0000002, y: 1, z: 1.0000002} - m_Children: [] - m_Father: {fileID: 393193070} - m_RootOrder: 6 - m_LocalEulerAnglesHint: {x: 0, y: -44.443, z: 0} ---- !u!23 &1144900973 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 2300022, guid: 56a9e5d3ec4e1d045ad05d326d5980ef, - type: 3} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1144900971} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 486de20504ba61443ae3ac61ac008b36, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 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 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &1144900974 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 3300022, guid: 56a9e5d3ec4e1d045ad05d326d5980ef, - type: 3} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1144900971} - m_Mesh: {fileID: 4300022, guid: 56a9e5d3ec4e1d045ad05d326d5980ef, type: 3} ---- !u!1001 &1167233012 +--- !u!1001 &1139771908 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 2018629624} + m_TransformParent: {fileID: 1760454241} m_Modifications: - - target: {fileID: 1750465690529392, guid: 6f91c7d5a5529ac4b8db3f7b31dc4e13, type: 3} + - target: {fileID: 1027917220076984, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} propertyPath: m_Name - value: GarbageBag (10) + value: EnemyRanged2.1 objectReference: {fileID: 0} - - target: {fileID: 4934182689417146, guid: 6f91c7d5a5529ac4b8db3f7b31dc4e13, type: 3} + - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} propertyPath: m_RootOrder - value: 14 + value: 12 objectReference: {fileID: 0} - - target: {fileID: 4934182689417146, guid: 6f91c7d5a5529ac4b8db3f7b31dc4e13, type: 3} + - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} propertyPath: m_LocalScale.x - value: 1 + value: 1.4707 objectReference: {fileID: 0} - - target: {fileID: 4934182689417146, guid: 6f91c7d5a5529ac4b8db3f7b31dc4e13, type: 3} + - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} propertyPath: m_LocalScale.y - value: 1 + value: 0.80563 objectReference: {fileID: 0} - - target: {fileID: 4934182689417146, guid: 6f91c7d5a5529ac4b8db3f7b31dc4e13, type: 3} + - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} propertyPath: m_LocalScale.z - value: 1 + value: 1.2279 objectReference: {fileID: 0} - - target: {fileID: 4934182689417146, guid: 6f91c7d5a5529ac4b8db3f7b31dc4e13, type: 3} + - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} propertyPath: m_LocalPosition.x - value: -17.886 + value: -6.5 objectReference: {fileID: 0} - - target: {fileID: 4934182689417146, guid: 6f91c7d5a5529ac4b8db3f7b31dc4e13, type: 3} + - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} propertyPath: m_LocalPosition.y - value: 0.204 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 4934182689417146, guid: 6f91c7d5a5529ac4b8db3f7b31dc4e13, type: 3} + - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} propertyPath: m_LocalPosition.z - value: -7.57 + value: -2.02 objectReference: {fileID: 0} - - target: {fileID: 4934182689417146, guid: 6f91c7d5a5529ac4b8db3f7b31dc4e13, type: 3} + - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} propertyPath: m_LocalRotation.w - value: 0.93633825 + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4368425269854844, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} + propertyPath: m_LocalPosition.x + value: 2.02 + objectReference: {fileID: 0} + - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + propertyPath: ranged + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + propertyPath: enemyName + value: Winkie Crossbowman + objectReference: {fileID: 0} + - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + propertyPath: walkSpeed + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + propertyPath: enemyTactic + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + propertyPath: defendChance + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + propertyPath: pickARandomName + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + propertyPath: PickRandomAttack + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + propertyPath: rangedDamage.damage + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + propertyPath: AttackPlayerAirborne + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + propertyPath: AttackList.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + propertyPath: canDefendDuringAttack + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + propertyPath: rangedDamage.knockDown + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + propertyPath: canHitDestroyableObjects + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + propertyPath: rangedDamage.forwardForce + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + propertyPath: rangedDamage.knockBackForce + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + propertyPath: AttackList.Array.data[0].damage + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + propertyPath: AttackList.Array.data[0].duration + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + propertyPath: AttackList.Array.data[0].knockBackForce + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 137230289712191612, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + propertyPath: m_Materials.Array.data[1] + value: + objectReference: {fileID: 2100000, guid: 7f0ad4a5c05085a439a31b106679890f, type: 2} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} +--- !u!4 &1139771909 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + m_PrefabInstance: {fileID: 1139771908} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1144900971 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 100022, guid: 56a9e5d3ec4e1d045ad05d326d5980ef, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1144900972} + - component: {fileID: 1144900974} + - component: {fileID: 1144900973} + m_Layer: 0 + m_Name: Rubble6 (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1144900972 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 400022, guid: 56a9e5d3ec4e1d045ad05d326d5980ef, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1144900971} + m_LocalRotation: {x: -4.4721382e-10, y: -0.37818554, z: 0.000000021851129, w: 0.9257299} + m_LocalPosition: {x: 11.046, y: 0, z: -4.291} + m_LocalScale: {x: 1.0000002, y: 1, z: 1.0000002} + m_Children: [] + m_Father: {fileID: 393193070} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: -44.443, z: 0} +--- !u!23 &1144900973 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 2300022, guid: 56a9e5d3ec4e1d045ad05d326d5980ef, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1144900971} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 486de20504ba61443ae3ac61ac008b36, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 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 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1144900974 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 3300022, guid: 56a9e5d3ec4e1d045ad05d326d5980ef, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1144900971} + m_Mesh: {fileID: 4300022, guid: 56a9e5d3ec4e1d045ad05d326d5980ef, type: 3} +--- !u!1001 &1167233012 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 2018629624} + m_Modifications: + - target: {fileID: 1750465690529392, guid: 6f91c7d5a5529ac4b8db3f7b31dc4e13, type: 3} + propertyPath: m_Name + value: GarbageBag (10) + objectReference: {fileID: 0} + - target: {fileID: 4934182689417146, guid: 6f91c7d5a5529ac4b8db3f7b31dc4e13, type: 3} + propertyPath: m_RootOrder + value: 14 + objectReference: {fileID: 0} + - target: {fileID: 4934182689417146, guid: 6f91c7d5a5529ac4b8db3f7b31dc4e13, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4934182689417146, guid: 6f91c7d5a5529ac4b8db3f7b31dc4e13, type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4934182689417146, guid: 6f91c7d5a5529ac4b8db3f7b31dc4e13, type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4934182689417146, guid: 6f91c7d5a5529ac4b8db3f7b31dc4e13, type: 3} + propertyPath: m_LocalPosition.x + value: -17.886 + objectReference: {fileID: 0} + - target: {fileID: 4934182689417146, guid: 6f91c7d5a5529ac4b8db3f7b31dc4e13, type: 3} + propertyPath: m_LocalPosition.y + value: 0.204 + objectReference: {fileID: 0} + - target: {fileID: 4934182689417146, guid: 6f91c7d5a5529ac4b8db3f7b31dc4e13, type: 3} + propertyPath: m_LocalPosition.z + value: -7.57 + objectReference: {fileID: 0} + - target: {fileID: 4934182689417146, guid: 6f91c7d5a5529ac4b8db3f7b31dc4e13, type: 3} + propertyPath: m_LocalRotation.w + value: 0.93633825 objectReference: {fileID: 0} - target: {fileID: 4934182689417146, guid: 6f91c7d5a5529ac4b8db3f7b31dc4e13, type: 3} propertyPath: m_LocalRotation.x @@ -6529,11 +6951,11 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1211514634} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -2.67, y: 0, z: 0} + m_LocalPosition: {x: -3.53, y: 0, z: 0} m_LocalScale: {x: 1, y: 10, z: 10} m_Children: [] m_Father: {fileID: 1760454241} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1229126076 PrefabInstance: @@ -6548,7 +6970,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} propertyPath: m_RootOrder - value: 16 + value: 19 objectReference: {fileID: 0} - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} propertyPath: m_LocalPosition.x @@ -6784,7 +7206,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} propertyPath: m_RootOrder - value: 4 + value: 7 objectReference: {fileID: 0} - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} propertyPath: m_LocalPosition.x @@ -7067,11 +7489,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} propertyPath: m_RootOrder - value: 6 + value: 8 objectReference: {fileID: 0} - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} propertyPath: m_LocalPosition.x - value: 9.8 + value: 5.59 objectReference: {fileID: 0} - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} propertyPath: m_LocalPosition.y @@ -7219,30 +7641,146 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1351862031} m_Mesh: {fileID: 4300016, guid: 56a9e5d3ec4e1d045ad05d326d5980ef, type: 3} ---- !u!1001 &1359987784 +--- !u!1001 &1355267275 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 1862557414} + m_TransformParent: {fileID: 1760454241} m_Modifications: - - target: {fileID: 4185504175717670, guid: 4bdf5d1286d0b71438ccfa7edfda52eb, type: 3} + - target: {fileID: 1027917220076984, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} + propertyPath: m_Name + value: EnemyCharger2.2 (2) + objectReference: {fileID: 0} + - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} propertyPath: m_RootOrder - value: 4 + value: 6 objectReference: {fileID: 0} - - target: {fileID: 4185504175717670, guid: 4bdf5d1286d0b71438ccfa7edfda52eb, type: 3} + - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: 1.88 objectReference: {fileID: 0} - - target: {fileID: 4185504175717670, guid: 4bdf5d1286d0b71438ccfa7edfda52eb, type: 3} + - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4185504175717670, guid: 4bdf5d1286d0b71438ccfa7edfda52eb, type: 3} + - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} propertyPath: m_LocalPosition.z - value: 0 + value: 2.17 objectReference: {fileID: 0} - - target: {fileID: 4185504175717670, guid: 4bdf5d1286d0b71438ccfa7edfda52eb, type: 3} + - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + propertyPath: enemyName + value: Winkie Charger + objectReference: {fileID: 0} + - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + propertyPath: walkSpeed + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + propertyPath: enemyTactic + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + propertyPath: defendChance + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + propertyPath: pickARandomName + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + propertyPath: PickRandomAttack + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + propertyPath: AttackPlayerAirborne + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + propertyPath: AttackList.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + propertyPath: canDefendDuringAttack + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + propertyPath: canHitDestroyableObjects + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + propertyPath: AttackList.Array.data[0].damage + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + propertyPath: AttackList.Array.data[0].knockBackForce + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 137230289712191612, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + propertyPath: m_Materials.Array.data[1] + value: + objectReference: {fileID: 2100000, guid: b038eb787a00fa744bef0acb43773fc2, type: 2} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} +--- !u!4 &1355267276 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + m_PrefabInstance: {fileID: 1355267275} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &1359987784 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1862557414} + m_Modifications: + - target: {fileID: 4185504175717670, guid: 4bdf5d1286d0b71438ccfa7edfda52eb, type: 3} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 4185504175717670, guid: 4bdf5d1286d0b71438ccfa7edfda52eb, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4185504175717670, guid: 4bdf5d1286d0b71438ccfa7edfda52eb, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4185504175717670, guid: 4bdf5d1286d0b71438ccfa7edfda52eb, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4185504175717670, guid: 4bdf5d1286d0b71438ccfa7edfda52eb, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} @@ -7358,19 +7896,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} propertyPath: m_RootOrder - value: 19 + value: 24 objectReference: {fileID: 0} - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} propertyPath: m_LocalScale.x - value: 1.2531 + value: 1.6587285 objectReference: {fileID: 0} - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} propertyPath: m_LocalScale.y - value: 1.2531 + value: 1.6587285 objectReference: {fileID: 0} - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} propertyPath: m_LocalScale.z - value: 1.2531 + value: 1.6587285 objectReference: {fileID: 0} - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} propertyPath: m_LocalPosition.x @@ -7715,17 +8253,11 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: eded051879df4c147b9010199d240258, type: 3} ---- !u!1 &1452321022 stripped +--- !u!1 &1436125042 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1027917220076984, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} - m_PrefabInstance: {fileID: 1800587273} - m_PrefabAsset: {fileID: 0} ---- !u!4 &1452321027 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, - type: 3} - m_PrefabInstance: {fileID: 1800587273} + m_PrefabInstance: {fileID: 1139771908} m_PrefabAsset: {fileID: 0} --- !u!1001 &1456959392 PrefabInstance: @@ -7850,7 +8382,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} propertyPath: m_RootOrder - value: 8 + value: 10 objectReference: {fileID: 0} - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} propertyPath: m_LocalPosition.x @@ -8401,7 +8933,12 @@ PrefabInstance: - target: {fileID: 114391388185752594, guid: 1676eecd56dc30e418def89fe88d4d46, type: 3} propertyPath: spawnChance - value: 50 + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 114391388185752594, guid: 1676eecd56dc30e418def89fe88d4d46, + type: 3} + propertyPath: destroyOnHit + value: 1 objectReference: {fileID: 0} - target: {fileID: 199199703959827192, guid: 1676eecd56dc30e418def89fe88d4d46, type: 3} @@ -8602,98 +9139,472 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1566567832} m_Mesh: {fileID: 4300016, guid: 56a9e5d3ec4e1d045ad05d326d5980ef, type: 3} +--- !u!1001 &1570948415 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1760454241} + m_Modifications: + - target: {fileID: 1027917220076984, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} + propertyPath: m_Name + value: EnemyCharger3.1 (3) + objectReference: {fileID: 0} + - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} + propertyPath: m_RootOrder + value: 15 + objectReference: {fileID: 0} + - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} + propertyPath: m_LocalPosition.x + value: -23.02 + objectReference: {fileID: 0} + - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} + propertyPath: m_LocalPosition.z + value: -1.64 + objectReference: {fileID: 0} + - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + propertyPath: enemyName + value: Winkie Charger + objectReference: {fileID: 0} + - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + propertyPath: walkSpeed + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + propertyPath: enemyTactic + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + propertyPath: defendChance + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + propertyPath: pickARandomName + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + propertyPath: PickRandomAttack + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + propertyPath: AttackPlayerAirborne + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + propertyPath: AttackList.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + propertyPath: canDefendDuringAttack + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + propertyPath: canHitDestroyableObjects + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + propertyPath: AttackList.Array.data[0].damage + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + propertyPath: AttackList.Array.data[0].knockBackForce + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 137230289712191612, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + propertyPath: m_Materials.Array.data[1] + value: + objectReference: {fileID: 2100000, guid: b038eb787a00fa744bef0acb43773fc2, type: 2} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} +--- !u!4 &1570948416 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + m_PrefabInstance: {fileID: 1570948415} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1588706327 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1027917220076984, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + m_PrefabInstance: {fileID: 1355267275} + m_PrefabAsset: {fileID: 0} --- !u!1 &1617096413 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1027917220076984, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} - m_PrefabInstance: {fileID: 1810459407} + m_PrefabInstance: {fileID: 1810459407} + m_PrefabAsset: {fileID: 0} +--- !u!4 &1617096418 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + m_PrefabInstance: {fileID: 1810459407} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &1634725651 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 2018629624} + m_Modifications: + - target: {fileID: 1750465690529392, guid: 6f91c7d5a5529ac4b8db3f7b31dc4e13, type: 3} + propertyPath: m_Name + value: GarbageBag (11) + objectReference: {fileID: 0} + - target: {fileID: 4934182689417146, guid: 6f91c7d5a5529ac4b8db3f7b31dc4e13, type: 3} + propertyPath: m_RootOrder + value: 15 + objectReference: {fileID: 0} + - target: {fileID: 4934182689417146, guid: 6f91c7d5a5529ac4b8db3f7b31dc4e13, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4934182689417146, guid: 6f91c7d5a5529ac4b8db3f7b31dc4e13, type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4934182689417146, guid: 6f91c7d5a5529ac4b8db3f7b31dc4e13, type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4934182689417146, guid: 6f91c7d5a5529ac4b8db3f7b31dc4e13, type: 3} + propertyPath: m_LocalPosition.x + value: -21.214 + objectReference: {fileID: 0} + - target: {fileID: 4934182689417146, guid: 6f91c7d5a5529ac4b8db3f7b31dc4e13, type: 3} + propertyPath: m_LocalPosition.y + value: 0.178 + objectReference: {fileID: 0} + - target: {fileID: 4934182689417146, guid: 6f91c7d5a5529ac4b8db3f7b31dc4e13, type: 3} + propertyPath: m_LocalPosition.z + value: -7.735 + objectReference: {fileID: 0} + - target: {fileID: 4934182689417146, guid: 6f91c7d5a5529ac4b8db3f7b31dc4e13, type: 3} + propertyPath: m_LocalRotation.w + value: -0.024440741 + objectReference: {fileID: 0} + - target: {fileID: 4934182689417146, guid: 6f91c7d5a5529ac4b8db3f7b31dc4e13, type: 3} + propertyPath: m_LocalRotation.x + value: -0.13071665 + objectReference: {fileID: 0} + - target: {fileID: 4934182689417146, guid: 6f91c7d5a5529ac4b8db3f7b31dc4e13, type: 3} + propertyPath: m_LocalRotation.y + value: 0.9901839 + objectReference: {fileID: 0} + - target: {fileID: 4934182689417146, guid: 6f91c7d5a5529ac4b8db3f7b31dc4e13, type: 3} + propertyPath: m_LocalRotation.z + value: 0.043031804 + objectReference: {fileID: 0} + - target: {fileID: 4934182689417146, guid: 6f91c7d5a5529ac4b8db3f7b31dc4e13, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -4.5210004 + objectReference: {fileID: 0} + - target: {fileID: 4934182689417146, guid: 6f91c7d5a5529ac4b8db3f7b31dc4e13, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 183.43 + objectReference: {fileID: 0} + - target: {fileID: 4934182689417146, guid: 6f91c7d5a5529ac4b8db3f7b31dc4e13, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -15.176001 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 6f91c7d5a5529ac4b8db3f7b31dc4e13, type: 3} +--- !u!4 &1634725652 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4934182689417146, guid: 6f91c7d5a5529ac4b8db3f7b31dc4e13, + type: 3} + m_PrefabInstance: {fileID: 1634725651} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &1635576747 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 386790988} + m_Modifications: + - target: {fileID: 1362483714243120, guid: 1676eecd56dc30e418def89fe88d4d46, type: 3} + propertyPath: m_Name + value: DrumBarrel (1) + objectReference: {fileID: 0} + - target: {fileID: 4821036514006508, guid: 1676eecd56dc30e418def89fe88d4d46, type: 3} + propertyPath: m_RootOrder + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 4821036514006508, guid: 1676eecd56dc30e418def89fe88d4d46, type: 3} + propertyPath: m_LocalPosition.x + value: -2.21 + objectReference: {fileID: 0} + - target: {fileID: 4821036514006508, guid: 1676eecd56dc30e418def89fe88d4d46, type: 3} + propertyPath: m_LocalPosition.y + value: -0.004 + objectReference: {fileID: 0} + - target: {fileID: 4821036514006508, guid: 1676eecd56dc30e418def89fe88d4d46, type: 3} + propertyPath: m_LocalPosition.z + value: -3.68 + objectReference: {fileID: 0} + - target: {fileID: 4821036514006508, guid: 1676eecd56dc30e418def89fe88d4d46, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4821036514006508, guid: 1676eecd56dc30e418def89fe88d4d46, type: 3} + propertyPath: m_LocalRotation.x + value: 0.000000021855694 + objectReference: {fileID: 0} + - target: {fileID: 4821036514006508, guid: 1676eecd56dc30e418def89fe88d4d46, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4821036514006508, guid: 1676eecd56dc30e418def89fe88d4d46, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 114391388185752594, guid: 1676eecd56dc30e418def89fe88d4d46, + type: 3} + propertyPath: spawnItem + value: + objectReference: {fileID: 1448244365320500, guid: 4bdf5d1286d0b71438ccfa7edfda52eb, + type: 3} + - target: {fileID: 114391388185752594, guid: 1676eecd56dc30e418def89fe88d4d46, + type: 3} + propertyPath: spawnChance + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 114391388185752594, guid: 1676eecd56dc30e418def89fe88d4d46, + type: 3} + propertyPath: destroyOnHit + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 199199703959827192, guid: 1676eecd56dc30e418def89fe88d4d46, + type: 3} + propertyPath: m_Materials.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 199484189353650512, guid: 1676eecd56dc30e418def89fe88d4d46, + type: 3} + propertyPath: m_Materials.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 199549554650603546, guid: 1676eecd56dc30e418def89fe88d4d46, + type: 3} + propertyPath: m_Materials.Array.size + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 1676eecd56dc30e418def89fe88d4d46, type: 3} +--- !u!4 &1635576748 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4821036514006508, guid: 1676eecd56dc30e418def89fe88d4d46, + type: 3} + m_PrefabInstance: {fileID: 1635576747} m_PrefabAsset: {fileID: 0} ---- !u!4 &1617096418 stripped +--- !u!4 &1664629864 stripped Transform: - m_CorrespondingSourceObject: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, + m_CorrespondingSourceObject: {fileID: 4279449019447086, guid: eded051879df4c147b9010199d240258, type: 3} - m_PrefabInstance: {fileID: 1810459407} + m_PrefabInstance: {fileID: 1051103989} m_PrefabAsset: {fileID: 0} ---- !u!1001 &1634725651 +--- !u!1001 &1667995989 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 2018629624} + m_TransformParent: {fileID: 1760454241} m_Modifications: - - target: {fileID: 1750465690529392, guid: 6f91c7d5a5529ac4b8db3f7b31dc4e13, type: 3} + - target: {fileID: 1027917220076984, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} propertyPath: m_Name - value: GarbageBag (11) + value: EnemyRanged3.2 objectReference: {fileID: 0} - - target: {fileID: 4934182689417146, guid: 6f91c7d5a5529ac4b8db3f7b31dc4e13, type: 3} + - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} propertyPath: m_RootOrder - value: 15 + value: 23 objectReference: {fileID: 0} - - target: {fileID: 4934182689417146, guid: 6f91c7d5a5529ac4b8db3f7b31dc4e13, type: 3} + - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} propertyPath: m_LocalScale.x - value: 1 + value: 1.4707 objectReference: {fileID: 0} - - target: {fileID: 4934182689417146, guid: 6f91c7d5a5529ac4b8db3f7b31dc4e13, type: 3} + - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} propertyPath: m_LocalScale.y - value: 1 + value: 0.80563 objectReference: {fileID: 0} - - target: {fileID: 4934182689417146, guid: 6f91c7d5a5529ac4b8db3f7b31dc4e13, type: 3} + - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} propertyPath: m_LocalScale.z - value: 1 + value: 1.2279 objectReference: {fileID: 0} - - target: {fileID: 4934182689417146, guid: 6f91c7d5a5529ac4b8db3f7b31dc4e13, type: 3} + - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} propertyPath: m_LocalPosition.x - value: -21.214 + value: -23.95 objectReference: {fileID: 0} - - target: {fileID: 4934182689417146, guid: 6f91c7d5a5529ac4b8db3f7b31dc4e13, type: 3} + - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} propertyPath: m_LocalPosition.y - value: 0.178 + value: 0.13 objectReference: {fileID: 0} - - target: {fileID: 4934182689417146, guid: 6f91c7d5a5529ac4b8db3f7b31dc4e13, type: 3} + - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} propertyPath: m_LocalPosition.z - value: -7.735 + value: 0.73 objectReference: {fileID: 0} - - target: {fileID: 4934182689417146, guid: 6f91c7d5a5529ac4b8db3f7b31dc4e13, type: 3} + - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} propertyPath: m_LocalRotation.w - value: -0.024440741 + value: 1 objectReference: {fileID: 0} - - target: {fileID: 4934182689417146, guid: 6f91c7d5a5529ac4b8db3f7b31dc4e13, type: 3} + - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} propertyPath: m_LocalRotation.x - value: -0.13071665 + value: -0 objectReference: {fileID: 0} - - target: {fileID: 4934182689417146, guid: 6f91c7d5a5529ac4b8db3f7b31dc4e13, type: 3} + - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} propertyPath: m_LocalRotation.y - value: 0.9901839 + value: -0 objectReference: {fileID: 0} - - target: {fileID: 4934182689417146, guid: 6f91c7d5a5529ac4b8db3f7b31dc4e13, type: 3} + - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} propertyPath: m_LocalRotation.z - value: 0.043031804 + value: -0 objectReference: {fileID: 0} - - target: {fileID: 4934182689417146, guid: 6f91c7d5a5529ac4b8db3f7b31dc4e13, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: -4.5210004 + - target: {fileID: 4368425269854844, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} + propertyPath: m_LocalPosition.x + value: 2.02 objectReference: {fileID: 0} - - target: {fileID: 4934182689417146, guid: 6f91c7d5a5529ac4b8db3f7b31dc4e13, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 183.43 + - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + propertyPath: ranged + value: 1 objectReference: {fileID: 0} - - target: {fileID: 4934182689417146, guid: 6f91c7d5a5529ac4b8db3f7b31dc4e13, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: -15.176001 + - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + propertyPath: enemyName + value: Winkie Crossbowman + objectReference: {fileID: 0} + - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + propertyPath: walkSpeed + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + propertyPath: enemyTactic + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + propertyPath: defendChance + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + propertyPath: pickARandomName + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + propertyPath: PickRandomAttack + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + propertyPath: rangedDamage.damage + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + propertyPath: AttackPlayerAirborne + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + propertyPath: AttackList.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + propertyPath: canDefendDuringAttack + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + propertyPath: rangedDamage.knockDown + value: 1 objectReference: {fileID: 0} + - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + propertyPath: canHitDestroyableObjects + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + propertyPath: rangedDamage.forwardForce + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + propertyPath: rangedDamage.knockBackForce + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + propertyPath: AttackList.Array.data[0].damage + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + propertyPath: AttackList.Array.data[0].duration + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + propertyPath: AttackList.Array.data[0].knockBackForce + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 137230289712191612, guid: 7d5feb6af67f18d43974e399da3c03b1, + type: 3} + propertyPath: m_Materials.Array.data[1] + value: + objectReference: {fileID: 2100000, guid: 7f0ad4a5c05085a439a31b106679890f, type: 2} m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 6f91c7d5a5529ac4b8db3f7b31dc4e13, type: 3} ---- !u!4 &1634725652 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4934182689417146, guid: 6f91c7d5a5529ac4b8db3f7b31dc4e13, - type: 3} - m_PrefabInstance: {fileID: 1634725651} - m_PrefabAsset: {fileID: 0} ---- !u!4 &1664629864 stripped + m_SourcePrefab: {fileID: 100100000, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} +--- !u!4 &1667995990 stripped Transform: - m_CorrespondingSourceObject: {fileID: 4279449019447086, guid: eded051879df4c147b9010199d240258, + m_CorrespondingSourceObject: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} - m_PrefabInstance: {fileID: 1051103989} + m_PrefabInstance: {fileID: 1667995989} m_PrefabAsset: {fileID: 0} --- !u!1 &1678025545 GameObject: @@ -9084,27 +9995,31 @@ MonoBehaviour: - {fileID: 386642271} - {fileID: 823083665} - {fileID: 673900961} + - {fileID: 966116621} - WaveName: Wave2 AreaCollider: {fileID: 743693478} EnemyList: - {fileID: 445455583} - - {fileID: 1452321022} - {fileID: 1072790780} - {fileID: 804914777} - {fileID: 1460617816} - {fileID: 1037968263} + - {fileID: 523604658} + - {fileID: 1588706327} + - {fileID: 1436125042} - WaveName: Wave3 AreaCollider: {fileID: 2088717324} EnemyList: - {fileID: 638451270} - {fileID: 1617096413} - {fileID: 974342745} - - {fileID: 360835531} - - {fileID: 837268738} + - {fileID: 231636337} + - {fileID: 110099301} - {fileID: 1229126078} - {fileID: 503921695} - {fileID: 228273778} - {fileID: 1400115371} + - {fileID: 1086449192} currentWave: 0 activateSlowMotionOnLastHit: 0 effectDuration: 1.5 @@ -9124,24 +10039,28 @@ Transform: - {fileID: 386642276} - {fileID: 823083670} - {fileID: 673900962} + - {fileID: 966116620} - {fileID: 1211514636} + - {fileID: 716466604} + - {fileID: 1355267276} - {fileID: 445455588} - - {fileID: 1452321027} - {fileID: 1072790785} - {fileID: 804914778} - {fileID: 1460617817} - {fileID: 1037968264} + - {fileID: 1139771909} - {fileID: 743693479} - {fileID: 638451275} - - {fileID: 360835536} + - {fileID: 1570948416} + - {fileID: 957587829} - {fileID: 974342750} - {fileID: 1617096418} - - {fileID: 837268737} - {fileID: 1229126077} - {fileID: 503921694} - {fileID: 228273777} - - {fileID: 1400115372} - {fileID: 2088717325} + - {fileID: 1667995990} + - {fileID: 1400115372} m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -9230,81 +10149,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1788459456} m_Mesh: {fileID: 4300014, guid: 56a9e5d3ec4e1d045ad05d326d5980ef, type: 3} ---- !u!1001 &1800587273 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1760454241} - m_Modifications: - - target: {fileID: 1027917220076984, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} - propertyPath: m_Name - value: Enemy2.2 - objectReference: {fileID: 0} - - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} - propertyPath: m_RootOrder - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} - propertyPath: m_LocalPosition.x - value: -9.31 - objectReference: {fileID: 0} - - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} - propertyPath: m_LocalPosition.z - value: 1.33 - objectReference: {fileID: 0} - - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, - type: 3} - propertyPath: enemyName - value: Winkie Guard - objectReference: {fileID: 0} - - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, - type: 3} - propertyPath: defendChance - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, - type: 3} - propertyPath: pickARandomName - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, - type: 3} - propertyPath: AttackPlayerAirborne - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, - type: 3} - propertyPath: canDefendDuringAttack - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 114862996046309558, guid: 7d5feb6af67f18d43974e399da3c03b1, - type: 3} - propertyPath: canHitDestroyableObjects - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} --- !u!1 &1805104069 GameObject: m_ObjectHideFlags: 0 @@ -9436,7 +10280,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} propertyPath: m_RootOrder - value: 14 + value: 18 objectReference: {fileID: 0} - target: {fileID: 4221300857950164, guid: 7d5feb6af67f18d43974e399da3c03b1, type: 3} propertyPath: m_LocalPosition.x @@ -9743,7 +10587,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!114 &1889650834 MonoBehaviour: m_ObjectHideFlags: 0 @@ -10174,11 +11018,11 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2088717323} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -21.402, y: 0, z: 0} + m_LocalPosition: {x: -27.83, y: 0, z: 0} m_LocalScale: {x: 1, y: 10, z: 10} m_Children: [] m_Father: {fileID: 1760454241} - m_RootOrder: 20 + m_RootOrder: 22 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2092718028 GameObject: @@ -10316,6 +11160,11 @@ PrefabInstance: propertyPath: spawnChance value: 100 objectReference: {fileID: 0} + - target: {fileID: 114225313807016428, guid: b8fcdd73fd0d4bc4d9d961b61d541181, + type: 3} + propertyPath: destroyOnHit + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b8fcdd73fd0d4bc4d9d961b61d541181, type: 3} --- !u!4 &2102502827 stripped @@ -10376,7 +11225,12 @@ PrefabInstance: - target: {fileID: 114391388185752594, guid: 1676eecd56dc30e418def89fe88d4d46, type: 3} propertyPath: spawnChance - value: 50 + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 114391388185752594, guid: 1676eecd56dc30e418def89fe88d4d46, + type: 3} + propertyPath: destroyOnHit + value: 1 objectReference: {fileID: 0} - target: {fileID: 199199703959827192, guid: 1676eecd56dc30e418def89fe88d4d46, type: 3} diff --git a/unity_project/Assets/BeatEmUp_GameTemplate3D/Materials/Mat_EnemyBlueSkin.mat b/unity_project/Assets/BeatEmUp_GameTemplate3D/Materials/Mat_EnemyBlueSkin.mat new file mode 100644 index 0000000..dbd9970 --- /dev/null +++ b/unity_project/Assets/BeatEmUp_GameTemplate3D/Materials/Mat_EnemyBlueSkin.mat @@ -0,0 +1,87 @@ +%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: Mat_EnemyBlueSkin + m_Shader: {fileID: 4800000, guid: ab587ef05bd2a724cb41e345bf85b97a, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _AOMap: + m_Texture: {fileID: 2800000, guid: 1f933cd2ffae3864ea93db52d653574b, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 2800000, guid: f92209d7067ea4c49835c8ebf9aa9bf0, type: 3} + 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: 2800000, guid: 6aa45942c2cf2cc43ade7597a4ef12be, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MatCap: + m_Texture: {fileID: 2800000, guid: 96bd125c3c6e4d04981cbb211d97eeae, type: 3} + 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 + - _Offset: 0 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 0.34509805, g: 0.34509805, b: 0.34509805, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/unity_project/Assets/BeatEmUp_GameTemplate3D/Materials/Mat_EnemyBlueSkin.mat.meta b/unity_project/Assets/BeatEmUp_GameTemplate3D/Materials/Mat_EnemyBlueSkin.mat.meta new file mode 100644 index 0000000..44f09a1 --- /dev/null +++ b/unity_project/Assets/BeatEmUp_GameTemplate3D/Materials/Mat_EnemyBlueSkin.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7f0ad4a5c05085a439a31b106679890f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity_project/Assets/BeatEmUp_GameTemplate3D/Materials/Mat_EnemyChargerSkin.mat b/unity_project/Assets/BeatEmUp_GameTemplate3D/Materials/Mat_EnemyChargerSkin.mat new file mode 100644 index 0000000..4cfc83c --- /dev/null +++ b/unity_project/Assets/BeatEmUp_GameTemplate3D/Materials/Mat_EnemyChargerSkin.mat @@ -0,0 +1,87 @@ +%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: Mat_EnemyChargerSkin + m_Shader: {fileID: 4800000, guid: ab587ef05bd2a724cb41e345bf85b97a, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _AOMap: + m_Texture: {fileID: 2800000, guid: 1f933cd2ffae3864ea93db52d653574b, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 2800000, guid: f92209d7067ea4c49835c8ebf9aa9bf0, type: 3} + 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: 2800000, guid: b4ad26106aeffc2409946a48195b0b84, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MatCap: + m_Texture: {fileID: 2800000, guid: 96bd125c3c6e4d04981cbb211d97eeae, type: 3} + 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 + - _Offset: 0 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 0.34509805, g: 0.34509805, b: 0.34509805, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/unity_project/Assets/BeatEmUp_GameTemplate3D/Materials/Mat_EnemyChargerSkin.mat.meta b/unity_project/Assets/BeatEmUp_GameTemplate3D/Materials/Mat_EnemyChargerSkin.mat.meta new file mode 100644 index 0000000..359b385 --- /dev/null +++ b/unity_project/Assets/BeatEmUp_GameTemplate3D/Materials/Mat_EnemyChargerSkin.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b038eb787a00fa744bef0acb43773fc2 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity_project/Assets/BeatEmUp_GameTemplate3D/Resources/ProjectileEnemyKnife.prefab b/unity_project/Assets/BeatEmUp_GameTemplate3D/Resources/ProjectileEnemyKnife.prefab new file mode 100644 index 0000000..4093d15 --- /dev/null +++ b/unity_project/Assets/BeatEmUp_GameTemplate3D/Resources/ProjectileEnemyKnife.prefab @@ -0,0 +1,285 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1000010322542792 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4000011925097456} + - component: {fileID: 65225784713525598} + - component: {fileID: 54526216341663494} + - component: {fileID: 96000012231254088} + - component: {fileID: 114000011184243308} + - component: {fileID: 114243203254085832} + m_Layer: 15 + m_Name: ProjectileEnemyKnife + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4000011925097456 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1000010322542792} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 4090755774628540} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &65225784713525598 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1000010322542792} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 0.8, y: 0.3, z: 2} + m_Center: {x: 0, y: 0, z: 0} +--- !u!54 &54526216341663494 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1000010322542792} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 0 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 124 + m_CollisionDetection: 1 +--- !u!96 &96000012231254088 +TrailRenderer: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1000010322542792} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 0 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: d284683e289e0494ca13798d8828e700, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 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 + m_Time: 0.4 + m_Parameters: + serializedVersion: 3 + widthMultiplier: 0.7 + widthCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0.1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + colorGradient: + serializedVersion: 2 + key0: {r: 1, g: 1, b: 1, a: 1} + key1: {r: 1, g: 1, b: 1, a: 0.84705883} + key2: {r: 1, g: 1, b: 1, a: 0.6392157} + key3: {r: 1, g: 1, b: 1, a: 0.34509805} + key4: {r: 1, g: 1, b: 1, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 16384 + ctime2: 32768 + ctime3: 49151 + ctime4: 65535 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 16384 + atime2: 32768 + atime3: 49151 + atime4: 65535 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_NumColorKeys: 5 + m_NumAlphaKeys: 5 + numCornerVertices: 0 + numCapVertices: 0 + alignment: 0 + textureMode: 0 + shadowBias: 0 + generateLightingData: 0 + m_MinVertexDistance: 0.1 + m_Autodestruct: 1 + m_Emitting: 1 +--- !u!114 &114000011184243308 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1000010322542792} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d6ce95a39b3125644986bd65106dd1d5, type: 3} + m_Name: + m_EditorClassIdentifier: + LifeTime: 2 +--- !u!114 &114243203254085832 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1000010322542792} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 723dd16cfdfd04740a45177828d2936b, type: 3} + m_Name: + m_EditorClassIdentifier: + speed: 15 + direction: -1 + destroyOnHit: 1 + EffectOnSpawn: {fileID: 0} + firedByEnemy: 0 +--- !u!1 &1910063761534454 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4090755774628540} + - component: {fileID: 33490788981067122} + - component: {fileID: 23842675587574202} + m_Layer: 10 + m_Name: GFX + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4090755774628540 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1910063761534454} + m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4000011925097456} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} +--- !u!33 &33490788981067122 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1910063761534454} + m_Mesh: {fileID: 4300002, guid: ad9bec502d8361f46a401a91505f41b5, type: 3} +--- !u!23 &23842675587574202 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1910063761534454} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: e8d4b2d8b28d2d24db7bd6c202ffbe27, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 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 + m_AdditionalVertexStreams: {fileID: 0} diff --git a/unity_project/Assets/BeatEmUp_GameTemplate3D/Resources/ProjectileEnemyKnife.prefab.meta b/unity_project/Assets/BeatEmUp_GameTemplate3D/Resources/ProjectileEnemyKnife.prefab.meta new file mode 100644 index 0000000..abc9321 --- /dev/null +++ b/unity_project/Assets/BeatEmUp_GameTemplate3D/Resources/ProjectileEnemyKnife.prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 01a9bf2bf87f2554cac0f0b94754fad3 +timeCreated: 1473608195 +licenseType: Store +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity_project/Assets/BeatEmUp_GameTemplate3D/Scripts/Enemy/EnemyAI.cs b/unity_project/Assets/BeatEmUp_GameTemplate3D/Scripts/Enemy/EnemyAI.cs index e12fc6b..bde4433 100644 --- a/unity_project/Assets/BeatEmUp_GameTemplate3D/Scripts/Enemy/EnemyAI.cs +++ b/unity_project/Assets/BeatEmUp_GameTemplate3D/Scripts/Enemy/EnemyAI.cs @@ -6,12 +6,17 @@ public class EnemyAI : EnemyActions, IDamagable{ [Space(10)] public bool enableAI; + public float chargeTime = 0f; + public bool ranged = false; + public DamageObject rangedDamage; + float _timeToShoot = 4f; //a list of states where the AI is executed private List ActiveAIStates = new List { UNITSTATE.IDLE, - UNITSTATE.WALK - }; + UNITSTATE.WALK, + UNITSTATE.CHARGE + }; void Start(){ @@ -36,10 +41,37 @@ public class EnemyAI : EnemyActions, IDamagable{ OnLateUpdate(); } + void Shoot() + { + _timeToShoot -= Time.deltaTime; + if (ranged && _timeToShoot < 0 && enemyState != UNITSTATE.KNOCKDOWNGROUNDED) + { + //spawn projectile at spawn position + GameObject projectilePrefab = GameObject.Instantiate(Resources.Load("ProjectileEnemyKnife"), this.transform.position + new Vector3(0f, 1f, 0f), Quaternion.identity) as GameObject; + if (!projectilePrefab) return; + + //set projectile to current direction + Projectile projectileComponent = projectilePrefab.GetComponent(); + if (projectileComponent) + { + projectileComponent.firedByEnemy = true; + projectileComponent.direction = this.currentDirection; + rangedDamage.inflictor = this.gameObject; + projectileComponent.SetDamage(rangedDamage); + + } + + _timeToShoot = 3f; + } + } + void Update(){ - //do nothing when there is no target or when AI is disabled - if (target == null || !enableAI) { + Shoot(); + + chargeTime -= Time.deltaTime; + //do nothing when there is no target or when AI is disabled + if (target == null || !enableAI) { Ready (); return; @@ -65,7 +97,21 @@ public class EnemyAI : EnemyActions, IDamagable{ void AI(){ LookAtTarget(target.transform); - if (range == RANGE.ATTACKRANGE){ + + if (enemyTactic == ENEMYTACTIC.CHARGE) + { + if (chargeTime < 0) + { + WalkTo(closeRangeDistance, 0f); + chargeTime = 2f; + } + else + { + Charge(); + } + } + + if (range == RANGE.ATTACKRANGE){ //attack the target if (!cliffSpotted){ @@ -83,7 +129,9 @@ public class EnemyAI : EnemyActions, IDamagable{ if (enemyTactic == ENEMYTACTIC.KEEPFARDISTANCE) WalkTo(farRangeDistance, RangeMarging); if (enemyTactic == ENEMYTACTIC.STANDSTILL) Ready (); - } else { + + + } else { //actions for CLOSERANGE, MIDRANGE & FARRANGE distances if (enemyTactic == ENEMYTACTIC.ENGAGE) WalkTo (attackRangeDistance, 0f); @@ -128,7 +176,9 @@ public class EnemyAI : EnemyActions, IDamagable{ //set an enemy tactic public void SetEnemyTactic(ENEMYTACTIC tactic){ - enemyTactic = tactic; + + if (enemyTactic != ENEMYTACTIC.CHARGE) + enemyTactic = tactic; } //spread enemies out in z distance @@ -171,6 +221,7 @@ public enum ENEMYTACTIC { KEEPMEDIUMDISTANCE = 2, KEEPFARDISTANCE = 3, STANDSTILL = 4, + CHARGE = 5 } public enum RANGE { diff --git a/unity_project/Assets/BeatEmUp_GameTemplate3D/Scripts/Enemy/EnemyActions.cs b/unity_project/Assets/BeatEmUp_GameTemplate3D/Scripts/Enemy/EnemyActions.cs index e0db546..acc7f6b 100644 --- a/unity_project/Assets/BeatEmUp_GameTemplate3D/Scripts/Enemy/EnemyActions.cs +++ b/unity_project/Assets/BeatEmUp_GameTemplate3D/Scripts/Enemy/EnemyActions.cs @@ -55,6 +55,7 @@ public class EnemyActions : MonoBehaviour { public bool randomizeValues = true; //randomize values to avoid enemy synchronization [HideInInspector] public float zSpreadMultiplier = 2f; //multiplyer for the z distance between enemies + float chargeTime = 0f; [Header ("Stats")] public RANGE range; @@ -138,8 +139,9 @@ public class EnemyActions : MonoBehaviour { //late Update public void OnLateUpdate(){ + //apply any root motion offsets to parent - if(animator && animator.GetComponent().applyRootMotion && animator.transform.localPosition != Vector3.zero) { + if (animator && animator.GetComponent().applyRootMotion && animator.transform.localPosition != Vector3.zero) { Vector3 offset = animator.transform.localPosition; animator.transform.localPosition = Vector3.zero; transform.position += offset * (int)currentDirection; @@ -429,6 +431,11 @@ public class EnemyActions : MonoBehaviour { #region Movement + public void Charge() + { + Move(moveDirection.normalized, walkSpeed); + } + //walk to target public void WalkTo(float proximityRange, float movementMargin){ Vector3 dirToTarget; diff --git a/unity_project/Assets/BeatEmUp_GameTemplate3D/Scripts/Enemy/EnemyManager.cs b/unity_project/Assets/BeatEmUp_GameTemplate3D/Scripts/Enemy/EnemyManager.cs index daba3e9..ebf895a 100644 --- a/unity_project/Assets/BeatEmUp_GameTemplate3D/Scripts/Enemy/EnemyManager.cs +++ b/unity_project/Assets/BeatEmUp_GameTemplate3D/Scripts/Enemy/EnemyManager.cs @@ -19,10 +19,21 @@ public static class EnemyManager { getActiveEnemies(); if(activeEnemies.Count > 0){ for(int i=0; i().SetEnemyTactic(ENEMYTACTIC.ENGAGE); - } else { - activeEnemies[i].GetComponent().SetEnemyTactic(ENEMYTACTIC.KEEPMEDIUMDISTANCE); + EnemyAI ai = activeEnemies[i].GetComponent(); + if (ai.ranged) + { + ai.SetEnemyTactic(ENEMYTACTIC.KEEPFARDISTANCE); + } + else + { + if (i < MaxEnemyAttacking()) + { + ai.SetEnemyTactic(ENEMYTACTIC.ENGAGE); + } + else + { + ai.SetEnemyTactic(ENEMYTACTIC.KEEPMEDIUMDISTANCE); + } } } } diff --git a/unity_project/Assets/BeatEmUp_GameTemplate3D/Scripts/Other/Projectile.cs b/unity_project/Assets/BeatEmUp_GameTemplate3D/Scripts/Other/Projectile.cs index 793d685..abbd7c0 100644 --- a/unity_project/Assets/BeatEmUp_GameTemplate3D/Scripts/Other/Projectile.cs +++ b/unity_project/Assets/BeatEmUp_GameTemplate3D/Scripts/Other/Projectile.cs @@ -10,6 +10,7 @@ public class Projectile : MonoBehaviour { public bool destroyOnHit; public GameObject EffectOnSpawn; private DamageObject damage; + public bool firedByEnemy = false; void Start () { GetComponent().velocity = new Vector2((int)direction * speed, 0); @@ -27,13 +28,32 @@ public class Projectile : MonoBehaviour { //tell the player that an item is in range void OnTriggerEnter(Collider coll) { - if(coll.CompareTag("Enemy")) { + if (firedByEnemy) + { + if (coll.CompareTag("Player")) + { - //hit a damagable object - IDamagable damagableObject = coll.GetComponent(typeof(IDamagable)) as IDamagable; - if(damagableObject != null) { - damagableObject.Hit(damage); - if(destroyOnHit) Destroy(gameObject); + //hit a damagable object + IDamagable damagableObject = coll.GetComponent(typeof(IDamagable)) as IDamagable; + if (damagableObject != null) + { + damagableObject.Hit(damage); + if (destroyOnHit) Destroy(gameObject); + } + } + } + else + { + if (coll.CompareTag("Enemy")) + { + + //hit a damagable object + IDamagable damagableObject = coll.GetComponent(typeof(IDamagable)) as IDamagable; + if (damagableObject != null) + { + damagableObject.Hit(damage); + if (destroyOnHit) Destroy(gameObject); + } } } } diff --git a/unity_project/Assets/BeatEmUp_GameTemplate3D/Scripts/Player/UnitState.cs b/unity_project/Assets/BeatEmUp_GameTemplate3D/Scripts/Player/UnitState.cs index de5d65e..47f79be 100644 --- a/unity_project/Assets/BeatEmUp_GameTemplate3D/Scripts/Player/UnitState.cs +++ b/unity_project/Assets/BeatEmUp_GameTemplate3D/Scripts/Player/UnitState.cs @@ -13,6 +13,7 @@ public enum UNITSTATE { IDLE, WALK, RUN, + CHARGE, JUMPING, LAND, JUMPKICK, diff --git a/unity_project/Assets/BeatEmUp_GameTemplate3D/Textures/BCharger 1.png b/unity_project/Assets/BeatEmUp_GameTemplate3D/Textures/BCharger 1.png new file mode 100644 index 0000000..ffee81b Binary files /dev/null and b/unity_project/Assets/BeatEmUp_GameTemplate3D/Textures/BCharger 1.png differ diff --git a/unity_project/Assets/BeatEmUp_GameTemplate3D/Textures/BCharger 1.png.meta b/unity_project/Assets/BeatEmUp_GameTemplate3D/Textures/BCharger 1.png.meta new file mode 100644 index 0000000..112fad5 --- /dev/null +++ b/unity_project/Assets/BeatEmUp_GameTemplate3D/Textures/BCharger 1.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 166b0da9c41288040970bcc3b367aae1 +timeCreated: 1501747357 +licenseType: Store +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: 5 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Standalone + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: iPhone + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Android + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity_project/Assets/BeatEmUp_GameTemplate3D/Textures/ChD 1.png b/unity_project/Assets/BeatEmUp_GameTemplate3D/Textures/ChD 1.png new file mode 100644 index 0000000..ffee81b Binary files /dev/null and b/unity_project/Assets/BeatEmUp_GameTemplate3D/Textures/ChD 1.png differ diff --git a/unity_project/Assets/BeatEmUp_GameTemplate3D/Textures/ChD 1.png.meta b/unity_project/Assets/BeatEmUp_GameTemplate3D/Textures/ChD 1.png.meta new file mode 100644 index 0000000..8f67215 --- /dev/null +++ b/unity_project/Assets/BeatEmUp_GameTemplate3D/Textures/ChD 1.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 79f21866848f61e42a06f818d2706dd0 +timeCreated: 1501747357 +licenseType: Store +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: 5 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Standalone + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: iPhone + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Android + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity_project/Assets/BeatEmUp_GameTemplate3D/Textures/Enemy_Blue.png b/unity_project/Assets/BeatEmUp_GameTemplate3D/Textures/Enemy_Blue.png new file mode 100644 index 0000000..155d9d3 Binary files /dev/null and b/unity_project/Assets/BeatEmUp_GameTemplate3D/Textures/Enemy_Blue.png differ diff --git a/unity_project/Assets/BeatEmUp_GameTemplate3D/Textures/Enemy_Blue.png.meta b/unity_project/Assets/BeatEmUp_GameTemplate3D/Textures/Enemy_Blue.png.meta new file mode 100644 index 0000000..757060d --- /dev/null +++ b/unity_project/Assets/BeatEmUp_GameTemplate3D/Textures/Enemy_Blue.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 6aa45942c2cf2cc43ade7597a4ef12be +timeCreated: 1501747357 +licenseType: Store +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: 5 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Standalone + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: iPhone + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Android + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity_project/Assets/BeatEmUp_GameTemplate3D/Textures/Enemy_Charger.png b/unity_project/Assets/BeatEmUp_GameTemplate3D/Textures/Enemy_Charger.png new file mode 100644 index 0000000..297f536 Binary files /dev/null and b/unity_project/Assets/BeatEmUp_GameTemplate3D/Textures/Enemy_Charger.png differ diff --git a/unity_project/Assets/BeatEmUp_GameTemplate3D/Textures/Enemy_Charger.png.meta b/unity_project/Assets/BeatEmUp_GameTemplate3D/Textures/Enemy_Charger.png.meta new file mode 100644 index 0000000..f47292e --- /dev/null +++ b/unity_project/Assets/BeatEmUp_GameTemplate3D/Textures/Enemy_Charger.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: b4ad26106aeffc2409946a48195b0b84 +timeCreated: 1501747357 +licenseType: Store +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: 5 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Standalone + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: iPhone + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Android + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity_project/ProjectSettings/DynamicsManager.asset b/unity_project/ProjectSettings/DynamicsManager.asset index 4e31ecc..e1bdcd6 100644 --- a/unity_project/ProjectSettings/DynamicsManager.asset +++ b/unity_project/ProjectSettings/DynamicsManager.asset @@ -3,10 +3,11 @@ --- !u!55 &1 PhysicsManager: m_ObjectHideFlags: 0 - serializedVersion: 3 + serializedVersion: 13 m_Gravity: {x: 0, y: -17, z: 0} m_DefaultMaterial: {fileID: 13400000, guid: 23b3e65e8933f4540933b43e8033912b, type: 2} m_BounceThreshold: 2 + m_DefaultMaxDepenetrationVelocity: 10 m_SleepThreshold: 0.003 m_DefaultContactOffset: 0.01 m_DefaultSolverIterations: 6 @@ -14,7 +15,23 @@ PhysicsManager: m_QueriesHitBackfaces: 0 m_QueriesHitTriggers: 1 m_EnableAdaptiveForce: 0 - m_EnablePCM: 1 - m_LayerCollisionMatrix: c888ffffc880ffffc880ffffffffffffc880ffffc880ffffffffffffffffffffc8bcffffc8e8ffffc889ffffc987ffffc881ffffc883ffffc882ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff + m_ClothInterCollisionDistance: 0.1 + m_ClothInterCollisionStiffness: 0.2 + m_ContactsGeneration: 1 + m_LayerCollisionMatrix: c808ffffc800ffffc800ffffffffffffc800ffffc800ffffffffffffffffffffc87cffffc8e8ffffc809ffffc907ffffc801ffffc803ffffc803ffffc802ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff m_AutoSimulation: 1 m_AutoSyncTransforms: 1 + m_ReuseCollisionCallbacks: 0 + m_ClothInterCollisionSettingsToggle: 0 + m_ClothGravity: {x: 0, y: -9.81, z: 0} + m_ContactPairsMode: 0 + m_BroadphaseType: 0 + m_WorldBounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 250, y: 250, z: 250} + m_WorldSubdivisions: 8 + m_FrictionType: 0 + m_EnableEnhancedDeterminism: 0 + m_EnableUnifiedHeightmaps: 1 + m_SolverType: 0 + m_DefaultMaxAngularSpeed: 7 diff --git a/unity_project/ProjectSettings/TagManager.asset b/unity_project/ProjectSettings/TagManager.asset index 39c0101..af58df4 100644 --- a/unity_project/ProjectSettings/TagManager.asset +++ b/unity_project/ProjectSettings/TagManager.asset @@ -22,7 +22,7 @@ TagManager: - Projectile - DestroyableObject - AreaCollider - - + - EnemyProjectile - - -