Skip to content

Commit 7276c50

Browse files
dingpinglvdingpinglv
committed
Closed #3371: replace setPosition(cc.p(x,y)) to setPosition(x,y)
1 parent b5281c4 commit 7276c50

File tree

39 files changed

+479
-479
lines changed

39 files changed

+479
-479
lines changed

‎games/CocosDragonJS/Published files Android/GameScene.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ GameScene.prototype.onDidLoadFromCCB = function()
4242
// Center the level on Screen
4343
gLevelOffsetX = (gWinSize.width-CD_LEVEL_WIDTH*gScaleFactor)/2;
4444

45-
level.setPosition(cc.p(gLevelOffsetX,0));
45+
level.setPosition(gLevelOffsetX,0);
4646

4747
this.rootNode.addChild(level);
4848
};

‎games/CocosDragonJS/Published files HTML5/GameScene.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ GameScene.prototype.onDidLoadFromCCB = function()
4242
// Center the level on Screen
4343
gLevelOffsetX = (gWinSize.width-CD_LEVEL_WIDTH*gScaleFactor)/2;
4444

45-
level.setPosition(cc.p(gLevelOffsetX,0));
45+
level.setPosition(gLevelOffsetX,0);
4646

4747
this.rootNode.addChild(level);
4848
};

‎games/CocosDragonJS/Published files HTML5/boot2-html5.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ var CCBMainScene = cc.Scene.extend({
66
var node = cc.BuilderReader.load("MainMenuScene.ccbi");
77

88
this.addChild(node);
9-
this.setPosition(cc.p(0, 0));
9+
this.setPosition(0, 0);
1010
}
1111
});

‎games/CocosDragonJS/Published files iOS/GameScene.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ GameScene.prototype.onDidLoadFromCCB = function()
4242
// Center the level on Screen
4343
gLevelOffsetX = (gWinSize.width-CD_LEVEL_WIDTH*gScaleFactor)/2;
4444

45-
level.setPosition(cc.p(gLevelOffsetX,0));
45+
level.setPosition(gLevelOffsetX,0);
4646

4747
this.rootNode.addChild(level);
4848
};

‎games/CocosDragonJS/Source/js/GameScene.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ GameScene.prototype.onDidLoadFromCCB = function()
4444
// Center the level on Screen
4545
gLevelOffsetX = (gWinSize.width-CD_LEVEL_WIDTH*gScaleFactor)/2;
4646

47-
level.setPosition(cc.p(gLevelOffsetX,0));
47+
level.setPosition(gLevelOffsetX,0);
4848

4949
this.rootNode.addChild(level);
5050

‎games/CrystalCraze/Published-Android/GameScene.js

+12-12
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ function removeConnectedGems(x, y)
170170
gBoard[idx] = kBoardTypePup0;
171171

