Skip to content

Commit 6f7413c

Browse files
dingpinglvdingpinglv
committed
fixed #2294 Actions which calls copy() now calls clone() instead
1 parent df2efc1 commit 6f7413c

File tree

17 files changed

+146
-148
lines changed

17 files changed

+146
-148
lines changed

‎games/MoonWarriors/src/Effect.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,11 @@ var spark = function (ccpoint, parent, scale, duration) {
6464
two.runAction(right);
6565

6666
one.runAction(scaleBy);
67-
two.runAction(scaleBy.copy());
68-
three.runAction(scaleBy.copy());
67+
two.runAction(scaleBy.clone());
68+
three.runAction(scaleBy.clone());
6969

7070
one.runAction(seq);
71-
two.runAction(seq.copy() );
72-
three.runAction(seq.copy());
71+
two.runAction(seq.clone() );
72+
three.runAction(seq.clone());
7373
};
7474

‎games/MoonWarriors/src/LevelManager.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ var LevelManager = cc.Class.extend({
7979
var a2 = cc.DelayTime.create(1);
8080
var a3 = cc.MoveBy.create(1, cc.p(100 + 100 * Math.random(), 0));
8181
pSender.runAction(cc.RepeatForever.create(
82-
cc.Sequence.create(a2, a3, a2.copy(), a3.reverse())
82+
cc.Sequence.create(a2, a3, a2.clone(), a3.reverse())
8383
));
8484
}.bind(addEnemy) );
8585
tmpAction = cc.Sequence.create(a0, a1, onComplete);

