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

update onLoad #125

Merged
merged 1 commit into from
Jun 9, 2017
Merged

update onLoad #125

merged 1 commit into from
Jun 9, 2017

Conversation

jareguo
Copy link
Contributor

@jareguo jareguo commented Jun 8, 2017

@nantas nantas merged commit 14bbae1 into cocos:master Jun 9, 2017
knoxHuang pushed a commit to knoxHuang/creator-docs that referenced this pull request May 21, 2019
* add v2.1 menu

* update
knoxHuang pushed a commit to knoxHuang/creator-docs that referenced this pull request May 21, 2019
* v1.10:
  update v1.10 (cocos#125)
  add v2.1 menu (cocos#120)
  add v2.1 menu (cocos#119)

# Conflicts:
#	en/book.json
#	en/classes/Acceleration.md
#	en/classes/Action.md
#	en/classes/ActionEase.md
#	en/classes/ActionInstant.md
#	en/classes/ActionInterval.md
#	en/classes/ActionManager.md
#	en/classes/AffineTransform.md
#	en/classes/AgentManager.md
#	en/classes/Animation.md
#	en/classes/AnimationClip.md
#	en/classes/AnimationState.md
#	en/classes/ArmatureDisplay.md
#	en/classes/Asset.md
#	en/classes/AudioClip.md
#	en/classes/AudioSource.md
#	en/classes/BitmapFont.md
#	en/classes/BlendFunc.md
#	en/classes/BlockInputEvents.md
#	en/classes/BoxCollider.md
#	en/classes/Button.md
#	en/classes/CallbacksInvoker.md
#	en/classes/Camera.md
#	en/classes/Canvas.md
#	en/classes/CircleCollider.md
#	en/classes/CoffeeScript.md
#	en/classes/Collider.Box.md
#	en/classes/Collider.Circle.md
#	en/classes/Collider.Polygon.md
#	en/classes/Collider.md
#	en/classes/CollisionManager.md
#	en/classes/Color.md
#	en/classes/Component.EventHandler.md
#	en/classes/Component.md
#	en/classes/ContainerStrategy.md
#	en/classes/ContentStrategy.md
#	en/classes/Details.md
#	en/classes/Director.md
#	en/classes/DistanceJoint.md
#	en/classes/DragonBonesAsset.md
#	en/classes/DragonBonesAtlasAsset.md
#	en/classes/EaseBounce.md
#	en/classes/EaseElastic.md
#	en/classes/EaseRateAction.md
#	en/classes/EditBox.md
#	en/classes/EqualToFrame.md
#	en/classes/EqualToWindow.md
#	en/classes/Event.EventAcceleration.md
#	en/classes/Event.EventCustom.md
#	en/classes/Event.EventKeyboard.md
#	en/classes/Event.EventMouse.md
#	en/classes/Event.EventTouch.md
#	en/classes/Event.md
#	en/classes/EventListener.md
#	en/classes/EventTarget.md
#	en/classes/FiniteTimeAction.md
#	en/classes/Font.md
#	en/classes/Game.md
#	en/classes/Graphics.md
#	en/classes/Intersection.md
#	en/classes/Joint.md
#	en/classes/JsonAsset.md
#	en/classes/Label.md
#	en/classes/LabelAtlas.md
#	en/classes/LabelOutline.md
#	en/classes/Layout.md
#	en/classes/LoadingItems.md
#	en/classes/Manifold.md
#	en/classes/ManifoldPoint.md
#	en/classes/Mask.md
#	en/classes/MotionStreak.md
#	en/classes/MotorJoint.md
#	en/classes/MouseJoint.md
#	en/classes/Node.EventType.md
#	en/classes/Node.md
#	en/classes/NodePool.md
#	en/classes/OriginalContainer.md
#	en/classes/PageView.md
#	en/classes/PageViewIndicator.md
#	en/classes/ParticleSystem.md
#	en/classes/PhysicsBoxCollider.md
#	en/classes/PhysicsChainCollider.md
#	en/classes/PhysicsCircleCollider.md
#	en/classes/PhysicsCollider.md
#	en/classes/PhysicsContact.md
#	en/classes/PhysicsImpulse.md
#	en/classes/PhysicsManager.md
#	en/classes/PhysicsPolygonCollider.md
#	en/classes/PhysicsRayCastResult.md
#	en/classes/Pipeline.Downloader.md
#	en/classes/Pipeline.Loader.md
#	en/classes/Pipeline.md
#	en/classes/Playable.md
#	en/classes/PluginParam.md
#	en/classes/PluginProtocol.md
#	en/classes/PolygonCollider.md
#	en/classes/Prefab.md
#	en/classes/PrismaticJoint.md
#	en/classes/ProgressBar.md
#	en/classes/ProportionalToFrame.md
#	en/classes/ProportionalToWindow.md
#	en/classes/ProtocolAdTracking.md
#	en/classes/ProtocolAds.md
#	en/classes/ProtocolAnalytics.md
#	en/classes/ProtocolCrash.md
#	en/classes/ProtocolCustom.md
#	en/classes/ProtocolIAP.md
#	en/classes/ProtocolPush.md
#	en/classes/ProtocolREC.md
#	en/classes/ProtocolShare.md
#	en/classes/ProtocolSocial.md
#	en/classes/ProtocolUser.md
#	en/classes/Quad2.md
#	en/classes/Quad3.md
#	en/classes/RawAsset.md
#	en/classes/Rect.md
#	en/classes/RenderComponent.md
#	en/classes/ResolutionPolicy.md
#	en/classes/RevoluteJoint.md
#	en/classes/RichText.md
#	en/classes/RigidBody.md
#	en/classes/RopeJoint.md
#	en/classes/Scene.md
#	en/classes/SceneAsset.md
#	en/classes/Scheduler.md
#	en/classes/ScrollView.md
#	en/classes/Scrollbar.md
#	en/classes/Size.md
#	en/classes/Skeleton.md
#	en/classes/SkeletonData.md
#	en/classes/Slider.md
#	en/classes/Sprite.md
#	en/classes/SpriteAtlas.md
#	en/classes/SpriteFrame.md
#	en/classes/SystemEvent.EventType.md
#	en/classes/SystemEvent.md
#	en/classes/TMXObject.md
#	en/classes/TTFFont.md
#	en/classes/Tex2F.md
#	en/classes/TextAsset.md
#	en/classes/Texture2D.md
#	en/classes/TiledLayer.md
#	en/classes/TiledMap.md
#	en/classes/TiledMapAsset.md
#	en/classes/TiledObjectGroup.md
#	en/classes/Toggle.md
#	en/classes/ToggleContainer.md
#	en/classes/ToggleGroup.md
#	en/classes/Touch.md
#	en/classes/TypeScript.md
#	en/classes/V2F_C4B_T2F.md
#	en/classes/V2F_C4B_T2F_Triangle.md
#	en/classes/V3F_C4B_T2F.md
#	en/classes/V3F_C4B_T2F_Quad.md
#	en/classes/ValueType.md
#	en/classes/Vec2.md
#	en/classes/Vertex2F.md
#	en/classes/Vertex3F.md
#	en/classes/VideoPlayer.md
#	en/classes/View.md
#	en/classes/ViewGroup.md
#	en/classes/WebGLColor.md
#	en/classes/WebView.md
#	en/classes/WeldJoint.md
#	en/classes/WheelJoint.md
#	en/classes/Widget.md
#	en/classes/WorldManifold.md
#	en/classes/array.md
#	en/classes/audioEngine.md
#	en/classes/eventManager.md
#	en/classes/loader.md
#	en/classes/pool.md
#	en/classes/screen.md
#	en/classes/sys.md
#	en/classes/textureCache.md
#	en/classes/url.md
#	en/classes/visibleRect.md
#	en/enums/AccountGender.md
#	en/enums/AccountOperate.md
#	en/enums/AccountType.md
#	en/enums/AdsPos.md
#	en/enums/AdsResultCode.md
#	en/enums/AdsType.md
#	en/enums/AnimationEventType.md
#	en/enums/Button.Transition.md
#	en/enums/CustomResultCode.md
#	en/enums/DrawBits.md
#	en/enums/EditBox.InputFlag.md
#	en/enums/EditBox.InputMode.md
#	en/enums/EditBox.KeyboardReturnType.md
#	en/enums/Graphics.LineCap.md
#	en/enums/Graphics.LineJoin.md
#	en/enums/Label.HorizontalAlign.md
#	en/enums/Label.Overflow.md
#	en/enums/Label.Type.md
#	en/enums/Label.VerticalAlign.md
#	en/enums/Layout.AxisDirection.md
#	en/enums/Layout.HorizontalDirection.md
#	en/enums/Layout.ResizeMode.md
#	en/enums/Layout.Type.md
#	en/enums/Layout.VerticalDirection.md
#	en/enums/LoadingItems.ItemState.md
#	en/enums/Mask.Type.md
#	en/enums/NetworkType.md
#	en/enums/PageView.Direction.md
#	en/enums/PageView.EventType.md
#	en/enums/PageView.SizeMode.md
#	en/enums/PageViewIndicator.Direction.md
#	en/enums/ParticleSystem.EmitterMode.md
#	en/enums/ParticleSystem.PositionType.md
#	en/enums/PayResultCode.md
#	en/enums/Prefab.OptimizationPolicy.md
#	en/enums/ProgressBar.Mode.md
#	en/enums/PushActionResultCode.md
#	en/enums/RECResultCode.md
#	en/enums/RayCastType.md
#	en/enums/RigidBodyType.md
#	en/enums/ScrollView.EventType.md
#	en/enums/Scrollbar.Direction.md
#	en/enums/ShareResultCode.md
#	en/enums/Slider.Direction.md
#	en/enums/SocialRetCode.md
#	en/enums/Sprite.FillType.md
#	en/enums/Sprite.SizeMode.md
#	en/enums/Sprite.Type.md
#	en/enums/TaskType.md
#	en/enums/Texture2D.Filter.md
#	en/enums/Texture2D.PixelFormat.md
#	en/enums/Texture2D.WrapMode.md
#	en/enums/TiledMap.Orientation.md
#	en/enums/ToolBarPlace.md
#	en/enums/UserActionResultCode.md
#	en/enums/VideoPlayer.EventType.md
#	en/enums/VideoPlayer.ResourceType.md
#	en/enums/WebView.EventType.md
#	en/enums/Widget.AlignMode.md
#	en/enums/WrapMode.md
#	en/enums/audioEngine.AudioState.md
#	en/enums/debug.DebugMode.md
#	en/enums/macro.BlendFactor.md
#	en/enums/macro.ImageFormat.md
#	en/enums/macro.KEY.md
#	en/enums/macro.TextAlignment.md
#	en/enums/macro.md
#	en/modules/GLOBAL-MACROS.md
#	en/modules/_decorator.md
#	en/modules/anysdk.md
#	en/modules/cc.md
#	en/modules/js.md
#	zh/book.json
#	zh/classes/Acceleration.md
#	zh/classes/Action.md
#	zh/classes/ActionEase.md
#	zh/classes/ActionInstant.md
#	zh/classes/ActionInterval.md
#	zh/classes/ActionManager.md
#	zh/classes/AffineTransform.md
#	zh/classes/AgentManager.md
#	zh/classes/Animation.md
#	zh/classes/AnimationClip.md
#	zh/classes/AnimationState.md
#	zh/classes/ArmatureDisplay.md
#	zh/classes/Asset.md
#	zh/classes/AudioClip.md
#	zh/classes/AudioSource.md
#	zh/classes/BitmapFont.md
#	zh/classes/BlendFunc.md
#	zh/classes/BlockInputEvents.md
#	zh/classes/BoxCollider.md
#	zh/classes/Button.md
#	zh/classes/CallbacksInvoker.md
#	zh/classes/Camera.md
#	zh/classes/Canvas.md
#	zh/classes/CircleCollider.md
#	zh/classes/CoffeeScript.md
#	zh/classes/Collider.Box.md
#	zh/classes/Collider.Circle.md
#	zh/classes/Collider.Polygon.md
#	zh/classes/Collider.md
#	zh/classes/CollisionManager.md
#	zh/classes/Color.md
#	zh/classes/Component.EventHandler.md
#	zh/classes/Component.md
#	zh/classes/ContainerStrategy.md
#	zh/classes/ContentStrategy.md
#	zh/classes/Details.md
#	zh/classes/Director.md
#	zh/classes/DistanceJoint.md
#	zh/classes/DragonBonesAsset.md
#	zh/classes/DragonBonesAtlasAsset.md
#	zh/classes/EaseBounce.md
#	zh/classes/EaseElastic.md
#	zh/classes/EaseRateAction.md
#	zh/classes/EditBox.md
#	zh/classes/EqualToFrame.md
#	zh/classes/EqualToWindow.md
#	zh/classes/Event.EventAcceleration.md
#	zh/classes/Event.EventCustom.md
#	zh/classes/Event.EventKeyboard.md
#	zh/classes/Event.EventMouse.md
#	zh/classes/Event.EventTouch.md
#	zh/classes/Event.md
#	zh/classes/EventListener.md
#	zh/classes/EventTarget.md
#	zh/classes/FiniteTimeAction.md
#	zh/classes/Font.md
#	zh/classes/Game.md
#	zh/classes/Graphics.md
#	zh/classes/Intersection.md
#	zh/classes/Joint.md
#	zh/classes/JsonAsset.md
#	zh/classes/Label.md
#	zh/classes/LabelAtlas.md
#	zh/classes/LabelOutline.md
#	zh/classes/Layout.md
#	zh/classes/LoadingItems.md
#	zh/classes/Manifold.md
#	zh/classes/ManifoldPoint.md
#	zh/classes/Mask.md
#	zh/classes/MotionStreak.md
#	zh/classes/MotorJoint.md
#	zh/classes/MouseJoint.md
#	zh/classes/Node.EventType.md
#	zh/classes/Node.md
#	zh/classes/NodePool.md
#	zh/classes/OriginalContainer.md
#	zh/classes/PageView.md
#	zh/classes/PageViewIndicator.md
#	zh/classes/ParticleSystem.md
#	zh/classes/PhysicsBoxCollider.md
#	zh/classes/PhysicsChainCollider.md
#	zh/classes/PhysicsCircleCollider.md
#	zh/classes/PhysicsCollider.md
#	zh/classes/PhysicsContact.md
#	zh/classes/PhysicsImpulse.md
#	zh/classes/PhysicsManager.md
#	zh/classes/PhysicsPolygonCollider.md
#	zh/classes/PhysicsRayCastResult.md
#	zh/classes/Pipeline.Downloader.md
#	zh/classes/Pipeline.Loader.md
#	zh/classes/Pipeline.md
#	zh/classes/Playable.md
#	zh/classes/PluginParam.md
#	zh/classes/PluginProtocol.md
#	zh/classes/PolygonCollider.md
#	zh/classes/Prefab.md
#	zh/classes/PrismaticJoint.md
#	zh/classes/ProgressBar.md
#	zh/classes/ProportionalToFrame.md
#	zh/classes/ProportionalToWindow.md
#	zh/classes/ProtocolAdTracking.md
#	zh/classes/ProtocolAds.md
#	zh/classes/ProtocolAnalytics.md
#	zh/classes/ProtocolCrash.md
#	zh/classes/ProtocolCustom.md
#	zh/classes/ProtocolIAP.md
#	zh/classes/ProtocolPush.md
#	zh/classes/ProtocolREC.md
#	zh/classes/ProtocolShare.md
#	zh/classes/ProtocolSocial.md
#	zh/classes/ProtocolUser.md
#	zh/classes/Quad2.md
#	zh/classes/Quad3.md
#	zh/classes/RawAsset.md
#	zh/classes/Rect.md
#	zh/classes/RenderComponent.md
#	zh/classes/ResolutionPolicy.md
#	zh/classes/RevoluteJoint.md
#	zh/classes/RichText.md
#	zh/classes/RigidBody.md
#	zh/classes/RopeJoint.md
#	zh/classes/Scene.md
#	zh/classes/SceneAsset.md
#	zh/classes/Scheduler.md
#	zh/classes/ScrollView.md
#	zh/classes/Scrollbar.md
#	zh/classes/Size.md
#	zh/classes/Skeleton.md
#	zh/classes/SkeletonData.md
#	zh/classes/Slider.md
#	zh/classes/Sprite.md
#	zh/classes/SpriteAtlas.md
#	zh/classes/SpriteFrame.md
#	zh/classes/SystemEvent.EventType.md
#	zh/classes/SystemEvent.md
#	zh/classes/TMXObject.md
#	zh/classes/TTFFont.md
#	zh/classes/Tex2F.md
#	zh/classes/TextAsset.md
#	zh/classes/Texture2D.md
#	zh/classes/TiledLayer.md
#	zh/classes/TiledMap.md
#	zh/classes/TiledMapAsset.md
#	zh/classes/TiledObjectGroup.md
#	zh/classes/Toggle.md
#	zh/classes/ToggleContainer.md
#	zh/classes/ToggleGroup.md
#	zh/classes/Touch.md
#	zh/classes/TypeScript.md
#	zh/classes/V2F_C4B_T2F.md
#	zh/classes/V2F_C4B_T2F_Triangle.md
#	zh/classes/V3F_C4B_T2F.md
#	zh/classes/V3F_C4B_T2F_Quad.md
#	zh/classes/ValueType.md
#	zh/classes/Vec2.md
#	zh/classes/Vertex2F.md
#	zh/classes/Vertex3F.md
#	zh/classes/VideoPlayer.md
#	zh/classes/View.md
#	zh/classes/ViewGroup.md
#	zh/classes/WebGLColor.md
#	zh/classes/WebView.md
#	zh/classes/WeldJoint.md
#	zh/classes/WheelJoint.md
#	zh/classes/Widget.md
#	zh/classes/WorldManifold.md
#	zh/classes/array.md
#	zh/classes/audioEngine.md
#	zh/classes/eventManager.md
#	zh/classes/loader.md
#	zh/classes/pool.md
#	zh/classes/screen.md
#	zh/classes/sys.md
#	zh/classes/textureCache.md
#	zh/classes/url.md
#	zh/classes/visibleRect.md
#	zh/enums/AccountGender.md
#	zh/enums/AccountOperate.md
#	zh/enums/AccountType.md
#	zh/enums/AdsPos.md
#	zh/enums/AdsResultCode.md
#	zh/enums/AdsType.md
#	zh/enums/AnimationEventType.md
#	zh/enums/Button.Transition.md
#	zh/enums/CustomResultCode.md
#	zh/enums/DrawBits.md
#	zh/enums/EditBox.InputFlag.md
#	zh/enums/EditBox.InputMode.md
#	zh/enums/EditBox.KeyboardReturnType.md
#	zh/enums/Graphics.LineCap.md
#	zh/enums/Graphics.LineJoin.md
#	zh/enums/Label.HorizontalAlign.md
#	zh/enums/Label.Overflow.md
#	zh/enums/Label.Type.md
#	zh/enums/Label.VerticalAlign.md
#	zh/enums/Layout.AxisDirection.md
#	zh/enums/Layout.HorizontalDirection.md
#	zh/enums/Layout.ResizeMode.md
#	zh/enums/Layout.Type.md
#	zh/enums/Layout.VerticalDirection.md
#	zh/enums/LoadingItems.ItemState.md
#	zh/enums/Mask.Type.md
#	zh/enums/NetworkType.md
#	zh/enums/PageView.Direction.md
#	zh/enums/PageView.EventType.md
#	zh/enums/PageView.SizeMode.md
#	zh/enums/PageViewIndicator.Direction.md
#	zh/enums/ParticleSystem.EmitterMode.md
#	zh/enums/ParticleSystem.PositionType.md
#	zh/enums/PayResultCode.md
#	zh/enums/Prefab.OptimizationPolicy.md
#	zh/enums/ProgressBar.Mode.md
#	zh/enums/PushActionResultCode.md
#	zh/enums/RECResultCode.md
#	zh/enums/RayCastType.md
#	zh/enums/RigidBodyType.md
#	zh/enums/ScrollView.EventType.md
#	zh/enums/Scrollbar.Direction.md
#	zh/enums/ShareResultCode.md
#	zh/enums/Slider.Direction.md
#	zh/enums/SocialRetCode.md
#	zh/enums/Sprite.FillType.md
#	zh/enums/Sprite.SizeMode.md
#	zh/enums/Sprite.Type.md
#	zh/enums/TaskType.md
#	zh/enums/Texture2D.Filter.md
#	zh/enums/Texture2D.PixelFormat.md
#	zh/enums/Texture2D.WrapMode.md
#	zh/enums/TiledMap.Orientation.md
#	zh/enums/ToolBarPlace.md
#	zh/enums/UserActionResultCode.md
#	zh/enums/VideoPlayer.EventType.md
#	zh/enums/VideoPlayer.ResourceType.md
#	zh/enums/WebView.EventType.md
#	zh/enums/Widget.AlignMode.md
#	zh/enums/WrapMode.md
#	zh/enums/audioEngine.AudioState.md
#	zh/enums/debug.DebugMode.md
#	zh/enums/macro.BlendFactor.md
#	zh/enums/macro.ImageFormat.md
#	zh/enums/macro.KEY.md
#	zh/enums/macro.TextAlignment.md
#	zh/enums/macro.md
#	zh/index.md
#	zh/modules/GLOBAL-MACROS.md
#	zh/modules/_decorator.md
#	zh/modules/anysdk.md
#	zh/modules/cc.md
#	zh/modules/js.md
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.

2 participants