Skip to content

MotionStreak scene optimize #781

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

Merged
merged 7 commits into from
Oct 16, 2019
Merged

MotionStreak scene optimize #781

merged 7 commits into from
Oct 16, 2019

Conversation

zhefengzhang
Copy link

No description provided.

@zhefengzhang
Copy link
Author

主要是MotionStreak optimize的提交,add shader example-cases 那个是之前的提交。


lateUpdate () {
if (!this.motionStreak.node.getComponent(cc.Animation).getAnimationState("move_around").isPlaying) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

提取个变量吧,代码太长了也不好看

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

可以了

@jareguo jareguo requested a review from knoxHuang October 15, 2019 14:27
@knoxHuang knoxHuang merged commit db04cd6 into cocos:v2.2.0-release Oct 16, 2019
knoxHuang added a commit that referenced this pull request Nov 29, 2019
* commit '066fb36b66c77fdb3dfb8be2661da57ec6dc83bd': (22 commits)
  fix net video crash on Huawei (#796)
  add draw line graphics demo (#794)
  fix resource loading (#795)
  V2.2.1 release camera (#792)
  fixed #783pr error commit (#790)
  Reduce the speed of sprite Filled change (#788)
  set io as global var in socket-io (#786)
  fix md5 url for wssCacert (#787)
  02_particle scenes optimize (#783)
  MotionStreak scene optimize (#781)
  Add ios access to Native_Call (#780)
  add shader example-cases (#779)
  fix wrong jump height in case platform
  fixed capture native
  let audio normally download when audio is playing
  Richer msgs for xhr states displaying
  Add more message for websocket state displaying
  update button transition in subpackage scene (#771)
  fix tiledmap change scene throw error (#770)
  add dynamic batch mesh renderer example (#769)
  ...

# Conflicts:
#	assets/cases/01_graphics/01_sprite/FilledSprite/FilledSpriteControl.js
#	assets/cases/3d/dynamic-batch-mesh-renderer.fire
#	assets/cases/3d/dynamic-batch-mesh-renderer.fire.meta
#	assets/res/textures/sheep/AutoAtlas.pac.meta
knoxHuang added a commit to knoxHuang/example-cases that referenced this pull request Dec 4, 2019
* v2.2.1-release: (32 commits)
  fixed #783pr error commit (cocos#790)
  Reduce the speed of sprite Filled change (cocos#788)
  set io as global var in socket-io (cocos#786)
  fix md5 url for wssCacert (cocos#787)
  02_particle scenes optimize (cocos#783)
  MotionStreak scene optimize (cocos#781)
  Add ios access to Native_Call (cocos#780)
  add shader example-cases (cocos#779)
  fix wrong jump height in case platform
  fixed capture native
  let audio normally download when audio is playing
  Richer msgs for xhr states displaying
  Add more message for websocket state displaying
  update button transition in subpackage scene (cocos#771)
  fix tiledmap change scene throw error (cocos#770)
  add dynamic batch mesh renderer example (cocos#769)
  fix socket-io plugin on xiaomi platform (cocos#767)
  Fix DragonBones replace skin example offset incorrect (cocos#768)
  improve Subpackages examples
  update meta
  ...

# Conflicts:
#	assets/cases/02_ui/12_slider/Slider.fire
#	assets/cases/05_scripting/11_network/NetworkCtrl.js
#	assets/cases/asset_bundle/AssetBundles.fire
#	assets/cases/asset_bundle/First/gold.png.meta
#	assets/cases/asset_bundle/Second/goldcoin.png.meta
#	assets/cases/asset_bundle/load-bundle.js
knoxHuang added a commit that referenced this pull request Dec 4, 2019
* update meta 2.1.2 to 2.1.3

* ban videoPlayer keepRatio (#752)

* ban editbox case on alipay (#753)

* disable mesh example on ie11

* open downloader-web case (#755)

* add id to example cases

* call label default onload on example-case (#760)

* add  mipmap example

* refine raycast example

* add screen-to-world-point example

* fixed cocos/2d-tasks/issues/1800

* add missing texture

* update meta

* improve Subpackages examples

* Fix DragonBones replace skin example offset incorrect (#768)

* fix socket-io plugin on xiaomi platform (#767)

* add dynamic batch mesh renderer example (#769)

* fix tiledmap change scene throw error (#770)

* update button transition in subpackage scene (#771)

* Add more message for websocket state displaying

add "Opened", "Error" and "Close" states to websocket state info

* Richer msgs for xhr states displaying

* let audio normally download when audio is playing

now audio will stop playing for deleting audio file before new audio download task start

* fixed capture native

* fix wrong jump height in case platform

* add shader example-cases (#779)

* Add ios access to Native_Call (#780)

* MotionStreak scene optimize (#781)

* add shader example-cases

* MotionStreak optimize

* Update MotionStreakCtrl.js

* Update MotionStreakCtrl.js

* Update MotionStreakCtrl.js

* 02_particle scenes optimize (#783)

* 02_particle scenes optimize

* Update ParticleControl.js

* fix md5 url for wssCacert (#787)

* set io as global var in socket-io (#786)

* Reduce the speed of sprite Filled change (#788)

* fixed #783pr error commit (#790)

* V2.2.1 release camera (#792)

* add camera ortho size

* refine moving-objects

* refinde code

* refine code

* refine code

* refine name

* fix resource loading (#795)

* add draw line graphics demo (#794)

* fix net video crash on Huawei (#796)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants