From 0d52b620e5c90e22b45553bae80001793d794aec Mon Sep 17 00:00:00 2001 From: pandamicro Date: Tue, 14 Jan 2014 17:51:06 +0800 Subject: [PATCH] Refactor #3690: Move CCNS.js content into CCCommon.js --- games/CocosDragonJS/Published files HTML5/cocos2d-html5.min.js | 2 +- games/CrystalCraze/Published-HTML5/cocos2d-html5.min.js | 2 +- games/MoonWarriors/build.xml | 1 - tests/build.xml | 1 - 4 files changed, 2 insertions(+), 4 deletions(-) diff --git a/games/CocosDragonJS/Published files HTML5/cocos2d-html5.min.js b/games/CocosDragonJS/Published files HTML5/cocos2d-html5.min.js index e98468ba..0278ffbb 100644 --- a/games/CocosDragonJS/Published files HTML5/cocos2d-html5.min.js +++ b/games/CocosDragonJS/Published files HTML5/cocos2d-html5.min.js @@ -1450,7 +1450,7 @@ new cc.Sprite,this._reusedTile.initWithTexture(this.getTexture(),a,!1)),this._re return b}});cc.TMXLayer.create=function(a,b,c){var d=new cc.TMXLayer;return d.initWithTilesetInfo(a,b,c)?d:null};cc.PointObject=cc.Class.extend({_ratio:null,_offset:null,_child:null,getRatio:function(){return this._ratio},setRatio:function(a){this._ratio=a},getOffset:function(){return this._offset},setOffset:function(a){this._offset=a},getChild:function(){return this._child},setChild:function(a){this._child=a},initWithCCPoint:function(a,b){this._ratio=a;this._offset=b;this._child=null;return!0}});cc.PointObject.create=function(a,b){var c=new cc.PointObject;c.initWithCCPoint(a,b);return c}; cc.ParallaxNode=cc.Node.extend({_lastPosition:null,_parallaxArray:[],getParallaxArray:function(){return this._parallaxArray},setParallaxArray:function(a){this._parallaxArray=a},ctor:function(){this._super();this._parallaxArray=[];this._lastPosition=cc.p(-100,-100)},addChild:function(a,b,c,d){if(3==arguments.length)cc.Assert(0,"ParallaxNode: use addChild:z:parallaxRatio:positionOffset instead");else{cc.Assert(null!=a,"Argument must be non-nil");var e=cc.PointObject.create(c,d);e.setChild(a);this._parallaxArray.push(e); e=cc.p(this._position.x,this._position.y);e.x=e.x*c.x+d.x;e.y=e.y*c.y+d.y;a.setPosition(e);this._super(a,b,a.getTag())}},removeChild:function(a,b){for(var c=0;c - diff --git a/tests/build.xml b/tests/build.xml index 4633b8be..247acd31 100644 --- a/tests/build.xml +++ b/tests/build.xml @@ -142,7 +142,6 @@ -