‎games/MoonWarriors/src/SparkEffect.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ var SparkEffect = cc.Class.extend({
2424

2525
this.spark1.runAction(right);
2626
this.spark1.runAction(scaleBy);
27-
this.spark2.runAction(scaleBy.copy());
27+
this.spark2.runAction(scaleBy.clone());
2828

2929
this.spark1.runAction(seq);
30-
this.spark2.runAction(seq.copy());
30+
this.spark2.runAction(seq.clone());
3131
},
3232
destroy:function () {
3333
this.spark1.setPosition(g_hideSpritePos);

‎games/WatermelonWithMe/watermelon_with_me.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -961,7 +961,7 @@ MenuLayerController.prototype.onDidLoadFromCCB = function () {
961961
var a_tint = cc.TintTo.create(0.5, 0, 255, 0);
962962
var a_rotate = cc.RotateBy.create(4, 360);
963963
var a_rep = cc.Repeat.create(a_rotate, 1000);
964-
var a_seq = cc.Sequence.create(a_delay, a_tint, a_delay.copy(), a_rep);
964+
var a_seq = cc.Sequence.create(a_delay, a_tint, a_delay.clone(), a_rep);
965965
o.runAction(a_seq);
966966
};
967967

‎tests/ActionsTest/ActionsTest.js

+26-26
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ var ActionRotate = ActionsDemo.extend({
316316
var actionByBack = actionBy.reverse();
317317
this._grossini.runAction(cc.Sequence.create(actionBy, cc.DelayTime.create(0.25), actionByBack));
318318

319-
this._kathia.runAction(cc.Sequence.create(actionTo2, cc.DelayTime.create(0.25), actionTo0.copy()));
319+
this._kathia.runAction(cc.Sequence.create(actionTo2, cc.DelayTime.create(0.25), actionTo0.clone()));
320320

321321
},
322322
title:function () {
@@ -359,9 +359,9 @@ var ActionRotateXY = ActionsDemo.extend({
359359
var delay = cc.DelayTime.create(0.25);
360360

361361
this._tamara.runAction(cc.Sequence.create(actionTo, delay, actionToBack));
362-
this._grossini.runAction(cc.Sequence.create(actionBy, delay.copy(), actionBy.reverse()));
362+
this._grossini.runAction(cc.Sequence.create(actionBy, delay.clone(), actionBy.reverse()));
363363

364-
this._kathia.runAction(cc.Sequence.create(actionBy2, delay.copy(), actionBy2.reverse()));
364+
this._kathia.runAction(cc.Sequence.create(actionBy2, delay.clone(), actionBy2.reverse()));
365365
},
366366
title:function () {
367367
return "cc.RotateBy(x,y) / cc.RotateTo(x,y)";
@@ -411,9 +411,9 @@ var ActionSkew = ActionsDemo.extend({
411411
var delay = cc.DelayTime.create(0.25);
412412

413413
this._tamara.runAction(cc.Sequence.create(actionTo, delay, actionToBack));
414-
this._grossini.runAction(cc.Sequence.create(actionBy, delay.copy(), actionBy.reverse()));
414+
this._grossini.runAction(cc.Sequence.create(actionBy, delay.clone(), actionBy.reverse()));
415415

416-
this._kathia.runAction(cc.Sequence.create(actionBy2, delay.copy(), actionBy2.reverse()));
416+
this._kathia.runAction(cc.Sequence.create(actionBy2, delay.clone(), actionBy2.reverse()));
417417
},
418418
title:function () {
419419
return "cc.SkewTo / cc.SkewBy";
@@ -480,8 +480,8 @@ var ActionSkewRotateScale = ActionsDemo.extend({
480480
var delay = cc.DelayTime.create(0.25);
481481

482482
box.runAction(cc.Sequence.create(actionTo, delay, actionToBack));
483-
box.runAction(cc.Sequence.create(rotateTo, delay.copy(), rotateToBack));
484-
box.runAction(cc.Sequence.create(actionScaleTo, delay.copy(), actionScaleToBack));
483+
box.runAction(cc.Sequence.create(rotateTo, delay.clone(), rotateToBack));
484+
box.runAction(cc.Sequence.create(actionScaleTo, delay.clone(), actionScaleToBack));
485485

486486
this.box = box;
487487
},
@@ -533,7 +533,7 @@ var ActionJump = ActionsDemo.extend({
533533
this._tamara.runAction(actionTo);
534534
this._grossini.runAction(cc.Sequence.create(actionBy, delay, actionByBack));
535535
this._kathia.runAction(cc.RepeatForever.create(
536-
cc.Sequence.create(actionUp, delay.copy() )
536+
cc.Sequence.create(actionUp, delay.clone() )
537537
) );
538538

539539
},
@@ -594,7 +594,7 @@ var ActionBezier = ActionsDemo.extend({
594594
var bezierForward = cc.BezierBy.create(2, controlPoints);
595595
var rep = cc.RepeatForever.create(
596596
cc.Sequence.create(
597-
bezierForward, delay, bezierForward.reverse(), delay.copy()
597+
bezierForward, delay, bezierForward.reverse(), delay.clone()
598598
));
599599

600600
// sprite 2
@@ -689,7 +689,7 @@ var ActionBezierToCopy = ActionsDemo.extend({
689689

690690
// sprite 2
691691
this._kathia.setPosition(80, 160);
692-
var bezierTo2 = bezierTo1.copy();
692+
var bezierTo2 = bezierTo1.clone();
693693

694694
this._tamara.runAction(bezierTo1);
695695
this._kathia.runAction(bezierTo2);
@@ -729,6 +729,7 @@ var Issue1008 = ActionsDemo.extend({
729729
var rep = cc.RepeatForever.create(cc.Sequence.create(bz1, bz2, trace,delay));
730730

731731
this._grossini.runAction(rep);
732+
//this._grossini.runAction(cc.Sequence.create(bz1, bz2, trace,delay));
732733

733734
},
734735
onTrace:function (sender) {
@@ -822,7 +823,7 @@ var ActionFade = ActionsDemo.extend({
822823
var action2Back = action2.reverse();
823824

824825
this._tamara.runAction(cc.Sequence.create(action1, delay, action1Back));
825-
this._kathia.runAction(cc.Sequence.create(action2, delay.copy(), action2Back));
826+
this._kathia.runAction(cc.Sequence.create(action2, delay.clone(), action2Back));
826827

827828

828829
},
@@ -927,7 +928,7 @@ var ActionAnimate = ActionsDemo.extend({
927928
// File animation
928929
//
929930
// with 4 loops
930-
var animation3 = animation2.copy();
931+
var animation3 = animation2.clone();
931932
animation3.setLoops(4);
932933

933934
var action3 = cc.Animate.create(animation3);
@@ -1210,7 +1211,6 @@ var ActionCallFunc3 = ActionsDemo.extend({
12101211
ret.push( this.control1 );
12111212
return JSON.stringify(ret);
12121213
}
1213-
12141214
});
12151215

12161216
//------------------------------------------------------------------
@@ -1311,7 +1311,7 @@ var ActionRotateToRepeat = ActionsDemo.extend({
13111311
var act2 = cc.RotateTo.create(0.5, 0);
13121312
var seq = cc.Sequence.create(act1, act2);
13131313
var rep1 = cc.RepeatForever.create(seq);
1314-
var rep2 = cc.Repeat.create((seq.copy()), 4);
1314+
var rep2 = cc.Repeat.create((seq.clone()), 4);
13151315

13161316
this._tamara.runAction(rep1);
13171317
this._kathia.runAction(rep2);
@@ -1353,7 +1353,7 @@ var ActionRotateJerk = ActionsDemo.extend({
13531353
cc.RotateTo.create(0.5, 20));
13541354

13551355
var rep1 = cc.Repeat.create(seq, 10);
1356-
var rep2 = cc.RepeatForever.create((seq.copy()));
1356+
var rep2 = cc.RepeatForever.create((seq.clone()));
13571357

13581358
this._tamara.runAction(rep1);
13591359
this._kathia.runAction(rep2);
@@ -1421,7 +1421,7 @@ var ActionDelayTime = ActionsDemo.extend({
14211421
this.alignSpritesLeft(1);
14221422

14231423
var move = cc.MoveBy.create(1, cc.p(150, 0));
1424-
var action = cc.Sequence.create(move, cc.DelayTime.create(2), move.copy());
1424+
var action = cc.Sequence.create(move, cc.DelayTime.create(2), move.clone());
14251425

14261426
this._grossini.runAction(action);
14271427
},
@@ -1518,7 +1518,7 @@ var ActionRepeat = ActionsDemo.extend({
15181518
cc.Sequence.create(cc.Place.create(cc.p(60, 60)), a1),
15191519
3);
15201520
var action2 = cc.RepeatForever.create(
1521-
cc.Sequence.create( a1.copy(), a1.reverse(), cc.DelayTime.create(0.25) )
1521+
cc.Sequence.create( a1.clone(), a1.reverse(), cc.DelayTime.create(0.25) )
15221522
);
15231523

15241524
this._kathia.runAction(action1);
@@ -1577,8 +1577,8 @@ var ActionOrbit = ActionsDemo.extend({
15771577
var seq = cc.Sequence.create(move, move_back);
15781578
var rfe = cc.RepeatForever.create(seq);
15791579
this._kathia.runAction(rfe);
1580-
this._tamara.runAction((rfe.copy()));
1581-
this._grossini.runAction((rfe.copy()));
1580+
this._tamara.runAction((rfe.clone()));
1581+
this._grossini.runAction((rfe.clone()));
15821582

15831583
},
15841584
subtitle:function () {
@@ -1649,7 +1649,7 @@ var ActionCardinalSpline = ActionsDemo.extend({
16491649
//
16501650
var action1 = cc.CardinalSplineBy.create(2, array, 0);
16511651
var reverse1 = action1.reverse();
1652-
var seq = cc.Sequence.create(action1, delay, reverse1, delay.copy() );
1652+
var seq = cc.Sequence.create(action1, delay, reverse1, delay.clone() );
16531653

16541654
this._tamara.setPosition(50, 50);
16551655
this._tamara.runAction(seq);
@@ -1661,7 +1661,7 @@ var ActionCardinalSpline = ActionsDemo.extend({
16611661
//
16621662
var action2 = cc.CardinalSplineBy.create(2, array, 1);
16631663
var reverse2 = action2.reverse();
1664-
var seq2 = cc.Sequence.create(action2, delay.copy(), reverse2, delay.copy() );
1664+
var seq2 = cc.Sequence.create(action2, delay.clone(), reverse2, delay.clone());
16651665

16661666
this._kathia.setPosition(winSize.width / 2, 50);
16671667
this._kathia.runAction(seq2);
@@ -1829,7 +1829,7 @@ var ActionCatmullRom = ActionsDemo.extend({
18291829
var action2 = cc.CatmullRomTo.create(3, array2);
18301830
var reverse2 = action2.reverse();
18311831

1832-
var seq2 = cc.Sequence.create(action2, delay.copy(), reverse2);
1832+
var seq2 = cc.Sequence.create(action2, delay.clone(), reverse2);
18331833

18341834
this._kathia.runAction(seq2);
18351835

@@ -1935,9 +1935,9 @@ var ActionTargeted = ActionsDemo.extend({
19351935
this.centerSprites(2);
19361936

19371937
var jump1 = cc.JumpBy.create(2, cc.p(0, 0), 100, 3);
1938-
var jump2 = jump1.copy();
1938+
var jump2 = jump1.clone();
19391939
var rot1 = cc.RotateBy.create(1, 360);
1940-
var rot2 = rot1.copy();
1940+
var rot2 = rot1.clone();
19411941

19421942
var t1 = cc.TargetedAction.create(this._kathia, jump2);
19431943
var t2 = cc.TargetedAction.create(this._kathia, rot2);
@@ -1966,10 +1966,10 @@ var ActionTargetedCopy = ActionsDemo.extend({
19661966
this.centerSprites(2);
19671967

19681968
var jump1 = cc.JumpBy.create(2, cc.p(0, 0), 100, 3);
1969-
var jump2 = jump1.copy();
1969+
var jump2 = jump1.clone();
19701970

19711971
var t1 = cc.TargetedAction.create(this._kathia, jump2);
1972-
var t_copy = t1.copy();
1972+
var t_copy = t1.clone();
19731973

19741974
var seq = cc.Sequence.create(jump1, t_copy);
19751975

‎tests/ChipmunkTest/ChipmunkTest.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -572,8 +572,8 @@ var ChipmunkSpriteAnchorPoint = function() {
572572
var repeat = cc.RepeatForever.create( seq );
573573

574574
sprite1.runAction( repeat );
575-
sprite2.runAction( repeat.copy() );
576-
sprite3.runAction( repeat.copy() );
575+
sprite2.runAction( repeat.clone() );
576+
sprite3.runAction( repeat.clone() );
577577

578578
this.addChild(sprite1);
579579
this.addChild(sprite2);

‎tests/CocosNodeTest/CocosNodeTest.js

+9-9
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ var CCNodeTest2 = TestNodeDemo.extend({
9393

9494
var action1 = cc.RepeatForever.create(cc.Sequence.create(a1, a2, delay, a2.reverse()));
9595
var action2 = cc.RepeatForever.create(cc.Sequence.create(
96-
a1.copy(), a2.copy(), delay.copy(), a2.reverse()));
96+
a1.clone(), a2.clone(), delay.clone(), a2.reverse()));
9797

9898
sp2.setAnchorPoint(cc.p(0, 0));
9999

@@ -177,7 +177,7 @@ var CCNodeTest5 = TestNodeDemo.extend({
177177
var rot = cc.RotateBy.create(2, 360);
178178
var rot_back = rot.reverse();
179179
var forever = cc.RepeatForever.create(cc.Sequence.create(rot, rot_back));
180-
var forever2 = forever.copy();
180+
var forever2 = forever.clone();
181181
forever.setTag(101);
182182
forever2.setTag(102);
183183

@@ -250,10 +250,10 @@ var CCNodeTest6 = TestNodeDemo.extend({
250250
var rot = cc.RotateBy.create(2, 360);
251251
var rot_back = rot.reverse();
252252
var forever1 = cc.RepeatForever.create(cc.Sequence.create(rot, rot_back));
253-
var forever11 = forever1.copy();
253+
var forever11 = forever1.clone();
254254

255-
var forever2 = forever1.copy();
256-
var forever21 = forever1.copy();
255+
var forever2 = forever1.clone();
256+
var forever21 = forever1.clone();
257257

258258
this.addChild(sp1, 0, TAG_SPRITE1);
259259
sp1.addChild(sp11, 11);
@@ -370,7 +370,7 @@ var StressTest2 = TestNodeDemo.extend({
370370
sp1.setPosition(cc.p(80, winSize.height / 2));
371371

372372
var move = cc.MoveBy.create(3, cc.p(350, 0));
373-
var move_ease_inout3 = cc.EaseInOut.create(move.copy(), 2.0);
373+
var move_ease_inout3 = cc.EaseInOut.create(move.clone(), 2.0);
374374
var move_ease_inout_back3 = move_ease_inout3.reverse();
375375
var seq3 = cc.Sequence.create(move_ease_inout3, move_ease_inout_back3);
376376
sp1.runAction(cc.RepeatForever.create(seq3));
@@ -380,7 +380,7 @@ var StressTest2 = TestNodeDemo.extend({
380380
fire.setTexture(cc.TextureCache.getInstance().addImage(s_fire));
381381
fire.setPosition(cc.p(80, winSize.height / 2 - 50));
382382

383-
var copy_seq3 = seq3.copy();
383+
var copy_seq3 = seq3.clone();
384384

385385
fire.runAction(cc.RepeatForever.create(copy_seq3));
386386
sublayer.addChild(fire, 2);
@@ -424,7 +424,7 @@ var NodeToWorld = TestNodeDemo.extend({
424424

425425
var move = cc.MoveBy.create(3, cc.p(200, 0));
426426
var move_back = move.reverse();
427-
var seq = cc.Sequence.create(move, delay.copy(), move_back);
427+
var seq = cc.Sequence.create(move, delay.clone(), move_back);
428428
var fe2 = cc.RepeatForever.create(seq);
429429
back.runAction(fe2);
430430

@@ -702,7 +702,7 @@ var ConvertToNode = TestNodeDemo.extend({
702702

703703
point.setPosition(sprite.getPosition());
704704

705-
var copy = action.copy();
705+
var copy = action.clone();
706706
sprite.runAction(copy);
707707
this.addChild(sprite, i);
708708
}

0 commit comments

Comments
 (0)