172172
var sprt = cc.Sprite.createWithSpriteFrameName("crystals/bomb.png");
173-
sprt.setPosition(cc.p(gemX*kGemSize, gemY*kGemSize));
173+
sprt.setPosition(gemX*kGemSize, gemY*kGemSize);
174174
sprt.setAnchorPoint(0,0);
175175
sprt.setOpacity(0);
176176
sprt.runAction(cc.FadeIn.create(0.4));
@@ -188,7 +188,7 @@ function removeConnectedGems(x, y)
188188
{
189189
// Animate effect for power-up
190190
var sprtLight = cc.Sprite.createWithSpriteFrameName("crystals/bomb-light.png");
191-
sprtLight.setPosition(cc.p(gemX*kGemSize+kGemSize/2, gemY*kGemSize+kGemSize/2));
191+
sprtLight.setPosition(gemX*kGemSize+kGemSize/2, gemY*kGemSize+kGemSize/2);
192192
sprtLight.setBlendFunc(gl.SRC_ALPHA, gl.ONE);
193193
gEffectsLayer.addChild(sprtLight);
194194

@@ -258,12 +258,12 @@ function activatePowerUp(x, y)
258258

259259
// Add particle effects
260260
var hp = cc.ParticleSystem.create("particles/taken-hrow.plist");
261-
hp.setPosition(cc.p(kBoardWidth/2*kGemSize+kGemSize/2, y*kGemSize+kGemSize/2));
261+
hp.setPosition(kBoardWidth/2*kGemSize+kGemSize/2, y*kGemSize+kGemSize/2);
262262
hp.setAutoRemoveOnFinish(true);
263263
gParticleLayer.addChild(hp);
264264

265265
var vp = cc.ParticleSystem.create("particles/taken-vrow.plist");
266-
vp.setPosition(cc.p(x*kGemSize+kGemSize/2, kBoardHeight/2*kGemSize+kGemSize/2));
266+
vp.setPosition(x*kGemSize+kGemSize/2, kBoardHeight/2*kGemSize+kGemSize/2);
267267
vp.setAutoRemoveOnFinish(true);
268268
gParticleLayer.addChild(vp);
269269

@@ -388,7 +388,7 @@ function setGemType(x, y, newType)
388388
gGameLayer.removeChild(gBoardSprites[idx], true);
389389

390390
var gemSprite = cc.Sprite.createWithSpriteFrameName("crystals/"+newType+".png");
391-
gemSprite.setPosition(cc.p(x * kGemSize, y * kGemSize));
391+
gemSprite.setPosition(x * kGemSize, y * kGemSize);
392392
gemSprite.setAnchorPoint(0,0);
393393

394394
gGameLayer.addChild(gemSprite);
@@ -526,7 +526,7 @@ function displayHint()
526526

527527
var hintSprite = cc.Sprite.createWithSpriteFrameName("crystals/hint.png");
528528
hintSprite.setOpacity(0);
529-
hintSprite.setPosition(cc.p(x*kGemSize, y*kGemSize));
529+
hintSprite.setPosition(x*kGemSize, y*kGemSize);
530530
hintSprite.setAnchorPoint(0, 0);
531531
gHintLayer.addChild(hintSprite);
532532
hintSprite.runAction(action);
@@ -591,10 +591,10 @@ function setupShimmer()
591591
y = Math.random()*kBoardHeight*kGemSize;
592592
rot = Math.random()*180-90;
593593

594-
sprt.setPosition(cc.p(x,y));
594+
sprt.setPosition(x,y);
595595
sprt.setRotation(rot);
596596

597-
sprt.setPosition(cc.p(kBoardWidth*kGemSize/2, kBoardHeight*kGemSize/2));
597+
sprt.setPosition(kBoardWidth*kGemSize/2, kBoardHeight*kGemSize/2);
598598
sprt.setBlendFunc(gl.SRC_ALPHA, gl.ONE);
599599
sprt.setScale(3);
600600

@@ -637,7 +637,7 @@ function updateSparkle()
637637
cc.FadeOut.create(2),
638638
cc.CallFunc.create(onRemoveFromParent, this)));
639639

640-
sprite.setPosition(cc.p(kGemSize*(2/6), kGemSize*(4/6)));
640+
sprite.setPosition(kGemSize*(2/6), kGemSize*(4/6));
641641

642642
gemSprite.addChild(sprite);
643643
}
@@ -849,7 +849,7 @@ GameScene.prototype.onUpdate = function(dt)
849849
// A gem should be added to this column!
850850
var gemType = Math.floor(Math.random()*5);
851851
var gemSprite = cc.Sprite.createWithSpriteFrameName("crystals/"+gemType+".png");
852-
gemSprite.setPosition(cc.p(x * kGemSize, kBoardHeight * kGemSize));
852+
gemSprite.setPosition(x * kGemSize, kBoardHeight * kGemSize);
853853
gemSprite.setAnchorPoint(0,0);
854854

855855
gem = {gemType: gemType, sprite: gemSprite, yPos: kBoardHeight, ySpeed: 0};
@@ -900,15 +900,15 @@ GameScene.prototype.onUpdate = function(dt)
900900
gBoardSprites[x + y*kBoardWidth] = gem.sprite;
901901

902902
// Update fixed position
903-
gem.sprite.setPosition(cc.p(x*kGemSize, y*kGemSize));
903+
gem.sprite.setPosition(x*kGemSize, y*kGemSize);
904904
gNumGemsInColumn[x] ++;
905905

906906
gBoardChangedSinceEvaluation = true;
907907
}
908908
else
909909
{
910910
// Update the falling gems position
911-
gem.sprite.setPosition(cc.p(x*kGemSize, gem.yPos*kGemSize));
911+
gem.sprite.setPosition(x*kGemSize, gem.yPos*kGemSize);
912912
}
913913
}
914914
}

‎games/CrystalCraze/Published-Android/MainScene.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -95,10 +95,10 @@ MainScene.prototype.onUpdate = function()
9595

9696
var speed = 2*scale*kGemSize/40;
9797

98-
sprt.setPosition(cc.p(x,y));
98+
sprt.setPosition(x,y);
9999
sprt.setScale(scale);
100100

101-
//p.setPosition(cc.p(x,y));
101+
//p.setPosition(x,y);
102102
//p.setScale(scale);
103103
//p.setAutoRemoveOnFinish(true);
104104

