Skip to content

Commit

Permalink
updated to rc31
Browse files Browse the repository at this point in the history
  • Loading branch information
@jeanfabre
jeanfabre committed Jul 9, 2015
1 parent bed450b commit 15d8090
Show file tree
Hide file tree
Showing 8 changed files with 2,065 additions and 1,378 deletions.
595 changes: 55 additions & 540 deletions Assets/PlayMaker Unity 2D Demo/Prefabs/Props/bombCrate.prefab
View file

Large diffs are not rendered by default.

523 changes: 36 additions & 487 deletions Assets/PlayMaker Unity 2D Demo/Prefabs/Props/healthCrate.prefab
View file

Large diffs are not rendered by default.

44 changes: 43 additions & 1 deletion Assets/PlayMaker Unity 2D Demo/Prefabs/enemy1.prefab
View file
Original file line number Diff line number Diff line change
Expand Up @@ -561,12 +561,26 @@ MonoBehaviour:
showStateLabel: 1
maxLoopCount: 0
watermark:
password:
locked: 0
preprocessed: 0
ExposedEvents: []
RestartOnEnable: 1
EnableDebugFlow: 0
EnableBreakpoints: 1
activeStateName:
mouseEvents: 0
handleTriggerEnter: 0
handleTriggerExit: 0
handleTriggerStay: 0
handleCollisionEnter: 0
handleCollisionExit: 0
handleCollisionStay: 0
handleOnGUI: 0
handleFixedUpdate: 0
handleApplicationEvents: 0
fsmTemplate: {fileID: 11400000, guid: 96475948966984df0a62480e2f1abd31, type: 2}
eventHandlerComponentsAdded: 0
--- !u!114 &11400002
MonoBehaviour:
m_ObjectHideFlags: 1
Expand All @@ -579,7 +593,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
fsm:
dataVersion: 0
dataVersion: 2
usedInTemplate: {fileID: 0}
name: Enemy Movement
startState: State 1
Expand Down Expand Up @@ -680,12 +694,26 @@ MonoBehaviour:
showStateLabel: 1
maxLoopCount: 0
watermark:
password:
locked: 0
preprocessed: 1
ExposedEvents: []
RestartOnEnable: 1
EnableDebugFlow: 0
EnableBreakpoints: 1
activeStateName:
mouseEvents: 0
handleTriggerEnter: 0
handleTriggerExit: 0
handleTriggerStay: 0
handleCollisionEnter: 0
handleCollisionExit: 0
handleCollisionStay: 0
handleOnGUI: 0
handleFixedUpdate: 0
handleApplicationEvents: 0
fsmTemplate: {fileID: 11400000, guid: 15349db176cab4dd7b640b1130bda060, type: 2}
eventHandlerComponentsAdded: 1
--- !u!114 &11400004
MonoBehaviour:
m_ObjectHideFlags: 1
Expand Down Expand Up @@ -1601,6 +1629,9 @@ MonoBehaviour:
showStateLabel: 1
maxLoopCount: 0
watermark:
password:
locked: 0
preprocessed: 0
ExposedEvents:
- name: ROCKET / HIT
isSystemEvent: 0
Expand All @@ -1609,7 +1640,18 @@ MonoBehaviour:
EnableDebugFlow: 0
EnableBreakpoints: 1
activeStateName:
mouseEvents: 0
handleTriggerEnter: 0
handleTriggerExit: 0
handleTriggerStay: 0
handleCollisionEnter: 0
handleCollisionExit: 0
handleCollisionStay: 0
handleOnGUI: 0
handleFixedUpdate: 0
handleApplicationEvents: 0
fsmTemplate: {fileID: 0}
eventHandlerComponentsAdded: 0
--- !u!212 &21200000
SpriteRenderer:
m_ObjectHideFlags: 1
Expand Down
112 changes: 105 additions & 7 deletions Assets/PlayMaker Unity 2D Demo/Prefabs/hero.prefab
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1916,7 +1916,7 @@ MonoBehaviour:
isGlobal: 0
- name: PLAYER / IS DEAD
isSystemEvent: 0
isGlobal: 0
isGlobal: 1
- name: PLAYER / ON PICK HEALTH
isSystemEvent: 0
isGlobal: 0
Expand Down Expand Up @@ -2054,12 +2054,26 @@ MonoBehaviour:
showStateLabel: 1
maxLoopCount: 0
watermark:
password:
locked: 0
preprocessed: 0
ExposedEvents: []
RestartOnEnable: 1
EnableDebugFlow: 0
EnableBreakpoints: 1
activeStateName:
mouseEvents: 0
handleTriggerEnter: 0
handleTriggerExit: 0
handleTriggerStay: 0
handleCollisionEnter: 0
handleCollisionExit: 0
handleCollisionStay: 0
handleOnGUI: 0
handleFixedUpdate: 0
handleApplicationEvents: 0
fsmTemplate: {fileID: 0}
eventHandlerComponentsAdded: 0
--- !u!114 &11400002
MonoBehaviour:
m_ObjectHideFlags: 1
Expand Down Expand Up @@ -2750,12 +2764,26 @@ MonoBehaviour:
showStateLabel: 1
maxLoopCount: 0
watermark:
password:
locked: 0
preprocessed: 0
ExposedEvents: []
RestartOnEnable: 1
EnableDebugFlow: 0
EnableBreakpoints: 1
activeStateName:
mouseEvents: 0
handleTriggerEnter: 0
handleTriggerExit: 0
handleTriggerStay: 0
handleCollisionEnter: 0
handleCollisionExit: 0
handleCollisionStay: 0
handleOnGUI: 0
handleFixedUpdate: 0
handleApplicationEvents: 0
fsmTemplate: {fileID: 0}
eventHandlerComponentsAdded: 0
--- !u!114 &11400004
MonoBehaviour:
m_ObjectHideFlags: 1
Expand Down Expand Up @@ -3018,12 +3046,26 @@ MonoBehaviour:
showStateLabel: 1
maxLoopCount: 0
watermark:
password:
locked: 0
preprocessed: 0
ExposedEvents: []
RestartOnEnable: 1
EnableDebugFlow: 0
EnableBreakpoints: 1
activeStateName:
mouseEvents: 0
handleTriggerEnter: 0
handleTriggerExit: 0
handleTriggerStay: 0
handleCollisionEnter: 0
handleCollisionExit: 0
handleCollisionStay: 0
handleOnGUI: 0
handleFixedUpdate: 0
handleApplicationEvents: 0
fsmTemplate: {fileID: 0}
eventHandlerComponentsAdded: 0
--- !u!114 &11400006
MonoBehaviour:
m_ObjectHideFlags: 1
Expand Down Expand Up @@ -3057,7 +3099,7 @@ MonoBehaviour:
- fsmEvent:
name: PLAYER IS FACING LEFT
isSystemEvent: 0
isGlobal: 0
isGlobal: 1
toState: Check for Right
linkStyle: 0
linkConstraint: 0
Expand Down Expand Up @@ -3247,7 +3289,7 @@ MonoBehaviour:
- fsmEvent:
name: PLAYER IS FACING RIGHT
isSystemEvent: 0
isGlobal: 0
isGlobal: 1
toState: check for Left
linkStyle: 0
linkConstraint: 0
Expand Down Expand Up @@ -3479,18 +3521,18 @@ MonoBehaviour:
isGlobal: 0
- name: PLAYER / IS DEAD
isSystemEvent: 0
isGlobal: 0
isGlobal: 1
- name: PLAYER IS FACING LEFT
isSystemEvent: 0
isGlobal: 0
isGlobal: 1
- name: PLAYER IS FACING RIGHT
isSystemEvent: 0
isGlobal: 0
isGlobal: 1
globalTransitions:
- fsmEvent:
name: PLAYER / IS DEAD
isSystemEvent: 0
isGlobal: 0
isGlobal: 1
toState: Disable
linkStyle: 0
linkConstraint: 0
Expand Down Expand Up @@ -3531,12 +3573,26 @@ MonoBehaviour:
showStateLabel: 1
maxLoopCount: 0
watermark:
password:
locked: 0
preprocessed: 0
ExposedEvents: []
RestartOnEnable: 1
EnableDebugFlow: 0
EnableBreakpoints: 1
activeStateName:
mouseEvents: 0
handleTriggerEnter: 0
handleTriggerExit: 0
handleTriggerStay: 0
handleCollisionEnter: 0
handleCollisionExit: 0
handleCollisionStay: 0
handleOnGUI: 0
handleFixedUpdate: 0
handleApplicationEvents: 0
fsmTemplate: {fileID: 0}
eventHandlerComponentsAdded: 0
--- !u!114 &11400008
MonoBehaviour:
m_ObjectHideFlags: 1
Expand Down Expand Up @@ -3933,12 +3989,26 @@ MonoBehaviour:
showStateLabel: 1
maxLoopCount: 0
watermark:
password:
locked: 0
preprocessed: 0
ExposedEvents: []
RestartOnEnable: 1
EnableDebugFlow: 0
EnableBreakpoints: 1
activeStateName:
mouseEvents: 0
handleTriggerEnter: 0
handleTriggerExit: 0
handleTriggerStay: 0
handleCollisionEnter: 0
handleCollisionExit: 0
handleCollisionStay: 0
handleOnGUI: 0
handleFixedUpdate: 0
handleApplicationEvents: 0
fsmTemplate: {fileID: 0}
eventHandlerComponentsAdded: 0
--- !u!114 &11400012
MonoBehaviour:
m_ObjectHideFlags: 1
Expand Down Expand Up @@ -4560,6 +4630,9 @@ MonoBehaviour:
showStateLabel: 1
maxLoopCount: 0
watermark:
password:
locked: 0
preprocessed: 0
ExposedEvents:
- name: PLAYER / TAUNT
isSystemEvent: 0
Expand All @@ -4568,7 +4641,18 @@ MonoBehaviour:
EnableDebugFlow: 0
EnableBreakpoints: 1
activeStateName:
mouseEvents: 0
handleTriggerEnter: 0
handleTriggerExit: 0
handleTriggerStay: 0
handleCollisionEnter: 0
handleCollisionExit: 0
handleCollisionStay: 0
handleOnGUI: 0
handleFixedUpdate: 0
handleApplicationEvents: 0
fsmTemplate: {fileID: 0}
eventHandlerComponentsAdded: 0
--- !u!114 &11400014
MonoBehaviour:
m_ObjectHideFlags: 1
Expand Down Expand Up @@ -5516,12 +5600,26 @@ MonoBehaviour:
showStateLabel: 1
maxLoopCount: 0
watermark:
password:
locked: 0
preprocessed: 0
ExposedEvents: []
RestartOnEnable: 1
EnableDebugFlow: 0
EnableBreakpoints: 1
activeStateName:
mouseEvents: 0
handleTriggerEnter: 0
handleTriggerExit: 0
handleTriggerStay: 0
handleCollisionEnter: 0
handleCollisionExit: 0
handleCollisionStay: 0
handleOnGUI: 0
handleFixedUpdate: 0
handleApplicationEvents: 0
fsmTemplate: {fileID: 0}
eventHandlerComponentsAdded: 0
--- !u!212 &21200000
SpriteRenderer:
m_ObjectHideFlags: 1
Expand Down
18 changes: 16 additions & 2 deletions Assets/PlayMaker Unity 2D Demo/Prefabs/kill Trigger.prefab
View file
Original file line number Diff line number Diff line change
Expand Up @@ -668,15 +668,15 @@ MonoBehaviour:
isGlobal: 0
- name: PLAYER / IS DEAD
isSystemEvent: 0
isGlobal: 0
isGlobal: 1
- name: PLAYER HIT
isSystemEvent: 0
isGlobal: 0
globalTransitions:
- fsmEvent:
name: PLAYER / IS DEAD
isSystemEvent: 0
isGlobal: 0
isGlobal: 1
toState: wait for 2 seconds
linkStyle: 0
linkConstraint: 0
Expand Down Expand Up @@ -729,12 +729,26 @@ MonoBehaviour:
showStateLabel: 1
maxLoopCount: 0
watermark:
password:
locked: 0
preprocessed: 0
ExposedEvents: []
RestartOnEnable: 1
EnableDebugFlow: 0
EnableBreakpoints: 1
activeStateName:
mouseEvents: 0
handleTriggerEnter: 0
handleTriggerExit: 0
handleTriggerStay: 0
handleCollisionEnter: 0
handleCollisionExit: 0
handleCollisionStay: 0
handleOnGUI: 0
handleFixedUpdate: 0
handleApplicationEvents: 0
fsmTemplate: {fileID: 0}
eventHandlerComponentsAdded: 0
--- !u!114 &11400004
MonoBehaviour:
m_ObjectHideFlags: 1
Expand Down
Loading

0 comments on commit 15d8090

Please sign in to comment.