diff --git a/Assets/Resources/1/Animation/Character/Super_Attack.anim b/Assets/Resources/1/Animation/Character/Super_Attack.anim index 24d37038..6b108d19 100644 --- a/Assets/Resources/1/Animation/Character/Super_Attack.anim +++ b/Assets/Resources/1/Animation/Character/Super_Attack.anim @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d9a547e8a3df9a3bf32dd0baede1ba4884e2a6ffea5a57ba1860eda8ec4fb78f -size 2190819 +oid sha256:f41e6134daef2d77e52bf440ee35e2a71d3808b404fdc8a1ac578efd65565fcf +size 7307994 diff --git a/Assets/Resources/1/Animation/Character/TestController.controller b/Assets/Resources/1/Animation/Character/TestController.controller index 4a6be3f4..a7a2207c 100644 --- a/Assets/Resources/1/Animation/Character/TestController.controller +++ b/Assets/Resources/1/Animation/Character/TestController.controller @@ -429,55 +429,55 @@ AnimatorController: m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: BackToIdle m_Type: 9 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: Build m_Type: 9 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: TreeAttack m_Type: 9 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: Move m_Type: 9 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: SuperJump m_Type: 9 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: Frozen m_Type: 9 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: isMoving m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: Death m_Type: 9 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -763,7 +763,7 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: 097363ae0f4e1f447b1b623e24b9cd2e, type: 2} + m_Motion: {fileID: 7400000, guid: 46c2b6df43404d447aace3726bf397e3, type: 2} m_Tag: m_SpeedParameter: m_MirrorParameter: diff --git a/Assets/Resources/1/VFX/_Game/Protectior/Bomb.prefab b/Assets/Resources/1/VFX/_Game/Protectior/Bomb.prefab index 69c86de6..7a4494b9 100644 --- a/Assets/Resources/1/VFX/_Game/Protectior/Bomb.prefab +++ b/Assets/Resources/1/VFX/_Game/Protectior/Bomb.prefab @@ -4738,6 +4738,7 @@ GameObject: - component: {fileID: 6736513976124970964} - component: {fileID: 6736513976126722542} - component: {fileID: 6736513976104981120} + - component: {fileID: 254311947008733808} m_Layer: 0 m_Name: Bomb m_TagString: Untagged @@ -9562,6 +9563,21 @@ AudioSource: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 0 +--- !u!114 &254311947008733808 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6736513976106828952} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bfb2f14a56c34dcb80031c2336b24f1b, type: 3} + m_Name: + m_EditorClassIdentifier: + damage: 100 + hit: {fileID: 2307028534112872116, guid: 79d768bf87aadec478a5722da8c6d516, type: 3} + timeHit: 1.8 --- !u!1 &6736513976106878902 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/1/Warrior/Tracking_Bomb/FBX/Bomb.controller b/Assets/Resources/1/Warrior/Tracking_Bomb/FBX/Bomb.controller index 316846cd..3017a1a8 100644 --- a/Assets/Resources/1/Warrior/Tracking_Bomb/FBX/Bomb.controller +++ b/Assets/Resources/1/Warrior/Tracking_Bomb/FBX/Bomb.controller @@ -1,5 +1,30 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1101 &-546070858855015587 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: Explode + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102293829521826198} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.625 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!91 &9100000 AnimatorController: m_ObjectHideFlags: 0 @@ -8,7 +33,13 @@ AnimatorController: m_PrefabAsset: {fileID: 0} m_Name: Bomb serializedVersion: 5 - m_AnimatorParameters: [] + m_AnimatorParameters: + - m_Name: Explode + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -24,7 +55,7 @@ AnimatorController: m_Controller: {fileID: 9100000} --- !u!1101 &1101016393745526072 AnimatorStateTransition: - m_ObjectHideFlags: 3 + m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -376,7 +407,7 @@ AnimatorStateTransition: m_CanTransitionToSelf: 1 --- !u!1101 &1101570748783259436 AnimatorStateTransition: - m_ObjectHideFlags: 3 + m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -442,7 +473,7 @@ AnimatorStateTransition: m_CanTransitionToSelf: 1 --- !u!1101 &1101628936160979654 AnimatorStateTransition: - m_ObjectHideFlags: 3 + m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -640,7 +671,7 @@ AnimatorStateTransition: m_CanTransitionToSelf: 1 --- !u!1101 &1101999127345121280 AnimatorStateTransition: - m_ObjectHideFlags: 3 + m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -662,7 +693,7 @@ AnimatorStateTransition: m_CanTransitionToSelf: 1 --- !u!1102 &1102017953835933110 AnimatorState: - serializedVersion: 5 + serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -689,8 +720,8 @@ AnimatorState: m_TimeParameter: --- !u!1102 &1102026339988270548 AnimatorState: - serializedVersion: 5 - m_ObjectHideFlags: 3 + serializedVersion: 6 + m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -716,8 +747,8 @@ AnimatorState: m_TimeParameter: --- !u!1102 &1102119963568475716 AnimatorState: - serializedVersion: 5 - m_ObjectHideFlags: 3 + serializedVersion: 6 + m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -743,7 +774,7 @@ AnimatorState: m_TimeParameter: --- !u!1102 &1102290600603978840 AnimatorState: - serializedVersion: 5 + serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -770,7 +801,7 @@ AnimatorState: m_TimeParameter: --- !u!1102 &1102293829521826198 AnimatorState: - serializedVersion: 5 + serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -797,8 +828,8 @@ AnimatorState: m_TimeParameter: --- !u!1102 &1102300038324231582 AnimatorState: - serializedVersion: 5 - m_ObjectHideFlags: 3 + serializedVersion: 6 + m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -824,8 +855,8 @@ AnimatorState: m_TimeParameter: --- !u!1102 &1102342943334615508 AnimatorState: - serializedVersion: 5 - m_ObjectHideFlags: 3 + serializedVersion: 6 + m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -851,7 +882,7 @@ AnimatorState: m_TimeParameter: --- !u!1102 &1102349128289543252 AnimatorState: - serializedVersion: 5 + serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -878,7 +909,7 @@ AnimatorState: m_TimeParameter: --- !u!1102 &1102468043089081518 AnimatorState: - serializedVersion: 5 + serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -905,7 +936,7 @@ AnimatorState: m_TimeParameter: --- !u!1102 &1102469734140886672 AnimatorState: - serializedVersion: 5 + serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -932,8 +963,8 @@ AnimatorState: m_TimeParameter: --- !u!1102 &1102478560215277762 AnimatorState: - serializedVersion: 5 - m_ObjectHideFlags: 3 + serializedVersion: 6 + m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -959,8 +990,8 @@ AnimatorState: m_TimeParameter: --- !u!1102 &1102500793846982196 AnimatorState: - serializedVersion: 5 - m_ObjectHideFlags: 3 + serializedVersion: 6 + m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -986,7 +1017,7 @@ AnimatorState: m_TimeParameter: --- !u!1102 &1102509494326483986 AnimatorState: - serializedVersion: 5 + serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -996,6 +1027,7 @@ AnimatorState: m_CycleOffset: 0 m_Transitions: - {fileID: 1101652252861656132} + - {fileID: -546070858855015587} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -1013,7 +1045,7 @@ AnimatorState: m_TimeParameter: --- !u!1102 &1102560292473526350 AnimatorState: - serializedVersion: 5 + serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -1040,8 +1072,8 @@ AnimatorState: m_TimeParameter: --- !u!1102 &1102573938536894438 AnimatorState: - serializedVersion: 5 - m_ObjectHideFlags: 3 + serializedVersion: 6 + m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -1067,8 +1099,8 @@ AnimatorState: m_TimeParameter: --- !u!1102 &1102643678307240484 AnimatorState: - serializedVersion: 5 - m_ObjectHideFlags: 3 + serializedVersion: 6 + m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -1094,8 +1126,8 @@ AnimatorState: m_TimeParameter: --- !u!1102 &1102655925780863650 AnimatorState: - serializedVersion: 5 - m_ObjectHideFlags: 3 + serializedVersion: 6 + m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -1121,8 +1153,8 @@ AnimatorState: m_TimeParameter: --- !u!1102 &1102678162120579112 AnimatorState: - serializedVersion: 5 - m_ObjectHideFlags: 3 + serializedVersion: 6 + m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -1148,8 +1180,8 @@ AnimatorState: m_TimeParameter: --- !u!1102 &1102707637426974368 AnimatorState: - serializedVersion: 5 - m_ObjectHideFlags: 3 + serializedVersion: 6 + m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -1175,8 +1207,8 @@ AnimatorState: m_TimeParameter: --- !u!1102 &1102827492225288746 AnimatorState: - serializedVersion: 5 - m_ObjectHideFlags: 3 + serializedVersion: 6 + m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -1202,7 +1234,7 @@ AnimatorState: m_TimeParameter: --- !u!1102 &1102855442037948304 AnimatorState: - serializedVersion: 5 + serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -1229,7 +1261,7 @@ AnimatorState: m_TimeParameter: --- !u!1102 &1102867912869228568 AnimatorState: - serializedVersion: 5 + serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -1256,8 +1288,8 @@ AnimatorState: m_TimeParameter: --- !u!1102 &1102878787506406972 AnimatorState: - serializedVersion: 5 - m_ObjectHideFlags: 3 + serializedVersion: 6 + m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -1283,7 +1315,7 @@ AnimatorState: m_TimeParameter: --- !u!1102 &1102884043357014408 AnimatorState: - serializedVersion: 5 + serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -1310,7 +1342,7 @@ AnimatorState: m_TimeParameter: --- !u!1102 &1102892898970591168 AnimatorState: - serializedVersion: 5 + serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -1336,7 +1368,7 @@ AnimatorState: m_TimeParameter: --- !u!1102 &1102903792119357532 AnimatorState: - serializedVersion: 5 + serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -1363,7 +1395,7 @@ AnimatorState: m_TimeParameter: --- !u!1107 &1107240124866355324 AnimatorStateMachine: - serializedVersion: 5 + serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -1378,7 +1410,7 @@ AnimatorStateMachine: m_Position: {x: 156, y: -108, z: 0} - serializedVersion: 1 m_State: {fileID: 1102855442037948304} - m_Position: {x: 444, y: -108, z: 0} + m_Position: {x: 440, y: -110, z: 0} - serializedVersion: 1 m_State: {fileID: 1102878787506406972} m_Position: {x: 444, y: -204, z: 0} @@ -1420,7 +1452,7 @@ AnimatorStateMachine: m_Position: {x: 768, y: 348, z: 0} - serializedVersion: 1 m_State: {fileID: 1102293829521826198} - m_Position: {x: 768, y: 240, z: 0} + m_Position: {x: 770, y: 240, z: 0} - serializedVersion: 1 m_State: {fileID: 1102469734140886672} m_Position: {x: 768, y: 432, z: 0} diff --git a/Assets/Resources/1/Warrior/Tracking_Bomb/Prefabs/Bomb.prefab b/Assets/Resources/1/Warrior/Tracking_Bomb/Prefabs/Bomb.prefab index a7c712a3..5b7c1061 100644 --- a/Assets/Resources/1/Warrior/Tracking_Bomb/Prefabs/Bomb.prefab +++ b/Assets/Resources/1/Warrior/Tracking_Bomb/Prefabs/Bomb.prefab @@ -552,73 +552,59 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1175122412763087250} m_Modifications: - - target: {fileID: 2591572350827275293, guid: 2e78e06fcf30c0a4993cde911703d443, - type: 3} + - target: {fileID: 2591572350827275293, guid: 2e78e06fcf30c0a4993cde911703d443, type: 3} propertyPath: m_Materials.Array.size value: 1 objectReference: {fileID: 0} - - target: {fileID: 2591572351042154496, guid: 2e78e06fcf30c0a4993cde911703d443, - type: 3} + - target: {fileID: 2591572351042154496, guid: 2e78e06fcf30c0a4993cde911703d443, type: 3} propertyPath: m_RootOrder value: 0 objectReference: {fileID: 0} - - target: {fileID: 2591572351042154496, guid: 2e78e06fcf30c0a4993cde911703d443, - type: 3} + - target: {fileID: 2591572351042154496, guid: 2e78e06fcf30c0a4993cde911703d443, type: 3} propertyPath: m_LocalPosition.x value: -0.083 objectReference: {fileID: 0} - - target: {fileID: 2591572351042154496, guid: 2e78e06fcf30c0a4993cde911703d443, - type: 3} + - target: {fileID: 2591572351042154496, guid: 2e78e06fcf30c0a4993cde911703d443, type: 3} propertyPath: m_LocalPosition.y value: 0.023 objectReference: {fileID: 0} - - target: {fileID: 2591572351042154496, guid: 2e78e06fcf30c0a4993cde911703d443, - type: 3} + - target: {fileID: 2591572351042154496, guid: 2e78e06fcf30c0a4993cde911703d443, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 2591572351042154496, guid: 2e78e06fcf30c0a4993cde911703d443, - type: 3} + - target: {fileID: 2591572351042154496, guid: 2e78e06fcf30c0a4993cde911703d443, type: 3} propertyPath: m_LocalRotation.w value: -0.26092538 objectReference: {fileID: 0} - - target: {fileID: 2591572351042154496, guid: 2e78e06fcf30c0a4993cde911703d443, - type: 3} + - target: {fileID: 2591572351042154496, guid: 2e78e06fcf30c0a4993cde911703d443, type: 3} propertyPath: m_LocalRotation.x value: -0.32429546 objectReference: {fileID: 0} - - target: {fileID: 2591572351042154496, guid: 2e78e06fcf30c0a4993cde911703d443, - type: 3} + - target: {fileID: 2591572351042154496, guid: 2e78e06fcf30c0a4993cde911703d443, type: 3} propertyPath: m_LocalRotation.y value: 0.029789386 objectReference: {fileID: 0} - - target: {fileID: 2591572351042154496, guid: 2e78e06fcf30c0a4993cde911703d443, - type: 3} + - target: {fileID: 2591572351042154496, guid: 2e78e06fcf30c0a4993cde911703d443, type: 3} propertyPath: m_LocalRotation.z value: 0.9087701 objectReference: {fileID: 0} - - target: {fileID: 2591572351042154496, guid: 2e78e06fcf30c0a4993cde911703d443, - type: 3} + - target: {fileID: 2591572351042154496, guid: 2e78e06fcf30c0a4993cde911703d443, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2591572351042154496, guid: 2e78e06fcf30c0a4993cde911703d443, - type: 3} + - target: {fileID: 2591572351042154496, guid: 2e78e06fcf30c0a4993cde911703d443, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2591572351042154496, guid: 2e78e06fcf30c0a4993cde911703d443, - type: 3} + - target: {fileID: 2591572351042154496, guid: 2e78e06fcf30c0a4993cde911703d443, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 2591572351042154498, guid: 2e78e06fcf30c0a4993cde911703d443, - type: 3} + - target: {fileID: 2591572351042154498, guid: 2e78e06fcf30c0a4993cde911703d443, type: 3} propertyPath: m_Materials.Array.size value: 1 objectReference: {fileID: 0} - - target: {fileID: 2591572351042154621, guid: 2e78e06fcf30c0a4993cde911703d443, - type: 3} + - target: {fileID: 2591572351042154621, guid: 2e78e06fcf30c0a4993cde911703d443, type: 3} propertyPath: m_Name value: FX Spark objectReference: {fileID: 0} @@ -626,8 +612,7 @@ PrefabInstance: m_SourcePrefab: {fileID: 100100000, guid: 2e78e06fcf30c0a4993cde911703d443, type: 3} --- !u!4 &3727224336371197390 stripped Transform: - m_CorrespondingSourceObject: {fileID: 2591572351042154496, guid: 2e78e06fcf30c0a4993cde911703d443, - type: 3} + m_CorrespondingSourceObject: {fileID: 2591572351042154496, guid: 2e78e06fcf30c0a4993cde911703d443, type: 3} m_PrefabInstance: {fileID: 1175122413194565070} m_PrefabAsset: {fileID: 0} --- !u!1001 &8207300010845384218 @@ -637,138 +622,111 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1175122412763087232} m_Modifications: - - target: {fileID: 594306107324874188, guid: ef48e21b8db1e4c42bf5cad1512c98d4, - type: 3} + - target: {fileID: 594306107324874188, guid: ef48e21b8db1e4c42bf5cad1512c98d4, type: 3} propertyPath: EmissionModule.rateOverTime.scalar value: 5 objectReference: {fileID: 0} - - target: {fileID: 594306107324874188, guid: ef48e21b8db1e4c42bf5cad1512c98d4, - type: 3} + - target: {fileID: 594306107324874188, guid: ef48e21b8db1e4c42bf5cad1512c98d4, type: 3} propertyPath: InitialModule.startSize.minMaxState value: 0 objectReference: {fileID: 0} - - target: {fileID: 594306107324874188, guid: ef48e21b8db1e4c42bf5cad1512c98d4, - type: 3} + - target: {fileID: 594306107324874188, guid: ef48e21b8db1e4c42bf5cad1512c98d4, type: 3} propertyPath: InitialModule.startSizeY.minMaxState value: 0 objectReference: {fileID: 0} - - target: {fileID: 594306107324874188, guid: ef48e21b8db1e4c42bf5cad1512c98d4, - type: 3} + - target: {fileID: 594306107324874188, guid: ef48e21b8db1e4c42bf5cad1512c98d4, type: 3} propertyPath: InitialModule.startSizeZ.minMaxState value: 0 objectReference: {fileID: 0} - - target: {fileID: 594306107324874188, guid: ef48e21b8db1e4c42bf5cad1512c98d4, - type: 3} + - target: {fileID: 594306107324874188, guid: ef48e21b8db1e4c42bf5cad1512c98d4, type: 3} propertyPath: EmissionModule.m_Bursts.Array.data[0].countCurve.maxCurve.m_Curve.Array.data[0].inWeight value: 0.33333334 objectReference: {fileID: 0} - - target: {fileID: 594306107324874188, guid: ef48e21b8db1e4c42bf5cad1512c98d4, - type: 3} + - target: {fileID: 594306107324874188, guid: ef48e21b8db1e4c42bf5cad1512c98d4, type: 3} propertyPath: EmissionModule.m_Bursts.Array.data[0].countCurve.maxCurve.m_Curve.Array.data[1].inWeight value: 0.33333334 objectReference: {fileID: 0} - - target: {fileID: 594306107324874188, guid: ef48e21b8db1e4c42bf5cad1512c98d4, - type: 3} + - target: {fileID: 594306107324874188, guid: ef48e21b8db1e4c42bf5cad1512c98d4, type: 3} propertyPath: EmissionModule.m_Bursts.Array.data[0].countCurve.minCurve.m_Curve.Array.data[0].inWeight value: 0.33333334 objectReference: {fileID: 0} - - target: {fileID: 594306107324874188, guid: ef48e21b8db1e4c42bf5cad1512c98d4, - type: 3} + - target: {fileID: 594306107324874188, guid: ef48e21b8db1e4c42bf5cad1512c98d4, type: 3} propertyPath: EmissionModule.m_Bursts.Array.data[0].countCurve.minCurve.m_Curve.Array.data[1].inWeight value: 0.33333334 objectReference: {fileID: 0} - - target: {fileID: 594306107324874188, guid: ef48e21b8db1e4c42bf5cad1512c98d4, - type: 3} + - target: {fileID: 594306107324874188, guid: ef48e21b8db1e4c42bf5cad1512c98d4, type: 3} propertyPath: EmissionModule.m_Bursts.Array.data[0].countCurve.maxCurve.m_Curve.Array.data[0].outWeight value: 0.33333334 objectReference: {fileID: 0} - - target: {fileID: 594306107324874188, guid: ef48e21b8db1e4c42bf5cad1512c98d4, - type: 3} + - target: {fileID: 594306107324874188, guid: ef48e21b8db1e4c42bf5cad1512c98d4, type: 3} propertyPath: EmissionModule.m_Bursts.Array.data[0].countCurve.maxCurve.m_Curve.Array.data[1].outWeight value: 0.33333334 objectReference: {fileID: 0} - - target: {fileID: 594306107324874188, guid: ef48e21b8db1e4c42bf5cad1512c98d4, - type: 3} + - target: {fileID: 594306107324874188, guid: ef48e21b8db1e4c42bf5cad1512c98d4, type: 3} propertyPath: EmissionModule.m_Bursts.Array.data[0].countCurve.minCurve.m_Curve.Array.data[0].outWeight value: 0.33333334 objectReference: {fileID: 0} - - target: {fileID: 594306107324874188, guid: ef48e21b8db1e4c42bf5cad1512c98d4, - type: 3} + - target: {fileID: 594306107324874188, guid: ef48e21b8db1e4c42bf5cad1512c98d4, type: 3} propertyPath: EmissionModule.m_Bursts.Array.data[0].countCurve.minCurve.m_Curve.Array.data[1].outWeight value: 0.33333334 objectReference: {fileID: 0} - - target: {fileID: 594306107339981724, guid: ef48e21b8db1e4c42bf5cad1512c98d4, - type: 3} + - target: {fileID: 594306107339981724, guid: ef48e21b8db1e4c42bf5cad1512c98d4, type: 3} propertyPath: m_RootOrder value: 9 objectReference: {fileID: 0} - - target: {fileID: 594306107339981724, guid: ef48e21b8db1e4c42bf5cad1512c98d4, - type: 3} + - target: {fileID: 594306107339981724, guid: ef48e21b8db1e4c42bf5cad1512c98d4, type: 3} propertyPath: m_LocalScale.x value: 0.37205154 objectReference: {fileID: 0} - - target: {fileID: 594306107339981724, guid: ef48e21b8db1e4c42bf5cad1512c98d4, - type: 3} + - target: {fileID: 594306107339981724, guid: ef48e21b8db1e4c42bf5cad1512c98d4, type: 3} propertyPath: m_LocalScale.y value: 0.37205148 objectReference: {fileID: 0} - - target: {fileID: 594306107339981724, guid: ef48e21b8db1e4c42bf5cad1512c98d4, - type: 3} + - target: {fileID: 594306107339981724, guid: ef48e21b8db1e4c42bf5cad1512c98d4, type: 3} propertyPath: m_LocalScale.z value: 0.37205154 objectReference: {fileID: 0} - - target: {fileID: 594306107339981724, guid: ef48e21b8db1e4c42bf5cad1512c98d4, - type: 3} + - target: {fileID: 594306107339981724, guid: ef48e21b8db1e4c42bf5cad1512c98d4, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 594306107339981724, guid: ef48e21b8db1e4c42bf5cad1512c98d4, - type: 3} + - target: {fileID: 594306107339981724, guid: ef48e21b8db1e4c42bf5cad1512c98d4, type: 3} propertyPath: m_LocalPosition.y value: 0.01 objectReference: {fileID: 0} - - target: {fileID: 594306107339981724, guid: ef48e21b8db1e4c42bf5cad1512c98d4, - type: 3} + - target: {fileID: 594306107339981724, guid: ef48e21b8db1e4c42bf5cad1512c98d4, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 594306107339981724, guid: ef48e21b8db1e4c42bf5cad1512c98d4, - type: 3} + - target: {fileID: 594306107339981724, guid: ef48e21b8db1e4c42bf5cad1512c98d4, type: 3} propertyPath: m_LocalRotation.w value: -0.006930769 objectReference: {fileID: 0} - - target: {fileID: 594306107339981724, guid: ef48e21b8db1e4c42bf5cad1512c98d4, - type: 3} + - target: {fileID: 594306107339981724, guid: ef48e21b8db1e4c42bf5cad1512c98d4, type: 3} propertyPath: m_LocalRotation.x value: -0 objectReference: {fileID: 0} - - target: {fileID: 594306107339981724, guid: ef48e21b8db1e4c42bf5cad1512c98d4, - type: 3} + - target: {fileID: 594306107339981724, guid: ef48e21b8db1e4c42bf5cad1512c98d4, type: 3} propertyPath: m_LocalRotation.y value: 0.999976 objectReference: {fileID: 0} - - target: {fileID: 594306107339981724, guid: ef48e21b8db1e4c42bf5cad1512c98d4, - type: 3} + - target: {fileID: 594306107339981724, guid: ef48e21b8db1e4c42bf5cad1512c98d4, type: 3} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: 594306107339981724, guid: ef48e21b8db1e4c42bf5cad1512c98d4, - type: 3} + - target: {fileID: 594306107339981724, guid: ef48e21b8db1e4c42bf5cad1512c98d4, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 594306107339981724, guid: ef48e21b8db1e4c42bf5cad1512c98d4, - type: 3} + - target: {fileID: 594306107339981724, guid: ef48e21b8db1e4c42bf5cad1512c98d4, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 594306107339981724, guid: ef48e21b8db1e4c42bf5cad1512c98d4, - type: 3} + - target: {fileID: 594306107339981724, guid: ef48e21b8db1e4c42bf5cad1512c98d4, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 594306107340321050, guid: ef48e21b8db1e4c42bf5cad1512c98d4, - type: 3} + - target: {fileID: 594306107340321050, guid: ef48e21b8db1e4c42bf5cad1512c98d4, type: 3} propertyPath: m_Name value: MonsterAura objectReference: {fileID: 0} @@ -776,7 +734,6 @@ PrefabInstance: m_SourcePrefab: {fileID: 100100000, guid: ef48e21b8db1e4c42bf5cad1512c98d4, type: 3} --- !u!4 &8780129905727237510 stripped Transform: - m_CorrespondingSourceObject: {fileID: 594306107339981724, guid: ef48e21b8db1e4c42bf5cad1512c98d4, - type: 3} + m_CorrespondingSourceObject: {fileID: 594306107339981724, guid: ef48e21b8db1e4c42bf5cad1512c98d4, type: 3} m_PrefabInstance: {fileID: 8207300010845384218} m_PrefabAsset: {fileID: 0} diff --git a/Assets/Resources/Data/ItemData.asset b/Assets/Resources/Data/ItemData.asset index 67664e21..4a6c9806 100644 --- a/Assets/Resources/Data/ItemData.asset +++ b/Assets/Resources/Data/ItemData.asset @@ -14,12 +14,16 @@ MonoBehaviour: m_EditorClassIdentifier: items: - item: {fileID: 11400000, guid: e7adbedb55c5db341a823370b696f709, type: 2} - _spawnChance: 0.486 + _spawnChance: 0.48 - item: {fileID: 11400000, guid: 62849ddbcd32e834887aac5eb3d98db0, type: 2} - _spawnChance: 0.766 + _spawnChance: 0.846 - item: {fileID: 11400000, guid: ef628c3158b0ea34bb919ca105507009, type: 2} - _spawnChance: 0.918 - - item: {fileID: 11400000, guid: ef628c3158b0ea34bb919ca105507009, type: 2} - _spawnChance: 0.918 + _spawnChance: 0.721 + - item: {fileID: 11400000, guid: f824f23273de8df429d37f10b51f9a6f, type: 2} + _spawnChance: 0.83 + - item: {fileID: 11400000, guid: 133e523fdd159754e8bf8927faec5b0f, type: 2} + _spawnChance: 0.75 + - item: {fileID: 11400000, guid: 133e523fdd159754e8bf8927faec5b0f, type: 2} + _spawnChance: 0.756 fromTimeSpawn: 2.93 toTimeSpawn: 10 diff --git a/Assets/Resources/Data/Items/Bomb.asset b/Assets/Resources/Data/Items/Bomb.asset new file mode 100644 index 00000000..df43cf40 --- /dev/null +++ b/Assets/Resources/Data/Items/Bomb.asset @@ -0,0 +1,17 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f23a091c5733400f8f0092a4c0f33c6e, type: 3} + m_Name: Bomb + m_EditorClassIdentifier: + iconPrefab: {fileID: 8639522512577941448, guid: 7b6a7f64e52da514d88aa97ad8f863df, type: 3} + icon: {fileID: 21300000, guid: 5a80ac41b33ef3f43945efa70e6dfdb0, type: 3} + buildingPrefab: {fileID: 6736513976106828952, guid: 18fb35664a7886842aa1702160b555a8, type: 3} diff --git a/Assets/Resources/Data/Items/Bomb.asset.meta b/Assets/Resources/Data/Items/Bomb.asset.meta new file mode 100644 index 00000000..3d5dd0f0 --- /dev/null +++ b/Assets/Resources/Data/Items/Bomb.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f824f23273de8df429d37f10b51f9a6f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Data/Items/CaptureTAbility.asset b/Assets/Resources/Data/Items/CaptureTAbility.asset index 56478b43..6d644bf9 100644 --- a/Assets/Resources/Data/Items/CaptureTAbility.asset +++ b/Assets/Resources/Data/Items/CaptureTAbility.asset @@ -12,6 +12,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 461496314fe84e509ae72dd06538b62c, type: 3} m_Name: CaptureTAbility m_EditorClassIdentifier: - iconPrefab: {fileID: 0} - icon: {fileID: 0} - AimCanvas: {fileID: 0} + iconPrefab: {fileID: 3197816592181874056, guid: 2704c4f795b0d7748a3e3fa53be4d893, type: 3} + icon: {fileID: 21300000, guid: 543c4732bd2d47a41bdbbf2156eb358c, type: 3} + aimCanvas: {fileID: 2273039178377770117, guid: 09a0317cbdff9fa479a18c9e20743a8e, type: 3} + itterationMove: 000000000000000000000000040000000500000001000000 + animName: SuperJump diff --git a/Assets/Scripts/Controller/GameInit.cs b/Assets/Scripts/Controller/GameInit.cs index ac2d5c1a..3b792791 100644 --- a/Assets/Scripts/Controller/GameInit.cs +++ b/Assets/Scripts/Controller/GameInit.cs @@ -68,7 +68,7 @@ namespace Controller controllers.Add(enemyController); units.Add(enemy); AIAgent agent = new AIAgent(unit, enemy); - controllers.Add(agent); + enemy.onPlayerSpawned += x => controllers.Add(agent); enemy.OnDeath += x => { controllers.Remove(agent); }; enemy.OnDeath += paintedController.PaintOnDeath; } diff --git a/Assets/Scripts/GameUI/PlayerInventoryView.cs b/Assets/Scripts/GameUI/PlayerInventoryView.cs index 19f6d048..3c618a23 100644 --- a/Assets/Scripts/GameUI/PlayerInventoryView.cs +++ b/Assets/Scripts/GameUI/PlayerInventoryView.cs @@ -11,7 +11,8 @@ namespace GameUI [SerializeField] private GameObject item; [SerializeField] private GameObject grid; - public Action OnBuildingInvoked; + public Action OnBuildingInvoked; + private List