‎games/CrystalCraze/Published-HTML5/GameScene.js

+12-12
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ function removeConnectedGems(x, y)
170170
gBoard[idx] = kBoardTypePup0;
171171

172172
var sprt = cc.Sprite.createWithSpriteFrameName("crystals/bomb.png");
173-
sprt.setPosition(cc.p(gemX*kGemSize, gemY*kGemSize));
173+
sprt.setPosition(gemX*kGemSize, gemY*kGemSize);
174174
sprt.setAnchorPoint(0,0);
175175
sprt.setOpacity(0);
176176
sprt.runAction(cc.FadeIn.create(0.4));
@@ -188,7 +188,7 @@ function removeConnectedGems(x, y)
188188
{
189189
// Animate effect for power-up
190190
var sprtLight = cc.Sprite.createWithSpriteFrameName("crystals/bomb-light.png");
191-
sprtLight.setPosition(cc.p(gemX*kGemSize+kGemSize/2, gemY*kGemSize+kGemSize/2));
191+
sprtLight.setPosition(gemX*kGemSize+kGemSize/2, gemY*kGemSize+kGemSize/2);
192192
sprtLight.setBlendFunc(gl.SRC_ALPHA, gl.ONE);
193193
gEffectsLayer.addChild(sprtLight);
194194

@@ -258,12 +258,12 @@ function activatePowerUp(x, y)
258258

259259
// Add particle effects
260260
var hp = cc.ParticleSystem.create("particles/taken-hrow.plist");
261-
hp.setPosition(cc.p(kBoardWidth/2*kGemSize+kGemSize/2, y*kGemSize+kGemSize/2));
261+
hp.setPosition(kBoardWidth/2*kGemSize+kGemSize/2, y*kGemSize+kGemSize/2);
262262
hp.setAutoRemoveOnFinish(true);
263263
gParticleLayer.addChild(hp);
264264

265265
var vp = cc.ParticleSystem.create("particles/taken-vrow.plist");
266-
vp.setPosition(cc.p(x*kGemSize+kGemSize/2, kBoardHeight/2*kGemSize+kGemSize/2));
266+
vp.setPosition(x*kGemSize+kGemSize/2, kBoardHeight/2*kGemSize+kGemSize/2);
267267
vp.setAutoRemoveOnFinish(true);
268268
gParticleLayer.addChild(vp);
269269

@@ -388,7 +388,7 @@ function setGemType(x, y, newType)
388388
gGameLayer.removeChild(gBoardSprites[idx], true);
389389

390390
var gemSprite = cc.Sprite.createWithSpriteFrameName("crystals/"+newType+".png");
391-
gemSprite.setPosition(cc.p(x * kGemSize, y * kGemSize));
391+
gemSprite.setPosition(x * kGemSize, y * kGemSize);
392392
gemSprite.setAnchorPoint(0,0);
393393

394394
gGameLayer.addChild(gemSprite);
@@ -526,7 +526,7 @@ function displayHint()
526526

527527
var hintSprite = cc.Sprite.createWithSpriteFrameName("crystals/hint.png");
528528
hintSprite.setOpacity(0);
529-
hintSprite.setPosition(cc.p(x*kGemSize, y*kGemSize));
529+
hintSprite.setPosition(x*kGemSize, y*kGemSize);
530530
hintSprite.setAnchorPoint(0, 0);
531531
gHintLayer.addChild(hintSprite);
532532
hintSprite.runAction(action);
@@ -591,10 +591,10 @@ function setupShimmer()
591591
y = Math.random()*kBoardHeight*kGemSize;
592592
rot = Math.random()*180-90;
593593

594-
sprt.setPosition(cc.p(x,y));
594+
sprt.setPosition(x,y);
595595
sprt.setRotation(rot);
596596

597-
sprt.setPosition(cc.p(kBoardWidth*kGemSize/2, kBoardHeight*kGemSize/2));
597+
sprt.setPosition(kBoardWidth*kGemSize/2, kBoardHeight*kGemSize/2);
598598
sprt.setBlendFunc(gl.SRC_ALPHA, gl.ONE);
599599
sprt.setScale(3);
600600

@@ -637,7 +637,7 @@ function updateSparkle()
637637
cc.FadeOut.create(2),
638638
cc.CallFunc.create(onRemoveFromParent, this)));
639639

640-
sprite.setPosition(cc.p(kGemSize*(2/6), kGemSize*(4/6)));
640+
sprite.setPosition(kGemSize*(2/6), kGemSize*(4/6));
641641

