Skip to content
Snippets Groups Projects
Commit b7fbe9fe authored by N2970's avatar N2970
Browse files

modifications to animations, added more crates, gems and other stuff

parent ffccfd82
No related branches found
No related tags found
No related merge requests found
Expand all Show whitespace changes
Inline Side-by-side
Showing
with 9735 additions and 1861 deletions
2D Winter Adventure/Assets/Animations/BombExplosion.anim
+ 2
− 2
View file @ b7fbe9fe
......@@ -87,12 +87,12 @@ AnimationClip:
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 0.9166666
m_StopTime: 0.9166667
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
m_LoopTime: 1
m_LoopTime: 0
m_LoopBlend: 0
m_LoopBlendOrientation: 0
m_LoopBlendPositionY: 0
......
2D Winter Adventure/Assets/Animations/Player_hit.anim
+ 4
− 4
View file @ b7fbe9fe
......@@ -21,13 +21,13 @@ AnimationClip:
- curve:
- time: 0
value: {fileID: 21300000, guid: c123c318507c6405a869f2f89068cf06, type: 3}
- time: 0.1
- time: 0.2
value: {fileID: 21300000, guid: a85f3724632254a6cb24066dc54cbf60, type: 3}
attribute: m_Sprite
path:
classID: 212
script: {fileID: 0}
m_SampleRate: 10
m_SampleRate: 5
m_WrapMode: 0
m_Bounds:
m_Center: {x: 0, y: 0, z: 0}
......@@ -49,12 +49,12 @@ AnimationClip:
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 0.2
m_StopTime: 0.4
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
m_LoopTime: 1
m_LoopTime: 0
m_LoopBlend: 0
m_LoopBlendOrientation: 0
m_LoopBlendPositionY: 0
......
2D Winter Adventure/Assets/Animations/bomb_ground_0.controller
+ 4
− 33
View file @ b7fbe9fe
......@@ -11,10 +11,10 @@ AnimatorStateMachine:
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: 5296263246846801081}
m_Position: {x: 200, y: 0, z: 0}
m_Position: {x: 290, y: -40, z: 0}
- serializedVersion: 1
m_State: {fileID: 1579304613998245642}
m_Position: {x: 340, y: 90, z: 0}
m_Position: {x: 350, y: 60, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
......@@ -22,7 +22,7 @@ AnimatorStateMachine:
m_StateMachineBehaviours: []
m_AnyStatePosition: {x: 50, y: 20, z: 0}
m_EntryPosition: {x: 50, y: 120, z: 0}
m_ExitPosition: {x: 800, y: 120, z: 0}
m_ExitPosition: {x: 600, y: 140, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: 5296263246846801081}
--- !u!91 &9100000
......@@ -69,8 +69,7 @@ AnimatorState:
m_Name: BombExplosion
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: 5550930122307271077}
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
......@@ -138,31 +137,3 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &5550930122307271077
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: isDeleted
m_EventTreshold: 0
- m_ConditionMode: 1
m_ConditionEvent: isExploded
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 0}
m_Solo: 0
m_Mute: 0
m_IsExit: 1
serializedVersion: 3
m_TransitionDuration: 0
m_TransitionOffset: 0
m_ExitTime: 0.72727275
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
2D Winter Adventure/Assets/Animations/player-idle-1.controller
+ 46
− 52
View file @ b7fbe9fe
......@@ -11,7 +11,7 @@ AnimatorState:
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: 322796046675061700}
- {fileID: 8339439798207029256}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
......@@ -83,7 +83,7 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &-3838354896857950192
--- !u!1101 &-2944873262049586207
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
......@@ -91,24 +91,27 @@ AnimatorStateTransition:
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: Hit
- m_ConditionMode: 2
m_ConditionEvent: isJumping
m_EventTreshold: 0
- m_ConditionMode: 4
m_ConditionEvent: Speed
m_EventTreshold: 0.01
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -8248992121978806940}
m_DstState: {fileID: 4875450127702774454}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0
m_TransitionOffset: 0
m_ExitTime: 0.25
m_ExitTime: 0.75
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &-2944873262049586207
--- !u!1101 &-2864876134378228275
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
......@@ -116,14 +119,11 @@ AnimatorStateTransition:
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 2
- m_ConditionMode: 1
m_ConditionEvent: isJumping
m_EventTreshold: 0
- m_ConditionMode: 4
m_ConditionEvent: Speed
m_EventTreshold: 0.01
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 4875450127702774454}
m_DstState: {fileID: 4374339450139153741}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
......@@ -135,8 +135,8 @@ AnimatorStateTransition:
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &-2864876134378228275
m_CanTransitionToSelf: 0
--- !u!1101 &-2634146883497592007
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
......@@ -145,10 +145,10 @@ AnimatorStateTransition:
m_Name:
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: isJumping
m_ConditionEvent: Hit
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 4374339450139153741}
m_DstState: {fileID: -8248992121978806940}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
......@@ -160,7 +160,7 @@ AnimatorStateTransition:
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 0
m_CanTransitionToSelf: 1
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
......@@ -175,31 +175,25 @@ AnimatorController:
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
- m_Name: isJumping
m_Type: 4
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
- m_Name: isCrouching
m_Type: 4
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
- m_Name: isHit
m_Type: 4
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
- m_Name: Hit
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
......@@ -213,28 +207,6 @@ AnimatorController:
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
--- !u!1101 &322796046675061700
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions: []
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 4875450127702774454}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &733805440341487113
AnimatorStateTransition:
m_ObjectHideFlags: 1
......@@ -277,7 +249,7 @@ AnimatorStateMachine:
m_Position: {x: 200, y: 0, z: 0}
- serializedVersion: 1
m_State: {fileID: 7200888804581700574}
m_Position: {x: 280, y: 80, z: 0}
m_Position: {x: 430, y: 90, z: 0}
- serializedVersion: 1
m_State: {fileID: -5088886776382075018}
m_Position: {x: 460, y: 0, z: 0}
......@@ -286,10 +258,11 @@ AnimatorStateMachine:
m_Position: {x: 20, y: 80, z: 0}
- serializedVersion: 1
m_State: {fileID: -8248992121978806940}
m_Position: {x: 290, y: -70, z: 0}
m_Position: {x: 270, y: 150, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions:
- {fileID: -2864876134378228275}
- {fileID: -2634146883497592007}
m_EntryTransitions: []
m_StateMachineTransitions: {}
m_StateMachineBehaviours: []
......@@ -364,7 +337,6 @@ AnimatorState:
m_Transitions:
- {fileID: 6667776418520464175}
- {fileID: 5059959773036352191}
- {fileID: -3838354896857950192}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
......@@ -486,6 +458,28 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &8339439798207029256
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions: []
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 4875450127702774454}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0
m_TransitionOffset: 0
m_ExitTime: 1
m_HasExitTime: 1
m_HasFixedDuration: 0
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &8856900383386861925
AnimatorStateTransition:
m_ObjectHideFlags: 1
......
2D Winter Adventure/Assets/Prefabs/Bomb.prefab
+ 3
− 0
View file @ b7fbe9fe
......@@ -132,3 +132,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 24b152a6a7eb1d44caa244e5bb1ce41a, type: 3}
m_Name:
m_EditorClassIdentifier:
smokeEffect: {fileID: 8978138360492040838, guid: 972a5ef4dea0103429364621c7ac424a,
type: 3}
isExploded: 0
2D Winter Adventure/Assets/Prefabs/SmokeEffect.prefab 0 → 100644
+ 4750
− 0
View file @ b7fbe9fe
This diff is collapsed.
2D Winter Adventure/Assets/Prefabs/SmokeEffect.prefab.meta 0 → 100644
+ 7
− 0
View file @ b7fbe9fe
fileFormatVersion: 2
guid: 972a5ef4dea0103429364621c7ac424a
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
2D Winter Adventure/Assets/Scenes/MainScene.unity
+ 4895
− 1759
View file @ b7fbe9fe
This diff is collapsed.
2D Winter Adventure/Assets/Scripts/BombCollectible.cs
+ 9
− 4
View file @ b7fbe9fe
......@@ -6,33 +6,38 @@ using UnityEngine;
public class BombCollectible : MonoBehaviour
{
public bool isExploded = false;
Animator animator;
void Start()
{
animator = GetComponent<Animator>();
}
private void OnTriggerEnter2D(Collider2D other)
{
StartCoroutine(waiter(other));
}
IEnumerator waiter(Collider2D other)
{
animator = GetComponent<Animator>();
PlayerController controller = other.GetComponent<PlayerController>();
//Wait for 2 seconds
yield return new WaitForSeconds(2);
//yield return new WaitForSeconds(1);
if (controller != null)
{
animator.SetBool("isExploded", true);
yield return new WaitForSeconds(1);
controller.ChangeHealth(-1);
//yield return new WaitForSeconds(1);
yield return new WaitForSeconds(1);
Destroy(gameObject);
}
}
......
2D Winter Adventure/Assets/Scripts/PlayerController.cs
+ 1
− 1
View file @ b7fbe9fe
......@@ -38,7 +38,7 @@ public class PlayerController : MonoBehaviour
void Start()
{
currentHealth = 2;
currentHealth = 3;
}
private void Awake()
......
2D Winter Adventure/Packages/manifest.json
+ 4
− 3
View file @ b7fbe9fe
......@@ -8,11 +8,12 @@
"com.unity.2d.tilemap": "1.0.0",
"com.unity.cinemachine": "2.6.3",
"com.unity.collab-proxy": "1.2.16",
"com.unity.ide.rider": "1.1.4",
"com.unity.ide.rider": "1.2.1",
"com.unity.ide.visualstudio": "2.0.2",
"com.unity.ide.vscode": "1.2.3",
"com.unity.test-framework": "1.1.19",
"com.unity.textmeshpro": "2.1.1",
"com.unity.timeline": "1.2.17",
"com.unity.textmeshpro": "3.0.0-preview.1",
"com.unity.timeline": "1.3.4",
"com.unity.ugui": "1.0.0",
"com.unity.modules.ai": "1.0.0",
"com.unity.modules.androidjni": "1.0.0",
......
2D Winter Adventure/Packages/packages-lock.json
+ 10
− 3
View file @ b7fbe9fe
......@@ -93,7 +93,7 @@
"url": "https://packages.unity.com"
},
"com.unity.ide.rider": {
"version": "1.1.4",
"version": "1.2.1",
"depth": 0,
"source": "registry",
"dependencies": {
......@@ -101,6 +101,13 @@
},
"url": "https://packages.unity.com"
},
"com.unity.ide.visualstudio": {
"version": "2.0.2",
"depth": 0,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.com"
},
"com.unity.ide.vscode": {
"version": "1.2.3",
"depth": 0,
......@@ -127,7 +134,7 @@
"url": "https://packages.unity.com"
},
"com.unity.textmeshpro": {
"version": "2.1.1",
"version": "3.0.0-preview.1",
"depth": 0,
"source": "registry",
"dependencies": {
......@@ -136,7 +143,7 @@
"url": "https://packages.unity.com"
},
"com.unity.timeline": {
"version": "1.2.17",
"version": "1.3.4",
"depth": 0,
"source": "registry",
"dependencies": {},
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment