Skip to content

Commit f31a74d

Browse files
committed
Merge pull request cocos2d#1850 from VisualSJ/develop-speedAndRepeat
Issue 3943: To create the mirror method
2 parents 07b3101 + fddc58f commit f31a74d

File tree

2 files changed

+45
-75
lines changed

2 files changed

+45
-75
lines changed

CCBoot.js

Lines changed: 0 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -1468,7 +1468,6 @@ cc.game = {
14681468
self._eventShow = self._eventShow || new cc.EventCustom(self.EVENT_SHOW);
14691469
self._eventShow.setUserData(self);
14701470
self.onStart();
1471-
self._mirrorMethod();
14721471
}
14731472
});
14741473
} else {
@@ -1482,7 +1481,6 @@ cc.game = {
14821481
self._eventShow = self._eventShow || new cc.EventCustom(self.EVENT_SHOW);
14831482
self._eventShow.setUserData(self);
14841483
self.onStart();
1485-
self._mirrorMethod();
14861484
clearInterval(self._checkPrepare);
14871485
}
14881486
}, 10);
@@ -1497,79 +1495,6 @@ cc.game = {
14971495
}, false);
14981496
},
14991497

1500-
/**
1501-
* To create the mirror method
1502-
* @private
1503-
*/
1504-
_mirrorMethod: function(){
1505-
cc.action = cc.Action.create;
1506-
cc.speed = cc.Speed.create;
1507-
cc.follow = cc.Follow.create;
1508-
cc.orbitCamera = cc.OrbitCamera.create;
1509-
cc.cardinalSplineTo = cc.CardinalSplineTo.create;
1510-
cc.cardinalSplineBy = cc.CardinalSplineBy.create;
1511-
cc.catmullRomTo = cc.CatmullRomTo.create;
1512-
cc.catmullRomBy = cc.CatmullRomBy.create;
1513-
// cc.actionEase = cc.ActionEase.create;
1514-
// cc.easeRateAction = cc.EaseRateAction.create;
1515-
// cc.easeIn = cc.EaseIn.create;
1516-
// cc.easeOut = cc.EaseOut.create;
1517-
// cc.easeInOut = cc.EaseInOut.create;
1518-
// cc.easeExponentialIn = cc.EaseExponentialIn.create;
1519-
// cc.easeExponentialOut = cc.EaseExponentialOut.create;
1520-
// cc.easeExponentialInOut = cc.EaseExponentialInOut.create;
1521-
// cc.easeSineIn = cc.EaseSineIn.create;
1522-
// cc.easeSineOut = cc.EaseSineOut.create;
1523-
// cc.easeSineInOut = cc.EaseSineInOut.create;
1524-
// cc.easeElastic = cc.EaseElastic.create;
1525-
// cc.easeElasticIn = cc.EaseElasticIn.create;
1526-
// cc.easeElasticOut = cc.EaseElasticOut.create;
1527-
// cc.easeElasticInOut = cc.EaseElasticInOut.create;
1528-
// cc.easeBounce = cc.EaseBounce.create;
1529-
// cc.easeBounceIn = cc.EaseBounceIn.create;
1530-
// cc.easeBounceOut = cc.EaseBounceOut.create;
1531-
// cc.easeBounceInOut = cc.EaseBounceInOut.create;
1532-
// cc.easeBackIn = cc.EaseBackIn.create;
1533-
// cc.easeBackOut = cc.EaseBackOut.create;
1534-
// cc.easeBackInOut = cc.EaseBackInOut.create;
1535-
cc.show = cc.Show.create;
1536-
cc.hide = cc.Hide.create;
1537-
cc.toggleVisibility = cc.ToggleVisibility.create;
1538-
cc.removeSelf = cc.RemoveSelf.create;
1539-
cc.flipX = cc.FlipX.create;
1540-
cc.flipY = cc.FlipY.create;
1541-
cc.place = cc.Place.create;
1542-
cc.callFunc = cc.CallFunc.create;
1543-
cc.actionInterval = cc.ActionInterval.create;
1544-
cc.sequence = cc.Sequence.create;
1545-
cc.repeat = cc.Repeat.create;
1546-
cc.repeatForever = cc.RepeatForever.create;
1547-
cc.spawn = cc.Spawn.create;
1548-
cc.rotateTo = cc.RotateTo.create;
1549-
cc.rotateBy = cc.RotateBy.create;
1550-
cc.moveBy = cc.MoveBy.create;
1551-
cc.moveTo = cc.MoveTo.create;
1552-
cc.skewTo = cc.SkewTo.create;
1553-
cc.skewBy = cc.SkewBy.create;
1554-
cc.jumpBy = cc.JumpBy.create;
1555-
cc.jumpTo = cc.JumpTo.create;
1556-
cc.bezierBy = cc.BezierBy.create;
1557-
cc.bezierTo = cc.BezierTo.create;
1558-
cc.scaleTo = cc.ScaleTo.create;
1559-
cc.scaleBy = cc.ScaleBy.create;
1560-
cc.blink = cc.Blink.create;
1561-
cc.fadeTo = cc.FadeTo.create;
1562-
cc.fadeIn = cc.FadeIn.create;
1563-
cc.fadeOut = cc.FadeOut.create;
1564-
cc.tintTo = cc.TintTo.create;
1565-
cc.tintBy = cc.TintBy.create;
1566-
cc.delayTime = cc.DelayTime.create;
1567-
cc.reverseTime = cc.ReverseTime.create;
1568-
cc.animate = cc.Animate.create;
1569-
cc.targetedAction = cc.TargetedAction.create;
1570-
cc.actionTween = cc.ActionTween.create;
1571-
},
1572-
15731498
/**
15741499
* Init config.
15751500
* @param cb

cocos2d/actions/CCActionTween.js

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,3 +131,48 @@ cc.ActionTween.create = function (duration, key, from, to) {
131131
return ret;
132132
return null;
133133
};
134+
135+
cc.action = cc.Action.create;
136+
cc.speed = cc.Speed.create;
137+
cc.follow = cc.Follow.create;
138+
cc.orbitCamera = cc.OrbitCamera.create;
139+
cc.cardinalSplineTo = cc.CardinalSplineTo.create;
140+
cc.cardinalSplineBy = cc.CardinalSplineBy.create;
141+
cc.catmullRomTo = cc.CatmullRomTo.create;
142+
cc.catmullRomBy = cc.CatmullRomBy.create;
143+
cc.show = cc.Show.create;
144+
cc.hide = cc.Hide.create;
145+
cc.toggleVisibility = cc.ToggleVisibility.create;
146+
cc.removeSelf = cc.RemoveSelf.create;
147+
cc.flipX = cc.FlipX.create;
148+
cc.flipY = cc.FlipY.create;
149+
cc.place = cc.Place.create;
150+
cc.callFunc = cc.CallFunc.create;
151+
cc.actionInterval = cc.ActionInterval.create;
152+
cc.sequence = cc.Sequence.create;
153+
cc.repeat = cc.Repeat.create;
154+
cc.repeatForever = cc.RepeatForever.create;
155+
cc.spawn = cc.Spawn.create;
156+
cc.rotateTo = cc.RotateTo.create;
157+
cc.rotateBy = cc.RotateBy.create;
158+
cc.moveBy = cc.MoveBy.create;
159+
cc.moveTo = cc.MoveTo.create;
160+
cc.skewTo = cc.SkewTo.create;
161+
cc.skewBy = cc.SkewBy.create;
162+
cc.jumpBy = cc.JumpBy.create;
163+
cc.jumpTo = cc.JumpTo.create;
164+
cc.bezierBy = cc.BezierBy.create;
165+
cc.bezierTo = cc.BezierTo.create;
166+
cc.scaleTo = cc.ScaleTo.create;
167+
cc.scaleBy = cc.ScaleBy.create;
168+
cc.blink = cc.Blink.create;
169+
cc.fadeTo = cc.FadeTo.create;
170+
cc.fadeIn = cc.FadeIn.create;
171+
cc.fadeOut = cc.FadeOut.create;
172+
cc.tintTo = cc.TintTo.create;
173+
cc.tintBy = cc.TintBy.create;
174+
cc.delayTime = cc.DelayTime.create;
175+
cc.reverseTime = cc.ReverseTime.create;
176+
cc.animate = cc.Animate.create;
177+
cc.targetedAction = cc.TargetedAction.create;
178+
cc.actionTween = cc.ActionTween.create;

0 commit comments

Comments
 (0)