642642
gemSprite.addChild(sprite);
643643
}
@@ -849,7 +849,7 @@ GameScene.prototype.onUpdate = function(dt)
849849
// A gem should be added to this column!
850850
var gemType = Math.floor(Math.random()*5);
851851
var gemSprite = cc.Sprite.createWithSpriteFrameName("crystals/"+gemType+".png");
852-
gemSprite.setPosition(cc.p(x * kGemSize, kBoardHeight * kGemSize));
852+
gemSprite.setPosition(x * kGemSize, kBoardHeight * kGemSize);
853853
gemSprite.setAnchorPoint(0,0);
854854

855855
gem = {gemType: gemType, sprite: gemSprite, yPos: kBoardHeight, ySpeed: 0};
@@ -900,15 +900,15 @@ GameScene.prototype.onUpdate = function(dt)
900900
gBoardSprites[x + y*kBoardWidth] = gem.sprite;
901901

902902
// Update fixed position
903-
gem.sprite.setPosition(cc.p(x*kGemSize, y*kGemSize));
903+
gem.sprite.setPosition(x*kGemSize, y*kGemSize);
904904
gNumGemsInColumn[x] ++;
905905

906906
gBoardChangedSinceEvaluation = true;
907907
}
908908
else
909909
{
910910
// Update the falling gems position
911-
gem.sprite.setPosition(cc.p(x*kGemSize, gem.yPos*kGemSize));
911+
gem.sprite.setPosition(x*kGemSize, gem.yPos*kGemSize);
912912
}
913913
}
914914
}

‎games/CrystalCraze/Published-HTML5/MainScene.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -95,10 +95,10 @@ MainScene.prototype.onUpdate = function()
9595

9696
var speed = 2*scale*kGemSize/40;
9797

98-
sprt.setPosition(cc.p(x,y));
98+
sprt.setPosition(x,y);
9999
sprt.setScale(scale);
100100

101-
//p.setPosition(cc.p(x,y));
101+
//p.setPosition(x,y);
102102
//p.setScale(scale);
103103
//p.setAutoRemoveOnFinish(true);
104104

‎games/CrystalCraze/Published-HTML5/boot2-html5.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ var CCBMainScene = cc.Scene.extend({
66
var node = cc.BuilderReader.load("MainScene.ccbi");
77

88
this.addChild(node);
9-
this.setPosition(cc.p(0, 0));
9+
this.setPosition(0, 0);
1010
}
1111
});

‎games/CrystalCraze/Published-iOS/GameScene.js

+12-12
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ function removeConnectedGems(x, y)
170170
gBoard[idx] = kBoardTypePup0;
171171

