Merge pull request #2782 from joshuastray/p

make particle can be created from a object

Author: dingpinglv

Diff for: cocos2d/particle/CCParticleSystem.js

@@ -341,8 +341,10 @@ cc.ParticleSystem = cc.Node.extend(/** @lends cc.ParticleSystem# */{
             var ton = plistFile || 100;
             this.setDrawMode(cc.ParticleSystem.TEXTURE_MODE);
             this.initWithTotalParticles(ton);
-        } else if (plistFile) {
+        } else if (cc.isString(plistFile)) {
             this.initWithFile(plistFile);
+        } else if (cc.isObject(plistFile)) {
+            this.initWithDictionary(plistFile, "");
         }
     },