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 spine cache error when change skin #4488

Merged

Conversation

Projects
None yet
2 participants
@sunnylanwanjun
Copy link
Contributor

commented May 23, 2019

修复换装时,缓存帧数错误的bug
form:https://forum.cocos.com/t/2-0-10animationcahce-bug/78322

@jareguo jareguo merged commit 4620e8a into cocos-creator:v2.0.10-release May 23, 2019

1 check was pending

ci/circleci: test CircleCI is running your tests
Details

jareguo added a commit that referenced this pull request May 23, 2019

Merge commit '70b47cef5197dead34813347b9d4ddd1c30e4165' into v2.1.2
* commit '70b47cef5197dead34813347b9d4ddd1c30e4165':
  refine uuid-loader error log code (#4492)
  add baidu subcontext view help url for 2d-tasks/issues/1465 (#4491)
  refine item error log (#4487)
  Fix spine cache error when change skin (#4488)
  fix instantiate prefab scale error (#4454)
  fix spine and dragonbones update cache bug (#4457)
  fix _histTest ignore scale bug (#4456)
  merge xiaomi (#4447)
  Optimize spine and dragonbones animation cache (#4387)
  update test-deserialize code (#4432)

# Conflicts:
#	cocos2d/core/CCNode.js
#	cocos2d/core/components/CCMask.js
#	extensions/dragonbones/ArmatureDisplay.js

jareguo added a commit that referenced this pull request May 23, 2019

Merge branch 'v2.1.2' into v2.2.0
* v2.1.2:
  refine uuid-loader error log code (#4492)
  add baidu subcontext view help url for 2d-tasks/issues/1465 (#4491)
  refine item error log (#4487)
  Fix spine cache error when change skin (#4488)
  refine docs (#4477)
  fixed generate animation joint matrix (#4475)
  add canvas don't support button disabled state for 2d-tasks/issues/1451 (#4474)
  fix instantiate prefab scale error (#4454)
  fixed the creator.d.ts error (#4372)
  fix spine and dragonbones update cache bug (#4457)
  fix _histTest ignore scale bug (#4456)
  add builtin-2d-base material (#4443)
  merge xiaomi (#4447)
  Fix the problem that the bitmap mode of label is invalid. (#4393)
  Optimize spine and dragonbones animation cache (#4387)
  update test-deserialize code (#4432)

# Conflicts:
#	cocos2d/core/CCNode.js
#	extensions/spine/Skeleton.js
@jareguo

This comment has been minimized.

Copy link
Contributor

commented May 23, 2019

修复 Spine 开启 Cache 模式后,换装时动画可能异常的问题

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.