Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Finish* Mario1-1 
This is the version of Mario1-1 that I build and submitted. It still is missing a bunch of stuff, but due dates and stuff...
  • Loading branch information
@mfs16101
mfs16101 committed Mar 5, 2020
1 parent 9fe572d commit 8abaeeb
Show file tree
Hide file tree
Showing 17,574 changed files with 232,978 additions and 479,647 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
2 changes: 1 addition & 1 deletion ...cts/Corgi1-1/Assets/CorgiEngine/Common/Scripts/Agents/CharacterAbilities/CharacterJump.cs
View file
Expand Up @@ -504,7 +504,7 @@ namespace MoreMountains.CorgiEngine
/// </summary> /// </summary>
protected override void InitializeAnimatorParameters() protected override void InitializeAnimatorParameters()
{ {
RegisterAnimatorParameter (_jumpingAnimationParameterName, AnimatorControllerParameterType.Bool, out _jumpingAnimationParameter); RegisterAnimatorParameter ("Jumping", AnimatorControllerParameterType.Bool, out _jumpingAnimationParameter);
RegisterAnimatorParameter (_doubleJumpingAnimationParameterName, AnimatorControllerParameterType.Bool, out _doubleJumpingAnimationParameter); RegisterAnimatorParameter (_doubleJumpingAnimationParameterName, AnimatorControllerParameterType.Bool, out _doubleJumpingAnimationParameter);
RegisterAnimatorParameter (_hitTheGroundAnimationParameterName, AnimatorControllerParameterType.Bool, out _hitTheGroundAnimationParameter); RegisterAnimatorParameter (_hitTheGroundAnimationParameterName, AnimatorControllerParameterType.Bool, out _hitTheGroundAnimationParameter);
} }
Expand Down
51 changes: 31 additions & 20 deletions ...s/Corgi1-1/Assets/CorgiEngine/Demos/Corgi2D/Animations/Environment/bonus-block.controller
View file
Expand Up @@ -3,8 +3,9 @@
--- !u!91 &9100000 --- !u!91 &9100000
AnimatorController: AnimatorController:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: bonus-block m_Name: bonus-block
serializedVersion: 5 serializedVersion: 5
m_AnimatorParameters: m_AnimatorParameters:
Expand Down Expand Up @@ -36,8 +37,9 @@ AnimatorController:
--- !u!1101 &110131496 --- !u!1101 &110131496
AnimatorStateTransition: AnimatorStateTransition:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: m_Name:
m_Conditions: m_Conditions:
- m_ConditionMode: 2 - m_ConditionMode: 2
Expand All @@ -60,8 +62,9 @@ AnimatorStateTransition:
--- !u!1101 &110147390 --- !u!1101 &110147390
AnimatorStateTransition: AnimatorStateTransition:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: m_Name:
m_Conditions: m_Conditions:
- m_ConditionMode: 1 - m_ConditionMode: 1
Expand All @@ -84,8 +87,9 @@ AnimatorStateTransition:
--- !u!1101 &110158964 --- !u!1101 &110158964
AnimatorStateTransition: AnimatorStateTransition:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: m_Name:
m_Conditions: m_Conditions:
- m_ConditionMode: 1 - m_ConditionMode: 1
Expand All @@ -109,8 +113,9 @@ AnimatorStateTransition:
AnimatorState: AnimatorState:
serializedVersion: 5 serializedVersion: 5
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: bonus-block-off m_Name: bonus-block-off
m_Speed: 1 m_Speed: 1
m_CycleOffset: 0 m_CycleOffset: 0
Expand All @@ -123,17 +128,20 @@ AnimatorState:
m_SpeedParameterActive: 0 m_SpeedParameterActive: 0
m_MirrorParameterActive: 0 m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0 m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: c4ae2473d7449f74b8a751b1364db695, type: 2} m_Motion: {fileID: 7400000, guid: c4ae2473d7449f74b8a751b1364db695, type: 2}
m_Tag: m_Tag:
m_SpeedParameter: m_SpeedParameter:
m_MirrorParameter: m_MirrorParameter:
m_CycleOffsetParameter: m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &110249268 --- !u!1102 &110249268
AnimatorState: AnimatorState:
serializedVersion: 5 serializedVersion: 5
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: bonus-block-idle m_Name: bonus-block-idle
m_Speed: 1 m_Speed: 1
m_CycleOffset: 0 m_CycleOffset: 0
Expand All @@ -147,17 +155,20 @@ AnimatorState:
m_SpeedParameterActive: 0 m_SpeedParameterActive: 0
m_MirrorParameterActive: 0 m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0 m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: e838f3b74f9f14b33a00b88922b9d79d, type: 2} m_Motion: {fileID: 7400000, guid: e838f3b74f9f14b33a00b88922b9d79d, type: 2}
m_Tag: m_Tag:
m_SpeedParameter: m_SpeedParameter:
m_MirrorParameter: m_MirrorParameter:
m_CycleOffsetParameter: m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &110299584 --- !u!1102 &110299584
AnimatorState: AnimatorState:
serializedVersion: 5 serializedVersion: 5
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: bonus-block-hit m_Name: bonus-block-hit
m_Speed: 1 m_Speed: 1
m_CycleOffset: 0 m_CycleOffset: 0
Expand All @@ -172,17 +183,20 @@ AnimatorState:
m_SpeedParameterActive: 0 m_SpeedParameterActive: 0
m_MirrorParameterActive: 0 m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0 m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 29846c98a0e1a42028b9c24b9b1b92f7, type: 2} m_Motion: {fileID: 7400000, guid: 29846c98a0e1a42028b9c24b9b1b92f7, type: 2}
m_Tag: m_Tag:
m_SpeedParameter: m_SpeedParameter:
m_MirrorParameter: m_MirrorParameter:
m_CycleOffsetParameter: m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1107 &110701856 --- !u!1107 &110701856
AnimatorStateMachine: AnimatorStateMachine:
serializedVersion: 5 serializedVersion: 5
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Base Layer m_Name: Base Layer
m_ChildStates: m_ChildStates:
- serializedVersion: 1 - serializedVersion: 1
Expand All @@ -197,10 +211,7 @@ AnimatorStateMachine:
m_ChildStateMachines: [] m_ChildStateMachines: []
m_AnyStateTransitions: [] m_AnyStateTransitions: []
m_EntryTransitions: [] m_EntryTransitions: []
m_StateMachineTransitions: m_StateMachineTransitions: {}
data:
first: {fileID: 110701856}
second: []
m_StateMachineBehaviours: [] m_StateMachineBehaviours: []
m_AnyStatePosition: {x: 50, y: 20, z: 0} m_AnyStatePosition: {x: 50, y: 20, z: 0}
m_EntryPosition: {x: 48, y: 84, z: 0} m_EntryPosition: {x: 48, y: 84, z: 0}
Expand Down

0 comments on commit 8abaeeb

Please sign in to comment.