172172
var sprt = cc.Sprite.createWithSpriteFrameName("crystals/bomb.png");
173-
sprt.setPosition(cc.p(gemX*kGemSize, gemY*kGemSize));
173+
sprt..setPosition(gemX*kGemSize, gemY*kGemSize);
174174
sprt.setAnchorPoint(0,0);
175175
sprt.setOpacity(0);
176176
sprt.runAction(cc.FadeIn.create(0.4));
@@ -188,7 +188,7 @@ function removeConnectedGems(x, y)
188188
{
189189
// Animate effect for power-up
190190
var sprtLight = cc.Sprite.createWithSpriteFrameName("crystals/bomb-light.png");
191-
sprtLight.setPosition(cc.p(gemX*kGemSize+kGemSize/2, gemY*kGemSize+kGemSize/2));
191+
sprtLight..setPosition(gemX*kGemSize+kGemSize/2, gemY*kGemSize+kGemSize/2);
192192
sprtLight.setBlendFunc(gl.SRC_ALPHA, gl.ONE);
193193
gEffectsLayer.addChild(sprtLight);
194194

@@ -258,12 +258,12 @@ function activatePowerUp(x, y)
258258

259259
// Add particle effects
260260
var hp = cc.ParticleSystem.create("particles/taken-hrow.plist");
261-
hp.setPosition(cc.p(kBoardWidth/2*kGemSize+kGemSize/2, y*kGemSize+kGemSize/2));
261+
hp..setPosition(kBoardWidth/2*kGemSize+kGemSize/2, y*kGemSize+kGemSize/2);
262262
hp.setAutoRemoveOnFinish(true);
263263
gParticleLayer.addChild(hp);
264264

265265
var vp = cc.ParticleSystem.create("particles/taken-vrow.plist");
266-
vp.setPosition(cc.p(x*kGemSize+kGemSize/2, kBoardHeight/2*kGemSize+kGemSize/2));
266+
vp..setPosition(x*kGemSize+kGemSize/2, kBoardHeight/2*kGemSize+kGemSize/2);
267267
vp.setAutoRemoveOnFinish(true);
268268
gParticleLayer.addChild(vp);
269269

@@ -388,7 +388,7 @@ function setGemType(x, y, newType)
388388
gGameLayer.removeChild(gBoardSprites[idx], true);
389389

390390
var gemSprite = cc.Sprite.createWithSpriteFrameName("crystals/"+newType+".png");
391-
gemSprite.setPosition(cc.p(x * kGemSize, y * kGemSize));
391+
gemSprite..setPosition(x * kGemSize, y * kGemSize);
392392
gemSprite.setAnchorPoint(0,0);
393393

394394
gGameLayer.addChild(gemSprite);
@@ -526,7 +526,7 @@ function displayHint()
526526

527527
var hintSprite = cc.Sprite.createWithSpriteFrameName("crystals/hint.png");
528528
hintSprite.setOpacity(0);
529-
hintSprite.setPosition(cc.p(x*kGemSize, y*kGemSize));
529+
hintSprite..setPosition(x*kGemSize, y*kGemSize);
530530
hintSprite.setAnchorPoint(0, 0);
531531
gHintLayer.addChild(hintSprite);
532532
hintSprite.runAction(action);
@@ -591,10 +591,10 @@ function setupShimmer()
591591
y = Math.random()*kBoardHeight*kGemSize;
592592
rot = Math.random()*180-90;
593593

594-
sprt.setPosition(cc.p(x,y));
594+
sprt..setPosition(x,y);
595595
sprt.setRotation(rot);
596596

597-
sprt.setPosition(cc.p(kBoardWidth*kGemSize/2, kBoardHeight*kGemSize/2));
597+
sprt..setPosition(kBoardWidth*kGemSize/2, kBoardHeight*kGemSize/2);
598598
sprt.setBlendFunc(gl.SRC_ALPHA, gl.ONE);
599599
sprt.setScale(3);
600600

@@ -637,7 +637,7 @@ function updateSparkle()
637637
cc.FadeOut.create(2),
638638
cc.CallFunc.create(onRemoveFromParent, this)));
639639

640-
sprite.setPosition(cc.p(kGemSize*(2/6), kGemSize*(4/6)));
640+
sprite..setPosition(kGemSize*(2/6), kGemSize*(4/6));
641641

642642
gemSprite.addChild(sprite);
643643
}
@@ -849,7 +849,7 @@ GameScene.prototype.onUpdate = function(dt)
849849
// A gem should be added to this column!
850850
var gemType = Math.floor(Math.random()*5);
851851
var gemSprite = cc.Sprite.createWithSpriteFrameName("crystals/"+gemType+".png");
852-
gemSprite.setPosition(cc.p(x * kGemSize, kBoardHeight * kGemSize));
852+
gemSprite..setPosition(x * kGemSize, kBoardHeight * kGemSize);
853853
gemSprite.setAnchorPoint(0,0);
854854

855855
gem = {gemType: gemType, sprite: gemSprite, yPos: kBoardHeight, ySpeed: 0};
@@ -900,15 +900,15 @@ GameScene.prototype.onUpdate = function(dt)
900900
gBoardSprites[x + y*kBoardWidth] = gem.sprite;
901901

902902
// Update fixed position
903-
gem.sprite.setPosition(cc.p(x*kGemSize, y*kGemSize));
903+
gem.sprite..setPosition(x*kGemSize, y*kGemSize);
904904
gNumGemsInColumn[x] ++;
905905

906906
gBoardChangedSinceEvaluation = true;
907907
}
908908
else
909909
{
910910
// Update the falling gems position
911-
gem.sprite.setPosition(cc.p(x*kGemSize, gem.yPos*kGemSize));
911+
gem.sprite..setPosition(x*kGemSize, gem.yPos*kGemSize);
912912
}
913913
}
914914
}

‎games/CrystalCraze/Published-iOS/MainScene.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -95,10 +95,10 @@ MainScene.prototype.onUpdate = function()
9595

9696
var speed = 2*scale*kGemSize/40;
9797

98-
sprt.setPosition(cc.p(x,y));
98+
sprt.setPosition(x,y);
9999
sprt.setScale(scale);
100100

101-
//p.setPosition(cc.p(x,y));
101+
//p.setPosition(x,y);
102102
//p.setScale(scale);
103103
//p.setAutoRemoveOnFinish(true);
104104

0 commit comments

Comments
 (0)