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 instantiate prefab scale error #4454

Merged
merged 1 commit into from May 20, 2019

Conversation

Projects
None yet
2 participants
@knoxHuang
Copy link
Collaborator

commented May 20, 2019

Re: https://forum.cocos.com/t/cocos2-0-7-2-0-9-scale-bug/78139

Changes:

  • 修复当 instantiate Prefab 三次以上会导致 instantiate 后的 scale 数值变成了默认数值

@knoxHuang knoxHuang requested a review from pandamicro May 20, 2019

@knoxHuang knoxHuang closed this May 20, 2019

@knoxHuang knoxHuang reopened this May 20, 2019

@jareguo jareguo merged commit db34f28 into cocos-creator:v2.0.10-release May 20, 2019

1 check passed

ci/circleci: test Your tests passed on CircleCI!
Details
@jareguo

This comment has been minimized.

Copy link
Contributor

commented May 20, 2019

修复 Scale 为 0 的节点在 Prefab 中 Instantiate 三次以上会导致 Scale 数值变成为 1 的问题

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
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.