clear SetMode PlayMaker action

This commit is contained in:
2015-12-13 23:14:14 +06:00
parent e8627d11ee
commit 63edf259e2
2 changed files with 15 additions and 52 deletions

View File

@@ -102,7 +102,7 @@ Prefab:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 453404, guid: d10e5320df9f84d4186bda0ba98db9ff, type: 2} - target: {fileID: 453404, guid: d10e5320df9f84d4186bda0ba98db9ff, type: 2}
propertyPath: m_LocalPosition.z propertyPath: m_LocalPosition.z
value: 1.4000001 value: 1.3000001
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 453404, guid: d10e5320df9f84d4186bda0ba98db9ff, type: 2} - target: {fileID: 453404, guid: d10e5320df9f84d4186bda0ba98db9ff, type: 2}
propertyPath: m_LocalRotation.x propertyPath: m_LocalRotation.x
@@ -677,17 +677,17 @@ MonoBehaviour:
colorIndex: 0 colorIndex: 0
actionData: actionData:
actionNames: actionNames:
- IsoTools.PlayMaker.Actions.IsoSetMode
- IsoTools.PlayMaker.Actions.IsoSetPosition - IsoTools.PlayMaker.Actions.IsoSetPosition
- HutongGames.PlayMaker.Actions.Wait - HutongGames.PlayMaker.Actions.Wait
- IsoTools.PlayMaker.Actions.IsoSetMode
customNames: customNames:
- -
- -
- -
actionEnabled: 010101 actionEnabled: 010101
actionIsOpen: 010101 actionIsOpen: 010101
actionStartIndex: 00000000080000000b000000 actionStartIndex: 00000000020000000a000000
actionHashCodes: ac9f610448c01101672cde03 actionHashCodes: 672cde03ac9f610448c01101
unityObjectParams: [] unityObjectParams: []
fsmGameObjectParams: [] fsmGameObjectParams: []
fsmOwnerDefaultParams: fsmOwnerDefaultParams:
@@ -770,9 +770,11 @@ MonoBehaviour:
arrayParamTypes: [] arrayParamTypes: []
customTypeSizes: customTypeSizes:
customTypeNames: [] customTypeNames: []
paramDataType: 140000001c0000000f0000000f0000000f0000000100000001000000010000000f0000001700000001000000140000002a000000 paramDataType: 140000002a000000140000001c0000000f0000000f0000000f0000000100000001000000010000000f0000001700000001000000
paramName: paramName:
- gameObject - gameObject
- mode
- gameObject
- vector - vector
- x - x
- y - y
@@ -783,10 +785,8 @@ MonoBehaviour:
- time - time
- finishEvent - finishEvent
- realTime - realTime
- gameObject paramDataPos: 00000000000000000100000000000000000000000100000002000000000000000100000002000000030000000000000003000000
- mode paramByteDataSize: 00000000000000000000000000000000000000000000000000000000010000000100000001000000000000000000000001000000
paramDataPos: 00000000000000000000000001000000020000000000000001000000020000000300000000000000030000000100000000000000
paramByteDataSize: 00000000000000000000000000000000000000000100000001000000010000000000000000000000010000000000000000000000
events: events:
- name: FINISHED - name: FINISHED
isSystemEvent: 1 isSystemEvent: 1
@@ -895,7 +895,7 @@ Prefab:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 453404, guid: d10e5320df9f84d4186bda0ba98db9ff, type: 2} - target: {fileID: 453404, guid: d10e5320df9f84d4186bda0ba98db9ff, type: 2}
propertyPath: m_LocalPosition.z propertyPath: m_LocalPosition.z
value: 1.3000001 value: 1.4000001
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 453404, guid: d10e5320df9f84d4186bda0ba98db9ff, type: 2} - target: {fileID: 453404, guid: d10e5320df9f84d4186bda0ba98db9ff, type: 2}
propertyPath: m_LocalRotation.x propertyPath: m_LocalRotation.x
@@ -953,7 +953,7 @@ Prefab:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 453404, guid: d10e5320df9f84d4186bda0ba98db9ff, type: 2} - target: {fileID: 453404, guid: d10e5320df9f84d4186bda0ba98db9ff, type: 2}
propertyPath: m_LocalPosition.z propertyPath: m_LocalPosition.z
value: 1.2 value: 1.1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 453404, guid: d10e5320df9f84d4186bda0ba98db9ff, type: 2} - target: {fileID: 453404, guid: d10e5320df9f84d4186bda0ba98db9ff, type: 2}
propertyPath: m_LocalRotation.x propertyPath: m_LocalRotation.x
@@ -1112,7 +1112,7 @@ Prefab:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 453404, guid: d10e5320df9f84d4186bda0ba98db9ff, type: 2} - target: {fileID: 453404, guid: d10e5320df9f84d4186bda0ba98db9ff, type: 2}
propertyPath: m_LocalPosition.z propertyPath: m_LocalPosition.z
value: 1.1 value: 1.2
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 453404, guid: d10e5320df9f84d4186bda0ba98db9ff, type: 2} - target: {fileID: 453404, guid: d10e5320df9f84d4186bda0ba98db9ff, type: 2}
propertyPath: m_LocalRotation.x propertyPath: m_LocalRotation.x

View File

@@ -12,51 +12,14 @@ namespace IsoTools.PlayMaker.Actions {
[ObjectType(typeof(IsoObject.Mode))] [ObjectType(typeof(IsoObject.Mode))]
public FsmEnum mode; public FsmEnum mode;
public bool everyFrame;
public bool lateUpdate;
public bool fixedUpdate;
public override void Reset() { public override void Reset() {
gameObject = null; gameObject = null;
mode = new FsmEnum{UseVariable = true}; mode = IsoObject.Mode.Mode2d;
everyFrame = false;
lateUpdate = false;
fixedUpdate = false;
}
public override void OnPreprocess() {
Fsm.HandleFixedUpdate = true;
} }
public override void OnEnter() { public override void OnEnter() {
if ( !everyFrame && !lateUpdate && !fixedUpdate ) { DoAction();
DoAction(); Finish();
Finish();
}
}
public override void OnUpdate() {
if ( !lateUpdate && !fixedUpdate ) {
DoAction();
}
}
public override void OnLateUpdate() {
if ( lateUpdate ) {
DoAction();
}
if ( !everyFrame ) {
Finish();
}
}
public override void OnFixedUpdate() {
if ( fixedUpdate ) {
DoAction();
}
if ( !everyFrame ) {
Finish();
}
} }
void DoAction() { void DoAction() {