Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix native spine json file missing in android instant game platform and add global time scale field #3999

Merged
merged 6 commits into from Mar 12, 2019

Conversation

Projects
None yet
2 participants
@sunnylanwanjun
Copy link
Contributor

commented Mar 11, 2019

issue:cocos-creator/2d-tasks#983 (comment)
issue:cocos-creator/2d-tasks#1213
关联pr:
jsb-adapter:cocos-creator-packages/jsb-adapter#118
cocos2d-x-lite:cocos-creator/cocos2d-x-lite#1694
1 修复android instant平台加载spine资源报错的问题。
2 添加spine 和 dragonbones 全局timeScale字段,通过sp.timeScale 和 dragonBones.timeScale 设置。

@pandamicro pandamicro merged commit 6631d68 into cocos-creator:v2.0-release Mar 12, 2019

1 check passed

ci/circleci: test Your tests passed on CircleCI!
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.