改了一下场景文件里的配置

creator 引擎报了这个问题

[db-task][sync-changes] Failed to import asset /Users/takanokaoru/Desktop/coco2d-x/sshclient/assets/scenes/GameScene/Mahjong/GameSPMJ.fire, message: SyntaxError: /Users/takanokaoru/Desktop/coco2d-x/sshclient/assets/scenes/GameScene/Mahjong/GameSPMJ.fire: Unexpected token
in JSON at position 297507
at /Applications/CocosCreator.app/Contents/Resources/app.asar/node_modules/jsonfile/index.js:36:18
at /Applications/CocosCreator.app/Contents/Resources/app.asar/node_modules/graceful-fs/graceful-fs.js:78:16
at FSReqWrap.readFileAfterClose [as oncomplete] (fs.js:445:3)

手动置顶,求大神解答

场景文件有错误,应该是 git 冲突了

好的,谢谢