diff --git a/CHANGELOG.REMOVED.git-id b/CHANGELOG.REMOVED.git-id index e90f414efd..2511eb4fe2 100644 --- a/CHANGELOG.REMOVED.git-id +++ b/CHANGELOG.REMOVED.git-id @@ -1 +1 @@ -936b6bad063ed7529710ca0edf9290b051097b23 \ No newline at end of file +3840d977454e06d4afa20ec009eee081f988ee03 \ No newline at end of file diff --git a/build/cocos2d_libs.xcodeproj/project.pbxproj.REMOVED.git-id b/build/cocos2d_libs.xcodeproj/project.pbxproj.REMOVED.git-id index df0f90e563..727df179ad 100644 --- a/build/cocos2d_libs.xcodeproj/project.pbxproj.REMOVED.git-id +++ b/build/cocos2d_libs.xcodeproj/project.pbxproj.REMOVED.git-id @@ -1 +1 @@ -b8986c04c89d3861f82fb99b0df633ac2cc4a13c \ No newline at end of file +044fbe06a7419f54a1da5bd5e597fe75024b6b88 \ No newline at end of file diff --git a/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/CocosDenshion Mac.xcscheme b/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/CocosDenshion Mac.xcscheme index 1870f59b66..8a9de3e3c5 100644 --- a/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/CocosDenshion Mac.xcscheme +++ b/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/CocosDenshion Mac.xcscheme @@ -1,6 +1,6 @@ initWithDuration(duration, sx, sy, sz); + scaleTo->autorelease(); + + return scaleTo; +} + bool ScaleTo::initWithDuration(float duration, float s) { if (ActionInterval::initWithDuration(duration)) { _endScaleX = s; _endScaleY = s; + _endScaleZ = s; return true; } @@ -1510,6 +1520,21 @@ bool ScaleTo::initWithDuration(float duration, float sx, float sy) { _endScaleX = sx; _endScaleY = sy; + _endScaleZ = 1.f; + + return true; + } + + return false; +} + +bool ScaleTo::initWithDuration(float duration, float sx, float sy, float sz) +{ + if (ActionInterval::initWithDuration(duration)) + { + _endScaleX = sx; + _endScaleY = sy; + _endScaleZ = sz; return true; } @@ -1521,7 +1546,7 @@ ScaleTo* ScaleTo::clone(void) const { // no copy constructor auto a = new ScaleTo(); - a->initWithDuration(_duration, _endScaleX, _endScaleY); + a->initWithDuration(_duration, _endScaleX, _endScaleY, _endScaleZ); a->autorelease(); return a; } @@ -1538,8 +1563,10 @@ void ScaleTo::startWithTarget(Node *target) ActionInterval::startWithTarget(target); _startScaleX = target->getScaleX(); _startScaleY = target->getScaleY(); + _startScaleZ = target->getScaleZ(); _deltaX = _endScaleX - _startScaleX; _deltaY = _endScaleY - _startScaleY; + _deltaZ = _endScaleZ - _startScaleZ; } void ScaleTo::update(float time) @@ -1548,6 +1575,7 @@ void ScaleTo::update(float time) { _target->setScaleX(_startScaleX + _deltaX * time); _target->setScaleY(_startScaleY + _deltaY * time); + _target->setScaleZ(_startScaleZ + _deltaZ * time); } } @@ -1567,7 +1595,16 @@ ScaleBy* ScaleBy::create(float duration, float s) ScaleBy* ScaleBy::create(float duration, float sx, float sy) { ScaleBy *scaleBy = new ScaleBy(); - scaleBy->initWithDuration(duration, sx, sy); + scaleBy->initWithDuration(duration, sx, sy, 1.f); + scaleBy->autorelease(); + + return scaleBy; +} + +ScaleBy* ScaleBy::create(float duration, float sx, float sy, float sz) +{ + ScaleBy *scaleBy = new ScaleBy(); + scaleBy->initWithDuration(duration, sx, sy, sz); scaleBy->autorelease(); return scaleBy; @@ -1577,7 +1614,7 @@ ScaleBy* ScaleBy::clone(void) const { // no copy constructor auto a = new ScaleBy(); - a->initWithDuration(_duration, _endScaleX, _endScaleY); + a->initWithDuration(_duration, _endScaleX, _endScaleY, _endScaleZ); a->autorelease(); return a; } @@ -1587,11 +1624,12 @@ void ScaleBy::startWithTarget(Node *target) ScaleTo::startWithTarget(target); _deltaX = _startScaleX * _endScaleX - _startScaleX; _deltaY = _startScaleY * _endScaleY - _startScaleY; + _deltaZ = _startScaleZ * _endScaleZ - _startScaleZ; } ScaleBy* ScaleBy::reverse() const { - return ScaleBy::create(_duration, 1 / _endScaleX, 1 / _endScaleY); + return ScaleBy::create(_duration, 1 / _endScaleX, 1 / _endScaleY, 1/ _endScaleZ); } // diff --git a/cocos/2d/CCActionInterval.h b/cocos/2d/CCActionInterval.h index e5a36d4ec1..b090abbbbc 100644 --- a/cocos/2d/CCActionInterval.h +++ b/cocos/2d/CCActionInterval.h @@ -622,6 +622,9 @@ public: /** creates the action with and X factor and a Y factor */ static ScaleTo* create(float duration, float sx, float sy); + /** creates the action with X Y Z factor */ + static ScaleTo* create(float duration, float sx, float sy, float sz); + // // Overrides // @@ -637,15 +640,21 @@ protected: bool initWithDuration(float duration, float s); /** initializes the action with and X factor and a Y factor */ bool initWithDuration(float duration, float sx, float sy); + /** initializes the action with X Y Z factor */ + bool initWithDuration(float duration, float sx, float sy, float sz); float _scaleX; float _scaleY; + float _scaleZ; float _startScaleX; float _startScaleY; + float _startScaleZ; float _endScaleX; float _endScaleY; + float _endScaleZ; float _deltaX; float _deltaY; + float _deltaZ; private: CC_DISALLOW_COPY_AND_ASSIGN(ScaleTo); @@ -662,6 +671,9 @@ public: /** creates the action with and X factor and a Y factor */ static ScaleBy* create(float duration, float sx, float sy); + /** creates the action with X Y Z factor */ + static ScaleBy* create(float duration, float sx, float sy, float sz); + // // Overrides // diff --git a/cocos/2d/CCFont.h b/cocos/2d/CCFont.h index c384ae752a..0d07078237 100644 --- a/cocos/2d/CCFont.h +++ b/cocos/2d/CCFont.h @@ -44,7 +44,6 @@ public: virtual int* getHorizontalKerningForTextUTF16(unsigned short *text, int &outNumLetters) const = 0; virtual const char* getCurrentGlyphCollection() const; - virtual unsigned char * getGlyphBitmap(unsigned short theChar, int &outWidth, int &outHeight) const { return 0; } virtual int getFontMaxHeight() const { return 0; } diff --git a/cocos/2d/CCFontAtlas.cpp b/cocos/2d/CCFontAtlas.cpp index a0cf4c2070..3e40e41419 100644 --- a/cocos/2d/CCFontAtlas.cpp +++ b/cocos/2d/CCFontAtlas.cpp @@ -221,8 +221,8 @@ bool FontAtlas::prepareLetterDefinitions(unsigned short *utf16String) int length = cc_wcslen(utf16String); float offsetAdjust = _letterPadding / 2; - int bitmapWidth; - int bitmapHeight; + long bitmapWidth; + long bitmapHeight; Rect tempRect; FontLetterDefinition tempDef; diff --git a/cocos/2d/CCFontAtlas.h b/cocos/2d/CCFontAtlas.h index 9059e119c9..2d3eb615a3 100644 --- a/cocos/2d/CCFontAtlas.h +++ b/cocos/2d/CCFontAtlas.h @@ -28,6 +28,7 @@ #include #include "CCPlatformMacros.h" #include "CCRef.h" +#include "CCStdC.h" NS_CC_BEGIN @@ -72,7 +73,7 @@ public: bool prepareLetterDefinitions(unsigned short *utf16String); - inline const std::unordered_map& getTextures() const{ return _atlasTextures;} + inline const std::unordered_map& getTextures() const{ return _atlasTextures;} void addTexture(Texture2D *texture, int slot); float getCommonLineHeight() const; void setCommonLineHeight(float newHeight); @@ -98,7 +99,7 @@ public: private: void relaseTextures(); - std::unordered_map _atlasTextures; + std::unordered_map _atlasTextures; std::unordered_map _fontLetterDefinitions; float _commonLineHeight; Font * _font; diff --git a/cocos/2d/CCFontFreeType.cpp b/cocos/2d/CCFontFreeType.cpp index 5713238a88..caaf2eb6ba 100644 --- a/cocos/2d/CCFontFreeType.cpp +++ b/cocos/2d/CCFontFreeType.cpp @@ -219,7 +219,7 @@ int FontFreeType::getFontAscender() const return (static_cast(_fontRef->size->metrics.ascender >> 6)); } -unsigned char* FontFreeType::getGlyphBitmap(unsigned short theChar, int &outWidth, int &outHeight, Rect &outRect,int &xAdvance) +unsigned char* FontFreeType::getGlyphBitmap(unsigned short theChar, long &outWidth, long &outHeight, Rect &outRect,int &xAdvance) { bool invalidChar = true; unsigned char * ret = nullptr; @@ -260,8 +260,8 @@ unsigned char* FontFreeType::getGlyphBitmap(unsigned short theChar, int &outWidt auto copyBitmap = new unsigned char[outWidth * outHeight]; memcpy(copyBitmap,ret,outWidth * outHeight * sizeof(unsigned char)); - int bitmapWidth; - int bitmapHeight; + long bitmapWidth; + long bitmapHeight; FT_BBox bbox; auto outlineBitmap = getGlyphBitmapWithOutline(theChar,bbox); if(outlineBitmap == nullptr) @@ -274,7 +274,7 @@ unsigned char* FontFreeType::getGlyphBitmap(unsigned short theChar, int &outWidt bitmapWidth = (bbox.xMax - bbox.xMin)>>6; bitmapHeight = (bbox.yMax - bbox.yMin)>>6; - int index; + long index; auto blendImage = new unsigned char[bitmapWidth * bitmapHeight * 2]; memset(blendImage, 0, bitmapWidth * bitmapHeight * 2); for (int x = 0; x < bitmapWidth; ++x) @@ -286,8 +286,8 @@ unsigned char* FontFreeType::getGlyphBitmap(unsigned short theChar, int &outWidt } } - int maxX = outWidth + _outlineSize; - int maxY = outHeight + _outlineSize; + long maxX = outWidth + _outlineSize; + long maxY = outHeight + _outlineSize; for (int x = _outlineSize; x < maxX; ++x) { for (int y = _outlineSize; y < maxY; ++y) @@ -347,15 +347,15 @@ unsigned char * FontFreeType::getGlyphBitmapWithOutline(unsigned short theChar, { FT_Outline *outline = &reinterpret_cast(glyph)->outline; FT_Glyph_Get_CBox(glyph,FT_GLYPH_BBOX_GRIDFIT,&bbox); - int width = (bbox.xMax - bbox.xMin)>>6; - int rows = (bbox.yMax - bbox.yMin)>>6; + long width = (bbox.xMax - bbox.xMin)>>6; + long rows = (bbox.yMax - bbox.yMin)>>6; FT_Bitmap bmp; bmp.buffer = new unsigned char[width * rows]; memset(bmp.buffer, 0, width * rows); - bmp.width = width; - bmp.rows = rows; - bmp.pitch = width; + bmp.width = (int)width; + bmp.rows = (int)rows; + bmp.pitch = (int)width; bmp.pixel_mode = FT_PIXEL_MODE_GRAY; bmp.num_grays = 256; @@ -377,9 +377,9 @@ unsigned char * FontFreeType::getGlyphBitmapWithOutline(unsigned short theChar, return ret; } -unsigned char * makeDistanceMap( unsigned char *img, unsigned int width, unsigned int height) +unsigned char * makeDistanceMap( unsigned char *img, long width, long height) { - unsigned int pixelAmount = (width + 2 * FontFreeType::DistanceMapSpread) * (height + 2 * FontFreeType::DistanceMapSpread); + long pixelAmount = (width + 2 * FontFreeType::DistanceMapSpread) * (height + 2 * FontFreeType::DistanceMapSpread); short * xdist = (short *) malloc( pixelAmount * sizeof(short) ); short * ydist = (short *) malloc( pixelAmount * sizeof(short) ); @@ -391,7 +391,7 @@ unsigned char * makeDistanceMap( unsigned char *img, unsigned int width, unsigne unsigned int i,j; // Convert img into double (data) rescale image levels between 0 and 1 - unsigned int outWidth = width + 2 * FontFreeType::DistanceMapSpread; + long outWidth = width + 2 * FontFreeType::DistanceMapSpread; for (i = 0; i < width; ++i) { for (j = 0; j < height; ++j) @@ -404,8 +404,8 @@ unsigned char * makeDistanceMap( unsigned char *img, unsigned int width, unsigne height += 2 * FontFreeType::DistanceMapSpread; // Transform background (outside contour, in areas of 0's) - computegradient( data, width, height, gx, gy); - edtaa3(data, gx, gy, width, height, xdist, ydist, outside); + computegradient( data, (int)width, (int)height, gx, gy); + edtaa3(data, gx, gy, (int)width, (int)height, xdist, ydist, outside); for( i=0; i< pixelAmount; i++) if( outside[i] < 0.0 ) outside[i] = 0.0; @@ -413,8 +413,8 @@ unsigned char * makeDistanceMap( unsigned char *img, unsigned int width, unsigne // Transform foreground (inside contour, in areas of 1's) for( i=0; i< pixelAmount; i++) data[i] = 1 - data[i]; - computegradient( data, width, height, gx, gy); - edtaa3(data, gx, gy, width, height, xdist, ydist, inside); + computegradient( data, (int)width, (int)height, gx, gy); + edtaa3(data, gx, gy, (int)width, (int)height, xdist, ydist, inside); for( i=0; i< pixelAmount; i++) if( inside[i] < 0.0 ) inside[i] = 0.0; @@ -458,7 +458,7 @@ unsigned char * makeDistanceMap( unsigned char *img, unsigned int width, unsigne return out; } -void FontFreeType::renderCharAt(unsigned char *dest,int posX, int posY, unsigned char* bitmap,int bitmapWidth,int bitmapHeight) +void FontFreeType::renderCharAt(unsigned char *dest,int posX, int posY, unsigned char* bitmap,long bitmapWidth,long bitmapHeight) { int iX = posX; int iY = posY; @@ -470,9 +470,9 @@ void FontFreeType::renderCharAt(unsigned char *dest,int posX, int posY, unsigned bitmapWidth += 2 * DistanceMapSpread; bitmapHeight += 2 * DistanceMapSpread; - for (int y = 0; y < bitmapHeight; ++y) + for (long y = 0; y < bitmapHeight; ++y) { - int bitmap_y = y * bitmapWidth; + long bitmap_y = y * bitmapWidth; for (int x = 0; x < bitmapWidth; ++x) { @@ -497,9 +497,9 @@ void FontFreeType::renderCharAt(unsigned char *dest,int posX, int posY, unsigned else if(_outlineSize > 0) { unsigned char tempChar; - for (int y = 0; y < bitmapHeight; ++y) + for (long y = 0; y < bitmapHeight; ++y) { - int bitmap_y = y * bitmapWidth; + long bitmap_y = y * bitmapWidth; for (int x = 0; x < bitmapWidth; ++x) { @@ -518,9 +518,9 @@ void FontFreeType::renderCharAt(unsigned char *dest,int posX, int posY, unsigned } else { - for (int y = 0; y < bitmapHeight; ++y) + for (long y = 0; y < bitmapHeight; ++y) { - int bitmap_y = y * bitmapWidth; + long bitmap_y = y * bitmapWidth; for (int x = 0; x < bitmapWidth; ++x) { diff --git a/cocos/2d/CCFontFreeType.h b/cocos/2d/CCFontFreeType.h index 1233daad7f..a103ee6570 100644 --- a/cocos/2d/CCFontFreeType.h +++ b/cocos/2d/CCFontFreeType.h @@ -48,12 +48,12 @@ public: bool isDistanceFieldEnabled() const { return _distanceFieldEnabled;} int getOutlineSize() const { return _outlineSize; } - void renderCharAt(unsigned char *dest,int posX, int posY, unsigned char* bitmap,int bitmapWidth,int bitmapHeight); + void renderCharAt(unsigned char *dest,int posX, int posY, unsigned char* bitmap,long bitmapWidth,long bitmapHeight); virtual FontAtlas * createFontAtlas() override; virtual int * getHorizontalKerningForTextUTF16(unsigned short *text, int &outNumLetters) const override; - unsigned char * getGlyphBitmap(unsigned short theChar, int &outWidth, int &outHeight, Rect &outRect,int &xAdvance); + unsigned char * getGlyphBitmap(unsigned short theChar, long &outWidth, long &outHeight, Rect &outRect,int &xAdvance); virtual int getFontMaxHeight() const override; virtual int getFontAscender() const; diff --git a/cocos/2d/CCIMEDelegate.h b/cocos/2d/CCIMEDelegate.h index d232236ceb..bf230e01df 100644 --- a/cocos/2d/CCIMEDelegate.h +++ b/cocos/2d/CCIMEDelegate.h @@ -103,7 +103,7 @@ protected: * @js NA * @lua NA */ - virtual void insertText(const char * text, int len) {CC_UNUSED_PARAM(text);CC_UNUSED_PARAM(len);} + virtual void insertText(const char * text, size_t len) {CC_UNUSED_PARAM(text);CC_UNUSED_PARAM(len);} /** @brief Called by IMEDispatcher after the user clicks the backward key. diff --git a/cocos/2d/CCIMEDispatcher.cpp b/cocos/2d/CCIMEDispatcher.cpp index c58f3d7d5e..8ba86f3350 100644 --- a/cocos/2d/CCIMEDispatcher.cpp +++ b/cocos/2d/CCIMEDispatcher.cpp @@ -214,7 +214,7 @@ void IMEDispatcher::removeDelegate(IMEDelegate* delegate) // dispatch text message ////////////////////////////////////////////////////////////////////////// -void IMEDispatcher::dispatchInsertText(const char * text, int len) +void IMEDispatcher::dispatchInsertText(const char * text, size_t len) { do { diff --git a/cocos/2d/CCIMEDispatcher.h b/cocos/2d/CCIMEDispatcher.h index 0f71c2fab6..698f033551 100644 --- a/cocos/2d/CCIMEDispatcher.h +++ b/cocos/2d/CCIMEDispatcher.h @@ -64,7 +64,7 @@ public: * @js NA * @lua NA */ - void dispatchInsertText(const char * text, int len); + void dispatchInsertText(const char * text, size_t len); /** @brief Dispatches the delete-backward operation. diff --git a/cocos/2d/CCLabel.cpp b/cocos/2d/CCLabel.cpp index 448dc2c0b1..c3dca66fce 100644 --- a/cocos/2d/CCLabel.cpp +++ b/cocos/2d/CCLabel.cpp @@ -446,7 +446,7 @@ bool Label::setBMFontFilePath(const std::string& bmfontFilePath, const Point& im reset(); return false; } - + _bmFontPath = bmfontFilePath; setFontAtlas(newAtlas); _currentLabelType = LabelType::BMFONT; @@ -457,6 +457,17 @@ void Label::setFontDefinition(const FontDefinition& textDefinition) { reset(); _fontDefinition = textDefinition; +#if (CC_TARGET_PLATFORM != CC_PLATFORM_ANDROID) && (CC_TARGET_PLATFORM != CC_PLATFORM_IOS) + setColor(_fontDefinition._fontFillColor); + _fontDefinition._fontFillColor = Color3B::WHITE; +#else + if ( !textDefinition._shadow._shadowEnabled && !textDefinition._stroke._strokeEnabled) + { + setColor(_fontDefinition._fontFillColor); + _fontDefinition._fontFillColor = Color3B::WHITE; + } +#endif + _fontName = textDefinition._fontName; _fontSize = textDefinition._fontSize; _contentDirty = true; @@ -624,17 +635,7 @@ void Label::alignText() } } - int index; - for (int ctr = 0; ctr < _limitShowCount; ++ctr) - { - if (_lettersInfo[ctr].def.validDefinition) - { - updateSpriteWithLetterDefinition(_lettersInfo[ctr].def,textures[_lettersInfo[ctr].def.textureID]); - _reusedLetter->setPosition(_lettersInfo[ctr].position); - index = _batchNodes[_lettersInfo[ctr].def.textureID]->getTextureAtlas()->getTotalQuads(); - _batchNodes[_lettersInfo[ctr].def.textureID]->insertQuadFromSprite(_reusedLetter,index); - } - } + updateQuads(); updateColor(); } @@ -691,16 +692,30 @@ bool Label::setCurrentString(unsigned short *stringToSet) return true; } -void Label::updateSpriteWithLetterDefinition(const FontLetterDefinition &theDefinition, Texture2D *theTexture) +void Label::updateQuads() { - _reusedRect.size.height = theDefinition.height; - _reusedRect.size.width = theDefinition.width; - _reusedRect.origin.x = theDefinition.U; - _reusedRect.origin.y = theDefinition.V; + int index; + for (int ctr = 0; ctr < _limitShowCount; ++ctr) + { + auto &letterDef = _lettersInfo[ctr].def; - if(_reusedLetter->getBatchNode() != _batchNodes[theDefinition.textureID]) - _reusedLetter->setBatchNode(_batchNodes[theDefinition.textureID]); - _reusedLetter->setTextureRect(_reusedRect,false,_reusedRect.size); + if (letterDef.validDefinition) + { + _reusedRect.size.height = letterDef.height; + _reusedRect.size.width = letterDef.width; + _reusedRect.origin.x = letterDef.U; + _reusedRect.origin.y = letterDef.V; + + if(_reusedLetter->getBatchNode() != _batchNodes[letterDef.textureID]) + _reusedLetter->setBatchNode(_batchNodes[letterDef.textureID]); + _reusedLetter->setTextureRect(_reusedRect,false,_reusedRect.size); + + _reusedLetter->setPosition(_lettersInfo[ctr].position); + index = static_cast(_batchNodes[letterDef.textureID]->getTextureAtlas()->getTotalQuads()); + _lettersInfo[ctr].atlasIndex = index; + _batchNodes[letterDef.textureID]->insertQuadFromSprite(_reusedLetter,index); + } + } } bool Label::recordLetterInfo(const cocos2d::Point& point,const FontLetterDefinition& letterDef, int spriteIndex) @@ -1039,7 +1054,7 @@ const std::string& Label::getFontName() const return _fontName; } -void Label::setFontSize(int fontSize) +void Label::setFontSize(float fontSize) { if (_fontSize != fontSize) { @@ -1048,41 +1063,47 @@ void Label::setFontSize(int fontSize) } } -int Label::getFontSize() const +float Label::getFontSize() const { return _fontSize; } ///// PROTOCOL STUFF -Sprite * Label::getLetter(int lettetIndex) +Sprite * Label::getLetter(int letterIndex) { + if (_fontDirty) + { + updateFont(); + } if (_contentDirty) { updateContent(); } - if (! _textSprite && lettetIndex < _limitShowCount) + if (! _textSprite && letterIndex < _limitShowCount) { - if(! _lettersInfo[lettetIndex].def.validDefinition) + const auto &letter = _lettersInfo[letterIndex]; + + if(! letter.def.validDefinition) return nullptr; - Sprite* sp = static_cast(this->getChildByTag(lettetIndex)); + Sprite* sp = static_cast(this->getChildByTag(letterIndex)); if (!sp) { Rect uvRect; - uvRect.size.height = _lettersInfo[lettetIndex].def.height; - uvRect.size.width = _lettersInfo[lettetIndex].def.width; - uvRect.origin.x = _lettersInfo[lettetIndex].def.U; - uvRect.origin.y = _lettersInfo[lettetIndex].def.V; + uvRect.size.height = letter.def.height; + uvRect.size.width = letter.def.width; + uvRect.origin.x = letter.def.U; + uvRect.origin.y = letter.def.V; - sp = Sprite::createWithTexture(_fontAtlas->getTexture(_lettersInfo[lettetIndex].def.textureID),uvRect); - sp->setBatchNode(this); - sp->setAnchorPoint(Point::ANCHOR_MIDDLE); - sp->setPosition(Point(_lettersInfo[lettetIndex].position.x+uvRect.size.width/2,_lettersInfo[lettetIndex].position.y-uvRect.size.height/2)); + sp = Sprite::createWithTexture(_fontAtlas->getTexture(letter.def.textureID),uvRect); + sp->setBatchNode(_batchNodes[letter.def.textureID]); + sp->setPosition(Point(letter.position.x + uvRect.size.width / 2, + letter.position.y - uvRect.size.height / 2)); sp->setOpacity(_realOpacity); - this->addSpriteWithoutQuad(sp, lettetIndex, lettetIndex); + _batchNodes[letter.def.textureID]->addSpriteWithoutQuad(sp, letter.atlasIndex, letterIndex); } return sp; } @@ -1120,7 +1141,7 @@ void Label::computeStringNumLines() int Label::getStringLength() const { - return _currentUTF16String ? cc_wcslen(_currentUTF16String) : 0; + return _currentUTF16String ? cc_wcslen(_currentUTF16String) : (int)_originalUTF8String.length(); } // RGBA protocol @@ -1140,34 +1161,28 @@ void Label::setOpacityModifyRGB(bool isOpacityModifyRGB) _reusedLetter->setOpacityModifyRGB(true); } -void Label::setColor(const Color3B& color) +void Label::updateDisplayedColor(const Color3B& parentColor) { - _fontDefinition._fontFillColor = color; + _displayedColor.r = _realColor.r * parentColor.r/255.0; + _displayedColor.g = _realColor.g * parentColor.g/255.0; + _displayedColor.b = _realColor.b * parentColor.b/255.0; + updateColor(); + if (_textSprite) { - updateContent(); + _textSprite->updateDisplayedColor(_displayedColor); } - if (_reusedLetter) - { - _reusedLetter->setColor(color); - } - SpriteBatchNode::setColor(color); } void Label::updateColor() { - Color4B color4( _displayedColor.r, _displayedColor.g, _displayedColor.b, _displayedOpacity ); - if (_textSprite) - { - _textSprite->setColor(_displayedColor); - _textSprite->setOpacity(_displayedOpacity); - } - if (nullptr == _textureAtlas) { return; } + Color4B color4( _displayedColor.r, _displayedColor.g, _displayedColor.b, _displayedOpacity ); + // special opacity for premultiplied textures if (_isOpacityModifyRGB) { diff --git a/cocos/2d/CCLabel.h b/cocos/2d/CCLabel.h index bef78167a6..41ace3d32f 100644 --- a/cocos/2d/CCLabel.h +++ b/cocos/2d/CCLabel.h @@ -116,6 +116,7 @@ public: virtual bool setTTFConfig(const TTFConfig& ttfConfig); virtual bool setBMFontFilePath(const std::string& bmfontFilePath, const Point& imageOffset = Point::ZERO); + const std::string& getBMFontFilePath() const { return _bmFontPath;} virtual bool setCharMap(const std::string& charMapFile, int itemWidth, int itemHeight, int startCharMap); virtual bool setCharMap(Texture2D* texture, int itemWidth, int itemHeight, int startCharMap); @@ -199,12 +200,12 @@ public: virtual void setFontName(const std::string& fontName); virtual const std::string& getFontName() const; - virtual void setFontSize(int fontSize); - virtual int getFontSize() const; + virtual void setFontSize(float fontSize); + virtual float getFontSize() const; virtual bool isOpacityModifyRGB() const override; virtual void setOpacityModifyRGB(bool isOpacityModifyRGB) override; - virtual void setColor(const Color3B& color) override; + virtual void updateDisplayedColor(const Color3B& parentColor) override; virtual Sprite * getLetter(int lettetIndex); @@ -248,6 +249,7 @@ protected: Point position; Size contentSize; + int atlasIndex; }; enum class LabelType { @@ -282,7 +284,7 @@ protected: bool setOriginalString(unsigned short *stringToSet); void computeStringNumLines(); - void updateSpriteWithLetterDefinition(const FontLetterDefinition &theDefinition, Texture2D *theTexture); + void updateQuads(); virtual void updateColor() override; @@ -295,11 +297,13 @@ protected: void updateFont(); void reset(); + std::string _bmFontPath; + bool _isOpacityModifyRGB; bool _contentDirty; bool _fontDirty; std::string _fontName; - int _fontSize; + float _fontSize; LabelType _currentLabelType; std::vector _batchNodes; diff --git a/cocos/2d/CCLabelTTF.cpp b/cocos/2d/CCLabelTTF.cpp index 7552edb0be..6802db728f 100644 --- a/cocos/2d/CCLabelTTF.cpp +++ b/cocos/2d/CCLabelTTF.cpp @@ -120,7 +120,7 @@ const std::string& LabelTTF::getString() const std::string LabelTTF::getDescription() const { - return StringUtils::format("", _renderLabel->getFontName().c_str(), _renderLabel->getFontSize(), _renderLabel->getString().c_str()); + return StringUtils::format("", _renderLabel->getFontName().c_str(), _renderLabel->getFontSize(), _renderLabel->getString().c_str()); } TextHAlignment LabelTTF::getHorizontalAlignment() const diff --git a/cocos/2d/CCSpriteBatchNode.h b/cocos/2d/CCSpriteBatchNode.h index d95fcfcaf4..b35b0fe610 100644 --- a/cocos/2d/CCSpriteBatchNode.h +++ b/cocos/2d/CCSpriteBatchNode.h @@ -172,16 +172,16 @@ public: For example: a tile map (TMXMap) or a label with lots of characters (LabelBMFont) */ void insertQuadFromSprite(Sprite *sprite, ssize_t index); + /* This is the opposite of "addQuadFromSprite. + It add the sprite to the children and descendants array, but it doesn't update add it to the texture atlas + */ + SpriteBatchNode * addSpriteWithoutQuad(Sprite *child, int z, int aTag); protected: /** Updates a quad at a certain index into the texture atlas. The Sprite won't be added into the children array. This method should be called only when you are dealing with very big AtlasSrite and when most of the Sprite won't be updated. For example: a tile map (TMXMap) or a label with lots of characters (LabelBMFont) */ - void updateQuadFromSprite(Sprite *sprite, ssize_t index); - /* This is the opposite of "addQuadFromSprite. - It add the sprite to the children and descendants array, but it doesn't update add it to the texture atlas - */ - SpriteBatchNode * addSpriteWithoutQuad(Sprite *child, int z, int aTag); + void updateQuadFromSprite(Sprite *sprite, ssize_t index); void updateAtlasIndex(Sprite* sprite, ssize_t* curIndex); void swap(ssize_t oldIndex, ssize_t newIndex); diff --git a/cocos/2d/CCTextFieldTTF.cpp b/cocos/2d/CCTextFieldTTF.cpp index 4911187604..d518919ca1 100644 --- a/cocos/2d/CCTextFieldTTF.cpp +++ b/cocos/2d/CCTextFieldTTF.cpp @@ -160,7 +160,7 @@ bool TextFieldTTF::canDetachWithIME() return (_delegate) ? (! _delegate->onTextFieldDetachWithIME(this)) : true; } -void TextFieldTTF::insertText(const char * text, int len) +void TextFieldTTF::insertText(const char * text, size_t len) { std::string insert(text, len); diff --git a/cocos/2d/CCTextFieldTTF.h b/cocos/2d/CCTextFieldTTF.h index 9019cf95ee..f086d0aa27 100644 --- a/cocos/2d/CCTextFieldTTF.h +++ b/cocos/2d/CCTextFieldTTF.h @@ -64,7 +64,7 @@ public: /** @brief If the sender doesn't want to insert the text, return true; */ - virtual bool onTextFieldInsertText(TextFieldTTF * sender, const char * text, int nLen) + virtual bool onTextFieldInsertText(TextFieldTTF * sender, const char * text, size_t nLen) { CC_UNUSED_PARAM(sender); CC_UNUSED_PARAM(text); @@ -181,7 +181,7 @@ protected: virtual bool canAttachWithIME() override; virtual bool canDetachWithIME() override; - virtual void insertText(const char * text, int len) override; + virtual void insertText(const char * text, size_t len) override; virtual void deleteBackward() override; virtual const std::string& getContentText() override; private: diff --git a/cocos/2d/platform/CCFileUtils.cpp b/cocos/2d/platform/CCFileUtils.cpp index 845739ccd3..f525ee99f6 100644 --- a/cocos/2d/platform/CCFileUtils.cpp +++ b/cocos/2d/platform/CCFileUtils.cpp @@ -742,7 +742,11 @@ void FileUtils::setSearchResolutionsOrder(const std::vector& search void FileUtils::addSearchResolutionsOrder(const std::string &order) { - _searchResolutionsOrderArray.push_back(order); + std::string resOrder = order; + if (!resOrder.empty() && resOrder[resOrder.length()-1] != '/') + resOrder.append("/"); + + _searchResolutionsOrderArray.push_back(resOrder); } const std::vector& FileUtils::getSearchResolutionsOrder() diff --git a/cocos/2d/platform/desktop/CCGLView.cpp b/cocos/2d/platform/desktop/CCGLView.cpp index 9c2d4a390d..aea8f87d8a 100644 --- a/cocos/2d/platform/desktop/CCGLView.cpp +++ b/cocos/2d/platform/desktop/CCGLView.cpp @@ -529,9 +529,9 @@ void GLView::onGLFWMouseCallBack(GLFWwindow* window, int button, int action, int } else if(GLFW_RELEASE == action) { - _captured = false; - if (this->getViewPortRect().equals(Rect::ZERO) || this->getViewPortRect().containsPoint(Point(_mouseX,_mouseY))) + if (_captured) { + _captured = false; int id = 0; this->handleTouchesEnd(1, &id, &_mouseX, &_mouseY); } @@ -575,11 +575,8 @@ void GLView::onGLFWMouseMoveCallBack(GLFWwindow* window, double x, double y) if (_captured) { - if (this->getViewPortRect().equals(Rect::ZERO) || this->getViewPortRect().containsPoint(Point(_mouseX, _mouseY))) - { - int id = 0; - this->handleTouchesMove(1, &id, &_mouseX, &_mouseY); - } + int id = 0; + this->handleTouchesMove(1, &id, &_mouseX, &_mouseY); } EventMouse event(EventMouse::MouseEventType::MOUSE_MOVE); diff --git a/cocos/2d/platform/ios/CCDirectorCaller.mm b/cocos/2d/platform/ios/CCDirectorCaller.mm index a7785aca32..f254530736 100644 --- a/cocos/2d/platform/ios/CCDirectorCaller.mm +++ b/cocos/2d/platform/ios/CCDirectorCaller.mm @@ -34,7 +34,7 @@ static id s_sharedDirectorCaller; @interface NSObject(CADisplayLink) +(id) displayLinkWithTarget: (id)arg1 selector:(SEL)arg2; -(void) addToRunLoop: (id)arg1 forMode: (id)arg2; --(void) setFrameInterval: (int)interval; +-(void) setFrameInterval: (NSInteger)interval; -(void) invalidate; @end diff --git a/cocos/2d/platform/ios/Simulation/AccelerometerSimulation.h b/cocos/2d/platform/ios/Simulation/AccelerometerSimulation.h deleted file mode 100644 index 49ef7c1276..0000000000 --- a/cocos/2d/platform/ios/Simulation/AccelerometerSimulation.h +++ /dev/null @@ -1,82 +0,0 @@ -/**************************************************************************** -Copyright (c) 2008 Otto Chrons at Seastringo Oy. -Copyright (c) 2010-2012 cocos2d-x.org -Copyright (c) 2013-2014 Chukong Technologies Inc. - -http://www.cocos2d-x.org - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. -****************************************************************************/ - -#include "CCPlatformConfig.h" -#if CC_TARGET_PLATFORM == CC_PLATFORM_IOS - -#import - -// when compiling to ARM (iPhone device), hide everything and use system defaults -// if you wish to use simulation mode even on the device, remove the #if/#endif -#if !TARGET_CPU_ARM -#import - -// this is exactly the same as UIAcceleration, but we can modify the member variables -@interface UIAccelerationSimulation: NSObject -{ - NSTimeInterval timestamp; - UIAccelerationValue x, y, z; -} -@property(nonatomic, readonly) NSTimeInterval timestamp; -@property(nonatomic, readonly) UIAccelerationValue x, y, z; - -@end - -// override UIAccelerometer behavior -@interface UIAccelerometer (Simulation) -+ (UIAccelerometer *)sharedAccelerometer; -@end - -// our own version of the Accelerometer -@interface CCAccelerometerSimulation : UIAccelerometer -{ - - //CFSocketRef udpSocket; - int udpSocket; - NSThread *thread; - BOOL isExiting; - id accelDelegate; - UIAccelerationSimulation *accObject; - // Threaded notification support - NSMutableArray *notifications; - NSThread *notificationThread; - NSLock *notificationLock; - NSMachPort *notificationPort; -} - -@property(nonatomic, assign) id delegate; - -- (void) setUpThreadingSupport; -- (void) handleMachMessage:(void *) msg; -- (void) processNotification:(NSNotification *) notification; -+ (CCAccelerometerSimulation *)getAccelerometer; -- (CCAccelerometerSimulation *)initialize; - -@end - -#endif // !TARGET_CPU_ARM - -#endif // CC_PLATFORM_IOS diff --git a/cocos/2d/platform/ios/Simulation/AccelerometerSimulation.m b/cocos/2d/platform/ios/Simulation/AccelerometerSimulation.m deleted file mode 100644 index 5056ce9522..0000000000 --- a/cocos/2d/platform/ios/Simulation/AccelerometerSimulation.m +++ /dev/null @@ -1,270 +0,0 @@ -/**************************************************************************** -Copyright (c) 2008 Otto Chrons at Seastringo Oy. -Copyright (c) 2010-2012 cocos2d-x.org -Copyright (c) 2013-2014 Chukong Technologies Inc. - -http://www.cocos2d-x.org - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. -****************************************************************************/ - -#import "AccelerometerSimulation.h" - -#if CC_TARGET_PLATFORM == CC_PLATFORM_IOS - -// when compiling to ARM (iPhone device), hide everything and use system defaults -// if you wish to use simulation mode even on the device, remove the #if/#endif -#if !TARGET_CPU_ARM - -#import - -#define kAccelerometerSimulationPort 10552 - -@implementation UIAccelerationSimulation - -@synthesize timestamp; -@synthesize x; -@synthesize y; -@synthesize z; - --(UIAccelerationSimulation*)initWithTimestamp:(NSTimeInterval)aTimeStamp - X:(UIAccelerationValue)ax - Y:(UIAccelerationValue)ay - Z:(UIAccelerationValue)az -{ - timestamp = aTimeStamp; - x = ax; - y = ay; - z = az; - - return self; -} -@end - -@implementation UIAccelerometer (Simulation) -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wobjc-protocol-method-implementation" -// override the static method and return our simulated version instead -+ (UIAccelerometer *)sharedAccelerometer -{ - return [CCAccelerometerSimulation getAccelerometer]; -} -#pragma clang diagnostic pop -@end -/* - // callback that never got called with CFSocket UDP... - - void mySocketCallBack( CFSocketRef s, - CFSocketCallBackType callbackType, - CFDataRef address, - const void *data, - void *info) - { - AccelerometerSimulation *accSim = (AccelerometerSimulation*)info; - - NSLog(@"Data %s received", (char*)data); - } - */ - -// singleton -static CCAccelerometerSimulation *sharedAccelerometer = NULL; - -@implementation CCAccelerometerSimulation - -- (void) dealloc { - if (sharedAccelerometer) { - [sharedAccelerometer release]; - sharedAccelerometer = NULL; - } - [super dealloc]; -} - -// this is straight from developer guide example for multi-threaded notifications -- (void) setUpThreadingSupport { - if ( notifications ) return; - - notifications = [[NSMutableArray alloc] init]; - notificationLock = [[NSLock alloc] init]; - notificationThread = [[NSThread currentThread] retain]; - - notificationPort = [[NSMachPort alloc] init]; - [notificationPort setDelegate:self]; - [[NSRunLoop currentRunLoop] addPort:notificationPort - forMode:(NSString *) kCFRunLoopCommonModes]; -} - -// this is straight from developer guide example - -- (void) processNotification:(NSNotification *) notification { - if( [NSThread currentThread] != notificationThread ) { - // Forward the notification to the correct thread, this is the socket thread - NSDate* date = [[NSDate alloc] init]; - [notificationLock lock]; - [notifications addObject:notification]; - [notificationLock unlock]; - [notificationPort sendBeforeDate:date - components:nil - from:nil - reserved:0]; - [date release]; - } - else { - // now we are in the main thread - // Process the notification here; - NSString *data = (NSString*)[notification object]; - - // parse the data, no error handling! - NSArray *components = [data componentsSeparatedByString:@","]; - - // create our own acceleration object - [accObject initWithTimestamp:[[components objectAtIndex:1] doubleValue] - X:[[components objectAtIndex:2] doubleValue] - Y:[[components objectAtIndex:3] doubleValue] - Z:[[components objectAtIndex:4] doubleValue]]; - [accelDelegate accelerometer:self didAccelerate:(UIAcceleration*)accObject]; - } -} - -// this is straight from developer guide example -- (void) handleMachMessage:(void *) msg { - [notificationLock lock]; - while ( [notifications count] ) { - NSNotification *notification = [[notifications objectAtIndex:0] retain]; - [notifications removeObjectAtIndex:0]; - [notificationLock unlock]; - [self processNotification:notification]; - [notification release]; - [notificationLock lock]; - }; - [notificationLock unlock]; -} -#ifndef __clang_analyzer__ -+ (CCAccelerometerSimulation *)getAccelerometer -{ - if( sharedAccelerometer == NULL ) - sharedAccelerometer = [[CCAccelerometerSimulation alloc] initialize]; - - return sharedAccelerometer; -} -#endif -- (void)threadLoop:(id)object -{ - char buffer[1024]; - // we never exit... - while(1) { - int count = recv( udpSocket, buffer, sizeof(buffer), 0 ); - if( count > 0 ) - { - // got data, let's pass it on - buffer[count] = 0; - NSString *str = [[NSString alloc] initWithUTF8String:buffer]; - [[NSNotificationCenter defaultCenter] postNotificationName:@"ThreadAccelNotification" object:str]; - [str release]; - } - - } -} - -// initialize our version of the accelerometer -- (CCAccelerometerSimulation *)initialize -{ - accObject = [UIAccelerationSimulation alloc]; - isExiting = false; - - // couldn't get the CFSocket version to work with UDP and runloop, so used Berkeley sockets and a thread instead - - udpSocket = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); - struct sockaddr_in sin; - memset(&sin, 0, sizeof(sin)); - // listen on all interfaces - sin.sin_addr.s_addr = INADDR_ANY; - sin.sin_len = sizeof(struct sockaddr_in); - sin.sin_family = AF_INET; - sin.sin_port = htons(kAccelerometerSimulationPort); - - bind(udpSocket, (const struct sockaddr*)&sin, sizeof(sin)); - - // create a separate thread for receiving UDP packets - thread = [[NSThread alloc] initWithTarget:self - selector:@selector(threadLoop:) - object:nil]; - [thread start]; - - // cross-thread communication setup - [self setUpThreadingSupport]; - [[NSNotificationCenter defaultCenter] - addObserver:self - selector:@selector(processNotification:) - name:@"ThreadAccelNotification" - object:nil]; - /* - // create and initialize a socket - CFSocketContext ctx; - - ctx.info = self; - ctx.version = 0; - ctx.retain = NULL; - ctx.release = NULL; - ctx.copyDescription = NULL; - udpSocket = CFSocketCreate(NULL, PF_INET, SOCK_DGRAM, IPPROTO_UDP, kCFSocketDataCallBack | 0xF, mySocketCallBack, NULL); - - CFRunLoopSourceRef source; - CFDataRef addr; - CFSocketError theErr; - struct sockaddr_in sin; - memset(&sin, 0, sizeof(sin)); - sin.sin_addr.s_addr = INADDR_ANY; - sin.sin_len = sizeof(struct sockaddr_in); - sin.sin_family = AF_INET; - sin.sin_port = htons(10552); - addr = CFDataCreate(NULL, (unsigned char *)&sin, sizeof(sin)); - theErr = CFSocketConnectToAddress(udpSocket, addr, 0); - switch (theErr) { - case kCFSocketSuccess: - NSLog(@"UDP Logged in"); - source = CFSocketCreateRunLoopSource(NULL, udpSocket, 0); - CFRunLoopAddSource(CFRunLoopGetMain(), source, - kCFRunLoopDefaultMode); - break; - case kCFSocketError: - NSLog(@"UDP Error"); - break; - default: - NSLog(@"UDP Networking Error"); - break; - } - */ - return self; -} - -// we grab the delegate setting action -- (void)setDelegate:(id)delegate -{ - accelDelegate = delegate; -} - -- (id)delegate -{ - return accelDelegate; -} -@end - -#endif // !TARGET_CPU_ARM - -#endif // CC_PLATFORM_IOS diff --git a/cocos/2d/platform/win32/CCFileUtilsWin32.cpp b/cocos/2d/platform/win32/CCFileUtilsWin32.cpp index 8b93969262..ee9b632ede 100644 --- a/cocos/2d/platform/win32/CCFileUtilsWin32.cpp +++ b/cocos/2d/platform/win32/CCFileUtilsWin32.cpp @@ -293,7 +293,7 @@ string FileUtilsWin32::getWritablePath() const // Create directory if (SUCCEEDED(SHCreateDirectoryExA(NULL, ret.c_str(), NULL))) { - return ret; + return convertPathFormatToUnixStyle(ret); } } } diff --git a/cocos/base/CCConsole.cpp b/cocos/base/CCConsole.cpp index 3a2b5c76c7..c58b933384 100644 --- a/cocos/base/CCConsole.cpp +++ b/cocos/base/CCConsole.cpp @@ -58,7 +58,7 @@ #include "CCConfiguration.h" #include "CCTextureCache.h" #include "CCGLView.h" - +#include "base64.h" NS_CC_BEGIN //TODO: these general utils should be in a seperate class @@ -252,8 +252,6 @@ Console::Console() , _running(false) , _endThread(false) , _sendDebugStrings(false) -,_fileUploading(false) -,_uploadFileSize(0) { // VS2012 doesn't support initializer list, so we create a new array and assign its elements to '_command'. Command commands[] = { @@ -284,13 +282,13 @@ Console::Console() { "texture", "Flush or print the TextureCache info. Args: [flush | ] ", std::bind(&Console::commandTextures, this, std::placeholders::_1, std::placeholders::_2) }, { "director", "director commands, type -h or [director help] to list supported directives", std::bind(&Console::commandDirector, this, std::placeholders::_1, std::placeholders::_2) }, { "touch", "simulate touch event via console, type -h or [touch help] to list supported directives", std::bind(&Console::commandTouch, this, std::placeholders::_1, std::placeholders::_2) }, - { "upload", "upload file. Args: [filename filesize]", std::bind(&Console::commandUpload, this, std::placeholders::_1, std::placeholders::_2) }, + { "upload", "upload file. Args: [filename base64_encoded_data]", std::bind(&Console::commandUpload, this, std::placeholders::_1) }, }; ; for (int i = 0; i < sizeof(commands)/sizeof(commands[0]); ++i) { - _commands.insert ( std::pair(commands[i].name,commands[i]) ); + _commands[commands[i].name] = commands[i]; } _writablePath = FileUtils::getInstance()->getWritablePath(); } @@ -300,10 +298,9 @@ Console::~Console() stop(); } - bool Console::listenOnTCP(int port) { - int listenfd, n; + int listenfd = -1, n; const int on = 1; struct addrinfo hints, *res, *ressave; char serv[30]; @@ -370,7 +367,6 @@ bool Console::listenOnTCP(int port) freeaddrinfo(ressave); - return listenOnFileDescriptor(listenfd); } @@ -642,7 +638,7 @@ void Console::commandTouch(int fd, const std::string& args) float x = std::atof(argv[1].c_str()); float y = std::atof(argv[2].c_str()); - srand (time(NULL)); + srand ((unsigned)time(NULL)); _touchId = rand(); Scheduler *sched = Director::getInstance()->getScheduler(); sched->performFunctionInCocosThread( [&](){ @@ -670,7 +666,7 @@ void Console::commandTouch(int fd, const std::string& args) float x2 = std::atof(argv[3].c_str()); float y2 = std::atof(argv[4].c_str()); - srand (time(NULL)); + srand ((unsigned)time(NULL)); _touchId = rand(); Scheduler *sched = Director::getInstance()->getScheduler(); @@ -757,33 +753,139 @@ void Console::commandTouch(int fd, const std::string& args) } } -void Console::commandUpload(int fd, const std::string& args) +void Console::commandUpload(int fd) { - auto argv = split(args,' '); - if(argv.size() == 2) + ssize_t n, rc; + char buf[512], c; + char *ptr = buf; + //read file name + for( n = 0; n < sizeof(buf) - 1; n++ ) { - _uploadFileName = argv[0]; - _uploadFileSize = std::atoi(argv[1].c_str()); - _fileUploading = true; - } - else - { - const char msg[] = "upload: invalid arguments.\n"; - send(fd, msg, sizeof(msg) - 1, 0); + if( (rc = recv(fd, &c, 1, 0)) ==1 ) + { + *ptr++ = c; + if(c == ' ') + { + break; + } + } + else if( rc == 0 ) + { + break; + } + else if( errno == EINTR ) + { + continue; + } + else + { + break; + } } + *ptr = 0; + std::string filepath = _writablePath + std::string(buf); + + FILE* fp = fopen(filepath.c_str(), "wb"); + if(!fp) + { + const char err[] = "can't create file!\n"; + send(fd, err, sizeof(err),0); + return; + } + + while (true) + { + char data[4]; + for(int i = 0; i < 4; i++) + { + data[i] = '='; + } + bool more_data; + readBytes(fd, data, 4, &more_data); + if(!more_data) + { + break; + } + unsigned char *decode; + unsigned char *in = (unsigned char *)data; + int dt = base64Decode(in, 4, &decode); + for(int i = 0; i < dt; i++) + { + fwrite(decode+i, 1, 1, fp); + } + free(decode); + } + fclose(fp); } + +ssize_t Console::readBytes(int fd, char* buffer, size_t maxlen, bool* more) +{ + ssize_t n, rc; + char c, *ptr = buffer; + *more = false; + for( n = 0; n < maxlen; n++ ) { + if( (rc = recv(fd, &c, 1, 0)) ==1 ) { + *ptr++ = c; + if(c == '\n') { + return n; + } + } else if( rc == 0 ) { + return 0; + } else if( errno == EINTR ) { + continue; + } else { + return -1; + } + } + *more = true; + return n; +} + bool Console::parseCommand(int fd) { char buf[512]; - auto r = readline(fd, buf, sizeof(buf)-1); - if(r < 1) + bool more_data; + auto h = readBytes(fd, buf, 6, &more_data); + if( h < 0) { - const char err[] = "Unknown error!\n"; - sendPrompt(fd); - send(fd, err, sizeof(err),0); return false; } + if(strncmp(buf, "upload", 6) == 0) + { + char c = '\0'; + recv(fd, &c, 1, 0); + if(c == ' ') + { + commandUpload(fd); + sendPrompt(fd); + return true; + } + else + { + const char err[] = "Unknown Command!\n"; + sendPrompt(fd); + send(fd, err, sizeof(err),0); + return false; + + } + } + if(!more_data) + { + buf[h] = 0; + } + else + { + char *pb = buf + 6; + auto r = readline(fd, pb, sizeof(buf)-6); + if(r < 0) + { + const char err[] = "Unknown error!\n"; + sendPrompt(fd); + send(fd, err, sizeof(err),0); + return false; + } + } std::string cmdLine; std::vector args; @@ -827,12 +929,12 @@ bool Console::parseCommand(int fd) // -ssize_t Console::readline(int fd, char* ptr, int maxlen) +ssize_t Console::readline(int fd, char* ptr, size_t maxlen) { ssize_t n, rc; char c; - for( n=1; n callback; }; @@ -99,8 +99,8 @@ public: protected: void loop(); - ssize_t readline(int fd, char *buf, int maxlen); - ssize_t readfile(int fd, std::string &file_name, int file_size); + ssize_t readline(int fd, char *buf, size_t maxlen); + ssize_t readBytes(int fd, char* buffer, size_t maxlen, bool* more); bool parseCommand(int fd); void addClient(); @@ -116,7 +116,7 @@ protected: void commandProjection(int fd, const std::string &args); void commandDirector(int fd, const std::string &args); void commandTouch(int fd, const std::string &args); - void commandUpload(int fd, const std::string &args); + void commandUpload(int fd); // file descriptor: socket, console, etc. int _listenfd; int _maxfd; @@ -128,9 +128,6 @@ protected: bool _running; bool _endThread; - bool _fileUploading; - ssize_t _uploadFileSize; - std::string _uploadFileName; std::string _writablePath; std::map _commands; diff --git a/cocos/editor-support/cocosbuilder/CCNodeLoader.cpp b/cocos/editor-support/cocosbuilder/CCNodeLoader.cpp index 80d2676e39..e54ed925c8 100644 --- a/cocos/editor-support/cocosbuilder/CCNodeLoader.cpp +++ b/cocos/editor-support/cocosbuilder/CCNodeLoader.cpp @@ -84,7 +84,7 @@ void NodeLoader::parseProperties(Node * pNode, Node * pParent, CCBReader * ccbRe bool bFound = false; CCARRAY_FOREACH(extraPropsNames, pObj) { - String* pStr = static_cast(pObj); + __String* pStr = static_cast<__String*>(pObj); if (0 == pStr->compare(propertyName.c_str())) { bFound = true; @@ -96,7 +96,7 @@ void NodeLoader::parseProperties(Node * pNode, Node * pParent, CCBReader * ccbRe } else if (isExtraProp && pNode == ccbReader->getAnimationManager()->getRootNode()) { - Array *extraPropsNames = static_cast(pNode->getUserObject()); + __Array *extraPropsNames = static_cast<__Array*>(pNode->getUserObject()); if (! extraPropsNames) { extraPropsNames = Array::create(); diff --git a/cocos/scripting/lua-bindings/auto/api/Action.lua b/cocos/scripting/lua-bindings/auto/api/Action.lua index 24e8e3cc12..a3282c2da2 100644 --- a/cocos/scripting/lua-bindings/auto/api/Action.lua +++ b/cocos/scripting/lua-bindings/auto/api/Action.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module Action +-- @extend Ref + -------------------------------- -- @function [parent=#Action] startWithTarget -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/ActionCamera.lua b/cocos/scripting/lua-bindings/auto/api/ActionCamera.lua index beb8f1b0fd..911a385015 100644 --- a/cocos/scripting/lua-bindings/auto/api/ActionCamera.lua +++ b/cocos/scripting/lua-bindings/auto/api/ActionCamera.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module ActionCamera +-- @extend ActionInterval + -------------------------------- -- overload function: setEye(float, float, float) -- @@ -37,6 +39,21 @@ -- @param self -- @return kmVec3#kmVec3 ret (return value: kmVec3) +-------------------------------- +-- @function [parent=#ActionCamera] startWithTarget +-- @param self +-- @param #cc.Node node + +-------------------------------- +-- @function [parent=#ActionCamera] clone +-- @param self +-- @return ActionCamera#ActionCamera ret (return value: cc.ActionCamera) + +-------------------------------- +-- @function [parent=#ActionCamera] reverse +-- @param self +-- @return ActionCamera#ActionCamera ret (return value: cc.ActionCamera) + -------------------------------- -- @function [parent=#ActionCamera] ActionCamera -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/ActionEase.lua b/cocos/scripting/lua-bindings/auto/api/ActionEase.lua index b84f3ca32c..2d9555eff3 100644 --- a/cocos/scripting/lua-bindings/auto/api/ActionEase.lua +++ b/cocos/scripting/lua-bindings/auto/api/ActionEase.lua @@ -1,9 +1,35 @@ -------------------------------- -- @module ActionEase +-- @extend ActionInterval + -------------------------------- -- @function [parent=#ActionEase] getInnerAction -- @param self -- @return ActionInterval#ActionInterval ret (return value: cc.ActionInterval) +-------------------------------- +-- @function [parent=#ActionEase] startWithTarget +-- @param self +-- @param #cc.Node node + +-------------------------------- +-- @function [parent=#ActionEase] clone +-- @param self +-- @return ActionEase#ActionEase ret (return value: cc.ActionEase) + +-------------------------------- +-- @function [parent=#ActionEase] stop +-- @param self + +-------------------------------- +-- @function [parent=#ActionEase] reverse +-- @param self +-- @return ActionEase#ActionEase ret (return value: cc.ActionEase) + +-------------------------------- +-- @function [parent=#ActionEase] update +-- @param self +-- @param #float float + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/ActionInstant.lua b/cocos/scripting/lua-bindings/auto/api/ActionInstant.lua index 625cfd4e32..81ee227b90 100644 --- a/cocos/scripting/lua-bindings/auto/api/ActionInstant.lua +++ b/cocos/scripting/lua-bindings/auto/api/ActionInstant.lua @@ -1,4 +1,31 @@ -------------------------------- -- @module ActionInstant +-- @extend FiniteTimeAction + +-------------------------------- +-- @function [parent=#ActionInstant] step +-- @param self +-- @param #float float + +-------------------------------- +-- @function [parent=#ActionInstant] clone +-- @param self +-- @return ActionInstant#ActionInstant ret (return value: cc.ActionInstant) + +-------------------------------- +-- @function [parent=#ActionInstant] reverse +-- @param self +-- @return ActionInstant#ActionInstant ret (return value: cc.ActionInstant) + +-------------------------------- +-- @function [parent=#ActionInstant] isDone +-- @param self +-- @return bool#bool ret (return value: bool) + +-------------------------------- +-- @function [parent=#ActionInstant] update +-- @param self +-- @param #float float + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/ActionInterval.lua b/cocos/scripting/lua-bindings/auto/api/ActionInterval.lua index 531221b05a..7410137832 100644 --- a/cocos/scripting/lua-bindings/auto/api/ActionInterval.lua +++ b/cocos/scripting/lua-bindings/auto/api/ActionInterval.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module ActionInterval +-- @extend FiniteTimeAction + -------------------------------- -- @function [parent=#ActionInterval] getAmplitudeRate -- @param self @@ -16,4 +18,29 @@ -- @param self -- @return float#float ret (return value: float) +-------------------------------- +-- @function [parent=#ActionInterval] startWithTarget +-- @param self +-- @param #cc.Node node + +-------------------------------- +-- @function [parent=#ActionInterval] step +-- @param self +-- @param #float float + +-------------------------------- +-- @function [parent=#ActionInterval] clone +-- @param self +-- @return ActionInterval#ActionInterval ret (return value: cc.ActionInterval) + +-------------------------------- +-- @function [parent=#ActionInterval] reverse +-- @param self +-- @return ActionInterval#ActionInterval ret (return value: cc.ActionInterval) + +-------------------------------- +-- @function [parent=#ActionInterval] isDone +-- @param self +-- @return bool#bool ret (return value: bool) + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/ActionManager.lua b/cocos/scripting/lua-bindings/auto/api/ActionManager.lua index 83fad47dc4..39b1977878 100644 --- a/cocos/scripting/lua-bindings/auto/api/ActionManager.lua +++ b/cocos/scripting/lua-bindings/auto/api/ActionManager.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module ActionManager +-- @extend Ref + -------------------------------- -- @function [parent=#ActionManager] getActionByTag -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/ActionManagerEx.lua b/cocos/scripting/lua-bindings/auto/api/ActionManagerEx.lua index f3a32bf505..4bc3a5a97c 100644 --- a/cocos/scripting/lua-bindings/auto/api/ActionManagerEx.lua +++ b/cocos/scripting/lua-bindings/auto/api/ActionManagerEx.lua @@ -1,6 +1,7 @@ -------------------------------- -- @module ActionManagerEx + -------------------------------- -- overload function: playActionByName(char, char, cc.CallFunc) -- diff --git a/cocos/scripting/lua-bindings/auto/api/ActionObject.lua b/cocos/scripting/lua-bindings/auto/api/ActionObject.lua index a38d4dba46..c61a546386 100644 --- a/cocos/scripting/lua-bindings/auto/api/ActionObject.lua +++ b/cocos/scripting/lua-bindings/auto/api/ActionObject.lua @@ -1,6 +1,7 @@ -------------------------------- -- @module ActionObject + -------------------------------- -- @function [parent=#ActionObject] setCurrentTime -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/ActionTween.lua b/cocos/scripting/lua-bindings/auto/api/ActionTween.lua index 7fa63c49ad..459497dfdd 100644 --- a/cocos/scripting/lua-bindings/auto/api/ActionTween.lua +++ b/cocos/scripting/lua-bindings/auto/api/ActionTween.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module ActionTween +-- @extend ActionInterval + -------------------------------- -- @function [parent=#ActionTween] initWithDuration -- @param self @@ -19,4 +21,24 @@ -- @param #float float -- @return ActionTween#ActionTween ret (return value: cc.ActionTween) +-------------------------------- +-- @function [parent=#ActionTween] startWithTarget +-- @param self +-- @param #cc.Node node + +-------------------------------- +-- @function [parent=#ActionTween] clone +-- @param self +-- @return ActionTween#ActionTween ret (return value: cc.ActionTween) + +-------------------------------- +-- @function [parent=#ActionTween] update +-- @param self +-- @param #float float + +-------------------------------- +-- @function [parent=#ActionTween] reverse +-- @param self +-- @return ActionTween#ActionTween ret (return value: cc.ActionTween) + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/Animate.lua b/cocos/scripting/lua-bindings/auto/api/Animate.lua index 9790543a3d..0edfcbaa83 100644 --- a/cocos/scripting/lua-bindings/auto/api/Animate.lua +++ b/cocos/scripting/lua-bindings/auto/api/Animate.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module Animate +-- @extend ActionInterval + -------------------------------- -- overload function: getAnimation() -- @@ -21,4 +23,28 @@ -- @param #cc.Animation animation -- @return Animate#Animate ret (return value: cc.Animate) +-------------------------------- +-- @function [parent=#Animate] startWithTarget +-- @param self +-- @param #cc.Node node + +-------------------------------- +-- @function [parent=#Animate] clone +-- @param self +-- @return Animate#Animate ret (return value: cc.Animate) + +-------------------------------- +-- @function [parent=#Animate] stop +-- @param self + +-------------------------------- +-- @function [parent=#Animate] reverse +-- @param self +-- @return Animate#Animate ret (return value: cc.Animate) + +-------------------------------- +-- @function [parent=#Animate] update +-- @param self +-- @param #float float + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/Animation.lua b/cocos/scripting/lua-bindings/auto/api/Animation.lua index 6f70ad8895..be0c6643da 100644 --- a/cocos/scripting/lua-bindings/auto/api/Animation.lua +++ b/cocos/scripting/lua-bindings/auto/api/Animation.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module Animation +-- @extend Ref + -------------------------------- -- @function [parent=#Animation] getLoops -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/AnimationCache.lua b/cocos/scripting/lua-bindings/auto/api/AnimationCache.lua index 5cc624e91c..1ab4912b96 100644 --- a/cocos/scripting/lua-bindings/auto/api/AnimationCache.lua +++ b/cocos/scripting/lua-bindings/auto/api/AnimationCache.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module AnimationCache +-- @extend Ref + -------------------------------- -- @function [parent=#AnimationCache] getAnimation -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/AnimationData.lua b/cocos/scripting/lua-bindings/auto/api/AnimationData.lua index 9810307206..80d6482163 100644 --- a/cocos/scripting/lua-bindings/auto/api/AnimationData.lua +++ b/cocos/scripting/lua-bindings/auto/api/AnimationData.lua @@ -1,6 +1,7 @@ -------------------------------- -- @module AnimationData + -------------------------------- -- @function [parent=#AnimationData] getMovement -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/AnimationFrame.lua b/cocos/scripting/lua-bindings/auto/api/AnimationFrame.lua index be020885e6..01753ea966 100644 --- a/cocos/scripting/lua-bindings/auto/api/AnimationFrame.lua +++ b/cocos/scripting/lua-bindings/auto/api/AnimationFrame.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module AnimationFrame +-- @extend Ref + -------------------------------- -- @function [parent=#AnimationFrame] setSpriteFrame -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/Application.lua b/cocos/scripting/lua-bindings/auto/api/Application.lua index c571332321..bb11429a39 100644 --- a/cocos/scripting/lua-bindings/auto/api/Application.lua +++ b/cocos/scripting/lua-bindings/auto/api/Application.lua @@ -1,6 +1,7 @@ -------------------------------- -- @module Application + -------------------------------- -- @function [parent=#Application] getTargetPlatform -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/Armature.lua b/cocos/scripting/lua-bindings/auto/api/Armature.lua index a01abe6930..c4c3a31527 100644 --- a/cocos/scripting/lua-bindings/auto/api/Armature.lua +++ b/cocos/scripting/lua-bindings/auto/api/Armature.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module Armature +-- @extend Node,BlendProtocol, + -------------------------------- -- @function [parent=#Armature] getBone -- @param self @@ -136,6 +138,38 @@ -- @param #ccs.Bone bone -- @return Armature#Armature ret (retunr value: ccs.Armature) +-------------------------------- +-- @function [parent=#Armature] setAnchorPoint +-- @param self +-- @param #point_table point + +-------------------------------- +-- @function [parent=#Armature] draw +-- @param self +-- @param #cc.Renderer renderer +-- @param #kmMat4 kmmat4 +-- @param #bool bool + +-------------------------------- +-- @function [parent=#Armature] getAnchorPointInPoints +-- @param self +-- @return point_table#point_table ret (return value: point_table) + +-------------------------------- +-- @function [parent=#Armature] update +-- @param self +-- @param #float float + +-------------------------------- +-- @function [parent=#Armature] getNodeToParentTransform +-- @param self +-- @return kmMat4#kmMat4 ret (return value: kmMat4) + +-------------------------------- +-- @function [parent=#Armature] getBoundingBox +-- @param self +-- @return rect_table#rect_table ret (return value: rect_table) + -------------------------------- -- @function [parent=#Armature] Armature -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/ArmatureAnimation.lua b/cocos/scripting/lua-bindings/auto/api/ArmatureAnimation.lua index 54f138acbc..00ed9e21fa 100644 --- a/cocos/scripting/lua-bindings/auto/api/ArmatureAnimation.lua +++ b/cocos/scripting/lua-bindings/auto/api/ArmatureAnimation.lua @@ -1,6 +1,7 @@ -------------------------------- -- @module ArmatureAnimation + -------------------------------- -- @function [parent=#ArmatureAnimation] getSpeedScale -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/ArmatureData.lua b/cocos/scripting/lua-bindings/auto/api/ArmatureData.lua index c09e50e2ad..503eee97ac 100644 --- a/cocos/scripting/lua-bindings/auto/api/ArmatureData.lua +++ b/cocos/scripting/lua-bindings/auto/api/ArmatureData.lua @@ -1,6 +1,7 @@ -------------------------------- -- @module ArmatureData + -------------------------------- -- @function [parent=#ArmatureData] addBoneData -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/ArmatureDataManager.lua b/cocos/scripting/lua-bindings/auto/api/ArmatureDataManager.lua index bc65fafe65..099bdf9600 100644 --- a/cocos/scripting/lua-bindings/auto/api/ArmatureDataManager.lua +++ b/cocos/scripting/lua-bindings/auto/api/ArmatureDataManager.lua @@ -1,6 +1,7 @@ -------------------------------- -- @module ArmatureDataManager + -------------------------------- -- @function [parent=#ArmatureDataManager] getAnimationDatas -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/ArmatureDisplayData.lua b/cocos/scripting/lua-bindings/auto/api/ArmatureDisplayData.lua index 5aea40a605..8806301030 100644 --- a/cocos/scripting/lua-bindings/auto/api/ArmatureDisplayData.lua +++ b/cocos/scripting/lua-bindings/auto/api/ArmatureDisplayData.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module ArmatureDisplayData +-- @extend DisplayData + -------------------------------- -- @function [parent=#ArmatureDisplayData] create -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/AssetsManager.lua b/cocos/scripting/lua-bindings/auto/api/AssetsManager.lua index 81aa919049..93c693ef61 100644 --- a/cocos/scripting/lua-bindings/auto/api/AssetsManager.lua +++ b/cocos/scripting/lua-bindings/auto/api/AssetsManager.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module AssetsManager +-- @extend Node + -------------------------------- -- @function [parent=#AssetsManager] setStoragePath -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/AtlasNode.lua b/cocos/scripting/lua-bindings/auto/api/AtlasNode.lua index f11f35f550..f4b0dee453 100644 --- a/cocos/scripting/lua-bindings/auto/api/AtlasNode.lua +++ b/cocos/scripting/lua-bindings/auto/api/AtlasNode.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module AtlasNode +-- @extend Node,TextureProtocol, + -------------------------------- -- @function [parent=#AtlasNode] updateAtlasValues -- @param self @@ -44,4 +46,36 @@ -- @param #int int -- @return AtlasNode#AtlasNode ret (return value: cc.AtlasNode) +-------------------------------- +-- @function [parent=#AtlasNode] draw +-- @param self +-- @param #cc.Renderer renderer +-- @param #kmMat4 kmmat4 +-- @param #bool bool + +-------------------------------- +-- @function [parent=#AtlasNode] isOpacityModifyRGB +-- @param self +-- @return bool#bool ret (return value: bool) + +-------------------------------- +-- @function [parent=#AtlasNode] setColor +-- @param self +-- @param #color3B_table color3b + +-------------------------------- +-- @function [parent=#AtlasNode] getColor +-- @param self +-- @return color3B_table#color3B_table ret (return value: color3B_table) + +-------------------------------- +-- @function [parent=#AtlasNode] setOpacityModifyRGB +-- @param self +-- @param #bool bool + +-------------------------------- +-- @function [parent=#AtlasNode] setOpacity +-- @param self +-- @param #unsigned char char + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/BaseData.lua b/cocos/scripting/lua-bindings/auto/api/BaseData.lua index 63e7660ae1..f674d532a4 100644 --- a/cocos/scripting/lua-bindings/auto/api/BaseData.lua +++ b/cocos/scripting/lua-bindings/auto/api/BaseData.lua @@ -1,6 +1,7 @@ -------------------------------- -- @module BaseData + -------------------------------- -- @function [parent=#BaseData] getColor -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/BatchNode.lua b/cocos/scripting/lua-bindings/auto/api/BatchNode.lua index 6d60cb747c..ee0082484b 100644 --- a/cocos/scripting/lua-bindings/auto/api/BatchNode.lua +++ b/cocos/scripting/lua-bindings/auto/api/BatchNode.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module BatchNode +-- @extend Node + -------------------------------- -- @function [parent=#BatchNode] init -- @param self @@ -11,4 +13,30 @@ -- @param self -- @return BatchNode#BatchNode ret (return value: ccs.BatchNode) +-------------------------------- +-- overload function: addChild(cc.Node, int) +-- +-- overload function: addChild(cc.Node) +-- +-- overload function: addChild(cc.Node, int, int) +-- +-- @function [parent=#BatchNode] addChild +-- @param self +-- @param #cc.Node node +-- @param #int int +-- @param #int int + +-------------------------------- +-- @function [parent=#BatchNode] draw +-- @param self +-- @param #cc.Renderer renderer +-- @param #kmMat4 kmmat4 +-- @param #bool bool + +-------------------------------- +-- @function [parent=#BatchNode] removeChild +-- @param self +-- @param #cc.Node node +-- @param #bool bool + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/BezierBy.lua b/cocos/scripting/lua-bindings/auto/api/BezierBy.lua index f7ca4174ea..a918c281e7 100644 --- a/cocos/scripting/lua-bindings/auto/api/BezierBy.lua +++ b/cocos/scripting/lua-bindings/auto/api/BezierBy.lua @@ -1,4 +1,26 @@ -------------------------------- -- @module BezierBy +-- @extend ActionInterval + +-------------------------------- +-- @function [parent=#BezierBy] startWithTarget +-- @param self +-- @param #cc.Node node + +-------------------------------- +-- @function [parent=#BezierBy] clone +-- @param self +-- @return BezierBy#BezierBy ret (return value: cc.BezierBy) + +-------------------------------- +-- @function [parent=#BezierBy] reverse +-- @param self +-- @return BezierBy#BezierBy ret (return value: cc.BezierBy) + +-------------------------------- +-- @function [parent=#BezierBy] update +-- @param self +-- @param #float float + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/BezierTo.lua b/cocos/scripting/lua-bindings/auto/api/BezierTo.lua index 4aff14c786..2a234cdc9d 100644 --- a/cocos/scripting/lua-bindings/auto/api/BezierTo.lua +++ b/cocos/scripting/lua-bindings/auto/api/BezierTo.lua @@ -1,4 +1,21 @@ -------------------------------- -- @module BezierTo +-- @extend BezierBy + +-------------------------------- +-- @function [parent=#BezierTo] startWithTarget +-- @param self +-- @param #cc.Node node + +-------------------------------- +-- @function [parent=#BezierTo] clone +-- @param self +-- @return BezierTo#BezierTo ret (return value: cc.BezierTo) + +-------------------------------- +-- @function [parent=#BezierTo] reverse +-- @param self +-- @return BezierTo#BezierTo ret (return value: cc.BezierTo) + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/Blink.lua b/cocos/scripting/lua-bindings/auto/api/Blink.lua index 7f2573abff..6b0d5e668f 100644 --- a/cocos/scripting/lua-bindings/auto/api/Blink.lua +++ b/cocos/scripting/lua-bindings/auto/api/Blink.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module Blink +-- @extend ActionInterval + -------------------------------- -- @function [parent=#Blink] create -- @param self @@ -8,4 +10,28 @@ -- @param #int int -- @return Blink#Blink ret (return value: cc.Blink) +-------------------------------- +-- @function [parent=#Blink] startWithTarget +-- @param self +-- @param #cc.Node node + +-------------------------------- +-- @function [parent=#Blink] clone +-- @param self +-- @return Blink#Blink ret (return value: cc.Blink) + +-------------------------------- +-- @function [parent=#Blink] stop +-- @param self + +-------------------------------- +-- @function [parent=#Blink] reverse +-- @param self +-- @return Blink#Blink ret (return value: cc.Blink) + +-------------------------------- +-- @function [parent=#Blink] update +-- @param self +-- @param #float float + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/Bone.lua b/cocos/scripting/lua-bindings/auto/api/Bone.lua index 8e8eb8a9f0..cfa8ccd740 100644 --- a/cocos/scripting/lua-bindings/auto/api/Bone.lua +++ b/cocos/scripting/lua-bindings/auto/api/Bone.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module Bone +-- @extend Node + -------------------------------- -- @function [parent=#Bone] isTransformDirty -- @param self @@ -187,6 +189,31 @@ -- @param #string str -- @return Bone#Bone ret (retunr value: ccs.Bone) +-------------------------------- +-- @function [parent=#Bone] updateDisplayedColor +-- @param self +-- @param #color3B_table color3b + +-------------------------------- +-- @function [parent=#Bone] setLocalZOrder +-- @param self +-- @param #int int + +-------------------------------- +-- @function [parent=#Bone] getNodeToWorldTransform +-- @param self +-- @return kmMat4#kmMat4 ret (return value: kmMat4) + +-------------------------------- +-- @function [parent=#Bone] update +-- @param self +-- @param #float float + +-------------------------------- +-- @function [parent=#Bone] updateDisplayedOpacity +-- @param self +-- @param #unsigned char char + -------------------------------- -- @function [parent=#Bone] Bone -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/BoneData.lua b/cocos/scripting/lua-bindings/auto/api/BoneData.lua index 70835dcb3c..78506b2007 100644 --- a/cocos/scripting/lua-bindings/auto/api/BoneData.lua +++ b/cocos/scripting/lua-bindings/auto/api/BoneData.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module BoneData +-- @extend BaseData + -------------------------------- -- @function [parent=#BoneData] getDisplayData -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/Button.lua b/cocos/scripting/lua-bindings/auto/api/Button.lua index 45e77d33c5..934052eac0 100644 --- a/cocos/scripting/lua-bindings/auto/api/Button.lua +++ b/cocos/scripting/lua-bindings/auto/api/Button.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module Button +-- @extend Widget + -------------------------------- -- @function [parent=#Button] getTitleText -- @param self @@ -127,6 +129,31 @@ -- @param self -- @return Ref#Ref ret (return value: cc.Ref) +-------------------------------- +-- @function [parent=#Button] setAnchorPoint +-- @param self +-- @param #point_table point + +-------------------------------- +-- @function [parent=#Button] getVirtualRenderer +-- @param self +-- @return Node#Node ret (return value: cc.Node) + +-------------------------------- +-- @function [parent=#Button] getDescription +-- @param self +-- @return string#string ret (return value: string) + +-------------------------------- +-- @function [parent=#Button] getContentSize +-- @param self +-- @return size_table#size_table ret (return value: size_table) + +-------------------------------- +-- @function [parent=#Button] ignoreContentAdaptWithSize +-- @param self +-- @param #bool bool + -------------------------------- -- @function [parent=#Button] Button -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/CCBAnimationManager.lua b/cocos/scripting/lua-bindings/auto/api/CCBAnimationManager.lua index 9cb4eda7fd..30874c8dab 100644 --- a/cocos/scripting/lua-bindings/auto/api/CCBAnimationManager.lua +++ b/cocos/scripting/lua-bindings/auto/api/CCBAnimationManager.lua @@ -1,6 +1,7 @@ -------------------------------- -- @module CCBAnimationManager + -------------------------------- -- @function [parent=#CCBAnimationManager] moveAnimationsFromNode -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/CCBReader.lua b/cocos/scripting/lua-bindings/auto/api/CCBReader.lua index 118fd252c7..add2dd0fb0 100644 --- a/cocos/scripting/lua-bindings/auto/api/CCBReader.lua +++ b/cocos/scripting/lua-bindings/auto/api/CCBReader.lua @@ -1,6 +1,7 @@ -------------------------------- -- @module CCBReader + -------------------------------- -- @function [parent=#CCBReader] addOwnerOutletName -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/CallFunc.lua b/cocos/scripting/lua-bindings/auto/api/CallFunc.lua index b019450023..0a49221bd9 100644 --- a/cocos/scripting/lua-bindings/auto/api/CallFunc.lua +++ b/cocos/scripting/lua-bindings/auto/api/CallFunc.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module CallFunc +-- @extend ActionInstant + -------------------------------- -- @function [parent=#CallFunc] execute -- @param self @@ -15,4 +17,19 @@ -- @param self -- @param #cc.Ref ref +-------------------------------- +-- @function [parent=#CallFunc] clone +-- @param self +-- @return CallFunc#CallFunc ret (return value: cc.CallFunc) + +-------------------------------- +-- @function [parent=#CallFunc] update +-- @param self +-- @param #float float + +-------------------------------- +-- @function [parent=#CallFunc] reverse +-- @param self +-- @return CallFunc#CallFunc ret (return value: cc.CallFunc) + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/CardinalSplineBy.lua b/cocos/scripting/lua-bindings/auto/api/CardinalSplineBy.lua index 26f659268f..295f31eff1 100644 --- a/cocos/scripting/lua-bindings/auto/api/CardinalSplineBy.lua +++ b/cocos/scripting/lua-bindings/auto/api/CardinalSplineBy.lua @@ -1,6 +1,28 @@ -------------------------------- -- @module CardinalSplineBy +-- @extend CardinalSplineTo + +-------------------------------- +-- @function [parent=#CardinalSplineBy] startWithTarget +-- @param self +-- @param #cc.Node node + +-------------------------------- +-- @function [parent=#CardinalSplineBy] clone +-- @param self +-- @return CardinalSplineBy#CardinalSplineBy ret (return value: cc.CardinalSplineBy) + +-------------------------------- +-- @function [parent=#CardinalSplineBy] updatePosition +-- @param self +-- @param #point_table point + +-------------------------------- +-- @function [parent=#CardinalSplineBy] reverse +-- @param self +-- @return CardinalSplineBy#CardinalSplineBy ret (return value: cc.CardinalSplineBy) + -------------------------------- -- @function [parent=#CardinalSplineBy] CardinalSplineBy -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/CardinalSplineTo.lua b/cocos/scripting/lua-bindings/auto/api/CardinalSplineTo.lua index 755dc507ea..fa067af1c8 100644 --- a/cocos/scripting/lua-bindings/auto/api/CardinalSplineTo.lua +++ b/cocos/scripting/lua-bindings/auto/api/CardinalSplineTo.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module CardinalSplineTo +-- @extend ActionInterval + -------------------------------- -- @function [parent=#CardinalSplineTo] getPoints -- @param self @@ -19,6 +21,26 @@ -- @param #float float -- @return bool#bool ret (return value: bool) +-------------------------------- +-- @function [parent=#CardinalSplineTo] startWithTarget +-- @param self +-- @param #cc.Node node + +-------------------------------- +-- @function [parent=#CardinalSplineTo] clone +-- @param self +-- @return CardinalSplineTo#CardinalSplineTo ret (return value: cc.CardinalSplineTo) + +-------------------------------- +-- @function [parent=#CardinalSplineTo] reverse +-- @param self +-- @return CardinalSplineTo#CardinalSplineTo ret (return value: cc.CardinalSplineTo) + +-------------------------------- +-- @function [parent=#CardinalSplineTo] update +-- @param self +-- @param #float float + -------------------------------- -- @function [parent=#CardinalSplineTo] CardinalSplineTo -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/CatmullRomBy.lua b/cocos/scripting/lua-bindings/auto/api/CatmullRomBy.lua index b7ac597190..227cffe760 100644 --- a/cocos/scripting/lua-bindings/auto/api/CatmullRomBy.lua +++ b/cocos/scripting/lua-bindings/auto/api/CatmullRomBy.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module CatmullRomBy +-- @extend CardinalSplineBy + -------------------------------- -- @function [parent=#CatmullRomBy] initWithDuration -- @param self @@ -8,4 +10,14 @@ -- @param #point_table pointarray -- @return bool#bool ret (return value: bool) +-------------------------------- +-- @function [parent=#CatmullRomBy] clone +-- @param self +-- @return CatmullRomBy#CatmullRomBy ret (return value: cc.CatmullRomBy) + +-------------------------------- +-- @function [parent=#CatmullRomBy] reverse +-- @param self +-- @return CatmullRomBy#CatmullRomBy ret (return value: cc.CatmullRomBy) + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/CatmullRomTo.lua b/cocos/scripting/lua-bindings/auto/api/CatmullRomTo.lua index c4875accea..59824b3519 100644 --- a/cocos/scripting/lua-bindings/auto/api/CatmullRomTo.lua +++ b/cocos/scripting/lua-bindings/auto/api/CatmullRomTo.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module CatmullRomTo +-- @extend CardinalSplineTo + -------------------------------- -- @function [parent=#CatmullRomTo] initWithDuration -- @param self @@ -8,4 +10,14 @@ -- @param #point_table pointarray -- @return bool#bool ret (return value: bool) +-------------------------------- +-- @function [parent=#CatmullRomTo] clone +-- @param self +-- @return CatmullRomTo#CatmullRomTo ret (return value: cc.CatmullRomTo) + +-------------------------------- +-- @function [parent=#CatmullRomTo] reverse +-- @param self +-- @return CatmullRomTo#CatmullRomTo ret (return value: cc.CatmullRomTo) + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/CheckBox.lua b/cocos/scripting/lua-bindings/auto/api/CheckBox.lua index d8cfb06f75..39585c6ba6 100644 --- a/cocos/scripting/lua-bindings/auto/api/CheckBox.lua +++ b/cocos/scripting/lua-bindings/auto/api/CheckBox.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module CheckBox +-- @extend Widget + -------------------------------- -- @function [parent=#CheckBox] getSelectedState -- @param self @@ -61,6 +63,26 @@ -- @param self -- @return Ref#Ref ret (return value: cc.Ref) +-------------------------------- +-- @function [parent=#CheckBox] setAnchorPoint +-- @param self +-- @param #point_table point + +-------------------------------- +-- @function [parent=#CheckBox] getVirtualRenderer +-- @param self +-- @return Node#Node ret (return value: cc.Node) + +-------------------------------- +-- @function [parent=#CheckBox] getDescription +-- @param self +-- @return string#string ret (return value: string) + +-------------------------------- +-- @function [parent=#CheckBox] getContentSize +-- @param self +-- @return size_table#size_table ret (return value: size_table) + -------------------------------- -- @function [parent=#CheckBox] CheckBox -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/ClippingNode.lua b/cocos/scripting/lua-bindings/auto/api/ClippingNode.lua index 95c99c5290..95c15e90bf 100644 --- a/cocos/scripting/lua-bindings/auto/api/ClippingNode.lua +++ b/cocos/scripting/lua-bindings/auto/api/ClippingNode.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module ClippingNode +-- @extend Node + -------------------------------- -- @function [parent=#ClippingNode] isInverted -- @param self @@ -41,4 +43,11 @@ -- @param #cc.Node node -- @return ClippingNode#ClippingNode ret (retunr value: cc.ClippingNode) +-------------------------------- +-- @function [parent=#ClippingNode] visit +-- @param self +-- @param #cc.Renderer renderer +-- @param #kmMat4 kmmat4 +-- @param #bool bool + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/ComAttribute.lua b/cocos/scripting/lua-bindings/auto/api/ComAttribute.lua index 1a56b59927..60b66adccb 100644 --- a/cocos/scripting/lua-bindings/auto/api/ComAttribute.lua +++ b/cocos/scripting/lua-bindings/auto/api/ComAttribute.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module ComAttribute +-- @extend Component + -------------------------------- -- @function [parent=#ComAttribute] getFloat -- @param self @@ -69,4 +71,15 @@ -- @param self -- @return Ref#Ref ret (return value: cc.Ref) +-------------------------------- +-- @function [parent=#ComAttribute] init +-- @param self +-- @return bool#bool ret (return value: bool) + +-------------------------------- +-- @function [parent=#ComAttribute] serialize +-- @param self +-- @param #void void +-- @return bool#bool ret (return value: bool) + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/ComAudio.lua b/cocos/scripting/lua-bindings/auto/api/ComAudio.lua index ed17a04cff..609f03e6d4 100644 --- a/cocos/scripting/lua-bindings/auto/api/ComAudio.lua +++ b/cocos/scripting/lua-bindings/auto/api/ComAudio.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module ComAudio +-- @extend Component + -------------------------------- -- @function [parent=#ComAudio] stopAllEffects -- @param self @@ -153,4 +155,25 @@ -- @param self -- @return Ref#Ref ret (return value: cc.Ref) +-------------------------------- +-- @function [parent=#ComAudio] setEnabled +-- @param self +-- @param #bool bool + +-------------------------------- +-- @function [parent=#ComAudio] isEnabled +-- @param self +-- @return bool#bool ret (return value: bool) + +-------------------------------- +-- @function [parent=#ComAudio] serialize +-- @param self +-- @param #void void +-- @return bool#bool ret (return value: bool) + +-------------------------------- +-- @function [parent=#ComAudio] init +-- @param self +-- @return bool#bool ret (return value: bool) + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/ComController.lua b/cocos/scripting/lua-bindings/auto/api/ComController.lua index abb9f781d9..0b0ec31ee3 100644 --- a/cocos/scripting/lua-bindings/auto/api/ComController.lua +++ b/cocos/scripting/lua-bindings/auto/api/ComController.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module ComController +-- @extend Component,InputDelegate, + -------------------------------- -- @function [parent=#ComController] create -- @param self @@ -11,6 +13,26 @@ -- @param self -- @return Ref#Ref ret (return value: cc.Ref) +-------------------------------- +-- @function [parent=#ComController] setEnabled +-- @param self +-- @param #bool bool + +-------------------------------- +-- @function [parent=#ComController] isEnabled +-- @param self +-- @return bool#bool ret (return value: bool) + +-------------------------------- +-- @function [parent=#ComController] update +-- @param self +-- @param #float float + +-------------------------------- +-- @function [parent=#ComController] init +-- @param self +-- @return bool#bool ret (return value: bool) + -------------------------------- -- @function [parent=#ComController] ComController -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/ComRender.lua b/cocos/scripting/lua-bindings/auto/api/ComRender.lua index 47cc709273..b410225a9c 100644 --- a/cocos/scripting/lua-bindings/auto/api/ComRender.lua +++ b/cocos/scripting/lua-bindings/auto/api/ComRender.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module ComRender +-- @extend Component + -------------------------------- -- @function [parent=#ComRender] setNode -- @param self @@ -27,4 +29,10 @@ -- @param self -- @return Ref#Ref ret (return value: cc.Ref) +-------------------------------- +-- @function [parent=#ComRender] serialize +-- @param self +-- @param #void void +-- @return bool#bool ret (return value: bool) + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/Component.lua b/cocos/scripting/lua-bindings/auto/api/Component.lua index 9ebea04fda..20306901d4 100644 --- a/cocos/scripting/lua-bindings/auto/api/Component.lua +++ b/cocos/scripting/lua-bindings/auto/api/Component.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module Component +-- @extend Ref + -------------------------------- -- @function [parent=#Component] setEnabled -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/ContourData.lua b/cocos/scripting/lua-bindings/auto/api/ContourData.lua index 0c1705d8eb..f16c786881 100644 --- a/cocos/scripting/lua-bindings/auto/api/ContourData.lua +++ b/cocos/scripting/lua-bindings/auto/api/ContourData.lua @@ -1,6 +1,7 @@ -------------------------------- -- @module ContourData + -------------------------------- -- @function [parent=#ContourData] init -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/Control.lua b/cocos/scripting/lua-bindings/auto/api/Control.lua index 4f05c72a54..3d37f6014a 100644 --- a/cocos/scripting/lua-bindings/auto/api/Control.lua +++ b/cocos/scripting/lua-bindings/auto/api/Control.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module Control +-- @extend Layer + -------------------------------- -- @function [parent=#Control] setEnabled -- @param self @@ -92,4 +94,14 @@ -- @param self -- @return Control#Control ret (return value: cc.Control) +-------------------------------- +-- @function [parent=#Control] isOpacityModifyRGB +-- @param self +-- @return bool#bool ret (return value: bool) + +-------------------------------- +-- @function [parent=#Control] setOpacityModifyRGB +-- @param self +-- @param #bool bool + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/ControlButton.lua b/cocos/scripting/lua-bindings/auto/api/ControlButton.lua index a531876630..8b81643908 100644 --- a/cocos/scripting/lua-bindings/auto/api/ControlButton.lua +++ b/cocos/scripting/lua-bindings/auto/api/ControlButton.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module ControlButton +-- @extend Control + -------------------------------- -- @function [parent=#ControlButton] isPushed -- @param self @@ -231,4 +233,49 @@ -- @param #float float -- @return ControlButton#ControlButton ret (retunr value: cc.ControlButton) +-------------------------------- +-- @function [parent=#ControlButton] onTouchMoved +-- @param self +-- @param #cc.Touch touch +-- @param #cc.Event event + +-------------------------------- +-- @function [parent=#ControlButton] onTouchEnded +-- @param self +-- @param #cc.Touch touch +-- @param #cc.Event event + +-------------------------------- +-- @function [parent=#ControlButton] setColor +-- @param self +-- @param #color3B_table color3b + +-------------------------------- +-- @function [parent=#ControlButton] getColor +-- @param self +-- @return color3B_table#color3B_table ret (return value: color3B_table) + +-------------------------------- +-- @function [parent=#ControlButton] onTouchCancelled +-- @param self +-- @param #cc.Touch touch +-- @param #cc.Event event + +-------------------------------- +-- @function [parent=#ControlButton] setOpacity +-- @param self +-- @param #unsigned char char + +-------------------------------- +-- @function [parent=#ControlButton] getOpacity +-- @param self +-- @return unsigned char#unsigned char ret (return value: unsigned char) + +-------------------------------- +-- @function [parent=#ControlButton] onTouchBegan +-- @param self +-- @param #cc.Touch touch +-- @param #cc.Event event +-- @return bool#bool ret (return value: bool) + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/ControlColourPicker.lua b/cocos/scripting/lua-bindings/auto/api/ControlColourPicker.lua index 738dd32e51..31436870f2 100644 --- a/cocos/scripting/lua-bindings/auto/api/ControlColourPicker.lua +++ b/cocos/scripting/lua-bindings/auto/api/ControlColourPicker.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module ControlColourPicker +-- @extend Control + -------------------------------- -- @function [parent=#ControlColourPicker] setEnabled -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/ControlHuePicker.lua b/cocos/scripting/lua-bindings/auto/api/ControlHuePicker.lua index bfafd369cf..86fc34cd8c 100644 --- a/cocos/scripting/lua-bindings/auto/api/ControlHuePicker.lua +++ b/cocos/scripting/lua-bindings/auto/api/ControlHuePicker.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module ControlHuePicker +-- @extend Control + -------------------------------- -- @function [parent=#ControlHuePicker] setEnabled -- @param self @@ -65,6 +67,19 @@ -- @param #point_table point -- @return ControlHuePicker#ControlHuePicker ret (return value: cc.ControlHuePicker) +-------------------------------- +-- @function [parent=#ControlHuePicker] onTouchMoved +-- @param self +-- @param #cc.Touch touch +-- @param #cc.Event event + +-------------------------------- +-- @function [parent=#ControlHuePicker] onTouchBegan +-- @param self +-- @param #cc.Touch touch +-- @param #cc.Event event +-- @return bool#bool ret (return value: bool) + -------------------------------- -- @function [parent=#ControlHuePicker] ControlHuePicker -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/ControlPotentiometer.lua b/cocos/scripting/lua-bindings/auto/api/ControlPotentiometer.lua index 7247a6195a..ecb0dabacf 100644 --- a/cocos/scripting/lua-bindings/auto/api/ControlPotentiometer.lua +++ b/cocos/scripting/lua-bindings/auto/api/ControlPotentiometer.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module ControlPotentiometer +-- @extend Control + -------------------------------- -- @function [parent=#ControlPotentiometer] setPreviousLocation -- @param self @@ -108,6 +110,36 @@ -- @param #char char -- @return ControlPotentiometer#ControlPotentiometer ret (return value: cc.ControlPotentiometer) +-------------------------------- +-- @function [parent=#ControlPotentiometer] isTouchInside +-- @param self +-- @param #cc.Touch touch +-- @return bool#bool ret (return value: bool) + +-------------------------------- +-- @function [parent=#ControlPotentiometer] setEnabled +-- @param self +-- @param #bool bool + +-------------------------------- +-- @function [parent=#ControlPotentiometer] onTouchMoved +-- @param self +-- @param #cc.Touch touch +-- @param #cc.Event event + +-------------------------------- +-- @function [parent=#ControlPotentiometer] onTouchEnded +-- @param self +-- @param #cc.Touch touch +-- @param #cc.Event event + +-------------------------------- +-- @function [parent=#ControlPotentiometer] onTouchBegan +-- @param self +-- @param #cc.Touch touch +-- @param #cc.Event event +-- @return bool#bool ret (return value: bool) + -------------------------------- -- @function [parent=#ControlPotentiometer] ControlPotentiometer -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/ControlSaturationBrightnessPicker.lua b/cocos/scripting/lua-bindings/auto/api/ControlSaturationBrightnessPicker.lua index df422daaf7..ad010cc1de 100644 --- a/cocos/scripting/lua-bindings/auto/api/ControlSaturationBrightnessPicker.lua +++ b/cocos/scripting/lua-bindings/auto/api/ControlSaturationBrightnessPicker.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module ControlSaturationBrightnessPicker +-- @extend Control + -------------------------------- -- @function [parent=#ControlSaturationBrightnessPicker] getShadow -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/ControlSlider.lua b/cocos/scripting/lua-bindings/auto/api/ControlSlider.lua index c388ad7e51..f1548908d7 100644 --- a/cocos/scripting/lua-bindings/auto/api/ControlSlider.lua +++ b/cocos/scripting/lua-bindings/auto/api/ControlSlider.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module ControlSlider +-- @extend Control + -------------------------------- -- @function [parent=#ControlSlider] getSelectedThumbSprite -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/ControlStepper.lua b/cocos/scripting/lua-bindings/auto/api/ControlStepper.lua index 0593d6d5ad..ac7a16f7fa 100644 --- a/cocos/scripting/lua-bindings/auto/api/ControlStepper.lua +++ b/cocos/scripting/lua-bindings/auto/api/ControlStepper.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module ControlStepper +-- @extend Control + -------------------------------- -- @function [parent=#ControlStepper] setMinusSprite -- @param self @@ -114,6 +116,25 @@ -- @param #cc.Sprite sprite -- @return ControlStepper#ControlStepper ret (return value: cc.ControlStepper) +-------------------------------- +-- @function [parent=#ControlStepper] onTouchMoved +-- @param self +-- @param #cc.Touch touch +-- @param #cc.Event event + +-------------------------------- +-- @function [parent=#ControlStepper] onTouchEnded +-- @param self +-- @param #cc.Touch touch +-- @param #cc.Event event + +-------------------------------- +-- @function [parent=#ControlStepper] onTouchBegan +-- @param self +-- @param #cc.Touch touch +-- @param #cc.Event event +-- @return bool#bool ret (return value: bool) + -------------------------------- -- @function [parent=#ControlStepper] ControlStepper -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/ControlSwitch.lua b/cocos/scripting/lua-bindings/auto/api/ControlSwitch.lua index b94ede5035..25de51ff61 100644 --- a/cocos/scripting/lua-bindings/auto/api/ControlSwitch.lua +++ b/cocos/scripting/lua-bindings/auto/api/ControlSwitch.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module ControlSwitch +-- @extend Control + -------------------------------- -- @function [parent=#ControlSwitch] setEnabled -- @param self @@ -62,6 +64,31 @@ -- @param #cc.LabelTTF labelttf -- @return ControlSwitch#ControlSwitch ret (retunr value: cc.ControlSwitch) +-------------------------------- +-- @function [parent=#ControlSwitch] onTouchMoved +-- @param self +-- @param #cc.Touch touch +-- @param #cc.Event event + +-------------------------------- +-- @function [parent=#ControlSwitch] onTouchEnded +-- @param self +-- @param #cc.Touch touch +-- @param #cc.Event event + +-------------------------------- +-- @function [parent=#ControlSwitch] onTouchCancelled +-- @param self +-- @param #cc.Touch touch +-- @param #cc.Event event + +-------------------------------- +-- @function [parent=#ControlSwitch] onTouchBegan +-- @param self +-- @param #cc.Touch touch +-- @param #cc.Event event +-- @return bool#bool ret (return value: bool) + -------------------------------- -- @function [parent=#ControlSwitch] ControlSwitch -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/DelayTime.lua b/cocos/scripting/lua-bindings/auto/api/DelayTime.lua index 2d4b2e0b8c..6bff3285fc 100644 --- a/cocos/scripting/lua-bindings/auto/api/DelayTime.lua +++ b/cocos/scripting/lua-bindings/auto/api/DelayTime.lua @@ -1,10 +1,27 @@ -------------------------------- -- @module DelayTime +-- @extend ActionInterval + -------------------------------- -- @function [parent=#DelayTime] create -- @param self -- @param #float float -- @return DelayTime#DelayTime ret (return value: cc.DelayTime) +-------------------------------- +-- @function [parent=#DelayTime] clone +-- @param self +-- @return DelayTime#DelayTime ret (return value: cc.DelayTime) + +-------------------------------- +-- @function [parent=#DelayTime] update +-- @param self +-- @param #float float + +-------------------------------- +-- @function [parent=#DelayTime] reverse +-- @param self +-- @return DelayTime#DelayTime ret (return value: cc.DelayTime) + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/Director.lua b/cocos/scripting/lua-bindings/auto/api/Director.lua index 92d9e11159..18a77a84f7 100644 --- a/cocos/scripting/lua-bindings/auto/api/Director.lua +++ b/cocos/scripting/lua-bindings/auto/api/Director.lua @@ -1,6 +1,7 @@ -------------------------------- -- @module Director + -------------------------------- -- @function [parent=#Director] pause -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/DisplayData.lua b/cocos/scripting/lua-bindings/auto/api/DisplayData.lua index 6254b517c5..a61d32bab2 100644 --- a/cocos/scripting/lua-bindings/auto/api/DisplayData.lua +++ b/cocos/scripting/lua-bindings/auto/api/DisplayData.lua @@ -1,6 +1,7 @@ -------------------------------- -- @module DisplayData + -------------------------------- -- @function [parent=#DisplayData] copy -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/DisplayManager.lua b/cocos/scripting/lua-bindings/auto/api/DisplayManager.lua index 51f3ecead1..035244b5ec 100644 --- a/cocos/scripting/lua-bindings/auto/api/DisplayManager.lua +++ b/cocos/scripting/lua-bindings/auto/api/DisplayManager.lua @@ -1,6 +1,7 @@ -------------------------------- -- @module DisplayManager + -------------------------------- -- @function [parent=#DisplayManager] getDisplayRenderNode -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/DrawNode.lua b/cocos/scripting/lua-bindings/auto/api/DrawNode.lua index 3b1395515d..33db0469ca 100644 --- a/cocos/scripting/lua-bindings/auto/api/DrawNode.lua +++ b/cocos/scripting/lua-bindings/auto/api/DrawNode.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module DrawNode +-- @extend Node + -------------------------------- -- @function [parent=#DrawNode] drawQuadraticBezier -- @param self @@ -58,4 +60,11 @@ -- @param self -- @return DrawNode#DrawNode ret (return value: cc.DrawNode) +-------------------------------- +-- @function [parent=#DrawNode] draw +-- @param self +-- @param #cc.Renderer renderer +-- @param #kmMat4 kmmat4 +-- @param #bool bool + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/EaseBackIn.lua b/cocos/scripting/lua-bindings/auto/api/EaseBackIn.lua index 72c45e3547..a2fc7f9599 100644 --- a/cocos/scripting/lua-bindings/auto/api/EaseBackIn.lua +++ b/cocos/scripting/lua-bindings/auto/api/EaseBackIn.lua @@ -1,10 +1,27 @@ -------------------------------- -- @module EaseBackIn +-- @extend ActionEase + -------------------------------- -- @function [parent=#EaseBackIn] create -- @param self -- @param #cc.ActionInterval actioninterval -- @return EaseBackIn#EaseBackIn ret (return value: cc.EaseBackIn) +-------------------------------- +-- @function [parent=#EaseBackIn] clone +-- @param self +-- @return EaseBackIn#EaseBackIn ret (return value: cc.EaseBackIn) + +-------------------------------- +-- @function [parent=#EaseBackIn] update +-- @param self +-- @param #float float + +-------------------------------- +-- @function [parent=#EaseBackIn] reverse +-- @param self +-- @return ActionEase#ActionEase ret (return value: cc.ActionEase) + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/EaseBackInOut.lua b/cocos/scripting/lua-bindings/auto/api/EaseBackInOut.lua index 89600126c9..c6e7983bb1 100644 --- a/cocos/scripting/lua-bindings/auto/api/EaseBackInOut.lua +++ b/cocos/scripting/lua-bindings/auto/api/EaseBackInOut.lua @@ -1,10 +1,27 @@ -------------------------------- -- @module EaseBackInOut +-- @extend ActionEase + -------------------------------- -- @function [parent=#EaseBackInOut] create -- @param self -- @param #cc.ActionInterval actioninterval -- @return EaseBackInOut#EaseBackInOut ret (return value: cc.EaseBackInOut) +-------------------------------- +-- @function [parent=#EaseBackInOut] clone +-- @param self +-- @return EaseBackInOut#EaseBackInOut ret (return value: cc.EaseBackInOut) + +-------------------------------- +-- @function [parent=#EaseBackInOut] update +-- @param self +-- @param #float float + +-------------------------------- +-- @function [parent=#EaseBackInOut] reverse +-- @param self +-- @return EaseBackInOut#EaseBackInOut ret (return value: cc.EaseBackInOut) + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/EaseBackOut.lua b/cocos/scripting/lua-bindings/auto/api/EaseBackOut.lua index 1cb1ef0020..c7b4946b6d 100644 --- a/cocos/scripting/lua-bindings/auto/api/EaseBackOut.lua +++ b/cocos/scripting/lua-bindings/auto/api/EaseBackOut.lua @@ -1,10 +1,27 @@ -------------------------------- -- @module EaseBackOut +-- @extend ActionEase + -------------------------------- -- @function [parent=#EaseBackOut] create -- @param self -- @param #cc.ActionInterval actioninterval -- @return EaseBackOut#EaseBackOut ret (return value: cc.EaseBackOut) +-------------------------------- +-- @function [parent=#EaseBackOut] clone +-- @param self +-- @return EaseBackOut#EaseBackOut ret (return value: cc.EaseBackOut) + +-------------------------------- +-- @function [parent=#EaseBackOut] update +-- @param self +-- @param #float float + +-------------------------------- +-- @function [parent=#EaseBackOut] reverse +-- @param self +-- @return ActionEase#ActionEase ret (return value: cc.ActionEase) + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/EaseBezierAction.lua b/cocos/scripting/lua-bindings/auto/api/EaseBezierAction.lua index 40888faf06..b53abe8e04 100644 --- a/cocos/scripting/lua-bindings/auto/api/EaseBezierAction.lua +++ b/cocos/scripting/lua-bindings/auto/api/EaseBezierAction.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module EaseBezierAction +-- @extend ActionEase + -------------------------------- -- @function [parent=#EaseBezierAction] setBezierParamer -- @param self @@ -15,4 +17,19 @@ -- @param #cc.ActionInterval actioninterval -- @return EaseBezierAction#EaseBezierAction ret (return value: cc.EaseBezierAction) +-------------------------------- +-- @function [parent=#EaseBezierAction] clone +-- @param self +-- @return EaseBezierAction#EaseBezierAction ret (return value: cc.EaseBezierAction) + +-------------------------------- +-- @function [parent=#EaseBezierAction] update +-- @param self +-- @param #float float + +-------------------------------- +-- @function [parent=#EaseBezierAction] reverse +-- @param self +-- @return EaseBezierAction#EaseBezierAction ret (return value: cc.EaseBezierAction) + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/EaseBounce.lua b/cocos/scripting/lua-bindings/auto/api/EaseBounce.lua index 073f0b5de0..3468bb451f 100644 --- a/cocos/scripting/lua-bindings/auto/api/EaseBounce.lua +++ b/cocos/scripting/lua-bindings/auto/api/EaseBounce.lua @@ -1,4 +1,16 @@ -------------------------------- -- @module EaseBounce +-- @extend ActionEase + +-------------------------------- +-- @function [parent=#EaseBounce] clone +-- @param self +-- @return EaseBounce#EaseBounce ret (return value: cc.EaseBounce) + +-------------------------------- +-- @function [parent=#EaseBounce] reverse +-- @param self +-- @return EaseBounce#EaseBounce ret (return value: cc.EaseBounce) + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/EaseBounceIn.lua b/cocos/scripting/lua-bindings/auto/api/EaseBounceIn.lua index 9282a1c3bf..f7006eddbf 100644 --- a/cocos/scripting/lua-bindings/auto/api/EaseBounceIn.lua +++ b/cocos/scripting/lua-bindings/auto/api/EaseBounceIn.lua @@ -1,10 +1,27 @@ -------------------------------- -- @module EaseBounceIn +-- @extend EaseBounce + -------------------------------- -- @function [parent=#EaseBounceIn] create -- @param self -- @param #cc.ActionInterval actioninterval -- @return EaseBounceIn#EaseBounceIn ret (return value: cc.EaseBounceIn) +-------------------------------- +-- @function [parent=#EaseBounceIn] clone +-- @param self +-- @return EaseBounceIn#EaseBounceIn ret (return value: cc.EaseBounceIn) + +-------------------------------- +-- @function [parent=#EaseBounceIn] update +-- @param self +-- @param #float float + +-------------------------------- +-- @function [parent=#EaseBounceIn] reverse +-- @param self +-- @return EaseBounce#EaseBounce ret (return value: cc.EaseBounce) + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/EaseBounceInOut.lua b/cocos/scripting/lua-bindings/auto/api/EaseBounceInOut.lua index 9812f9e831..7c695b5ac9 100644 --- a/cocos/scripting/lua-bindings/auto/api/EaseBounceInOut.lua +++ b/cocos/scripting/lua-bindings/auto/api/EaseBounceInOut.lua @@ -1,10 +1,27 @@ -------------------------------- -- @module EaseBounceInOut +-- @extend EaseBounce + -------------------------------- -- @function [parent=#EaseBounceInOut] create -- @param self -- @param #cc.ActionInterval actioninterval -- @return EaseBounceInOut#EaseBounceInOut ret (return value: cc.EaseBounceInOut) +-------------------------------- +-- @function [parent=#EaseBounceInOut] clone +-- @param self +-- @return EaseBounceInOut#EaseBounceInOut ret (return value: cc.EaseBounceInOut) + +-------------------------------- +-- @function [parent=#EaseBounceInOut] update +-- @param self +-- @param #float float + +-------------------------------- +-- @function [parent=#EaseBounceInOut] reverse +-- @param self +-- @return EaseBounceInOut#EaseBounceInOut ret (return value: cc.EaseBounceInOut) + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/EaseBounceOut.lua b/cocos/scripting/lua-bindings/auto/api/EaseBounceOut.lua index 8b0f6cb190..49f2173cb0 100644 --- a/cocos/scripting/lua-bindings/auto/api/EaseBounceOut.lua +++ b/cocos/scripting/lua-bindings/auto/api/EaseBounceOut.lua @@ -1,10 +1,27 @@ -------------------------------- -- @module EaseBounceOut +-- @extend EaseBounce + -------------------------------- -- @function [parent=#EaseBounceOut] create -- @param self -- @param #cc.ActionInterval actioninterval -- @return EaseBounceOut#EaseBounceOut ret (return value: cc.EaseBounceOut) +-------------------------------- +-- @function [parent=#EaseBounceOut] clone +-- @param self +-- @return EaseBounceOut#EaseBounceOut ret (return value: cc.EaseBounceOut) + +-------------------------------- +-- @function [parent=#EaseBounceOut] update +-- @param self +-- @param #float float + +-------------------------------- +-- @function [parent=#EaseBounceOut] reverse +-- @param self +-- @return EaseBounce#EaseBounce ret (return value: cc.EaseBounce) + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/EaseCircleActionIn.lua b/cocos/scripting/lua-bindings/auto/api/EaseCircleActionIn.lua index 1a620dedd9..d6c218df39 100644 --- a/cocos/scripting/lua-bindings/auto/api/EaseCircleActionIn.lua +++ b/cocos/scripting/lua-bindings/auto/api/EaseCircleActionIn.lua @@ -1,10 +1,27 @@ -------------------------------- -- @module EaseCircleActionIn +-- @extend ActionEase + -------------------------------- -- @function [parent=#EaseCircleActionIn] create -- @param self -- @param #cc.ActionInterval actioninterval -- @return EaseCircleActionIn#EaseCircleActionIn ret (return value: cc.EaseCircleActionIn) +-------------------------------- +-- @function [parent=#EaseCircleActionIn] clone +-- @param self +-- @return EaseCircleActionIn#EaseCircleActionIn ret (return value: cc.EaseCircleActionIn) + +-------------------------------- +-- @function [parent=#EaseCircleActionIn] update +-- @param self +-- @param #float float + +-------------------------------- +-- @function [parent=#EaseCircleActionIn] reverse +-- @param self +-- @return EaseCircleActionIn#EaseCircleActionIn ret (return value: cc.EaseCircleActionIn) + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/EaseCircleActionInOut.lua b/cocos/scripting/lua-bindings/auto/api/EaseCircleActionInOut.lua index 07a92ad3b5..481e7beee6 100644 --- a/cocos/scripting/lua-bindings/auto/api/EaseCircleActionInOut.lua +++ b/cocos/scripting/lua-bindings/auto/api/EaseCircleActionInOut.lua @@ -1,10 +1,27 @@ -------------------------------- -- @module EaseCircleActionInOut +-- @extend ActionEase + -------------------------------- -- @function [parent=#EaseCircleActionInOut] create -- @param self -- @param #cc.ActionInterval actioninterval -- @return EaseCircleActionInOut#EaseCircleActionInOut ret (return value: cc.EaseCircleActionInOut) +-------------------------------- +-- @function [parent=#EaseCircleActionInOut] clone +-- @param self +-- @return EaseCircleActionInOut#EaseCircleActionInOut ret (return value: cc.EaseCircleActionInOut) + +-------------------------------- +-- @function [parent=#EaseCircleActionInOut] update +-- @param self +-- @param #float float + +-------------------------------- +-- @function [parent=#EaseCircleActionInOut] reverse +-- @param self +-- @return EaseCircleActionInOut#EaseCircleActionInOut ret (return value: cc.EaseCircleActionInOut) + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/EaseCircleActionOut.lua b/cocos/scripting/lua-bindings/auto/api/EaseCircleActionOut.lua index dfb8264986..0d5f7597d7 100644 --- a/cocos/scripting/lua-bindings/auto/api/EaseCircleActionOut.lua +++ b/cocos/scripting/lua-bindings/auto/api/EaseCircleActionOut.lua @@ -1,10 +1,27 @@ -------------------------------- -- @module EaseCircleActionOut +-- @extend ActionEase + -------------------------------- -- @function [parent=#EaseCircleActionOut] create -- @param self -- @param #cc.ActionInterval actioninterval -- @return EaseCircleActionOut#EaseCircleActionOut ret (return value: cc.EaseCircleActionOut) +-------------------------------- +-- @function [parent=#EaseCircleActionOut] clone +-- @param self +-- @return EaseCircleActionOut#EaseCircleActionOut ret (return value: cc.EaseCircleActionOut) + +-------------------------------- +-- @function [parent=#EaseCircleActionOut] update +-- @param self +-- @param #float float + +-------------------------------- +-- @function [parent=#EaseCircleActionOut] reverse +-- @param self +-- @return EaseCircleActionOut#EaseCircleActionOut ret (return value: cc.EaseCircleActionOut) + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/EaseCubicActionIn.lua b/cocos/scripting/lua-bindings/auto/api/EaseCubicActionIn.lua index eded3af4dd..a2edcccda6 100644 --- a/cocos/scripting/lua-bindings/auto/api/EaseCubicActionIn.lua +++ b/cocos/scripting/lua-bindings/auto/api/EaseCubicActionIn.lua @@ -1,10 +1,27 @@ -------------------------------- -- @module EaseCubicActionIn +-- @extend ActionEase + -------------------------------- -- @function [parent=#EaseCubicActionIn] create -- @param self -- @param #cc.ActionInterval actioninterval -- @return EaseCubicActionIn#EaseCubicActionIn ret (return value: cc.EaseCubicActionIn) +-------------------------------- +-- @function [parent=#EaseCubicActionIn] clone +-- @param self +-- @return EaseCubicActionIn#EaseCubicActionIn ret (return value: cc.EaseCubicActionIn) + +-------------------------------- +-- @function [parent=#EaseCubicActionIn] update +-- @param self +-- @param #float float + +-------------------------------- +-- @function [parent=#EaseCubicActionIn] reverse +-- @param self +-- @return EaseCubicActionIn#EaseCubicActionIn ret (return value: cc.EaseCubicActionIn) + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/EaseCubicActionInOut.lua b/cocos/scripting/lua-bindings/auto/api/EaseCubicActionInOut.lua index e6b509b18e..1677d50dae 100644 --- a/cocos/scripting/lua-bindings/auto/api/EaseCubicActionInOut.lua +++ b/cocos/scripting/lua-bindings/auto/api/EaseCubicActionInOut.lua @@ -1,10 +1,27 @@ -------------------------------- -- @module EaseCubicActionInOut +-- @extend ActionEase + -------------------------------- -- @function [parent=#EaseCubicActionInOut] create -- @param self -- @param #cc.ActionInterval actioninterval -- @return EaseCubicActionInOut#EaseCubicActionInOut ret (return value: cc.EaseCubicActionInOut) +-------------------------------- +-- @function [parent=#EaseCubicActionInOut] clone +-- @param self +-- @return EaseCubicActionInOut#EaseCubicActionInOut ret (return value: cc.EaseCubicActionInOut) + +-------------------------------- +-- @function [parent=#EaseCubicActionInOut] update +-- @param self +-- @param #float float + +-------------------------------- +-- @function [parent=#EaseCubicActionInOut] reverse +-- @param self +-- @return EaseCubicActionInOut#EaseCubicActionInOut ret (return value: cc.EaseCubicActionInOut) + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/EaseCubicActionOut.lua b/cocos/scripting/lua-bindings/auto/api/EaseCubicActionOut.lua index c028f30f27..63e0e565b0 100644 --- a/cocos/scripting/lua-bindings/auto/api/EaseCubicActionOut.lua +++ b/cocos/scripting/lua-bindings/auto/api/EaseCubicActionOut.lua @@ -1,10 +1,27 @@ -------------------------------- -- @module EaseCubicActionOut +-- @extend ActionEase + -------------------------------- -- @function [parent=#EaseCubicActionOut] create -- @param self -- @param #cc.ActionInterval actioninterval -- @return EaseCubicActionOut#EaseCubicActionOut ret (return value: cc.EaseCubicActionOut) +-------------------------------- +-- @function [parent=#EaseCubicActionOut] clone +-- @param self +-- @return EaseCubicActionOut#EaseCubicActionOut ret (return value: cc.EaseCubicActionOut) + +-------------------------------- +-- @function [parent=#EaseCubicActionOut] update +-- @param self +-- @param #float float + +-------------------------------- +-- @function [parent=#EaseCubicActionOut] reverse +-- @param self +-- @return EaseCubicActionOut#EaseCubicActionOut ret (return value: cc.EaseCubicActionOut) + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/EaseElastic.lua b/cocos/scripting/lua-bindings/auto/api/EaseElastic.lua index fc3b59dc31..155c03c396 100644 --- a/cocos/scripting/lua-bindings/auto/api/EaseElastic.lua +++ b/cocos/scripting/lua-bindings/auto/api/EaseElastic.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module EaseElastic +-- @extend ActionEase + -------------------------------- -- @function [parent=#EaseElastic] setPeriod -- @param self @@ -11,4 +13,14 @@ -- @param self -- @return float#float ret (return value: float) +-------------------------------- +-- @function [parent=#EaseElastic] clone +-- @param self +-- @return EaseElastic#EaseElastic ret (return value: cc.EaseElastic) + +-------------------------------- +-- @function [parent=#EaseElastic] reverse +-- @param self +-- @return EaseElastic#EaseElastic ret (return value: cc.EaseElastic) + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/EaseElasticIn.lua b/cocos/scripting/lua-bindings/auto/api/EaseElasticIn.lua index 031427012b..179994d3f1 100644 --- a/cocos/scripting/lua-bindings/auto/api/EaseElasticIn.lua +++ b/cocos/scripting/lua-bindings/auto/api/EaseElasticIn.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module EaseElasticIn +-- @extend EaseElastic + -------------------------------- -- overload function: create(cc.ActionInterval) -- @@ -12,4 +14,19 @@ -- @param #float float -- @return EaseElasticIn#EaseElasticIn ret (retunr value: cc.EaseElasticIn) +-------------------------------- +-- @function [parent=#EaseElasticIn] clone +-- @param self +-- @return EaseElasticIn#EaseElasticIn ret (return value: cc.EaseElasticIn) + +-------------------------------- +-- @function [parent=#EaseElasticIn] update +-- @param self +-- @param #float float + +-------------------------------- +-- @function [parent=#EaseElasticIn] reverse +-- @param self +-- @return EaseElastic#EaseElastic ret (return value: cc.EaseElastic) + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/EaseElasticInOut.lua b/cocos/scripting/lua-bindings/auto/api/EaseElasticInOut.lua index 5fa77fdf44..451f93ae4e 100644 --- a/cocos/scripting/lua-bindings/auto/api/EaseElasticInOut.lua +++ b/cocos/scripting/lua-bindings/auto/api/EaseElasticInOut.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module EaseElasticInOut +-- @extend EaseElastic + -------------------------------- -- overload function: create(cc.ActionInterval) -- @@ -12,4 +14,19 @@ -- @param #float float -- @return EaseElasticInOut#EaseElasticInOut ret (retunr value: cc.EaseElasticInOut) +-------------------------------- +-- @function [parent=#EaseElasticInOut] clone +-- @param self +-- @return EaseElasticInOut#EaseElasticInOut ret (return value: cc.EaseElasticInOut) + +-------------------------------- +-- @function [parent=#EaseElasticInOut] update +-- @param self +-- @param #float float + +-------------------------------- +-- @function [parent=#EaseElasticInOut] reverse +-- @param self +-- @return EaseElasticInOut#EaseElasticInOut ret (return value: cc.EaseElasticInOut) + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/EaseElasticOut.lua b/cocos/scripting/lua-bindings/auto/api/EaseElasticOut.lua index 2092a5e457..811f384fbe 100644 --- a/cocos/scripting/lua-bindings/auto/api/EaseElasticOut.lua +++ b/cocos/scripting/lua-bindings/auto/api/EaseElasticOut.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module EaseElasticOut +-- @extend EaseElastic + -------------------------------- -- overload function: create(cc.ActionInterval) -- @@ -12,4 +14,19 @@ -- @param #float float -- @return EaseElasticOut#EaseElasticOut ret (retunr value: cc.EaseElasticOut) +-------------------------------- +-- @function [parent=#EaseElasticOut] clone +-- @param self +-- @return EaseElasticOut#EaseElasticOut ret (return value: cc.EaseElasticOut) + +-------------------------------- +-- @function [parent=#EaseElasticOut] update +-- @param self +-- @param #float float + +-------------------------------- +-- @function [parent=#EaseElasticOut] reverse +-- @param self +-- @return EaseElastic#EaseElastic ret (return value: cc.EaseElastic) + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/EaseExponentialIn.lua b/cocos/scripting/lua-bindings/auto/api/EaseExponentialIn.lua index 4a6e475214..e7b047ad5d 100644 --- a/cocos/scripting/lua-bindings/auto/api/EaseExponentialIn.lua +++ b/cocos/scripting/lua-bindings/auto/api/EaseExponentialIn.lua @@ -1,10 +1,27 @@ -------------------------------- -- @module EaseExponentialIn +-- @extend ActionEase + -------------------------------- -- @function [parent=#EaseExponentialIn] create -- @param self -- @param #cc.ActionInterval actioninterval -- @return EaseExponentialIn#EaseExponentialIn ret (return value: cc.EaseExponentialIn) +-------------------------------- +-- @function [parent=#EaseExponentialIn] clone +-- @param self +-- @return EaseExponentialIn#EaseExponentialIn ret (return value: cc.EaseExponentialIn) + +-------------------------------- +-- @function [parent=#EaseExponentialIn] update +-- @param self +-- @param #float float + +-------------------------------- +-- @function [parent=#EaseExponentialIn] reverse +-- @param self +-- @return ActionEase#ActionEase ret (return value: cc.ActionEase) + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/EaseExponentialInOut.lua b/cocos/scripting/lua-bindings/auto/api/EaseExponentialInOut.lua index 180c5fb6bd..6feb541bd7 100644 --- a/cocos/scripting/lua-bindings/auto/api/EaseExponentialInOut.lua +++ b/cocos/scripting/lua-bindings/auto/api/EaseExponentialInOut.lua @@ -1,10 +1,27 @@ -------------------------------- -- @module EaseExponentialInOut +-- @extend ActionEase + -------------------------------- -- @function [parent=#EaseExponentialInOut] create -- @param self -- @param #cc.ActionInterval actioninterval -- @return EaseExponentialInOut#EaseExponentialInOut ret (return value: cc.EaseExponentialInOut) +-------------------------------- +-- @function [parent=#EaseExponentialInOut] clone +-- @param self +-- @return EaseExponentialInOut#EaseExponentialInOut ret (return value: cc.EaseExponentialInOut) + +-------------------------------- +-- @function [parent=#EaseExponentialInOut] update +-- @param self +-- @param #float float + +-------------------------------- +-- @function [parent=#EaseExponentialInOut] reverse +-- @param self +-- @return EaseExponentialInOut#EaseExponentialInOut ret (return value: cc.EaseExponentialInOut) + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/EaseExponentialOut.lua b/cocos/scripting/lua-bindings/auto/api/EaseExponentialOut.lua index 7022bfb980..01e8f3f1cb 100644 --- a/cocos/scripting/lua-bindings/auto/api/EaseExponentialOut.lua +++ b/cocos/scripting/lua-bindings/auto/api/EaseExponentialOut.lua @@ -1,10 +1,27 @@ -------------------------------- -- @module EaseExponentialOut +-- @extend ActionEase + -------------------------------- -- @function [parent=#EaseExponentialOut] create -- @param self -- @param #cc.ActionInterval actioninterval -- @return EaseExponentialOut#EaseExponentialOut ret (return value: cc.EaseExponentialOut) +-------------------------------- +-- @function [parent=#EaseExponentialOut] clone +-- @param self +-- @return EaseExponentialOut#EaseExponentialOut ret (return value: cc.EaseExponentialOut) + +-------------------------------- +-- @function [parent=#EaseExponentialOut] update +-- @param self +-- @param #float float + +-------------------------------- +-- @function [parent=#EaseExponentialOut] reverse +-- @param self +-- @return ActionEase#ActionEase ret (return value: cc.ActionEase) + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/EaseIn.lua b/cocos/scripting/lua-bindings/auto/api/EaseIn.lua index 669a3dd41d..b0c2a397bb 100644 --- a/cocos/scripting/lua-bindings/auto/api/EaseIn.lua +++ b/cocos/scripting/lua-bindings/auto/api/EaseIn.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module EaseIn +-- @extend EaseRateAction + -------------------------------- -- @function [parent=#EaseIn] create -- @param self @@ -8,4 +10,19 @@ -- @param #float float -- @return EaseIn#EaseIn ret (return value: cc.EaseIn) +-------------------------------- +-- @function [parent=#EaseIn] clone +-- @param self +-- @return EaseIn#EaseIn ret (return value: cc.EaseIn) + +-------------------------------- +-- @function [parent=#EaseIn] update +-- @param self +-- @param #float float + +-------------------------------- +-- @function [parent=#EaseIn] reverse +-- @param self +-- @return EaseIn#EaseIn ret (return value: cc.EaseIn) + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/EaseInOut.lua b/cocos/scripting/lua-bindings/auto/api/EaseInOut.lua index 520bf95f9b..32ce881141 100644 --- a/cocos/scripting/lua-bindings/auto/api/EaseInOut.lua +++ b/cocos/scripting/lua-bindings/auto/api/EaseInOut.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module EaseInOut +-- @extend EaseRateAction + -------------------------------- -- @function [parent=#EaseInOut] create -- @param self @@ -8,4 +10,19 @@ -- @param #float float -- @return EaseInOut#EaseInOut ret (return value: cc.EaseInOut) +-------------------------------- +-- @function [parent=#EaseInOut] clone +-- @param self +-- @return EaseInOut#EaseInOut ret (return value: cc.EaseInOut) + +-------------------------------- +-- @function [parent=#EaseInOut] update +-- @param self +-- @param #float float + +-------------------------------- +-- @function [parent=#EaseInOut] reverse +-- @param self +-- @return EaseInOut#EaseInOut ret (return value: cc.EaseInOut) + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/EaseOut.lua b/cocos/scripting/lua-bindings/auto/api/EaseOut.lua index 0a9e2581ea..1ad6c641ff 100644 --- a/cocos/scripting/lua-bindings/auto/api/EaseOut.lua +++ b/cocos/scripting/lua-bindings/auto/api/EaseOut.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module EaseOut +-- @extend EaseRateAction + -------------------------------- -- @function [parent=#EaseOut] create -- @param self @@ -8,4 +10,19 @@ -- @param #float float -- @return EaseOut#EaseOut ret (return value: cc.EaseOut) +-------------------------------- +-- @function [parent=#EaseOut] clone +-- @param self +-- @return EaseOut#EaseOut ret (return value: cc.EaseOut) + +-------------------------------- +-- @function [parent=#EaseOut] update +-- @param self +-- @param #float float + +-------------------------------- +-- @function [parent=#EaseOut] reverse +-- @param self +-- @return EaseOut#EaseOut ret (return value: cc.EaseOut) + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/EaseQuadraticActionIn.lua b/cocos/scripting/lua-bindings/auto/api/EaseQuadraticActionIn.lua index 81132ad946..571c8bcebc 100644 --- a/cocos/scripting/lua-bindings/auto/api/EaseQuadraticActionIn.lua +++ b/cocos/scripting/lua-bindings/auto/api/EaseQuadraticActionIn.lua @@ -1,10 +1,27 @@ -------------------------------- -- @module EaseQuadraticActionIn +-- @extend ActionEase + -------------------------------- -- @function [parent=#EaseQuadraticActionIn] create -- @param self -- @param #cc.ActionInterval actioninterval -- @return EaseQuadraticActionIn#EaseQuadraticActionIn ret (return value: cc.EaseQuadraticActionIn) +-------------------------------- +-- @function [parent=#EaseQuadraticActionIn] clone +-- @param self +-- @return EaseQuadraticActionIn#EaseQuadraticActionIn ret (return value: cc.EaseQuadraticActionIn) + +-------------------------------- +-- @function [parent=#EaseQuadraticActionIn] update +-- @param self +-- @param #float float + +-------------------------------- +-- @function [parent=#EaseQuadraticActionIn] reverse +-- @param self +-- @return EaseQuadraticActionIn#EaseQuadraticActionIn ret (return value: cc.EaseQuadraticActionIn) + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/EaseQuadraticActionInOut.lua b/cocos/scripting/lua-bindings/auto/api/EaseQuadraticActionInOut.lua index db288ddff0..65a4e7a841 100644 --- a/cocos/scripting/lua-bindings/auto/api/EaseQuadraticActionInOut.lua +++ b/cocos/scripting/lua-bindings/auto/api/EaseQuadraticActionInOut.lua @@ -1,10 +1,27 @@ -------------------------------- -- @module EaseQuadraticActionInOut +-- @extend ActionEase + -------------------------------- -- @function [parent=#EaseQuadraticActionInOut] create -- @param self -- @param #cc.ActionInterval actioninterval -- @return EaseQuadraticActionInOut#EaseQuadraticActionInOut ret (return value: cc.EaseQuadraticActionInOut) +-------------------------------- +-- @function [parent=#EaseQuadraticActionInOut] clone +-- @param self +-- @return EaseQuadraticActionInOut#EaseQuadraticActionInOut ret (return value: cc.EaseQuadraticActionInOut) + +-------------------------------- +-- @function [parent=#EaseQuadraticActionInOut] update +-- @param self +-- @param #float float + +-------------------------------- +-- @function [parent=#EaseQuadraticActionInOut] reverse +-- @param self +-- @return EaseQuadraticActionInOut#EaseQuadraticActionInOut ret (return value: cc.EaseQuadraticActionInOut) + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/EaseQuadraticActionOut.lua b/cocos/scripting/lua-bindings/auto/api/EaseQuadraticActionOut.lua index d20294e98e..84ea02681a 100644 --- a/cocos/scripting/lua-bindings/auto/api/EaseQuadraticActionOut.lua +++ b/cocos/scripting/lua-bindings/auto/api/EaseQuadraticActionOut.lua @@ -1,10 +1,27 @@ -------------------------------- -- @module EaseQuadraticActionOut +-- @extend ActionEase + -------------------------------- -- @function [parent=#EaseQuadraticActionOut] create -- @param self -- @param #cc.ActionInterval actioninterval -- @return EaseQuadraticActionOut#EaseQuadraticActionOut ret (return value: cc.EaseQuadraticActionOut) +-------------------------------- +-- @function [parent=#EaseQuadraticActionOut] clone +-- @param self +-- @return EaseQuadraticActionOut#EaseQuadraticActionOut ret (return value: cc.EaseQuadraticActionOut) + +-------------------------------- +-- @function [parent=#EaseQuadraticActionOut] update +-- @param self +-- @param #float float + +-------------------------------- +-- @function [parent=#EaseQuadraticActionOut] reverse +-- @param self +-- @return EaseQuadraticActionOut#EaseQuadraticActionOut ret (return value: cc.EaseQuadraticActionOut) + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/EaseQuarticActionIn.lua b/cocos/scripting/lua-bindings/auto/api/EaseQuarticActionIn.lua index 4c0e3cf004..e1735d5cc5 100644 --- a/cocos/scripting/lua-bindings/auto/api/EaseQuarticActionIn.lua +++ b/cocos/scripting/lua-bindings/auto/api/EaseQuarticActionIn.lua @@ -1,10 +1,27 @@ -------------------------------- -- @module EaseQuarticActionIn +-- @extend ActionEase + -------------------------------- -- @function [parent=#EaseQuarticActionIn] create -- @param self -- @param #cc.ActionInterval actioninterval -- @return EaseQuarticActionIn#EaseQuarticActionIn ret (return value: cc.EaseQuarticActionIn) +-------------------------------- +-- @function [parent=#EaseQuarticActionIn] clone +-- @param self +-- @return EaseQuarticActionIn#EaseQuarticActionIn ret (return value: cc.EaseQuarticActionIn) + +-------------------------------- +-- @function [parent=#EaseQuarticActionIn] update +-- @param self +-- @param #float float + +-------------------------------- +-- @function [parent=#EaseQuarticActionIn] reverse +-- @param self +-- @return EaseQuarticActionIn#EaseQuarticActionIn ret (return value: cc.EaseQuarticActionIn) + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/EaseQuarticActionInOut.lua b/cocos/scripting/lua-bindings/auto/api/EaseQuarticActionInOut.lua index 174c793580..2c76504b9c 100644 --- a/cocos/scripting/lua-bindings/auto/api/EaseQuarticActionInOut.lua +++ b/cocos/scripting/lua-bindings/auto/api/EaseQuarticActionInOut.lua @@ -1,10 +1,27 @@ -------------------------------- -- @module EaseQuarticActionInOut +-- @extend ActionEase + -------------------------------- -- @function [parent=#EaseQuarticActionInOut] create -- @param self -- @param #cc.ActionInterval actioninterval -- @return EaseQuarticActionInOut#EaseQuarticActionInOut ret (return value: cc.EaseQuarticActionInOut) +-------------------------------- +-- @function [parent=#EaseQuarticActionInOut] clone +-- @param self +-- @return EaseQuarticActionInOut#EaseQuarticActionInOut ret (return value: cc.EaseQuarticActionInOut) + +-------------------------------- +-- @function [parent=#EaseQuarticActionInOut] update +-- @param self +-- @param #float float + +-------------------------------- +-- @function [parent=#EaseQuarticActionInOut] reverse +-- @param self +-- @return EaseQuarticActionInOut#EaseQuarticActionInOut ret (return value: cc.EaseQuarticActionInOut) + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/EaseQuarticActionOut.lua b/cocos/scripting/lua-bindings/auto/api/EaseQuarticActionOut.lua index a4b48536a9..bf1f322028 100644 --- a/cocos/scripting/lua-bindings/auto/api/EaseQuarticActionOut.lua +++ b/cocos/scripting/lua-bindings/auto/api/EaseQuarticActionOut.lua @@ -1,10 +1,27 @@ -------------------------------- -- @module EaseQuarticActionOut +-- @extend ActionEase + -------------------------------- -- @function [parent=#EaseQuarticActionOut] create -- @param self -- @param #cc.ActionInterval actioninterval -- @return EaseQuarticActionOut#EaseQuarticActionOut ret (return value: cc.EaseQuarticActionOut) +-------------------------------- +-- @function [parent=#EaseQuarticActionOut] clone +-- @param self +-- @return EaseQuarticActionOut#EaseQuarticActionOut ret (return value: cc.EaseQuarticActionOut) + +-------------------------------- +-- @function [parent=#EaseQuarticActionOut] update +-- @param self +-- @param #float float + +-------------------------------- +-- @function [parent=#EaseQuarticActionOut] reverse +-- @param self +-- @return EaseQuarticActionOut#EaseQuarticActionOut ret (return value: cc.EaseQuarticActionOut) + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/EaseQuinticActionIn.lua b/cocos/scripting/lua-bindings/auto/api/EaseQuinticActionIn.lua index ed40819c2c..fb7c654148 100644 --- a/cocos/scripting/lua-bindings/auto/api/EaseQuinticActionIn.lua +++ b/cocos/scripting/lua-bindings/auto/api/EaseQuinticActionIn.lua @@ -1,10 +1,27 @@ -------------------------------- -- @module EaseQuinticActionIn +-- @extend ActionEase + -------------------------------- -- @function [parent=#EaseQuinticActionIn] create -- @param self -- @param #cc.ActionInterval actioninterval -- @return EaseQuinticActionIn#EaseQuinticActionIn ret (return value: cc.EaseQuinticActionIn) +-------------------------------- +-- @function [parent=#EaseQuinticActionIn] clone +-- @param self +-- @return EaseQuinticActionIn#EaseQuinticActionIn ret (return value: cc.EaseQuinticActionIn) + +-------------------------------- +-- @function [parent=#EaseQuinticActionIn] update +-- @param self +-- @param #float float + +-------------------------------- +-- @function [parent=#EaseQuinticActionIn] reverse +-- @param self +-- @return EaseQuinticActionIn#EaseQuinticActionIn ret (return value: cc.EaseQuinticActionIn) + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/EaseQuinticActionInOut.lua b/cocos/scripting/lua-bindings/auto/api/EaseQuinticActionInOut.lua index 4272c67c37..9a01786aee 100644 --- a/cocos/scripting/lua-bindings/auto/api/EaseQuinticActionInOut.lua +++ b/cocos/scripting/lua-bindings/auto/api/EaseQuinticActionInOut.lua @@ -1,10 +1,27 @@ -------------------------------- -- @module EaseQuinticActionInOut +-- @extend ActionEase + -------------------------------- -- @function [parent=#EaseQuinticActionInOut] create -- @param self -- @param #cc.ActionInterval actioninterval -- @return EaseQuinticActionInOut#EaseQuinticActionInOut ret (return value: cc.EaseQuinticActionInOut) +-------------------------------- +-- @function [parent=#EaseQuinticActionInOut] clone +-- @param self +-- @return EaseQuinticActionInOut#EaseQuinticActionInOut ret (return value: cc.EaseQuinticActionInOut) + +-------------------------------- +-- @function [parent=#EaseQuinticActionInOut] update +-- @param self +-- @param #float float + +-------------------------------- +-- @function [parent=#EaseQuinticActionInOut] reverse +-- @param self +-- @return EaseQuinticActionInOut#EaseQuinticActionInOut ret (return value: cc.EaseQuinticActionInOut) + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/EaseQuinticActionOut.lua b/cocos/scripting/lua-bindings/auto/api/EaseQuinticActionOut.lua index fc50ca0487..bbf07dc721 100644 --- a/cocos/scripting/lua-bindings/auto/api/EaseQuinticActionOut.lua +++ b/cocos/scripting/lua-bindings/auto/api/EaseQuinticActionOut.lua @@ -1,10 +1,27 @@ -------------------------------- -- @module EaseQuinticActionOut +-- @extend ActionEase + -------------------------------- -- @function [parent=#EaseQuinticActionOut] create -- @param self -- @param #cc.ActionInterval actioninterval -- @return EaseQuinticActionOut#EaseQuinticActionOut ret (return value: cc.EaseQuinticActionOut) +-------------------------------- +-- @function [parent=#EaseQuinticActionOut] clone +-- @param self +-- @return EaseQuinticActionOut#EaseQuinticActionOut ret (return value: cc.EaseQuinticActionOut) + +-------------------------------- +-- @function [parent=#EaseQuinticActionOut] update +-- @param self +-- @param #float float + +-------------------------------- +-- @function [parent=#EaseQuinticActionOut] reverse +-- @param self +-- @return EaseQuinticActionOut#EaseQuinticActionOut ret (return value: cc.EaseQuinticActionOut) + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/EaseRateAction.lua b/cocos/scripting/lua-bindings/auto/api/EaseRateAction.lua index 30bbe7f221..81eebb865c 100644 --- a/cocos/scripting/lua-bindings/auto/api/EaseRateAction.lua +++ b/cocos/scripting/lua-bindings/auto/api/EaseRateAction.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module EaseRateAction +-- @extend ActionEase + -------------------------------- -- @function [parent=#EaseRateAction] setRate -- @param self @@ -11,4 +13,14 @@ -- @param self -- @return float#float ret (return value: float) +-------------------------------- +-- @function [parent=#EaseRateAction] clone +-- @param self +-- @return EaseRateAction#EaseRateAction ret (return value: cc.EaseRateAction) + +-------------------------------- +-- @function [parent=#EaseRateAction] reverse +-- @param self +-- @return EaseRateAction#EaseRateAction ret (return value: cc.EaseRateAction) + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/EaseSineIn.lua b/cocos/scripting/lua-bindings/auto/api/EaseSineIn.lua index 564aa381c7..036287b7bb 100644 --- a/cocos/scripting/lua-bindings/auto/api/EaseSineIn.lua +++ b/cocos/scripting/lua-bindings/auto/api/EaseSineIn.lua @@ -1,10 +1,27 @@ -------------------------------- -- @module EaseSineIn +-- @extend ActionEase + -------------------------------- -- @function [parent=#EaseSineIn] create -- @param self -- @param #cc.ActionInterval actioninterval -- @return EaseSineIn#EaseSineIn ret (return value: cc.EaseSineIn) +-------------------------------- +-- @function [parent=#EaseSineIn] clone +-- @param self +-- @return EaseSineIn#EaseSineIn ret (return value: cc.EaseSineIn) + +-------------------------------- +-- @function [parent=#EaseSineIn] update +-- @param self +-- @param #float float + +-------------------------------- +-- @function [parent=#EaseSineIn] reverse +-- @param self +-- @return ActionEase#ActionEase ret (return value: cc.ActionEase) + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/EaseSineInOut.lua b/cocos/scripting/lua-bindings/auto/api/EaseSineInOut.lua index 18de34e92a..e3582698ff 100644 --- a/cocos/scripting/lua-bindings/auto/api/EaseSineInOut.lua +++ b/cocos/scripting/lua-bindings/auto/api/EaseSineInOut.lua @@ -1,10 +1,27 @@ -------------------------------- -- @module EaseSineInOut +-- @extend ActionEase + -------------------------------- -- @function [parent=#EaseSineInOut] create -- @param self -- @param #cc.ActionInterval actioninterval -- @return EaseSineInOut#EaseSineInOut ret (return value: cc.EaseSineInOut) +-------------------------------- +-- @function [parent=#EaseSineInOut] clone +-- @param self +-- @return EaseSineInOut#EaseSineInOut ret (return value: cc.EaseSineInOut) + +-------------------------------- +-- @function [parent=#EaseSineInOut] update +-- @param self +-- @param #float float + +-------------------------------- +-- @function [parent=#EaseSineInOut] reverse +-- @param self +-- @return EaseSineInOut#EaseSineInOut ret (return value: cc.EaseSineInOut) + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/EaseSineOut.lua b/cocos/scripting/lua-bindings/auto/api/EaseSineOut.lua index cba5817cd4..cc4b02462b 100644 --- a/cocos/scripting/lua-bindings/auto/api/EaseSineOut.lua +++ b/cocos/scripting/lua-bindings/auto/api/EaseSineOut.lua @@ -1,10 +1,27 @@ -------------------------------- -- @module EaseSineOut +-- @extend ActionEase + -------------------------------- -- @function [parent=#EaseSineOut] create -- @param self -- @param #cc.ActionInterval actioninterval -- @return EaseSineOut#EaseSineOut ret (return value: cc.EaseSineOut) +-------------------------------- +-- @function [parent=#EaseSineOut] clone +-- @param self +-- @return EaseSineOut#EaseSineOut ret (return value: cc.EaseSineOut) + +-------------------------------- +-- @function [parent=#EaseSineOut] update +-- @param self +-- @param #float float + +-------------------------------- +-- @function [parent=#EaseSineOut] reverse +-- @param self +-- @return ActionEase#ActionEase ret (return value: cc.ActionEase) + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/EditBox.lua b/cocos/scripting/lua-bindings/auto/api/EditBox.lua index 184fbc8ab0..2485ed45a3 100644 --- a/cocos/scripting/lua-bindings/auto/api/EditBox.lua +++ b/cocos/scripting/lua-bindings/auto/api/EditBox.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module EditBox +-- @extend ControlButton,IMEDelegate, + -------------------------------- -- @function [parent=#EditBox] getText -- @param self @@ -104,6 +106,26 @@ -- @param #cc.Scale9Sprite scale9sprite -- @return EditBox#EditBox ret (return value: cc.EditBox) +-------------------------------- +-- @function [parent=#EditBox] setAnchorPoint +-- @param self +-- @param #point_table point + +-------------------------------- +-- @function [parent=#EditBox] setPosition +-- @param self +-- @param #point_table point + +-------------------------------- +-- @function [parent=#EditBox] setVisible +-- @param self +-- @param #bool bool + +-------------------------------- +-- @function [parent=#EditBox] setContentSize +-- @param self +-- @param #size_table size + -------------------------------- -- @function [parent=#EditBox] EditBox -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/Event.lua b/cocos/scripting/lua-bindings/auto/api/Event.lua index f9b49b565d..6e2d9626bd 100644 --- a/cocos/scripting/lua-bindings/auto/api/Event.lua +++ b/cocos/scripting/lua-bindings/auto/api/Event.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module Event +-- @extend Ref + -------------------------------- -- @function [parent=#Event] isStopped -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/EventAcceleration.lua b/cocos/scripting/lua-bindings/auto/api/EventAcceleration.lua index 96f962872f..fac51f0769 100644 --- a/cocos/scripting/lua-bindings/auto/api/EventAcceleration.lua +++ b/cocos/scripting/lua-bindings/auto/api/EventAcceleration.lua @@ -1,4 +1,6 @@ -------------------------------- -- @module EventAcceleration +-- @extend Event + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/EventCustom.lua b/cocos/scripting/lua-bindings/auto/api/EventCustom.lua index 353d4db5b9..f65559f168 100644 --- a/cocos/scripting/lua-bindings/auto/api/EventCustom.lua +++ b/cocos/scripting/lua-bindings/auto/api/EventCustom.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module EventCustom +-- @extend Event + -------------------------------- -- @function [parent=#EventCustom] getEventName -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/EventDispatcher.lua b/cocos/scripting/lua-bindings/auto/api/EventDispatcher.lua index edbfec945d..361090e3c4 100644 --- a/cocos/scripting/lua-bindings/auto/api/EventDispatcher.lua +++ b/cocos/scripting/lua-bindings/auto/api/EventDispatcher.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module EventDispatcher +-- @extend Ref + -------------------------------- -- @function [parent=#EventDispatcher] pauseEventListenersForTarget -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/EventKeyboard.lua b/cocos/scripting/lua-bindings/auto/api/EventKeyboard.lua index 01a8715397..62660ef9a4 100644 --- a/cocos/scripting/lua-bindings/auto/api/EventKeyboard.lua +++ b/cocos/scripting/lua-bindings/auto/api/EventKeyboard.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module EventKeyboard +-- @extend Event + -------------------------------- -- @function [parent=#EventKeyboard] EventKeyboard -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/EventListener.lua b/cocos/scripting/lua-bindings/auto/api/EventListener.lua index 82ef017363..0397425ffc 100644 --- a/cocos/scripting/lua-bindings/auto/api/EventListener.lua +++ b/cocos/scripting/lua-bindings/auto/api/EventListener.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module EventListener +-- @extend Ref + -------------------------------- -- @function [parent=#EventListener] clone -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/EventListenerAcceleration.lua b/cocos/scripting/lua-bindings/auto/api/EventListenerAcceleration.lua index 6a7a27c266..9515fc9f78 100644 --- a/cocos/scripting/lua-bindings/auto/api/EventListenerAcceleration.lua +++ b/cocos/scripting/lua-bindings/auto/api/EventListenerAcceleration.lua @@ -1,4 +1,16 @@ -------------------------------- -- @module EventListenerAcceleration +-- @extend EventListener + +-------------------------------- +-- @function [parent=#EventListenerAcceleration] clone +-- @param self +-- @return EventListenerAcceleration#EventListenerAcceleration ret (return value: cc.EventListenerAcceleration) + +-------------------------------- +-- @function [parent=#EventListenerAcceleration] checkAvailable +-- @param self +-- @return bool#bool ret (return value: bool) + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/EventListenerCustom.lua b/cocos/scripting/lua-bindings/auto/api/EventListenerCustom.lua index 4b4e72f3e0..4494827fe4 100644 --- a/cocos/scripting/lua-bindings/auto/api/EventListenerCustom.lua +++ b/cocos/scripting/lua-bindings/auto/api/EventListenerCustom.lua @@ -1,4 +1,16 @@ -------------------------------- -- @module EventListenerCustom +-- @extend EventListener + +-------------------------------- +-- @function [parent=#EventListenerCustom] clone +-- @param self +-- @return EventListenerCustom#EventListenerCustom ret (return value: cc.EventListenerCustom) + +-------------------------------- +-- @function [parent=#EventListenerCustom] checkAvailable +-- @param self +-- @return bool#bool ret (return value: bool) + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/EventListenerKeyboard.lua b/cocos/scripting/lua-bindings/auto/api/EventListenerKeyboard.lua index 76a19a8621..73d6d41498 100644 --- a/cocos/scripting/lua-bindings/auto/api/EventListenerKeyboard.lua +++ b/cocos/scripting/lua-bindings/auto/api/EventListenerKeyboard.lua @@ -1,4 +1,16 @@ -------------------------------- -- @module EventListenerKeyboard +-- @extend EventListener + +-------------------------------- +-- @function [parent=#EventListenerKeyboard] clone +-- @param self +-- @return EventListenerKeyboard#EventListenerKeyboard ret (return value: cc.EventListenerKeyboard) + +-------------------------------- +-- @function [parent=#EventListenerKeyboard] checkAvailable +-- @param self +-- @return bool#bool ret (return value: bool) + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/EventListenerMouse.lua b/cocos/scripting/lua-bindings/auto/api/EventListenerMouse.lua index 978ee1c212..5f6fb224f3 100644 --- a/cocos/scripting/lua-bindings/auto/api/EventListenerMouse.lua +++ b/cocos/scripting/lua-bindings/auto/api/EventListenerMouse.lua @@ -1,4 +1,16 @@ -------------------------------- -- @module EventListenerMouse +-- @extend EventListener + +-------------------------------- +-- @function [parent=#EventListenerMouse] clone +-- @param self +-- @return EventListenerMouse#EventListenerMouse ret (return value: cc.EventListenerMouse) + +-------------------------------- +-- @function [parent=#EventListenerMouse] checkAvailable +-- @param self +-- @return bool#bool ret (return value: bool) + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/EventListenerPhysicsContact.lua b/cocos/scripting/lua-bindings/auto/api/EventListenerPhysicsContact.lua index c4fd4d1ac6..22945a7dc6 100644 --- a/cocos/scripting/lua-bindings/auto/api/EventListenerPhysicsContact.lua +++ b/cocos/scripting/lua-bindings/auto/api/EventListenerPhysicsContact.lua @@ -1,9 +1,21 @@ -------------------------------- -- @module EventListenerPhysicsContact +-- @extend EventListenerCustom + -------------------------------- -- @function [parent=#EventListenerPhysicsContact] create -- @param self -- @return EventListenerPhysicsContact#EventListenerPhysicsContact ret (return value: cc.EventListenerPhysicsContact) +-------------------------------- +-- @function [parent=#EventListenerPhysicsContact] clone +-- @param self +-- @return EventListenerPhysicsContact#EventListenerPhysicsContact ret (return value: cc.EventListenerPhysicsContact) + +-------------------------------- +-- @function [parent=#EventListenerPhysicsContact] checkAvailable +-- @param self +-- @return bool#bool ret (return value: bool) + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/EventListenerPhysicsContactWithBodies.lua b/cocos/scripting/lua-bindings/auto/api/EventListenerPhysicsContactWithBodies.lua index 888f390470..f1f5309955 100644 --- a/cocos/scripting/lua-bindings/auto/api/EventListenerPhysicsContactWithBodies.lua +++ b/cocos/scripting/lua-bindings/auto/api/EventListenerPhysicsContactWithBodies.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module EventListenerPhysicsContactWithBodies +-- @extend EventListenerPhysicsContact + -------------------------------- -- @function [parent=#EventListenerPhysicsContactWithBodies] hitTest -- @param self @@ -15,4 +17,9 @@ -- @param #cc.PhysicsBody physicsbody -- @return EventListenerPhysicsContactWithBodies#EventListenerPhysicsContactWithBodies ret (return value: cc.EventListenerPhysicsContactWithBodies) +-------------------------------- +-- @function [parent=#EventListenerPhysicsContactWithBodies] clone +-- @param self +-- @return EventListenerPhysicsContactWithBodies#EventListenerPhysicsContactWithBodies ret (return value: cc.EventListenerPhysicsContactWithBodies) + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/EventListenerPhysicsContactWithGroup.lua b/cocos/scripting/lua-bindings/auto/api/EventListenerPhysicsContactWithGroup.lua index ebee8a8d2a..4f591a2073 100644 --- a/cocos/scripting/lua-bindings/auto/api/EventListenerPhysicsContactWithGroup.lua +++ b/cocos/scripting/lua-bindings/auto/api/EventListenerPhysicsContactWithGroup.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module EventListenerPhysicsContactWithGroup +-- @extend EventListenerPhysicsContact + -------------------------------- -- @function [parent=#EventListenerPhysicsContactWithGroup] hitTest -- @param self @@ -14,4 +16,9 @@ -- @param #int int -- @return EventListenerPhysicsContactWithGroup#EventListenerPhysicsContactWithGroup ret (return value: cc.EventListenerPhysicsContactWithGroup) +-------------------------------- +-- @function [parent=#EventListenerPhysicsContactWithGroup] clone +-- @param self +-- @return EventListenerPhysicsContactWithGroup#EventListenerPhysicsContactWithGroup ret (return value: cc.EventListenerPhysicsContactWithGroup) + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/EventListenerPhysicsContactWithShapes.lua b/cocos/scripting/lua-bindings/auto/api/EventListenerPhysicsContactWithShapes.lua index a8ec760d44..83035d2250 100644 --- a/cocos/scripting/lua-bindings/auto/api/EventListenerPhysicsContactWithShapes.lua +++ b/cocos/scripting/lua-bindings/auto/api/EventListenerPhysicsContactWithShapes.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module EventListenerPhysicsContactWithShapes +-- @extend EventListenerPhysicsContact + -------------------------------- -- @function [parent=#EventListenerPhysicsContactWithShapes] hitTest -- @param self @@ -15,4 +17,9 @@ -- @param #cc.PhysicsShape physicsshape -- @return EventListenerPhysicsContactWithShapes#EventListenerPhysicsContactWithShapes ret (return value: cc.EventListenerPhysicsContactWithShapes) +-------------------------------- +-- @function [parent=#EventListenerPhysicsContactWithShapes] clone +-- @param self +-- @return EventListenerPhysicsContactWithShapes#EventListenerPhysicsContactWithShapes ret (return value: cc.EventListenerPhysicsContactWithShapes) + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/EventListenerTouchAllAtOnce.lua b/cocos/scripting/lua-bindings/auto/api/EventListenerTouchAllAtOnce.lua index b7aed9c410..eab91ae66a 100644 --- a/cocos/scripting/lua-bindings/auto/api/EventListenerTouchAllAtOnce.lua +++ b/cocos/scripting/lua-bindings/auto/api/EventListenerTouchAllAtOnce.lua @@ -1,4 +1,16 @@ -------------------------------- -- @module EventListenerTouchAllAtOnce +-- @extend EventListener + +-------------------------------- +-- @function [parent=#EventListenerTouchAllAtOnce] clone +-- @param self +-- @return EventListenerTouchAllAtOnce#EventListenerTouchAllAtOnce ret (return value: cc.EventListenerTouchAllAtOnce) + +-------------------------------- +-- @function [parent=#EventListenerTouchAllAtOnce] checkAvailable +-- @param self +-- @return bool#bool ret (return value: bool) + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/EventListenerTouchOneByOne.lua b/cocos/scripting/lua-bindings/auto/api/EventListenerTouchOneByOne.lua index 0e2238b061..60e632a799 100644 --- a/cocos/scripting/lua-bindings/auto/api/EventListenerTouchOneByOne.lua +++ b/cocos/scripting/lua-bindings/auto/api/EventListenerTouchOneByOne.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module EventListenerTouchOneByOne +-- @extend EventListener + -------------------------------- -- @function [parent=#EventListenerTouchOneByOne] isSwallowTouches -- @param self @@ -11,4 +13,14 @@ -- @param self -- @param #bool bool +-------------------------------- +-- @function [parent=#EventListenerTouchOneByOne] clone +-- @param self +-- @return EventListenerTouchOneByOne#EventListenerTouchOneByOne ret (return value: cc.EventListenerTouchOneByOne) + +-------------------------------- +-- @function [parent=#EventListenerTouchOneByOne] checkAvailable +-- @param self +-- @return bool#bool ret (return value: bool) + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/EventMouse.lua b/cocos/scripting/lua-bindings/auto/api/EventMouse.lua index 39c7e628d9..afbb9df08c 100644 --- a/cocos/scripting/lua-bindings/auto/api/EventMouse.lua +++ b/cocos/scripting/lua-bindings/auto/api/EventMouse.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module EventMouse +-- @extend Event + -------------------------------- -- @function [parent=#EventMouse] getMouseButton -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/EventTouch.lua b/cocos/scripting/lua-bindings/auto/api/EventTouch.lua index 15a0232910..02f48bfded 100644 --- a/cocos/scripting/lua-bindings/auto/api/EventTouch.lua +++ b/cocos/scripting/lua-bindings/auto/api/EventTouch.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module EventTouch +-- @extend Event + -------------------------------- -- @function [parent=#EventTouch] getEventCode -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/FadeIn.lua b/cocos/scripting/lua-bindings/auto/api/FadeIn.lua index 7bac39c98a..f3472f652a 100644 --- a/cocos/scripting/lua-bindings/auto/api/FadeIn.lua +++ b/cocos/scripting/lua-bindings/auto/api/FadeIn.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module FadeIn +-- @extend FadeTo + -------------------------------- -- @function [parent=#FadeIn] setReverseAction -- @param self @@ -12,4 +14,19 @@ -- @param #float float -- @return FadeIn#FadeIn ret (return value: cc.FadeIn) +-------------------------------- +-- @function [parent=#FadeIn] startWithTarget +-- @param self +-- @param #cc.Node node + +-------------------------------- +-- @function [parent=#FadeIn] clone +-- @param self +-- @return FadeIn#FadeIn ret (return value: cc.FadeIn) + +-------------------------------- +-- @function [parent=#FadeIn] reverse +-- @param self +-- @return FadeTo#FadeTo ret (return value: cc.FadeTo) + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/FadeOut.lua b/cocos/scripting/lua-bindings/auto/api/FadeOut.lua index 7d759c4d4e..c9ac45b12c 100644 --- a/cocos/scripting/lua-bindings/auto/api/FadeOut.lua +++ b/cocos/scripting/lua-bindings/auto/api/FadeOut.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module FadeOut +-- @extend FadeTo + -------------------------------- -- @function [parent=#FadeOut] setReverseAction -- @param self @@ -12,4 +14,19 @@ -- @param #float float -- @return FadeOut#FadeOut ret (return value: cc.FadeOut) +-------------------------------- +-- @function [parent=#FadeOut] startWithTarget +-- @param self +-- @param #cc.Node node + +-------------------------------- +-- @function [parent=#FadeOut] clone +-- @param self +-- @return FadeOut#FadeOut ret (return value: cc.FadeOut) + +-------------------------------- +-- @function [parent=#FadeOut] reverse +-- @param self +-- @return FadeTo#FadeTo ret (return value: cc.FadeTo) + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/FadeOutBLTiles.lua b/cocos/scripting/lua-bindings/auto/api/FadeOutBLTiles.lua index 69b458bbaf..a43aebee4e 100644 --- a/cocos/scripting/lua-bindings/auto/api/FadeOutBLTiles.lua +++ b/cocos/scripting/lua-bindings/auto/api/FadeOutBLTiles.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module FadeOutBLTiles +-- @extend FadeOutTRTiles + -------------------------------- -- @function [parent=#FadeOutBLTiles] create -- @param self @@ -8,4 +10,16 @@ -- @param #size_table size -- @return FadeOutBLTiles#FadeOutBLTiles ret (return value: cc.FadeOutBLTiles) +-------------------------------- +-- @function [parent=#FadeOutBLTiles] clone +-- @param self +-- @return FadeOutBLTiles#FadeOutBLTiles ret (return value: cc.FadeOutBLTiles) + +-------------------------------- +-- @function [parent=#FadeOutBLTiles] testFunc +-- @param self +-- @param #size_table size +-- @param #float float +-- @return float#float ret (return value: float) + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/FadeOutDownTiles.lua b/cocos/scripting/lua-bindings/auto/api/FadeOutDownTiles.lua index 8ede2c7e06..e058fdf32e 100644 --- a/cocos/scripting/lua-bindings/auto/api/FadeOutDownTiles.lua +++ b/cocos/scripting/lua-bindings/auto/api/FadeOutDownTiles.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module FadeOutDownTiles +-- @extend FadeOutUpTiles + -------------------------------- -- @function [parent=#FadeOutDownTiles] create -- @param self @@ -8,4 +10,16 @@ -- @param #size_table size -- @return FadeOutDownTiles#FadeOutDownTiles ret (return value: cc.FadeOutDownTiles) +-------------------------------- +-- @function [parent=#FadeOutDownTiles] clone +-- @param self +-- @return FadeOutDownTiles#FadeOutDownTiles ret (return value: cc.FadeOutDownTiles) + +-------------------------------- +-- @function [parent=#FadeOutDownTiles] testFunc +-- @param self +-- @param #size_table size +-- @param #float float +-- @return float#float ret (return value: float) + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/FadeOutTRTiles.lua b/cocos/scripting/lua-bindings/auto/api/FadeOutTRTiles.lua index cf9961ddec..a3d34257b2 100644 --- a/cocos/scripting/lua-bindings/auto/api/FadeOutTRTiles.lua +++ b/cocos/scripting/lua-bindings/auto/api/FadeOutTRTiles.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module FadeOutTRTiles +-- @extend TiledGrid3DAction + -------------------------------- -- @function [parent=#FadeOutTRTiles] turnOnTile -- @param self @@ -31,4 +33,14 @@ -- @param #size_table size -- @return FadeOutTRTiles#FadeOutTRTiles ret (return value: cc.FadeOutTRTiles) +-------------------------------- +-- @function [parent=#FadeOutTRTiles] clone +-- @param self +-- @return FadeOutTRTiles#FadeOutTRTiles ret (return value: cc.FadeOutTRTiles) + +-------------------------------- +-- @function [parent=#FadeOutTRTiles] update +-- @param self +-- @param #float float + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/FadeOutUpTiles.lua b/cocos/scripting/lua-bindings/auto/api/FadeOutUpTiles.lua index 595be3b7d1..480fcdfb49 100644 --- a/cocos/scripting/lua-bindings/auto/api/FadeOutUpTiles.lua +++ b/cocos/scripting/lua-bindings/auto/api/FadeOutUpTiles.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module FadeOutUpTiles +-- @extend FadeOutTRTiles + -------------------------------- -- @function [parent=#FadeOutUpTiles] transformTile -- @param self @@ -14,4 +16,16 @@ -- @param #size_table size -- @return FadeOutUpTiles#FadeOutUpTiles ret (return value: cc.FadeOutUpTiles) +-------------------------------- +-- @function [parent=#FadeOutUpTiles] clone +-- @param self +-- @return FadeOutUpTiles#FadeOutUpTiles ret (return value: cc.FadeOutUpTiles) + +-------------------------------- +-- @function [parent=#FadeOutUpTiles] testFunc +-- @param self +-- @param #size_table size +-- @param #float float +-- @return float#float ret (return value: float) + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/FadeTo.lua b/cocos/scripting/lua-bindings/auto/api/FadeTo.lua index 1a33af625e..4114602f27 100644 --- a/cocos/scripting/lua-bindings/auto/api/FadeTo.lua +++ b/cocos/scripting/lua-bindings/auto/api/FadeTo.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module FadeTo +-- @extend ActionInterval + -------------------------------- -- @function [parent=#FadeTo] create -- @param self @@ -8,4 +10,24 @@ -- @param #unsigned char char -- @return FadeTo#FadeTo ret (return value: cc.FadeTo) +-------------------------------- +-- @function [parent=#FadeTo] startWithTarget +-- @param self +-- @param #cc.Node node + +-------------------------------- +-- @function [parent=#FadeTo] clone +-- @param self +-- @return FadeTo#FadeTo ret (return value: cc.FadeTo) + +-------------------------------- +-- @function [parent=#FadeTo] reverse +-- @param self +-- @return FadeTo#FadeTo ret (return value: cc.FadeTo) + +-------------------------------- +-- @function [parent=#FadeTo] update +-- @param self +-- @param #float float + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/FileUtils.lua b/cocos/scripting/lua-bindings/auto/api/FileUtils.lua index 517dcd59f5..87586f26bf 100644 --- a/cocos/scripting/lua-bindings/auto/api/FileUtils.lua +++ b/cocos/scripting/lua-bindings/auto/api/FileUtils.lua @@ -1,6 +1,7 @@ -------------------------------- -- @module FileUtils + -------------------------------- -- @function [parent=#FileUtils] fullPathForFilename -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/FiniteTimeAction.lua b/cocos/scripting/lua-bindings/auto/api/FiniteTimeAction.lua index 9b77997e1c..d213f1fbe3 100644 --- a/cocos/scripting/lua-bindings/auto/api/FiniteTimeAction.lua +++ b/cocos/scripting/lua-bindings/auto/api/FiniteTimeAction.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module FiniteTimeAction +-- @extend Action + -------------------------------- -- @function [parent=#FiniteTimeAction] setDuration -- @param self @@ -11,4 +13,14 @@ -- @param self -- @return float#float ret (return value: float) +-------------------------------- +-- @function [parent=#FiniteTimeAction] clone +-- @param self +-- @return FiniteTimeAction#FiniteTimeAction ret (return value: cc.FiniteTimeAction) + +-------------------------------- +-- @function [parent=#FiniteTimeAction] reverse +-- @param self +-- @return FiniteTimeAction#FiniteTimeAction ret (return value: cc.FiniteTimeAction) + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/FlipX.lua b/cocos/scripting/lua-bindings/auto/api/FlipX.lua index 1d28d16969..27b2e18c9d 100644 --- a/cocos/scripting/lua-bindings/auto/api/FlipX.lua +++ b/cocos/scripting/lua-bindings/auto/api/FlipX.lua @@ -1,10 +1,27 @@ -------------------------------- -- @module FlipX +-- @extend ActionInstant + -------------------------------- -- @function [parent=#FlipX] create -- @param self -- @param #bool bool -- @return FlipX#FlipX ret (return value: cc.FlipX) +-------------------------------- +-- @function [parent=#FlipX] clone +-- @param self +-- @return FlipX#FlipX ret (return value: cc.FlipX) + +-------------------------------- +-- @function [parent=#FlipX] update +-- @param self +-- @param #float float + +-------------------------------- +-- @function [parent=#FlipX] reverse +-- @param self +-- @return FlipX#FlipX ret (return value: cc.FlipX) + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/FlipX3D.lua b/cocos/scripting/lua-bindings/auto/api/FlipX3D.lua index 736bd72e38..195dd3acfa 100644 --- a/cocos/scripting/lua-bindings/auto/api/FlipX3D.lua +++ b/cocos/scripting/lua-bindings/auto/api/FlipX3D.lua @@ -1,10 +1,22 @@ -------------------------------- -- @module FlipX3D +-- @extend Grid3DAction + -------------------------------- -- @function [parent=#FlipX3D] create -- @param self -- @param #float float -- @return FlipX3D#FlipX3D ret (return value: cc.FlipX3D) +-------------------------------- +-- @function [parent=#FlipX3D] clone +-- @param self +-- @return FlipX3D#FlipX3D ret (return value: cc.FlipX3D) + +-------------------------------- +-- @function [parent=#FlipX3D] update +-- @param self +-- @param #float float + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/FlipY.lua b/cocos/scripting/lua-bindings/auto/api/FlipY.lua index a26ae24a69..7083426f09 100644 --- a/cocos/scripting/lua-bindings/auto/api/FlipY.lua +++ b/cocos/scripting/lua-bindings/auto/api/FlipY.lua @@ -1,10 +1,27 @@ -------------------------------- -- @module FlipY +-- @extend ActionInstant + -------------------------------- -- @function [parent=#FlipY] create -- @param self -- @param #bool bool -- @return FlipY#FlipY ret (return value: cc.FlipY) +-------------------------------- +-- @function [parent=#FlipY] clone +-- @param self +-- @return FlipY#FlipY ret (return value: cc.FlipY) + +-------------------------------- +-- @function [parent=#FlipY] update +-- @param self +-- @param #float float + +-------------------------------- +-- @function [parent=#FlipY] reverse +-- @param self +-- @return FlipY#FlipY ret (return value: cc.FlipY) + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/FlipY3D.lua b/cocos/scripting/lua-bindings/auto/api/FlipY3D.lua index 5381e36cf0..bbc705581a 100644 --- a/cocos/scripting/lua-bindings/auto/api/FlipY3D.lua +++ b/cocos/scripting/lua-bindings/auto/api/FlipY3D.lua @@ -1,10 +1,22 @@ -------------------------------- -- @module FlipY3D +-- @extend FlipX3D + -------------------------------- -- @function [parent=#FlipY3D] create -- @param self -- @param #float float -- @return FlipY3D#FlipY3D ret (return value: cc.FlipY3D) +-------------------------------- +-- @function [parent=#FlipY3D] clone +-- @param self +-- @return FlipY3D#FlipY3D ret (return value: cc.FlipY3D) + +-------------------------------- +-- @function [parent=#FlipY3D] update +-- @param self +-- @param #float float + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/Follow.lua b/cocos/scripting/lua-bindings/auto/api/Follow.lua index 0e7abc3220..bdcc8182cd 100644 --- a/cocos/scripting/lua-bindings/auto/api/Follow.lua +++ b/cocos/scripting/lua-bindings/auto/api/Follow.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module Follow +-- @extend Action + -------------------------------- -- @function [parent=#Follow] setBoudarySet -- @param self @@ -18,4 +20,28 @@ -- @param #rect_table rect -- @return Follow#Follow ret (return value: cc.Follow) +-------------------------------- +-- @function [parent=#Follow] step +-- @param self +-- @param #float float + +-------------------------------- +-- @function [parent=#Follow] clone +-- @param self +-- @return Follow#Follow ret (return value: cc.Follow) + +-------------------------------- +-- @function [parent=#Follow] stop +-- @param self + +-------------------------------- +-- @function [parent=#Follow] reverse +-- @param self +-- @return Follow#Follow ret (return value: cc.Follow) + +-------------------------------- +-- @function [parent=#Follow] isDone +-- @param self +-- @return bool#bool ret (return value: bool) + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/FrameData.lua b/cocos/scripting/lua-bindings/auto/api/FrameData.lua index c23f2f372a..e4c0defd70 100644 --- a/cocos/scripting/lua-bindings/auto/api/FrameData.lua +++ b/cocos/scripting/lua-bindings/auto/api/FrameData.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module FrameData +-- @extend BaseData + -------------------------------- -- @function [parent=#FrameData] copy -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/GLProgram.lua b/cocos/scripting/lua-bindings/auto/api/GLProgram.lua index 9a1cb0d159..c2d2b24dcd 100644 --- a/cocos/scripting/lua-bindings/auto/api/GLProgram.lua +++ b/cocos/scripting/lua-bindings/auto/api/GLProgram.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module GLProgram +-- @extend Ref + -------------------------------- -- @function [parent=#GLProgram] getFragmentShaderLog -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/GLView.lua b/cocos/scripting/lua-bindings/auto/api/GLView.lua index 679bc0b9c6..851e449e01 100644 --- a/cocos/scripting/lua-bindings/auto/api/GLView.lua +++ b/cocos/scripting/lua-bindings/auto/api/GLView.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module GLView +-- @extend GLViewProtocol,Ref, + -------------------------------- -- @function [parent=#GLView] createWithRect -- @param self @@ -21,4 +23,14 @@ -- @param #string str -- @return GLView#GLView ret (return value: cc.GLView) +-------------------------------- +-- @function [parent=#GLView] setIMEKeyboardState +-- @param self +-- @param #bool bool + +-------------------------------- +-- @function [parent=#GLView] isOpenGLReady +-- @param self +-- @return bool#bool ret (return value: bool) + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/GLViewProtocol.lua b/cocos/scripting/lua-bindings/auto/api/GLViewProtocol.lua index 1247d08bf6..c8beea4ca9 100644 --- a/cocos/scripting/lua-bindings/auto/api/GLViewProtocol.lua +++ b/cocos/scripting/lua-bindings/auto/api/GLViewProtocol.lua @@ -1,6 +1,7 @@ -------------------------------- -- @module GLViewProtocol + -------------------------------- -- @function [parent=#GLViewProtocol] setFrameSize -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/GUIReader.lua b/cocos/scripting/lua-bindings/auto/api/GUIReader.lua index eaf01fd1b9..0c182ddde9 100644 --- a/cocos/scripting/lua-bindings/auto/api/GUIReader.lua +++ b/cocos/scripting/lua-bindings/auto/api/GUIReader.lua @@ -1,6 +1,7 @@ -------------------------------- -- @module GUIReader + -------------------------------- -- @function [parent=#GUIReader] widgetFromJsonFile -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/Grid3D.lua b/cocos/scripting/lua-bindings/auto/api/Grid3D.lua index aa15b0bf83..0c3f94acfc 100644 --- a/cocos/scripting/lua-bindings/auto/api/Grid3D.lua +++ b/cocos/scripting/lua-bindings/auto/api/Grid3D.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module Grid3D +-- @extend GridBase + -------------------------------- -- overload function: create(size_table) -- @@ -13,6 +15,18 @@ -- @param #bool bool -- @return Grid3D#Grid3D ret (retunr value: cc.Grid3D) +-------------------------------- +-- @function [parent=#Grid3D] calculateVertexPoints +-- @param self + +-------------------------------- +-- @function [parent=#Grid3D] blit +-- @param self + +-------------------------------- +-- @function [parent=#Grid3D] reuse +-- @param self + -------------------------------- -- @function [parent=#Grid3D] Grid3D -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/Grid3DAction.lua b/cocos/scripting/lua-bindings/auto/api/Grid3DAction.lua index df754d0dfd..431b3dd3be 100644 --- a/cocos/scripting/lua-bindings/auto/api/Grid3DAction.lua +++ b/cocos/scripting/lua-bindings/auto/api/Grid3DAction.lua @@ -1,9 +1,16 @@ -------------------------------- -- @module Grid3DAction +-- @extend GridAction + -------------------------------- -- @function [parent=#Grid3DAction] getGrid -- @param self -- @return GridBase#GridBase ret (return value: cc.GridBase) +-------------------------------- +-- @function [parent=#Grid3DAction] clone +-- @param self +-- @return Grid3DAction#Grid3DAction ret (return value: cc.Grid3DAction) + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/GridAction.lua b/cocos/scripting/lua-bindings/auto/api/GridAction.lua index afa48c5fed..40ee410312 100644 --- a/cocos/scripting/lua-bindings/auto/api/GridAction.lua +++ b/cocos/scripting/lua-bindings/auto/api/GridAction.lua @@ -1,9 +1,26 @@ -------------------------------- -- @module GridAction +-- @extend ActionInterval + -------------------------------- -- @function [parent=#GridAction] getGrid -- @param self -- @return GridBase#GridBase ret (return value: cc.GridBase) +-------------------------------- +-- @function [parent=#GridAction] startWithTarget +-- @param self +-- @param #cc.Node node + +-------------------------------- +-- @function [parent=#GridAction] clone +-- @param self +-- @return GridAction#GridAction ret (return value: cc.GridAction) + +-------------------------------- +-- @function [parent=#GridAction] reverse +-- @param self +-- @return GridAction#GridAction ret (return value: cc.GridAction) + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/GridBase.lua b/cocos/scripting/lua-bindings/auto/api/GridBase.lua index bb9f3edb4a..e006a6373d 100644 --- a/cocos/scripting/lua-bindings/auto/api/GridBase.lua +++ b/cocos/scripting/lua-bindings/auto/api/GridBase.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module GridBase +-- @extend Ref + -------------------------------- -- @function [parent=#GridBase] setGridSize -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/Helper.lua b/cocos/scripting/lua-bindings/auto/api/Helper.lua index 565e5922a5..777b62a0fe 100644 --- a/cocos/scripting/lua-bindings/auto/api/Helper.lua +++ b/cocos/scripting/lua-bindings/auto/api/Helper.lua @@ -1,6 +1,7 @@ -------------------------------- -- @module Helper + -------------------------------- -- @function [parent=#Helper] seekActionWidgetByActionTag -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/Hide.lua b/cocos/scripting/lua-bindings/auto/api/Hide.lua index 7baf4c3784..cc891780c4 100644 --- a/cocos/scripting/lua-bindings/auto/api/Hide.lua +++ b/cocos/scripting/lua-bindings/auto/api/Hide.lua @@ -1,9 +1,26 @@ -------------------------------- -- @module Hide +-- @extend ActionInstant + -------------------------------- -- @function [parent=#Hide] create -- @param self -- @return Hide#Hide ret (return value: cc.Hide) +-------------------------------- +-- @function [parent=#Hide] clone +-- @param self +-- @return Hide#Hide ret (return value: cc.Hide) + +-------------------------------- +-- @function [parent=#Hide] update +-- @param self +-- @param #float float + +-------------------------------- +-- @function [parent=#Hide] reverse +-- @param self +-- @return ActionInstant#ActionInstant ret (return value: cc.ActionInstant) + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/Image.lua b/cocos/scripting/lua-bindings/auto/api/Image.lua index 55e397fc9f..77594f9074 100644 --- a/cocos/scripting/lua-bindings/auto/api/Image.lua +++ b/cocos/scripting/lua-bindings/auto/api/Image.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module Image +-- @extend Ref + -------------------------------- -- @function [parent=#Image] hasPremultipliedAlpha -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/ImageView.lua b/cocos/scripting/lua-bindings/auto/api/ImageView.lua index 58e10a2206..d05cd9ac20 100644 --- a/cocos/scripting/lua-bindings/auto/api/ImageView.lua +++ b/cocos/scripting/lua-bindings/auto/api/ImageView.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module ImageView +-- @extend Widget + -------------------------------- -- @function [parent=#ImageView] loadTexture -- @param self @@ -42,6 +44,31 @@ -- @param self -- @return Ref#Ref ret (return value: cc.Ref) +-------------------------------- +-- @function [parent=#ImageView] setAnchorPoint +-- @param self +-- @param #point_table point + +-------------------------------- +-- @function [parent=#ImageView] getVirtualRenderer +-- @param self +-- @return Node#Node ret (return value: cc.Node) + +-------------------------------- +-- @function [parent=#ImageView] getDescription +-- @param self +-- @return string#string ret (return value: string) + +-------------------------------- +-- @function [parent=#ImageView] getContentSize +-- @param self +-- @return size_table#size_table ret (return value: size_table) + +-------------------------------- +-- @function [parent=#ImageView] ignoreContentAdaptWithSize +-- @param self +-- @param #bool bool + -------------------------------- -- @function [parent=#ImageView] ImageView -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/JumpBy.lua b/cocos/scripting/lua-bindings/auto/api/JumpBy.lua index b42df90e34..467460fb48 100644 --- a/cocos/scripting/lua-bindings/auto/api/JumpBy.lua +++ b/cocos/scripting/lua-bindings/auto/api/JumpBy.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module JumpBy +-- @extend ActionInterval + -------------------------------- -- @function [parent=#JumpBy] create -- @param self @@ -10,4 +12,24 @@ -- @param #int int -- @return JumpBy#JumpBy ret (return value: cc.JumpBy) +-------------------------------- +-- @function [parent=#JumpBy] startWithTarget +-- @param self +-- @param #cc.Node node + +-------------------------------- +-- @function [parent=#JumpBy] clone +-- @param self +-- @return JumpBy#JumpBy ret (return value: cc.JumpBy) + +-------------------------------- +-- @function [parent=#JumpBy] reverse +-- @param self +-- @return JumpBy#JumpBy ret (return value: cc.JumpBy) + +-------------------------------- +-- @function [parent=#JumpBy] update +-- @param self +-- @param #float float + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/JumpTiles3D.lua b/cocos/scripting/lua-bindings/auto/api/JumpTiles3D.lua index ca146738d9..0cb8efe537 100644 --- a/cocos/scripting/lua-bindings/auto/api/JumpTiles3D.lua +++ b/cocos/scripting/lua-bindings/auto/api/JumpTiles3D.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module JumpTiles3D +-- @extend TiledGrid3DAction + -------------------------------- -- @function [parent=#JumpTiles3D] getAmplitudeRate -- @param self @@ -30,4 +32,14 @@ -- @param #float float -- @return JumpTiles3D#JumpTiles3D ret (return value: cc.JumpTiles3D) +-------------------------------- +-- @function [parent=#JumpTiles3D] clone +-- @param self +-- @return JumpTiles3D#JumpTiles3D ret (return value: cc.JumpTiles3D) + +-------------------------------- +-- @function [parent=#JumpTiles3D] update +-- @param self +-- @param #float float + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/JumpTo.lua b/cocos/scripting/lua-bindings/auto/api/JumpTo.lua index 5071658f89..c942d04f26 100644 --- a/cocos/scripting/lua-bindings/auto/api/JumpTo.lua +++ b/cocos/scripting/lua-bindings/auto/api/JumpTo.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module JumpTo +-- @extend JumpBy + -------------------------------- -- @function [parent=#JumpTo] create -- @param self @@ -10,4 +12,19 @@ -- @param #int int -- @return JumpTo#JumpTo ret (return value: cc.JumpTo) +-------------------------------- +-- @function [parent=#JumpTo] startWithTarget +-- @param self +-- @param #cc.Node node + +-------------------------------- +-- @function [parent=#JumpTo] clone +-- @param self +-- @return JumpTo#JumpTo ret (return value: cc.JumpTo) + +-------------------------------- +-- @function [parent=#JumpTo] reverse +-- @param self +-- @return JumpTo#JumpTo ret (return value: cc.JumpTo) + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/Label.lua b/cocos/scripting/lua-bindings/auto/api/Label.lua index a11ee15ffa..537e8773a7 100644 --- a/cocos/scripting/lua-bindings/auto/api/Label.lua +++ b/cocos/scripting/lua-bindings/auto/api/Label.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module Label +-- @extend SpriteBatchNode,LabelProtocol, + -------------------------------- -- @function [parent=#Label] enableShadow -- @param self @@ -14,7 +16,7 @@ -------------------------------- -- @function [parent=#Label] getFontSize -- @param self --- @return int#int ret (return value: int) +-- @return float#float ret (return value: float) -------------------------------- -- @function [parent=#Label] getString @@ -25,11 +27,6 @@ -- @function [parent=#Label] disableEffect -- @param self --------------------------------- --- @function [parent=#Label] getWidth --- @param self --- @return unsigned int#unsigned int ret (return value: unsigned int) - -------------------------------- -- @function [parent=#Label] getCommonLineHeight -- @param self @@ -140,7 +137,7 @@ -------------------------------- -- @function [parent=#Label] setFontSize -- @param self --- @param #int int +-- @param #float float -------------------------------- -- @function [parent=#Label] getVerticalAlignment @@ -152,6 +149,11 @@ -- @param self -- @param #unsigned int int +-------------------------------- +-- @function [parent=#Label] getWidth +-- @param self +-- @return unsigned int#unsigned int ret (return value: unsigned int) + -------------------------------- -- @function [parent=#Label] enableGlow -- @param self @@ -168,6 +170,11 @@ -- @param self -- @return TextHAlignment#TextHAlignment ret (return value: cc.TextHAlignment) +-------------------------------- +-- @function [parent=#Label] getBMFontFilePath +-- @param self +-- @return string#string ret (return value: string) + -------------------------------- -- @function [parent=#Label] setHorizontalAlignment -- @param self @@ -235,4 +242,75 @@ -- @param #cc.FontDefinition fontdefinition -- @return Label#Label ret (return value: cc.Label) +-------------------------------- +-- @function [parent=#Label] addChild +-- @param self +-- @param #cc.Node node +-- @param #int int +-- @param #int int + +-------------------------------- +-- @function [parent=#Label] draw +-- @param self +-- @param #cc.Renderer renderer +-- @param #kmMat4 kmmat4 +-- @param #bool bool + +-------------------------------- +-- @function [parent=#Label] setScaleX +-- @param self +-- @param #float float + +-------------------------------- +-- @function [parent=#Label] isOpacityModifyRGB +-- @param self +-- @return bool#bool ret (return value: bool) + +-------------------------------- +-- @function [parent=#Label] getScaleY +-- @param self +-- @return float#float ret (return value: float) + +-------------------------------- +-- @function [parent=#Label] getScaleX +-- @param self +-- @return float#float ret (return value: float) + +-------------------------------- +-- @function [parent=#Label] getDescription +-- @param self +-- @return string#string ret (return value: string) + +-------------------------------- +-- @function [parent=#Label] visit +-- @param self +-- @param #cc.Renderer renderer +-- @param #kmMat4 kmmat4 +-- @param #bool bool + +-------------------------------- +-- @function [parent=#Label] setOpacityModifyRGB +-- @param self +-- @param #bool bool + +-------------------------------- +-- @function [parent=#Label] setScale +-- @param self +-- @param #float float + +-------------------------------- +-- @function [parent=#Label] setScaleY +-- @param self +-- @param #float float + +-------------------------------- +-- @function [parent=#Label] getContentSize +-- @param self +-- @return size_table#size_table ret (return value: size_table) + +-------------------------------- +-- @function [parent=#Label] updateDisplayedColor +-- @param self +-- @param #color3B_table color3b + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/LabelAtlas.lua b/cocos/scripting/lua-bindings/auto/api/LabelAtlas.lua index 95a8167be6..816ed5a333 100644 --- a/cocos/scripting/lua-bindings/auto/api/LabelAtlas.lua +++ b/cocos/scripting/lua-bindings/auto/api/LabelAtlas.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module LabelAtlas +-- @extend AtlasNode,LabelProtocol, + -------------------------------- -- @function [parent=#LabelAtlas] setString -- @param self @@ -47,4 +49,9 @@ -- @param #int int -- @return LabelAtlas#LabelAtlas ret (retunr value: cc.LabelAtlas) +-------------------------------- +-- @function [parent=#LabelAtlas] getDescription +-- @param self +-- @return string#string ret (return value: string) + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/LabelBMFont.lua b/cocos/scripting/lua-bindings/auto/api/LabelBMFont.lua index 3dd36dad1a..5733e69560 100644 --- a/cocos/scripting/lua-bindings/auto/api/LabelBMFont.lua +++ b/cocos/scripting/lua-bindings/auto/api/LabelBMFont.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module LabelBMFont +-- @extend Node,LabelProtocol,BlendProtocol, + -------------------------------- -- @function [parent=#LabelBMFont] setLineBreakWithoutSpace -- @param self @@ -87,6 +89,22 @@ -- @param #point_table point -- @return LabelBMFont#LabelBMFont ret (retunr value: cc.LabelBMFont) +-------------------------------- +-- @function [parent=#LabelBMFont] getDescription +-- @param self +-- @return string#string ret (return value: string) + +-------------------------------- +-- @function [parent=#LabelBMFont] setColor +-- @param self +-- @param #color3B_table color3b + +-------------------------------- +-- @function [parent=#LabelBMFont] getChildByTag +-- @param self +-- @param #int int +-- @return Node#Node ret (return value: cc.Node) + -------------------------------- -- @function [parent=#LabelBMFont] LabelBMFont -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/LabelTTF.lua b/cocos/scripting/lua-bindings/auto/api/LabelTTF.lua index 3a5f91fcaf..6de559381e 100644 --- a/cocos/scripting/lua-bindings/auto/api/LabelTTF.lua +++ b/cocos/scripting/lua-bindings/auto/api/LabelTTF.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module LabelTTF +-- @extend Node,LabelProtocol,BlendProtocol, + -------------------------------- -- @function [parent=#LabelTTF] enableShadow -- @param self @@ -160,6 +162,23 @@ -- @param #cc.FontDefinition fontdefinition -- @return LabelTTF#LabelTTF ret (return value: cc.LabelTTF) +-------------------------------- +-- @function [parent=#LabelTTF] visit +-- @param self +-- @param #cc.Renderer renderer +-- @param #kmMat4 kmmat4 +-- @param #bool bool + +-------------------------------- +-- @function [parent=#LabelTTF] getDescription +-- @param self +-- @return string#string ret (return value: string) + +-------------------------------- +-- @function [parent=#LabelTTF] getContentSize +-- @param self +-- @return size_table#size_table ret (return value: size_table) + -------------------------------- -- @function [parent=#LabelTTF] LabelTTF -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/Layer.lua b/cocos/scripting/lua-bindings/auto/api/Layer.lua index dc09c20df3..005f4aefc7 100644 --- a/cocos/scripting/lua-bindings/auto/api/Layer.lua +++ b/cocos/scripting/lua-bindings/auto/api/Layer.lua @@ -1,9 +1,16 @@ -------------------------------- -- @module Layer +-- @extend Node + -------------------------------- -- @function [parent=#Layer] create -- @param self -- @return Layer#Layer ret (return value: cc.Layer) +-------------------------------- +-- @function [parent=#Layer] getDescription +-- @param self +-- @return string#string ret (return value: string) + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/LayerColor.lua b/cocos/scripting/lua-bindings/auto/api/LayerColor.lua index 53648a1237..bdc2d44b4e 100644 --- a/cocos/scripting/lua-bindings/auto/api/LayerColor.lua +++ b/cocos/scripting/lua-bindings/auto/api/LayerColor.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module LayerColor +-- @extend Layer,BlendProtocol, + -------------------------------- -- @function [parent=#LayerColor] changeWidthAndHeight -- @param self @@ -31,4 +33,21 @@ -- @param #float float -- @return LayerColor#LayerColor ret (retunr value: cc.LayerColor) +-------------------------------- +-- @function [parent=#LayerColor] draw +-- @param self +-- @param #cc.Renderer renderer +-- @param #kmMat4 kmmat4 +-- @param #bool bool + +-------------------------------- +-- @function [parent=#LayerColor] getDescription +-- @param self +-- @return string#string ret (return value: string) + +-------------------------------- +-- @function [parent=#LayerColor] setContentSize +-- @param self +-- @param #size_table size + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/LayerGradient.lua b/cocos/scripting/lua-bindings/auto/api/LayerGradient.lua index 196478762a..772dc5fd47 100644 --- a/cocos/scripting/lua-bindings/auto/api/LayerGradient.lua +++ b/cocos/scripting/lua-bindings/auto/api/LayerGradient.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module LayerGradient +-- @extend LayerColor + -------------------------------- -- @function [parent=#LayerGradient] getStartColor -- @param self @@ -89,4 +91,9 @@ -- @param #point_table point -- @return LayerGradient#LayerGradient ret (retunr value: cc.LayerGradient) +-------------------------------- +-- @function [parent=#LayerGradient] getDescription +-- @param self +-- @return string#string ret (return value: string) + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/LayerMultiplex.lua b/cocos/scripting/lua-bindings/auto/api/LayerMultiplex.lua index 907636c0aa..b45805eed4 100644 --- a/cocos/scripting/lua-bindings/auto/api/LayerMultiplex.lua +++ b/cocos/scripting/lua-bindings/auto/api/LayerMultiplex.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module LayerMultiplex +-- @extend Layer + -------------------------------- -- @function [parent=#LayerMultiplex] switchToAndReleaseMe -- @param self @@ -16,4 +18,9 @@ -- @param self -- @param #int int +-------------------------------- +-- @function [parent=#LayerMultiplex] getDescription +-- @param self +-- @return string#string ret (return value: string) + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/Layout.lua b/cocos/scripting/lua-bindings/auto/api/Layout.lua index bd313ad92b..1a5a5ea65c 100644 --- a/cocos/scripting/lua-bindings/auto/api/Layout.lua +++ b/cocos/scripting/lua-bindings/auto/api/Layout.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module Layout +-- @extend Widget + -------------------------------- -- @function [parent=#Layout] setBackGroundColorVector -- @param self @@ -161,6 +163,43 @@ -- @param self -- @return Ref#Ref ret (return value: cc.Ref) +-------------------------------- +-- overload function: addChild(cc.Node, int) +-- +-- overload function: addChild(cc.Node) +-- +-- overload function: addChild(cc.Node, int, int) +-- +-- @function [parent=#Layout] addChild +-- @param self +-- @param #cc.Node node +-- @param #int int +-- @param #int int + +-------------------------------- +-- @function [parent=#Layout] getDescription +-- @param self +-- @return string#string ret (return value: string) + +-------------------------------- +-- @function [parent=#Layout] removeAllChildrenWithCleanup +-- @param self +-- @param #bool bool + +-------------------------------- +-- @function [parent=#Layout] removeAllChildren +-- @param self + +-------------------------------- +-- @function [parent=#Layout] sortAllChildren +-- @param self + +-------------------------------- +-- @function [parent=#Layout] removeChild +-- @param self +-- @param #cc.Node node +-- @param #bool bool + -------------------------------- -- @function [parent=#Layout] Layout -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/LayoutParameter.lua b/cocos/scripting/lua-bindings/auto/api/LayoutParameter.lua index 55cb2ccd17..d46a0af912 100644 --- a/cocos/scripting/lua-bindings/auto/api/LayoutParameter.lua +++ b/cocos/scripting/lua-bindings/auto/api/LayoutParameter.lua @@ -1,6 +1,7 @@ -------------------------------- -- @module LayoutParameter + -------------------------------- -- @function [parent=#LayoutParameter] clone -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/Lens3D.lua b/cocos/scripting/lua-bindings/auto/api/Lens3D.lua index c908c4b489..7b13bd556c 100644 --- a/cocos/scripting/lua-bindings/auto/api/Lens3D.lua +++ b/cocos/scripting/lua-bindings/auto/api/Lens3D.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module Lens3D +-- @extend Grid3DAction + -------------------------------- -- @function [parent=#Lens3D] setPosition -- @param self @@ -35,4 +37,14 @@ -- @param #float float -- @return Lens3D#Lens3D ret (return value: cc.Lens3D) +-------------------------------- +-- @function [parent=#Lens3D] clone +-- @param self +-- @return Lens3D#Lens3D ret (return value: cc.Lens3D) + +-------------------------------- +-- @function [parent=#Lens3D] update +-- @param self +-- @param #float float + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/LinearLayoutParameter.lua b/cocos/scripting/lua-bindings/auto/api/LinearLayoutParameter.lua index c1509ba4f1..50bc21ae51 100644 --- a/cocos/scripting/lua-bindings/auto/api/LinearLayoutParameter.lua +++ b/cocos/scripting/lua-bindings/auto/api/LinearLayoutParameter.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module LinearLayoutParameter +-- @extend LayoutParameter + -------------------------------- -- @function [parent=#LinearLayoutParameter] setGravity -- @param self @@ -16,6 +18,16 @@ -- @param self -- @return LinearLayoutParameter#LinearLayoutParameter ret (return value: ccui.LinearLayoutParameter) +-------------------------------- +-- @function [parent=#LinearLayoutParameter] createCloneInstance +-- @param self +-- @return LayoutParameter#LayoutParameter ret (return value: ccui.LayoutParameter) + +-------------------------------- +-- @function [parent=#LinearLayoutParameter] copyProperties +-- @param self +-- @param #ccui.LayoutParameter layoutparameter + -------------------------------- -- @function [parent=#LinearLayoutParameter] LinearLayoutParameter -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/Liquid.lua b/cocos/scripting/lua-bindings/auto/api/Liquid.lua index ea120cd160..197e2b5aa9 100644 --- a/cocos/scripting/lua-bindings/auto/api/Liquid.lua +++ b/cocos/scripting/lua-bindings/auto/api/Liquid.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module Liquid +-- @extend Grid3DAction + -------------------------------- -- @function [parent=#Liquid] getAmplitudeRate -- @param self @@ -30,6 +32,16 @@ -- @param #float float -- @return Liquid#Liquid ret (return value: cc.Liquid) +-------------------------------- +-- @function [parent=#Liquid] clone +-- @param self +-- @return Liquid#Liquid ret (return value: cc.Liquid) + +-------------------------------- +-- @function [parent=#Liquid] update +-- @param self +-- @param #float float + -------------------------------- -- @function [parent=#Liquid] Liquid -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/ListView.lua b/cocos/scripting/lua-bindings/auto/api/ListView.lua index 834e28d8a7..c4db6e511f 100644 --- a/cocos/scripting/lua-bindings/auto/api/ListView.lua +++ b/cocos/scripting/lua-bindings/auto/api/ListView.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module ListView +-- @extend ScrollView + -------------------------------- -- @function [parent=#ListView] getIndex -- @param self @@ -94,6 +96,20 @@ -- @param self -- @return Ref#Ref ret (return value: cc.Ref) +-------------------------------- +-- @function [parent=#ListView] setDirection +-- @param self +-- @param #ccui.SCROLLVIEW_DIR scrollview_dir + +-------------------------------- +-- @function [parent=#ListView] getDescription +-- @param self +-- @return string#string ret (return value: string) + +-------------------------------- +-- @function [parent=#ListView] sortAllChildren +-- @param self + -------------------------------- -- @function [parent=#ListView] ListView -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/LoadingBar.lua b/cocos/scripting/lua-bindings/auto/api/LoadingBar.lua index 81043e1021..bfff41cbec 100644 --- a/cocos/scripting/lua-bindings/auto/api/LoadingBar.lua +++ b/cocos/scripting/lua-bindings/auto/api/LoadingBar.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module LoadingBar +-- @extend Widget + -------------------------------- -- @function [parent=#LoadingBar] setPercent -- @param self @@ -57,6 +59,26 @@ -- @param self -- @return Ref#Ref ret (return value: cc.Ref) +-------------------------------- +-- @function [parent=#LoadingBar] getVirtualRenderer +-- @param self +-- @return Node#Node ret (return value: cc.Node) + +-------------------------------- +-- @function [parent=#LoadingBar] getDescription +-- @param self +-- @return string#string ret (return value: string) + +-------------------------------- +-- @function [parent=#LoadingBar] getContentSize +-- @param self +-- @return size_table#size_table ret (return value: size_table) + +-------------------------------- +-- @function [parent=#LoadingBar] ignoreContentAdaptWithSize +-- @param self +-- @param #bool bool + -------------------------------- -- @function [parent=#LoadingBar] LoadingBar -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/Menu.lua b/cocos/scripting/lua-bindings/auto/api/Menu.lua index d5f3f49990..7a5ef7db5f 100644 --- a/cocos/scripting/lua-bindings/auto/api/Menu.lua +++ b/cocos/scripting/lua-bindings/auto/api/Menu.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module Menu +-- @extend Layer + -------------------------------- -- @function [parent=#Menu] setEnabled -- @param self @@ -29,4 +31,38 @@ -- @function [parent=#Menu] alignItemsHorizontally -- @param self +-------------------------------- +-- overload function: addChild(cc.Node, int) +-- +-- overload function: addChild(cc.Node) +-- +-- overload function: addChild(cc.Node, int, int) +-- +-- @function [parent=#Menu] addChild +-- @param self +-- @param #cc.Node node +-- @param #int int +-- @param #int int + +-------------------------------- +-- @function [parent=#Menu] isOpacityModifyRGB +-- @param self +-- @return bool#bool ret (return value: bool) + +-------------------------------- +-- @function [parent=#Menu] getDescription +-- @param self +-- @return string#string ret (return value: string) + +-------------------------------- +-- @function [parent=#Menu] setOpacityModifyRGB +-- @param self +-- @param #bool bool + +-------------------------------- +-- @function [parent=#Menu] removeChild +-- @param self +-- @param #cc.Node node +-- @param #bool bool + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/MenuItem.lua b/cocos/scripting/lua-bindings/auto/api/MenuItem.lua index a9d7b728ec..0aa434aa57 100644 --- a/cocos/scripting/lua-bindings/auto/api/MenuItem.lua +++ b/cocos/scripting/lua-bindings/auto/api/MenuItem.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module MenuItem +-- @extend Node + -------------------------------- -- @function [parent=#MenuItem] setEnabled -- @param self @@ -33,4 +35,9 @@ -- @param self -- @return rect_table#rect_table ret (return value: rect_table) +-------------------------------- +-- @function [parent=#MenuItem] getDescription +-- @param self +-- @return string#string ret (return value: string) + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/MenuItemAtlasFont.lua b/cocos/scripting/lua-bindings/auto/api/MenuItemAtlasFont.lua index 26853472b2..197d5748ce 100644 --- a/cocos/scripting/lua-bindings/auto/api/MenuItemAtlasFont.lua +++ b/cocos/scripting/lua-bindings/auto/api/MenuItemAtlasFont.lua @@ -1,4 +1,6 @@ -------------------------------- -- @module MenuItemAtlasFont +-- @extend MenuItemLabel + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/MenuItemFont.lua b/cocos/scripting/lua-bindings/auto/api/MenuItemFont.lua index 027c7a052a..ea80ac9e74 100644 --- a/cocos/scripting/lua-bindings/auto/api/MenuItemFont.lua +++ b/cocos/scripting/lua-bindings/auto/api/MenuItemFont.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module MenuItemFont +-- @extend MenuItemLabel + -------------------------------- -- @function [parent=#MenuItemFont] getFontSizeObj -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/MenuItemImage.lua b/cocos/scripting/lua-bindings/auto/api/MenuItemImage.lua index f005666e82..aad34464e1 100644 --- a/cocos/scripting/lua-bindings/auto/api/MenuItemImage.lua +++ b/cocos/scripting/lua-bindings/auto/api/MenuItemImage.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module MenuItemImage +-- @extend MenuItemSprite + -------------------------------- -- @function [parent=#MenuItemImage] setDisabledSpriteFrame -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/MenuItemLabel.lua b/cocos/scripting/lua-bindings/auto/api/MenuItemLabel.lua index 3e25866838..9a81231381 100644 --- a/cocos/scripting/lua-bindings/auto/api/MenuItemLabel.lua +++ b/cocos/scripting/lua-bindings/auto/api/MenuItemLabel.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module MenuItemLabel +-- @extend MenuItem + -------------------------------- -- @function [parent=#MenuItemLabel] getDisabledColor -- @param self @@ -26,4 +28,21 @@ -- @param self -- @return Node#Node ret (return value: cc.Node) +-------------------------------- +-- @function [parent=#MenuItemLabel] setEnabled +-- @param self +-- @param #bool bool + +-------------------------------- +-- @function [parent=#MenuItemLabel] activate +-- @param self + +-------------------------------- +-- @function [parent=#MenuItemLabel] unselected +-- @param self + +-------------------------------- +-- @function [parent=#MenuItemLabel] selected +-- @param self + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/MenuItemSprite.lua b/cocos/scripting/lua-bindings/auto/api/MenuItemSprite.lua index b8fdcd63c0..58a3cb9e8d 100644 --- a/cocos/scripting/lua-bindings/auto/api/MenuItemSprite.lua +++ b/cocos/scripting/lua-bindings/auto/api/MenuItemSprite.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module MenuItemSprite +-- @extend MenuItem + -------------------------------- -- @function [parent=#MenuItemSprite] setEnabled -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/MenuItemToggle.lua b/cocos/scripting/lua-bindings/auto/api/MenuItemToggle.lua index 25fd532397..775f7b18e8 100644 --- a/cocos/scripting/lua-bindings/auto/api/MenuItemToggle.lua +++ b/cocos/scripting/lua-bindings/auto/api/MenuItemToggle.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module MenuItemToggle +-- @extend MenuItem + -------------------------------- -- @function [parent=#MenuItemToggle] setSubItems -- @param self @@ -26,4 +28,21 @@ -- @param self -- @param #unsigned int int +-------------------------------- +-- @function [parent=#MenuItemToggle] setEnabled +-- @param self +-- @param #bool bool + +-------------------------------- +-- @function [parent=#MenuItemToggle] activate +-- @param self + +-------------------------------- +-- @function [parent=#MenuItemToggle] unselected +-- @param self + +-------------------------------- +-- @function [parent=#MenuItemToggle] selected +-- @param self + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/MotionStreak.lua b/cocos/scripting/lua-bindings/auto/api/MotionStreak.lua index 454aba7b9d..dd7b6a5621 100644 --- a/cocos/scripting/lua-bindings/auto/api/MotionStreak.lua +++ b/cocos/scripting/lua-bindings/auto/api/MotionStreak.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module MotionStreak +-- @extend Node,TextureProtocol, + -------------------------------- -- @function [parent=#MotionStreak] reset -- @param self @@ -54,4 +56,64 @@ -- @param #string str -- @return MotionStreak#MotionStreak ret (retunr value: cc.MotionStreak) +-------------------------------- +-- @function [parent=#MotionStreak] isOpacityModifyRGB +-- @param self +-- @return bool#bool ret (return value: bool) + +-------------------------------- +-- @function [parent=#MotionStreak] setPositionY +-- @param self +-- @param #float float + +-------------------------------- +-- @function [parent=#MotionStreak] setPositionX +-- @param self +-- @param #float float + +-------------------------------- +-- @function [parent=#MotionStreak] getPositionY +-- @param self +-- @return float#float ret (return value: float) + +-------------------------------- +-- @function [parent=#MotionStreak] getPositionX +-- @param self +-- @return float#float ret (return value: float) + +-------------------------------- +-- @function [parent=#MotionStreak] setOpacity +-- @param self +-- @param #unsigned char char + +-------------------------------- +-- @function [parent=#MotionStreak] setOpacityModifyRGB +-- @param self +-- @param #bool bool + +-------------------------------- +-- @function [parent=#MotionStreak] getOpacity +-- @param self +-- @return unsigned char#unsigned char ret (return value: unsigned char) + +-------------------------------- +-- overload function: setPosition(float, float) +-- +-- overload function: setPosition(point_table) +-- +-- @function [parent=#MotionStreak] setPosition +-- @param self +-- @param #float float +-- @param #float float + +-------------------------------- +-- overload function: getPosition(float, float) +-- +-- overload function: getPosition() +-- +-- @function [parent=#MotionStreak] getPosition +-- @param self +-- @param #float float +-- @param #float float + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/MoveBy.lua b/cocos/scripting/lua-bindings/auto/api/MoveBy.lua index 315aa61475..94f33fad9c 100644 --- a/cocos/scripting/lua-bindings/auto/api/MoveBy.lua +++ b/cocos/scripting/lua-bindings/auto/api/MoveBy.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module MoveBy +-- @extend ActionInterval + -------------------------------- -- @function [parent=#MoveBy] create -- @param self @@ -8,4 +10,24 @@ -- @param #point_table point -- @return MoveBy#MoveBy ret (return value: cc.MoveBy) +-------------------------------- +-- @function [parent=#MoveBy] startWithTarget +-- @param self +-- @param #cc.Node node + +-------------------------------- +-- @function [parent=#MoveBy] clone +-- @param self +-- @return MoveBy#MoveBy ret (return value: cc.MoveBy) + +-------------------------------- +-- @function [parent=#MoveBy] reverse +-- @param self +-- @return MoveBy#MoveBy ret (return value: cc.MoveBy) + +-------------------------------- +-- @function [parent=#MoveBy] update +-- @param self +-- @param #float float + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/MoveTo.lua b/cocos/scripting/lua-bindings/auto/api/MoveTo.lua index ad822b7cda..4a6e1682b8 100644 --- a/cocos/scripting/lua-bindings/auto/api/MoveTo.lua +++ b/cocos/scripting/lua-bindings/auto/api/MoveTo.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module MoveTo +-- @extend MoveBy + -------------------------------- -- @function [parent=#MoveTo] create -- @param self @@ -8,4 +10,14 @@ -- @param #point_table point -- @return MoveTo#MoveTo ret (return value: cc.MoveTo) +-------------------------------- +-- @function [parent=#MoveTo] startWithTarget +-- @param self +-- @param #cc.Node node + +-------------------------------- +-- @function [parent=#MoveTo] clone +-- @param self +-- @return MoveTo#MoveTo ret (return value: cc.MoveTo) + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/MovementBoneData.lua b/cocos/scripting/lua-bindings/auto/api/MovementBoneData.lua index d6e2e98de6..b9c3f826b6 100644 --- a/cocos/scripting/lua-bindings/auto/api/MovementBoneData.lua +++ b/cocos/scripting/lua-bindings/auto/api/MovementBoneData.lua @@ -1,6 +1,7 @@ -------------------------------- -- @module MovementBoneData + -------------------------------- -- @function [parent=#MovementBoneData] init -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/MovementData.lua b/cocos/scripting/lua-bindings/auto/api/MovementData.lua index e33de3cb17..11e59e7e66 100644 --- a/cocos/scripting/lua-bindings/auto/api/MovementData.lua +++ b/cocos/scripting/lua-bindings/auto/api/MovementData.lua @@ -1,6 +1,7 @@ -------------------------------- -- @module MovementData + -------------------------------- -- @function [parent=#MovementData] getMovementBoneData -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/Node.lua b/cocos/scripting/lua-bindings/auto/api/Node.lua index d68c53dff9..d7e884c2dd 100644 --- a/cocos/scripting/lua-bindings/auto/api/Node.lua +++ b/cocos/scripting/lua-bindings/auto/api/Node.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module Node +-- @extend Ref + -------------------------------- -- overload function: addChild(cc.Node, int) -- diff --git a/cocos/scripting/lua-bindings/auto/api/NodeGrid.lua b/cocos/scripting/lua-bindings/auto/api/NodeGrid.lua index fa4f136767..4a384dda4e 100644 --- a/cocos/scripting/lua-bindings/auto/api/NodeGrid.lua +++ b/cocos/scripting/lua-bindings/auto/api/NodeGrid.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module NodeGrid +-- @extend Node + -------------------------------- -- @function [parent=#NodeGrid] setTarget -- @param self @@ -25,4 +27,11 @@ -- @param self -- @return NodeGrid#NodeGrid ret (return value: cc.NodeGrid) +-------------------------------- +-- @function [parent=#NodeGrid] visit +-- @param self +-- @param #cc.Renderer renderer +-- @param #kmMat4 kmmat4 +-- @param #bool bool + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/OrbitCamera.lua b/cocos/scripting/lua-bindings/auto/api/OrbitCamera.lua index 1d5026af32..f36b94ebbd 100644 --- a/cocos/scripting/lua-bindings/auto/api/OrbitCamera.lua +++ b/cocos/scripting/lua-bindings/auto/api/OrbitCamera.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module OrbitCamera +-- @extend ActionCamera + -------------------------------- -- @function [parent=#OrbitCamera] sphericalRadius -- @param self @@ -32,6 +34,21 @@ -- @param #float float -- @return OrbitCamera#OrbitCamera ret (return value: cc.OrbitCamera) +-------------------------------- +-- @function [parent=#OrbitCamera] startWithTarget +-- @param self +-- @param #cc.Node node + +-------------------------------- +-- @function [parent=#OrbitCamera] clone +-- @param self +-- @return OrbitCamera#OrbitCamera ret (return value: cc.OrbitCamera) + +-------------------------------- +-- @function [parent=#OrbitCamera] update +-- @param self +-- @param #float float + -------------------------------- -- @function [parent=#OrbitCamera] OrbitCamera -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/PageTurn3D.lua b/cocos/scripting/lua-bindings/auto/api/PageTurn3D.lua index ac37b17467..c0aaba17a7 100644 --- a/cocos/scripting/lua-bindings/auto/api/PageTurn3D.lua +++ b/cocos/scripting/lua-bindings/auto/api/PageTurn3D.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module PageTurn3D +-- @extend Grid3DAction + -------------------------------- -- @function [parent=#PageTurn3D] create -- @param self @@ -8,4 +10,14 @@ -- @param #size_table size -- @return PageTurn3D#PageTurn3D ret (return value: cc.PageTurn3D) +-------------------------------- +-- @function [parent=#PageTurn3D] clone +-- @param self +-- @return PageTurn3D#PageTurn3D ret (return value: cc.PageTurn3D) + +-------------------------------- +-- @function [parent=#PageTurn3D] update +-- @param self +-- @param #float float + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/PageView.lua b/cocos/scripting/lua-bindings/auto/api/PageView.lua index 2063952c10..eb3dea7b08 100644 --- a/cocos/scripting/lua-bindings/auto/api/PageView.lua +++ b/cocos/scripting/lua-bindings/auto/api/PageView.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module PageView +-- @extend Layout,UIScrollInterface, + -------------------------------- -- @function [parent=#PageView] getCurPageIndex -- @param self @@ -64,6 +66,26 @@ -- @param self -- @return Ref#Ref ret (return value: cc.Ref) +-------------------------------- +-- @function [parent=#PageView] getLayoutType +-- @param self +-- @return LayoutType#LayoutType ret (return value: ccui.LayoutType) + +-------------------------------- +-- @function [parent=#PageView] getDescription +-- @param self +-- @return string#string ret (return value: string) + +-------------------------------- +-- @function [parent=#PageView] update +-- @param self +-- @param #float float + +-------------------------------- +-- @function [parent=#PageView] setLayoutType +-- @param self +-- @param #ccui.LayoutType layouttype + -------------------------------- -- @function [parent=#PageView] PageView -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/ParallaxNode.lua b/cocos/scripting/lua-bindings/auto/api/ParallaxNode.lua index 80ba88325e..d1a4647441 100644 --- a/cocos/scripting/lua-bindings/auto/api/ParallaxNode.lua +++ b/cocos/scripting/lua-bindings/auto/api/ParallaxNode.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module ParallaxNode +-- @extend Node + -------------------------------- -- overload function: getParallaxArray() -- @@ -33,4 +35,24 @@ -- @param self -- @return ParallaxNode#ParallaxNode ret (return value: cc.ParallaxNode) +-------------------------------- +-- @function [parent=#ParallaxNode] addChild +-- @param self +-- @param #cc.Node node +-- @param #int int +-- @param #int int + +-------------------------------- +-- @function [parent=#ParallaxNode] visit +-- @param self +-- @param #cc.Renderer renderer +-- @param #kmMat4 kmmat4 +-- @param #bool bool + +-------------------------------- +-- @function [parent=#ParallaxNode] removeChild +-- @param self +-- @param #cc.Node node +-- @param #bool bool + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/ParticleBatchNode.lua b/cocos/scripting/lua-bindings/auto/api/ParticleBatchNode.lua index 1fc8d31812..4e894df073 100644 --- a/cocos/scripting/lua-bindings/auto/api/ParticleBatchNode.lua +++ b/cocos/scripting/lua-bindings/auto/api/ParticleBatchNode.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module ParticleBatchNode +-- @extend Node,TextureProtocol, + -------------------------------- -- @function [parent=#ParticleBatchNode] setTexture -- @param self @@ -57,4 +59,37 @@ -- @param #int int -- @return ParticleBatchNode#ParticleBatchNode ret (return value: cc.ParticleBatchNode) +-------------------------------- +-- @function [parent=#ParticleBatchNode] addChild +-- @param self +-- @param #cc.Node node +-- @param #int int +-- @param #int int + +-------------------------------- +-- @function [parent=#ParticleBatchNode] draw +-- @param self +-- @param #cc.Renderer renderer +-- @param #kmMat4 kmmat4 +-- @param #bool bool + +-------------------------------- +-- @function [parent=#ParticleBatchNode] visit +-- @param self +-- @param #cc.Renderer renderer +-- @param #kmMat4 kmmat4 +-- @param #bool bool + +-------------------------------- +-- @function [parent=#ParticleBatchNode] reorderChild +-- @param self +-- @param #cc.Node node +-- @param #int int + +-------------------------------- +-- @function [parent=#ParticleBatchNode] removeChild +-- @param self +-- @param #cc.Node node +-- @param #bool bool + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/ParticleDisplayData.lua b/cocos/scripting/lua-bindings/auto/api/ParticleDisplayData.lua index 9a5099fabc..910bfa64e0 100644 --- a/cocos/scripting/lua-bindings/auto/api/ParticleDisplayData.lua +++ b/cocos/scripting/lua-bindings/auto/api/ParticleDisplayData.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module ParticleDisplayData +-- @extend DisplayData + -------------------------------- -- @function [parent=#ParticleDisplayData] create -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/ParticleExplosion.lua b/cocos/scripting/lua-bindings/auto/api/ParticleExplosion.lua index f8d3bccb12..f6e10aaf57 100644 --- a/cocos/scripting/lua-bindings/auto/api/ParticleExplosion.lua +++ b/cocos/scripting/lua-bindings/auto/api/ParticleExplosion.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module ParticleExplosion +-- @extend ParticleSystemQuad + -------------------------------- -- @function [parent=#ParticleExplosion] create -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/ParticleFire.lua b/cocos/scripting/lua-bindings/auto/api/ParticleFire.lua index 5ae44b4045..b7d09c2e9a 100644 --- a/cocos/scripting/lua-bindings/auto/api/ParticleFire.lua +++ b/cocos/scripting/lua-bindings/auto/api/ParticleFire.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module ParticleFire +-- @extend ParticleSystemQuad + -------------------------------- -- @function [parent=#ParticleFire] create -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/ParticleFireworks.lua b/cocos/scripting/lua-bindings/auto/api/ParticleFireworks.lua index b074b8b494..b39bbe2d99 100644 --- a/cocos/scripting/lua-bindings/auto/api/ParticleFireworks.lua +++ b/cocos/scripting/lua-bindings/auto/api/ParticleFireworks.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module ParticleFireworks +-- @extend ParticleSystemQuad + -------------------------------- -- @function [parent=#ParticleFireworks] create -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/ParticleFlower.lua b/cocos/scripting/lua-bindings/auto/api/ParticleFlower.lua index a5fb4482ac..04835a1545 100644 --- a/cocos/scripting/lua-bindings/auto/api/ParticleFlower.lua +++ b/cocos/scripting/lua-bindings/auto/api/ParticleFlower.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module ParticleFlower +-- @extend ParticleSystemQuad + -------------------------------- -- @function [parent=#ParticleFlower] create -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/ParticleGalaxy.lua b/cocos/scripting/lua-bindings/auto/api/ParticleGalaxy.lua index 64fe8a0cb5..48aa8d0704 100644 --- a/cocos/scripting/lua-bindings/auto/api/ParticleGalaxy.lua +++ b/cocos/scripting/lua-bindings/auto/api/ParticleGalaxy.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module ParticleGalaxy +-- @extend ParticleSystemQuad + -------------------------------- -- @function [parent=#ParticleGalaxy] create -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/ParticleMeteor.lua b/cocos/scripting/lua-bindings/auto/api/ParticleMeteor.lua index 630deb7b20..1cabc5d89d 100644 --- a/cocos/scripting/lua-bindings/auto/api/ParticleMeteor.lua +++ b/cocos/scripting/lua-bindings/auto/api/ParticleMeteor.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module ParticleMeteor +-- @extend ParticleSystemQuad + -------------------------------- -- @function [parent=#ParticleMeteor] create -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/ParticleRain.lua b/cocos/scripting/lua-bindings/auto/api/ParticleRain.lua index adec94d477..31241f1f28 100644 --- a/cocos/scripting/lua-bindings/auto/api/ParticleRain.lua +++ b/cocos/scripting/lua-bindings/auto/api/ParticleRain.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module ParticleRain +-- @extend ParticleSystemQuad + -------------------------------- -- @function [parent=#ParticleRain] create -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/ParticleSmoke.lua b/cocos/scripting/lua-bindings/auto/api/ParticleSmoke.lua index c2f64bec54..fd4eb82e33 100644 --- a/cocos/scripting/lua-bindings/auto/api/ParticleSmoke.lua +++ b/cocos/scripting/lua-bindings/auto/api/ParticleSmoke.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module ParticleSmoke +-- @extend ParticleSystemQuad + -------------------------------- -- @function [parent=#ParticleSmoke] create -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/ParticleSnow.lua b/cocos/scripting/lua-bindings/auto/api/ParticleSnow.lua index 1d46180f1a..d5097a65ed 100644 --- a/cocos/scripting/lua-bindings/auto/api/ParticleSnow.lua +++ b/cocos/scripting/lua-bindings/auto/api/ParticleSnow.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module ParticleSnow +-- @extend ParticleSystemQuad + -------------------------------- -- @function [parent=#ParticleSnow] create -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/ParticleSpiral.lua b/cocos/scripting/lua-bindings/auto/api/ParticleSpiral.lua index 5a435b0d33..ae8f232bc8 100644 --- a/cocos/scripting/lua-bindings/auto/api/ParticleSpiral.lua +++ b/cocos/scripting/lua-bindings/auto/api/ParticleSpiral.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module ParticleSpiral +-- @extend ParticleSystemQuad + -------------------------------- -- @function [parent=#ParticleSpiral] create -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/ParticleSun.lua b/cocos/scripting/lua-bindings/auto/api/ParticleSun.lua index 32d361092f..b2e39db889 100644 --- a/cocos/scripting/lua-bindings/auto/api/ParticleSun.lua +++ b/cocos/scripting/lua-bindings/auto/api/ParticleSun.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module ParticleSun +-- @extend ParticleSystemQuad + -------------------------------- -- @function [parent=#ParticleSun] create -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/ParticleSystem.lua b/cocos/scripting/lua-bindings/auto/api/ParticleSystem.lua index a79302d7c3..4c463ae45f 100644 --- a/cocos/scripting/lua-bindings/auto/api/ParticleSystem.lua +++ b/cocos/scripting/lua-bindings/auto/api/ParticleSystem.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module ParticleSystem +-- @extend Node,TextureProtocol, + -------------------------------- -- @function [parent=#ParticleSystem] getStartSizeVar -- @param self @@ -510,4 +512,9 @@ -- @param #int int -- @return ParticleSystem#ParticleSystem ret (return value: cc.ParticleSystem) +-------------------------------- +-- @function [parent=#ParticleSystem] update +-- @param self +-- @param #float float + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/ParticleSystemQuad.lua b/cocos/scripting/lua-bindings/auto/api/ParticleSystemQuad.lua index de9ab07eff..b725a61d3b 100644 --- a/cocos/scripting/lua-bindings/auto/api/ParticleSystemQuad.lua +++ b/cocos/scripting/lua-bindings/auto/api/ParticleSystemQuad.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module ParticleSystemQuad +-- @extend ParticleSystem + -------------------------------- -- @function [parent=#ParticleSystemQuad] setDisplayFrame -- @param self @@ -28,4 +30,9 @@ -- @param #int int -- @return ParticleSystemQuad#ParticleSystemQuad ret (return value: cc.ParticleSystemQuad) +-------------------------------- +-- @function [parent=#ParticleSystemQuad] getDescription +-- @param self +-- @return string#string ret (return value: string) + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/PhysicsBody.lua b/cocos/scripting/lua-bindings/auto/api/PhysicsBody.lua index a611fb7553..ac33c207bf 100644 --- a/cocos/scripting/lua-bindings/auto/api/PhysicsBody.lua +++ b/cocos/scripting/lua-bindings/auto/api/PhysicsBody.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module PhysicsBody +-- @extend Ref + -------------------------------- -- @function [parent=#PhysicsBody] isGravityEnabled -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/PhysicsContact.lua b/cocos/scripting/lua-bindings/auto/api/PhysicsContact.lua index 5bbe33c633..01403efdb8 100644 --- a/cocos/scripting/lua-bindings/auto/api/PhysicsContact.lua +++ b/cocos/scripting/lua-bindings/auto/api/PhysicsContact.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module PhysicsContact +-- @extend EventCustom + -------------------------------- -- @function [parent=#PhysicsContact] getContactData -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/PhysicsContactPostSolve.lua b/cocos/scripting/lua-bindings/auto/api/PhysicsContactPostSolve.lua index 9ee6b2bfd6..ddcac2a6d5 100644 --- a/cocos/scripting/lua-bindings/auto/api/PhysicsContactPostSolve.lua +++ b/cocos/scripting/lua-bindings/auto/api/PhysicsContactPostSolve.lua @@ -1,6 +1,7 @@ -------------------------------- -- @module PhysicsContactPostSolve + -------------------------------- -- @function [parent=#PhysicsContactPostSolve] getFriction -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/PhysicsContactPreSolve.lua b/cocos/scripting/lua-bindings/auto/api/PhysicsContactPreSolve.lua index 0971058e55..06228e0914 100644 --- a/cocos/scripting/lua-bindings/auto/api/PhysicsContactPreSolve.lua +++ b/cocos/scripting/lua-bindings/auto/api/PhysicsContactPreSolve.lua @@ -1,6 +1,7 @@ -------------------------------- -- @module PhysicsContactPreSolve + -------------------------------- -- @function [parent=#PhysicsContactPreSolve] getFriction -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/PhysicsDebugDraw.lua b/cocos/scripting/lua-bindings/auto/api/PhysicsDebugDraw.lua index 66e9efb13b..1715d4fb46 100644 --- a/cocos/scripting/lua-bindings/auto/api/PhysicsDebugDraw.lua +++ b/cocos/scripting/lua-bindings/auto/api/PhysicsDebugDraw.lua @@ -1,4 +1,5 @@ -------------------------------- -- @module PhysicsDebugDraw + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/PhysicsJoint.lua b/cocos/scripting/lua-bindings/auto/api/PhysicsJoint.lua index ab7b41656e..b61f0b3936 100644 --- a/cocos/scripting/lua-bindings/auto/api/PhysicsJoint.lua +++ b/cocos/scripting/lua-bindings/auto/api/PhysicsJoint.lua @@ -1,6 +1,7 @@ -------------------------------- -- @module PhysicsJoint + -------------------------------- -- @function [parent=#PhysicsJoint] getBodyA -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/PhysicsJointDistance.lua b/cocos/scripting/lua-bindings/auto/api/PhysicsJointDistance.lua index 46275610ed..83f0516223 100644 --- a/cocos/scripting/lua-bindings/auto/api/PhysicsJointDistance.lua +++ b/cocos/scripting/lua-bindings/auto/api/PhysicsJointDistance.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module PhysicsJointDistance +-- @extend PhysicsJoint + -------------------------------- -- @function [parent=#PhysicsJointDistance] setDistance -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/PhysicsJointFixed.lua b/cocos/scripting/lua-bindings/auto/api/PhysicsJointFixed.lua index 02cff92e5f..33247fd85c 100644 --- a/cocos/scripting/lua-bindings/auto/api/PhysicsJointFixed.lua +++ b/cocos/scripting/lua-bindings/auto/api/PhysicsJointFixed.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module PhysicsJointFixed +-- @extend PhysicsJoint + -------------------------------- -- @function [parent=#PhysicsJointFixed] construct -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/PhysicsJointGear.lua b/cocos/scripting/lua-bindings/auto/api/PhysicsJointGear.lua index d0bfd887fd..641cf3cb5a 100644 --- a/cocos/scripting/lua-bindings/auto/api/PhysicsJointGear.lua +++ b/cocos/scripting/lua-bindings/auto/api/PhysicsJointGear.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module PhysicsJointGear +-- @extend PhysicsJoint + -------------------------------- -- @function [parent=#PhysicsJointGear] setRatio -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/PhysicsJointGroove.lua b/cocos/scripting/lua-bindings/auto/api/PhysicsJointGroove.lua index d167283aac..70926c23d4 100644 --- a/cocos/scripting/lua-bindings/auto/api/PhysicsJointGroove.lua +++ b/cocos/scripting/lua-bindings/auto/api/PhysicsJointGroove.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module PhysicsJointGroove +-- @extend PhysicsJoint + -------------------------------- -- @function [parent=#PhysicsJointGroove] setAnchr2 -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/PhysicsJointLimit.lua b/cocos/scripting/lua-bindings/auto/api/PhysicsJointLimit.lua index b8472579a0..fc88a72376 100644 --- a/cocos/scripting/lua-bindings/auto/api/PhysicsJointLimit.lua +++ b/cocos/scripting/lua-bindings/auto/api/PhysicsJointLimit.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module PhysicsJointLimit +-- @extend PhysicsJoint + -------------------------------- -- @function [parent=#PhysicsJointLimit] setAnchr2 -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/PhysicsJointMotor.lua b/cocos/scripting/lua-bindings/auto/api/PhysicsJointMotor.lua index f40d92c105..f6e625aa2e 100644 --- a/cocos/scripting/lua-bindings/auto/api/PhysicsJointMotor.lua +++ b/cocos/scripting/lua-bindings/auto/api/PhysicsJointMotor.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module PhysicsJointMotor +-- @extend PhysicsJoint + -------------------------------- -- @function [parent=#PhysicsJointMotor] setRate -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/PhysicsJointPin.lua b/cocos/scripting/lua-bindings/auto/api/PhysicsJointPin.lua index 41bf80587e..1fb8084412 100644 --- a/cocos/scripting/lua-bindings/auto/api/PhysicsJointPin.lua +++ b/cocos/scripting/lua-bindings/auto/api/PhysicsJointPin.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module PhysicsJointPin +-- @extend PhysicsJoint + -------------------------------- -- @function [parent=#PhysicsJointPin] construct -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/PhysicsJointRatchet.lua b/cocos/scripting/lua-bindings/auto/api/PhysicsJointRatchet.lua index b0370c4339..44bfc9f012 100644 --- a/cocos/scripting/lua-bindings/auto/api/PhysicsJointRatchet.lua +++ b/cocos/scripting/lua-bindings/auto/api/PhysicsJointRatchet.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module PhysicsJointRatchet +-- @extend PhysicsJoint + -------------------------------- -- @function [parent=#PhysicsJointRatchet] getAngle -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/PhysicsJointRotaryLimit.lua b/cocos/scripting/lua-bindings/auto/api/PhysicsJointRotaryLimit.lua index 376385c24a..88c2ea9b50 100644 --- a/cocos/scripting/lua-bindings/auto/api/PhysicsJointRotaryLimit.lua +++ b/cocos/scripting/lua-bindings/auto/api/PhysicsJointRotaryLimit.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module PhysicsJointRotaryLimit +-- @extend PhysicsJoint + -------------------------------- -- @function [parent=#PhysicsJointRotaryLimit] getMax -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/PhysicsJointRotarySpring.lua b/cocos/scripting/lua-bindings/auto/api/PhysicsJointRotarySpring.lua index 283a002ce6..05a8f6d99d 100644 --- a/cocos/scripting/lua-bindings/auto/api/PhysicsJointRotarySpring.lua +++ b/cocos/scripting/lua-bindings/auto/api/PhysicsJointRotarySpring.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module PhysicsJointRotarySpring +-- @extend PhysicsJoint + -------------------------------- -- @function [parent=#PhysicsJointRotarySpring] getDamping -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/PhysicsJointSpring.lua b/cocos/scripting/lua-bindings/auto/api/PhysicsJointSpring.lua index 8080d5d73d..c6b5abc10d 100644 --- a/cocos/scripting/lua-bindings/auto/api/PhysicsJointSpring.lua +++ b/cocos/scripting/lua-bindings/auto/api/PhysicsJointSpring.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module PhysicsJointSpring +-- @extend PhysicsJoint + -------------------------------- -- @function [parent=#PhysicsJointSpring] setAnchr2 -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/PhysicsShape.lua b/cocos/scripting/lua-bindings/auto/api/PhysicsShape.lua index 4792debb04..5e0955aba5 100644 --- a/cocos/scripting/lua-bindings/auto/api/PhysicsShape.lua +++ b/cocos/scripting/lua-bindings/auto/api/PhysicsShape.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module PhysicsShape +-- @extend Ref + -------------------------------- -- @function [parent=#PhysicsShape] getFriction -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/PhysicsShapeBox.lua b/cocos/scripting/lua-bindings/auto/api/PhysicsShapeBox.lua index 84e9fcc05b..3057f9e703 100644 --- a/cocos/scripting/lua-bindings/auto/api/PhysicsShapeBox.lua +++ b/cocos/scripting/lua-bindings/auto/api/PhysicsShapeBox.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module PhysicsShapeBox +-- @extend PhysicsShape + -------------------------------- -- @function [parent=#PhysicsShapeBox] getPointsCount -- @param self @@ -33,4 +35,14 @@ -- @param #point_table point -- @return float#float ret (return value: float) +-------------------------------- +-- @function [parent=#PhysicsShapeBox] getOffset +-- @param self +-- @return point_table#point_table ret (return value: point_table) + +-------------------------------- +-- @function [parent=#PhysicsShapeBox] calculateDefaultMoment +-- @param self +-- @return float#float ret (return value: float) + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/PhysicsShapeCircle.lua b/cocos/scripting/lua-bindings/auto/api/PhysicsShapeCircle.lua index 834877fbff..1130a59728 100644 --- a/cocos/scripting/lua-bindings/auto/api/PhysicsShapeCircle.lua +++ b/cocos/scripting/lua-bindings/auto/api/PhysicsShapeCircle.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module PhysicsShapeCircle +-- @extend PhysicsShape + -------------------------------- -- @function [parent=#PhysicsShapeCircle] getRadius -- @param self @@ -28,4 +30,14 @@ -- @param #point_table point -- @return float#float ret (return value: float) +-------------------------------- +-- @function [parent=#PhysicsShapeCircle] getOffset +-- @param self +-- @return point_table#point_table ret (return value: point_table) + +-------------------------------- +-- @function [parent=#PhysicsShapeCircle] calculateDefaultMoment +-- @param self +-- @return float#float ret (return value: float) + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/PhysicsShapeEdgeBox.lua b/cocos/scripting/lua-bindings/auto/api/PhysicsShapeEdgeBox.lua index ff309ac8a4..a7f1c6a758 100644 --- a/cocos/scripting/lua-bindings/auto/api/PhysicsShapeEdgeBox.lua +++ b/cocos/scripting/lua-bindings/auto/api/PhysicsShapeEdgeBox.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module PhysicsShapeEdgeBox +-- @extend PhysicsShape + -------------------------------- -- @function [parent=#PhysicsShapeEdgeBox] getPointsCount -- @param self @@ -15,4 +17,9 @@ -- @param #point_table point -- @return PhysicsShapeEdgeBox#PhysicsShapeEdgeBox ret (return value: cc.PhysicsShapeEdgeBox) +-------------------------------- +-- @function [parent=#PhysicsShapeEdgeBox] getOffset +-- @param self +-- @return point_table#point_table ret (return value: point_table) + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/PhysicsShapeEdgeChain.lua b/cocos/scripting/lua-bindings/auto/api/PhysicsShapeEdgeChain.lua index 373adbca00..1252504026 100644 --- a/cocos/scripting/lua-bindings/auto/api/PhysicsShapeEdgeChain.lua +++ b/cocos/scripting/lua-bindings/auto/api/PhysicsShapeEdgeChain.lua @@ -1,9 +1,16 @@ -------------------------------- -- @module PhysicsShapeEdgeChain +-- @extend PhysicsShape + -------------------------------- -- @function [parent=#PhysicsShapeEdgeChain] getPointsCount -- @param self -- @return int#int ret (return value: int) +-------------------------------- +-- @function [parent=#PhysicsShapeEdgeChain] getCenter +-- @param self +-- @return point_table#point_table ret (return value: point_table) + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/PhysicsShapeEdgePolygon.lua b/cocos/scripting/lua-bindings/auto/api/PhysicsShapeEdgePolygon.lua index 8a9dea0b9c..7252ef6710 100644 --- a/cocos/scripting/lua-bindings/auto/api/PhysicsShapeEdgePolygon.lua +++ b/cocos/scripting/lua-bindings/auto/api/PhysicsShapeEdgePolygon.lua @@ -1,9 +1,16 @@ -------------------------------- -- @module PhysicsShapeEdgePolygon +-- @extend PhysicsShape + -------------------------------- -- @function [parent=#PhysicsShapeEdgePolygon] getPointsCount -- @param self -- @return int#int ret (return value: int) +-------------------------------- +-- @function [parent=#PhysicsShapeEdgePolygon] getCenter +-- @param self +-- @return point_table#point_table ret (return value: point_table) + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/PhysicsShapeEdgeSegment.lua b/cocos/scripting/lua-bindings/auto/api/PhysicsShapeEdgeSegment.lua index 602d2a48d1..d38127cf9f 100644 --- a/cocos/scripting/lua-bindings/auto/api/PhysicsShapeEdgeSegment.lua +++ b/cocos/scripting/lua-bindings/auto/api/PhysicsShapeEdgeSegment.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module PhysicsShapeEdgeSegment +-- @extend PhysicsShape + -------------------------------- -- @function [parent=#PhysicsShapeEdgeSegment] getPointB -- @param self @@ -20,4 +22,9 @@ -- @param #float float -- @return PhysicsShapeEdgeSegment#PhysicsShapeEdgeSegment ret (return value: cc.PhysicsShapeEdgeSegment) +-------------------------------- +-- @function [parent=#PhysicsShapeEdgeSegment] getCenter +-- @param self +-- @return point_table#point_table ret (return value: point_table) + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/PhysicsShapePolygon.lua b/cocos/scripting/lua-bindings/auto/api/PhysicsShapePolygon.lua index 9c0b737f03..04f349ef73 100644 --- a/cocos/scripting/lua-bindings/auto/api/PhysicsShapePolygon.lua +++ b/cocos/scripting/lua-bindings/auto/api/PhysicsShapePolygon.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module PhysicsShapePolygon +-- @extend PhysicsShape + -------------------------------- -- @function [parent=#PhysicsShapePolygon] getPointsCount -- @param self @@ -12,4 +14,14 @@ -- @param #int int -- @return point_table#point_table ret (return value: point_table) +-------------------------------- +-- @function [parent=#PhysicsShapePolygon] calculateDefaultMoment +-- @param self +-- @return float#float ret (return value: float) + +-------------------------------- +-- @function [parent=#PhysicsShapePolygon] getCenter +-- @param self +-- @return point_table#point_table ret (return value: point_table) + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/PhysicsWorld.lua b/cocos/scripting/lua-bindings/auto/api/PhysicsWorld.lua index a3512a36e7..f773844932 100644 --- a/cocos/scripting/lua-bindings/auto/api/PhysicsWorld.lua +++ b/cocos/scripting/lua-bindings/auto/api/PhysicsWorld.lua @@ -1,6 +1,7 @@ -------------------------------- -- @module PhysicsWorld + -------------------------------- -- @function [parent=#PhysicsWorld] getGravity -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/Place.lua b/cocos/scripting/lua-bindings/auto/api/Place.lua index ab899d512c..5adb1f76cc 100644 --- a/cocos/scripting/lua-bindings/auto/api/Place.lua +++ b/cocos/scripting/lua-bindings/auto/api/Place.lua @@ -1,10 +1,27 @@ -------------------------------- -- @module Place +-- @extend ActionInstant + -------------------------------- -- @function [parent=#Place] create -- @param self -- @param #point_table point -- @return Place#Place ret (return value: cc.Place) +-------------------------------- +-- @function [parent=#Place] clone +-- @param self +-- @return Place#Place ret (return value: cc.Place) + +-------------------------------- +-- @function [parent=#Place] update +-- @param self +-- @param #float float + +-------------------------------- +-- @function [parent=#Place] reverse +-- @param self +-- @return Place#Place ret (return value: cc.Place) + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/ProgressFromTo.lua b/cocos/scripting/lua-bindings/auto/api/ProgressFromTo.lua index df4dc08b42..865f0ff63f 100644 --- a/cocos/scripting/lua-bindings/auto/api/ProgressFromTo.lua +++ b/cocos/scripting/lua-bindings/auto/api/ProgressFromTo.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module ProgressFromTo +-- @extend ActionInterval + -------------------------------- -- @function [parent=#ProgressFromTo] create -- @param self @@ -9,4 +11,24 @@ -- @param #float float -- @return ProgressFromTo#ProgressFromTo ret (return value: cc.ProgressFromTo) +-------------------------------- +-- @function [parent=#ProgressFromTo] startWithTarget +-- @param self +-- @param #cc.Node node + +-------------------------------- +-- @function [parent=#ProgressFromTo] clone +-- @param self +-- @return ProgressFromTo#ProgressFromTo ret (return value: cc.ProgressFromTo) + +-------------------------------- +-- @function [parent=#ProgressFromTo] reverse +-- @param self +-- @return ProgressFromTo#ProgressFromTo ret (return value: cc.ProgressFromTo) + +-------------------------------- +-- @function [parent=#ProgressFromTo] update +-- @param self +-- @param #float float + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/ProgressTimer.lua b/cocos/scripting/lua-bindings/auto/api/ProgressTimer.lua index ee4c0b69e0..7aab5e1b03 100644 --- a/cocos/scripting/lua-bindings/auto/api/ProgressTimer.lua +++ b/cocos/scripting/lua-bindings/auto/api/ProgressTimer.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module ProgressTimer +-- @extend Node + -------------------------------- -- @function [parent=#ProgressTimer] isReverseDirection -- @param self @@ -71,4 +73,36 @@ -- @param #cc.Sprite sprite -- @return ProgressTimer#ProgressTimer ret (return value: cc.ProgressTimer) +-------------------------------- +-- @function [parent=#ProgressTimer] setAnchorPoint +-- @param self +-- @param #point_table point + +-------------------------------- +-- @function [parent=#ProgressTimer] draw +-- @param self +-- @param #cc.Renderer renderer +-- @param #kmMat4 kmmat4 +-- @param #bool bool + +-------------------------------- +-- @function [parent=#ProgressTimer] setColor +-- @param self +-- @param #color3B_table color3b + +-------------------------------- +-- @function [parent=#ProgressTimer] getColor +-- @param self +-- @return color3B_table#color3B_table ret (return value: color3B_table) + +-------------------------------- +-- @function [parent=#ProgressTimer] setOpacity +-- @param self +-- @param #unsigned char char + +-------------------------------- +-- @function [parent=#ProgressTimer] getOpacity +-- @param self +-- @return unsigned char#unsigned char ret (return value: unsigned char) + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/ProgressTo.lua b/cocos/scripting/lua-bindings/auto/api/ProgressTo.lua index 5e64a84499..cafdded583 100644 --- a/cocos/scripting/lua-bindings/auto/api/ProgressTo.lua +++ b/cocos/scripting/lua-bindings/auto/api/ProgressTo.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module ProgressTo +-- @extend ActionInterval + -------------------------------- -- @function [parent=#ProgressTo] create -- @param self @@ -8,4 +10,24 @@ -- @param #float float -- @return ProgressTo#ProgressTo ret (return value: cc.ProgressTo) +-------------------------------- +-- @function [parent=#ProgressTo] startWithTarget +-- @param self +-- @param #cc.Node node + +-------------------------------- +-- @function [parent=#ProgressTo] clone +-- @param self +-- @return ProgressTo#ProgressTo ret (return value: cc.ProgressTo) + +-------------------------------- +-- @function [parent=#ProgressTo] reverse +-- @param self +-- @return ProgressTo#ProgressTo ret (return value: cc.ProgressTo) + +-------------------------------- +-- @function [parent=#ProgressTo] update +-- @param self +-- @param #float float + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/Ref.lua b/cocos/scripting/lua-bindings/auto/api/Ref.lua index 900db37e4c..9f73f2198d 100644 --- a/cocos/scripting/lua-bindings/auto/api/Ref.lua +++ b/cocos/scripting/lua-bindings/auto/api/Ref.lua @@ -1,6 +1,7 @@ -------------------------------- -- @module Ref + -------------------------------- -- @function [parent=#Ref] release -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/RelativeLayoutParameter.lua b/cocos/scripting/lua-bindings/auto/api/RelativeLayoutParameter.lua index a9a239ad52..2a6fc86e58 100644 --- a/cocos/scripting/lua-bindings/auto/api/RelativeLayoutParameter.lua +++ b/cocos/scripting/lua-bindings/auto/api/RelativeLayoutParameter.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module RelativeLayoutParameter +-- @extend LayoutParameter + -------------------------------- -- @function [parent=#RelativeLayoutParameter] setAlign -- @param self @@ -36,6 +38,16 @@ -- @param self -- @return RelativeLayoutParameter#RelativeLayoutParameter ret (return value: ccui.RelativeLayoutParameter) +-------------------------------- +-- @function [parent=#RelativeLayoutParameter] createCloneInstance +-- @param self +-- @return LayoutParameter#LayoutParameter ret (return value: ccui.LayoutParameter) + +-------------------------------- +-- @function [parent=#RelativeLayoutParameter] copyProperties +-- @param self +-- @param #ccui.LayoutParameter layoutparameter + -------------------------------- -- @function [parent=#RelativeLayoutParameter] RelativeLayoutParameter -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/RemoveSelf.lua b/cocos/scripting/lua-bindings/auto/api/RemoveSelf.lua index deab99d1ca..9aabed71fe 100644 --- a/cocos/scripting/lua-bindings/auto/api/RemoveSelf.lua +++ b/cocos/scripting/lua-bindings/auto/api/RemoveSelf.lua @@ -1,9 +1,26 @@ -------------------------------- -- @module RemoveSelf +-- @extend ActionInstant + -------------------------------- -- @function [parent=#RemoveSelf] create -- @param self -- @return RemoveSelf#RemoveSelf ret (return value: cc.RemoveSelf) +-------------------------------- +-- @function [parent=#RemoveSelf] clone +-- @param self +-- @return RemoveSelf#RemoveSelf ret (return value: cc.RemoveSelf) + +-------------------------------- +-- @function [parent=#RemoveSelf] update +-- @param self +-- @param #float float + +-------------------------------- +-- @function [parent=#RemoveSelf] reverse +-- @param self +-- @return RemoveSelf#RemoveSelf ret (return value: cc.RemoveSelf) + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/RenderTexture.lua b/cocos/scripting/lua-bindings/auto/api/RenderTexture.lua index 5472fef86e..5250f47296 100644 --- a/cocos/scripting/lua-bindings/auto/api/RenderTexture.lua +++ b/cocos/scripting/lua-bindings/auto/api/RenderTexture.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module RenderTexture +-- @extend Node + -------------------------------- -- @function [parent=#RenderTexture] setVirtualViewport -- @param self @@ -163,6 +165,20 @@ -- @param #unsigned int int -- @return RenderTexture#RenderTexture ret (retunr value: cc.RenderTexture) +-------------------------------- +-- @function [parent=#RenderTexture] draw +-- @param self +-- @param #cc.Renderer renderer +-- @param #kmMat4 kmmat4 +-- @param #bool bool + +-------------------------------- +-- @function [parent=#RenderTexture] visit +-- @param self +-- @param #cc.Renderer renderer +-- @param #kmMat4 kmmat4 +-- @param #bool bool + -------------------------------- -- @function [parent=#RenderTexture] RenderTexture -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/Repeat.lua b/cocos/scripting/lua-bindings/auto/api/Repeat.lua index e17bcc5c0f..a63fe7fb38 100644 --- a/cocos/scripting/lua-bindings/auto/api/Repeat.lua +++ b/cocos/scripting/lua-bindings/auto/api/Repeat.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module Repeat +-- @extend ActionInterval + -------------------------------- -- @function [parent=#Repeat] setInnerAction -- @param self @@ -18,4 +20,33 @@ -- @param #unsigned int int -- @return Repeat#Repeat ret (return value: cc.Repeat) +-------------------------------- +-- @function [parent=#Repeat] startWithTarget +-- @param self +-- @param #cc.Node node + +-------------------------------- +-- @function [parent=#Repeat] reverse +-- @param self +-- @return Repeat#Repeat ret (return value: cc.Repeat) + +-------------------------------- +-- @function [parent=#Repeat] clone +-- @param self +-- @return Repeat#Repeat ret (return value: cc.Repeat) + +-------------------------------- +-- @function [parent=#Repeat] stop +-- @param self + +-------------------------------- +-- @function [parent=#Repeat] update +-- @param self +-- @param #float float + +-------------------------------- +-- @function [parent=#Repeat] isDone +-- @param self +-- @return bool#bool ret (return value: bool) + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/RepeatForever.lua b/cocos/scripting/lua-bindings/auto/api/RepeatForever.lua index 85e9b0c6ea..6e32420f61 100644 --- a/cocos/scripting/lua-bindings/auto/api/RepeatForever.lua +++ b/cocos/scripting/lua-bindings/auto/api/RepeatForever.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module RepeatForever +-- @extend ActionInterval + -------------------------------- -- @function [parent=#RepeatForever] setInnerAction -- @param self @@ -17,4 +19,29 @@ -- @param #cc.ActionInterval actioninterval -- @return RepeatForever#RepeatForever ret (return value: cc.RepeatForever) +-------------------------------- +-- @function [parent=#RepeatForever] startWithTarget +-- @param self +-- @param #cc.Node node + +-------------------------------- +-- @function [parent=#RepeatForever] clone +-- @param self +-- @return RepeatForever#RepeatForever ret (return value: cc.RepeatForever) + +-------------------------------- +-- @function [parent=#RepeatForever] isDone +-- @param self +-- @return bool#bool ret (return value: bool) + +-------------------------------- +-- @function [parent=#RepeatForever] reverse +-- @param self +-- @return RepeatForever#RepeatForever ret (return value: cc.RepeatForever) + +-------------------------------- +-- @function [parent=#RepeatForever] step +-- @param self +-- @param #float float + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/ReuseGrid.lua b/cocos/scripting/lua-bindings/auto/api/ReuseGrid.lua index 87d1b725d7..ea1fdbbe18 100644 --- a/cocos/scripting/lua-bindings/auto/api/ReuseGrid.lua +++ b/cocos/scripting/lua-bindings/auto/api/ReuseGrid.lua @@ -1,10 +1,27 @@ -------------------------------- -- @module ReuseGrid +-- @extend ActionInstant + -------------------------------- -- @function [parent=#ReuseGrid] create -- @param self -- @param #int int -- @return ReuseGrid#ReuseGrid ret (return value: cc.ReuseGrid) +-------------------------------- +-- @function [parent=#ReuseGrid] startWithTarget +-- @param self +-- @param #cc.Node node + +-------------------------------- +-- @function [parent=#ReuseGrid] clone +-- @param self +-- @return ReuseGrid#ReuseGrid ret (return value: cc.ReuseGrid) + +-------------------------------- +-- @function [parent=#ReuseGrid] reverse +-- @param self +-- @return ReuseGrid#ReuseGrid ret (return value: cc.ReuseGrid) + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/RichElement.lua b/cocos/scripting/lua-bindings/auto/api/RichElement.lua index 34d4aec0a9..762d7b6480 100644 --- a/cocos/scripting/lua-bindings/auto/api/RichElement.lua +++ b/cocos/scripting/lua-bindings/auto/api/RichElement.lua @@ -1,6 +1,7 @@ -------------------------------- -- @module RichElement + -------------------------------- -- @function [parent=#RichElement] init -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/RichElementCustomNode.lua b/cocos/scripting/lua-bindings/auto/api/RichElementCustomNode.lua index 99943ed0d3..56673221ec 100644 --- a/cocos/scripting/lua-bindings/auto/api/RichElementCustomNode.lua +++ b/cocos/scripting/lua-bindings/auto/api/RichElementCustomNode.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module RichElementCustomNode +-- @extend RichElement + -------------------------------- -- @function [parent=#RichElementCustomNode] init -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/RichElementImage.lua b/cocos/scripting/lua-bindings/auto/api/RichElementImage.lua index 202e67672a..7db74e410e 100644 --- a/cocos/scripting/lua-bindings/auto/api/RichElementImage.lua +++ b/cocos/scripting/lua-bindings/auto/api/RichElementImage.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module RichElementImage +-- @extend RichElement + -------------------------------- -- @function [parent=#RichElementImage] init -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/RichElementText.lua b/cocos/scripting/lua-bindings/auto/api/RichElementText.lua index 5cf922dcf0..0dab3b4583 100644 --- a/cocos/scripting/lua-bindings/auto/api/RichElementText.lua +++ b/cocos/scripting/lua-bindings/auto/api/RichElementText.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module RichElementText +-- @extend RichElement + -------------------------------- -- @function [parent=#RichElementText] init -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/RichText.lua b/cocos/scripting/lua-bindings/auto/api/RichText.lua index 6fadaad8ff..3c181b3a2d 100644 --- a/cocos/scripting/lua-bindings/auto/api/RichText.lua +++ b/cocos/scripting/lua-bindings/auto/api/RichText.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module RichText +-- @extend Widget + -------------------------------- -- @function [parent=#RichText] insertElement -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/Ripple3D.lua b/cocos/scripting/lua-bindings/auto/api/Ripple3D.lua index b0946ad4f3..745418ff1b 100644 --- a/cocos/scripting/lua-bindings/auto/api/Ripple3D.lua +++ b/cocos/scripting/lua-bindings/auto/api/Ripple3D.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module Ripple3D +-- @extend Grid3DAction + -------------------------------- -- @function [parent=#Ripple3D] setAmplitudeRate -- @param self @@ -42,4 +44,14 @@ -- @param #float float -- @return Ripple3D#Ripple3D ret (return value: cc.Ripple3D) +-------------------------------- +-- @function [parent=#Ripple3D] clone +-- @param self +-- @return Ripple3D#Ripple3D ret (return value: cc.Ripple3D) + +-------------------------------- +-- @function [parent=#Ripple3D] update +-- @param self +-- @param #float float + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/RotateBy.lua b/cocos/scripting/lua-bindings/auto/api/RotateBy.lua index e69b7a0129..b4fad54ded 100644 --- a/cocos/scripting/lua-bindings/auto/api/RotateBy.lua +++ b/cocos/scripting/lua-bindings/auto/api/RotateBy.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module RotateBy +-- @extend ActionInterval + -------------------------------- -- overload function: create(float, float, float) -- @@ -15,4 +17,24 @@ -- @param #float float -- @return RotateBy#RotateBy ret (retunr value: cc.RotateBy) +-------------------------------- +-- @function [parent=#RotateBy] startWithTarget +-- @param self +-- @param #cc.Node node + +-------------------------------- +-- @function [parent=#RotateBy] clone +-- @param self +-- @return RotateBy#RotateBy ret (return value: cc.RotateBy) + +-------------------------------- +-- @function [parent=#RotateBy] reverse +-- @param self +-- @return RotateBy#RotateBy ret (return value: cc.RotateBy) + +-------------------------------- +-- @function [parent=#RotateBy] update +-- @param self +-- @param #float float + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/RotateTo.lua b/cocos/scripting/lua-bindings/auto/api/RotateTo.lua index a927eb8c6a..f71848fe75 100644 --- a/cocos/scripting/lua-bindings/auto/api/RotateTo.lua +++ b/cocos/scripting/lua-bindings/auto/api/RotateTo.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module RotateTo +-- @extend ActionInterval + -------------------------------- -- overload function: create(float, float) -- @@ -13,4 +15,24 @@ -- @param #float float -- @return RotateTo#RotateTo ret (retunr value: cc.RotateTo) +-------------------------------- +-- @function [parent=#RotateTo] startWithTarget +-- @param self +-- @param #cc.Node node + +-------------------------------- +-- @function [parent=#RotateTo] clone +-- @param self +-- @return RotateTo#RotateTo ret (return value: cc.RotateTo) + +-------------------------------- +-- @function [parent=#RotateTo] reverse +-- @param self +-- @return RotateTo#RotateTo ret (return value: cc.RotateTo) + +-------------------------------- +-- @function [parent=#RotateTo] update +-- @param self +-- @param #float float + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/Scale9Sprite.lua b/cocos/scripting/lua-bindings/auto/api/Scale9Sprite.lua index 7b27a4ec24..525e13fd4f 100644 --- a/cocos/scripting/lua-bindings/auto/api/Scale9Sprite.lua +++ b/cocos/scripting/lua-bindings/auto/api/Scale9Sprite.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module Scale9Sprite +-- @extend Node + -------------------------------- -- @function [parent=#Scale9Sprite] resizableSpriteWithCapInsets -- @param self @@ -182,6 +184,41 @@ -- @param #rect_table rect -- @return Scale9Sprite#Scale9Sprite ret (retunr value: cc.Scale9Sprite) +-------------------------------- +-- @function [parent=#Scale9Sprite] isOpacityModifyRGB +-- @param self +-- @return bool#bool ret (return value: bool) + +-------------------------------- +-- @function [parent=#Scale9Sprite] setColor +-- @param self +-- @param #color3B_table color3b + +-------------------------------- +-- @function [parent=#Scale9Sprite] setOpacityModifyRGB +-- @param self +-- @param #bool bool + +-------------------------------- +-- @function [parent=#Scale9Sprite] setOpacity +-- @param self +-- @param #unsigned char char + +-------------------------------- +-- @function [parent=#Scale9Sprite] updateDisplayedOpacity +-- @param self +-- @param #unsigned char char + +-------------------------------- +-- @function [parent=#Scale9Sprite] updateDisplayedColor +-- @param self +-- @param #color3B_table color3b + +-------------------------------- +-- @function [parent=#Scale9Sprite] setContentSize +-- @param self +-- @param #size_table size + -------------------------------- -- @function [parent=#Scale9Sprite] Scale9Sprite -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/ScaleBy.lua b/cocos/scripting/lua-bindings/auto/api/ScaleBy.lua index 13e45bee3f..e0bcf117c2 100644 --- a/cocos/scripting/lua-bindings/auto/api/ScaleBy.lua +++ b/cocos/scripting/lua-bindings/auto/api/ScaleBy.lua @@ -1,16 +1,36 @@ -------------------------------- -- @module ScaleBy +-- @extend ScaleTo + -------------------------------- -- overload function: create(float, float, float) -- -- overload function: create(float, float) -- +-- overload function: create(float, float, float, float) +-- -- @function [parent=#ScaleBy] create -- @param self -- @param #float float -- @param #float float -- @param #float float +-- @param #float float -- @return ScaleBy#ScaleBy ret (retunr value: cc.ScaleBy) +-------------------------------- +-- @function [parent=#ScaleBy] startWithTarget +-- @param self +-- @param #cc.Node node + +-------------------------------- +-- @function [parent=#ScaleBy] clone +-- @param self +-- @return ScaleBy#ScaleBy ret (return value: cc.ScaleBy) + +-------------------------------- +-- @function [parent=#ScaleBy] reverse +-- @param self +-- @return ScaleBy#ScaleBy ret (return value: cc.ScaleBy) + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/ScaleTo.lua b/cocos/scripting/lua-bindings/auto/api/ScaleTo.lua index 9e7a5f37c4..df3e9b4901 100644 --- a/cocos/scripting/lua-bindings/auto/api/ScaleTo.lua +++ b/cocos/scripting/lua-bindings/auto/api/ScaleTo.lua @@ -1,16 +1,41 @@ -------------------------------- -- @module ScaleTo +-- @extend ActionInterval + -------------------------------- -- overload function: create(float, float, float) -- -- overload function: create(float, float) -- +-- overload function: create(float, float, float, float) +-- -- @function [parent=#ScaleTo] create -- @param self -- @param #float float -- @param #float float -- @param #float float +-- @param #float float -- @return ScaleTo#ScaleTo ret (retunr value: cc.ScaleTo) +-------------------------------- +-- @function [parent=#ScaleTo] startWithTarget +-- @param self +-- @param #cc.Node node + +-------------------------------- +-- @function [parent=#ScaleTo] clone +-- @param self +-- @return ScaleTo#ScaleTo ret (return value: cc.ScaleTo) + +-------------------------------- +-- @function [parent=#ScaleTo] reverse +-- @param self +-- @return ScaleTo#ScaleTo ret (return value: cc.ScaleTo) + +-------------------------------- +-- @function [parent=#ScaleTo] update +-- @param self +-- @param #float float + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/Scene.lua b/cocos/scripting/lua-bindings/auto/api/Scene.lua index 478824f214..112cdd6a5a 100644 --- a/cocos/scripting/lua-bindings/auto/api/Scene.lua +++ b/cocos/scripting/lua-bindings/auto/api/Scene.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module Scene +-- @extend Node + -------------------------------- -- @function [parent=#Scene] getPhysicsWorld -- @param self @@ -16,4 +18,26 @@ -- @param self -- @return Scene#Scene ret (return value: cc.Scene) +-------------------------------- +-- @function [parent=#Scene] getDescription +-- @param self +-- @return string#string ret (return value: string) + +-------------------------------- +-- @function [parent=#Scene] getScene +-- @param self +-- @return Scene#Scene ret (return value: cc.Scene) + +-------------------------------- +-- @function [parent=#Scene] update +-- @param self +-- @param #float float + +-------------------------------- +-- @function [parent=#Scene] addChild +-- @param self +-- @param #cc.Node node +-- @param #int int +-- @param #int int + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/SceneReader.lua b/cocos/scripting/lua-bindings/auto/api/SceneReader.lua index 1af228cb42..af4616454d 100644 --- a/cocos/scripting/lua-bindings/auto/api/SceneReader.lua +++ b/cocos/scripting/lua-bindings/auto/api/SceneReader.lua @@ -1,6 +1,7 @@ -------------------------------- -- @module SceneReader + -------------------------------- -- @function [parent=#SceneReader] setTarget -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/Scheduler.lua b/cocos/scripting/lua-bindings/auto/api/Scheduler.lua index 27d44ef951..70b3d2a20f 100644 --- a/cocos/scripting/lua-bindings/auto/api/Scheduler.lua +++ b/cocos/scripting/lua-bindings/auto/api/Scheduler.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module Scheduler +-- @extend Ref + -------------------------------- -- @function [parent=#Scheduler] setTimeScale -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/ScrollView.lua b/cocos/scripting/lua-bindings/auto/api/ScrollView.lua index 05ce95c9ee..66b3f739f6 100644 --- a/cocos/scripting/lua-bindings/auto/api/ScrollView.lua +++ b/cocos/scripting/lua-bindings/auto/api/ScrollView.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module ScrollView +-- @extend Layout,UIScrollInterface, + -------------------------------- -- @function [parent=#ScrollView] scrollToTop -- @param self @@ -172,6 +174,118 @@ -- @param self -- @return Ref#Ref ret (return value: cc.Ref) +-------------------------------- +-- overload function: addChild(cc.Node, int) +-- +-- overload function: addChild(cc.Node) +-- +-- overload function: addChild(cc.Node, int, int) +-- +-- @function [parent=#ScrollView] addChild +-- @param self +-- @param #cc.Node node +-- @param #int int +-- @param #int int + +-------------------------------- +-- @function [parent=#ScrollView] getDescription +-- @param self +-- @return string#string ret (return value: string) + +-------------------------------- +-- @function [parent=#ScrollView] removeAllChildren +-- @param self + +-------------------------------- +-- overload function: getChildren() +-- +-- overload function: getChildren() +-- +-- @function [parent=#ScrollView] getChildren +-- @param self +-- @return array_table#array_table ret (retunr value: array_table) + +-------------------------------- +-- @function [parent=#ScrollView] getNodes +-- @param self +-- @return array_table#array_table ret (return value: array_table) + +-------------------------------- +-- @function [parent=#ScrollView] getChildByTag +-- @param self +-- @param #int int +-- @return Node#Node ret (return value: cc.Node) + +-------------------------------- +-- @function [parent=#ScrollView] removeNode +-- @param self +-- @param #cc.Node node + +-------------------------------- +-- @function [parent=#ScrollView] removeNodeByTag +-- @param self +-- @param #int int + +-------------------------------- +-- overload function: addNode(cc.Node, int) +-- +-- overload function: addNode(cc.Node) +-- +-- overload function: addNode(cc.Node, int, int) +-- +-- @function [parent=#ScrollView] addNode +-- @param self +-- @param #cc.Node node +-- @param #int int +-- @param #int int + +-------------------------------- +-- @function [parent=#ScrollView] getLayoutType +-- @param self +-- @return LayoutType#LayoutType ret (return value: ccui.LayoutType) + +-------------------------------- +-- @function [parent=#ScrollView] removeAllChildrenWithCleanup +-- @param self +-- @param #bool bool + +-------------------------------- +-- @function [parent=#ScrollView] update +-- @param self +-- @param #float float + +-------------------------------- +-- @function [parent=#ScrollView] getNodeByTag +-- @param self +-- @param #int int +-- @return Node#Node ret (return value: cc.Node) + +-------------------------------- +-- @function [parent=#ScrollView] getChildByName +-- @param self +-- @param #char char +-- @return Widget#Widget ret (return value: ccui.Widget) + +-------------------------------- +-- @function [parent=#ScrollView] removeAllNodes +-- @param self + +-------------------------------- +-- @function [parent=#ScrollView] removeChild +-- @param self +-- @param #cc.Node node +-- @param #bool bool + +-------------------------------- +-- @function [parent=#ScrollView] getChildrenCount +-- @param self +-- @return long#long ret (return value: long) + +-------------------------------- +-- @function [parent=#ScrollView] setLayoutType +-- @param self +-- @param #ccui.LayoutType layouttype + -------------------------------- -- @function [parent=#ScrollView] ScrollView -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/Sequence.lua b/cocos/scripting/lua-bindings/auto/api/Sequence.lua index e770e7190c..0de4aabb13 100644 --- a/cocos/scripting/lua-bindings/auto/api/Sequence.lua +++ b/cocos/scripting/lua-bindings/auto/api/Sequence.lua @@ -1,4 +1,30 @@ -------------------------------- -- @module Sequence +-- @extend ActionInterval + +-------------------------------- +-- @function [parent=#Sequence] startWithTarget +-- @param self +-- @param #cc.Node node + +-------------------------------- +-- @function [parent=#Sequence] clone +-- @param self +-- @return Sequence#Sequence ret (return value: cc.Sequence) + +-------------------------------- +-- @function [parent=#Sequence] stop +-- @param self + +-------------------------------- +-- @function [parent=#Sequence] reverse +-- @param self +-- @return Sequence#Sequence ret (return value: cc.Sequence) + +-------------------------------- +-- @function [parent=#Sequence] update +-- @param self +-- @param #float float + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/ShaderCache.lua b/cocos/scripting/lua-bindings/auto/api/ShaderCache.lua index 3bf11af57b..3447ae9099 100644 --- a/cocos/scripting/lua-bindings/auto/api/ShaderCache.lua +++ b/cocos/scripting/lua-bindings/auto/api/ShaderCache.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module ShaderCache +-- @extend Ref + -------------------------------- -- @function [parent=#ShaderCache] reloadDefaultShaders -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/Shaky3D.lua b/cocos/scripting/lua-bindings/auto/api/Shaky3D.lua index 90375bb571..b60ac1eace 100644 --- a/cocos/scripting/lua-bindings/auto/api/Shaky3D.lua +++ b/cocos/scripting/lua-bindings/auto/api/Shaky3D.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module Shaky3D +-- @extend Grid3DAction + -------------------------------- -- @function [parent=#Shaky3D] create -- @param self @@ -10,6 +12,16 @@ -- @param #bool bool -- @return Shaky3D#Shaky3D ret (return value: cc.Shaky3D) +-------------------------------- +-- @function [parent=#Shaky3D] clone +-- @param self +-- @return Shaky3D#Shaky3D ret (return value: cc.Shaky3D) + +-------------------------------- +-- @function [parent=#Shaky3D] update +-- @param self +-- @param #float float + -------------------------------- -- @function [parent=#Shaky3D] Shaky3D -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/ShakyTiles3D.lua b/cocos/scripting/lua-bindings/auto/api/ShakyTiles3D.lua index 7c47dec8e8..320b282b32 100644 --- a/cocos/scripting/lua-bindings/auto/api/ShakyTiles3D.lua +++ b/cocos/scripting/lua-bindings/auto/api/ShakyTiles3D.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module ShakyTiles3D +-- @extend TiledGrid3DAction + -------------------------------- -- @function [parent=#ShakyTiles3D] create -- @param self @@ -10,4 +12,14 @@ -- @param #bool bool -- @return ShakyTiles3D#ShakyTiles3D ret (return value: cc.ShakyTiles3D) +-------------------------------- +-- @function [parent=#ShakyTiles3D] clone +-- @param self +-- @return ShakyTiles3D#ShakyTiles3D ret (return value: cc.ShakyTiles3D) + +-------------------------------- +-- @function [parent=#ShakyTiles3D] update +-- @param self +-- @param #float float + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/ShatteredTiles3D.lua b/cocos/scripting/lua-bindings/auto/api/ShatteredTiles3D.lua index 537a3f70db..818e0c9df3 100644 --- a/cocos/scripting/lua-bindings/auto/api/ShatteredTiles3D.lua +++ b/cocos/scripting/lua-bindings/auto/api/ShatteredTiles3D.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module ShatteredTiles3D +-- @extend TiledGrid3DAction + -------------------------------- -- @function [parent=#ShatteredTiles3D] create -- @param self @@ -10,4 +12,14 @@ -- @param #bool bool -- @return ShatteredTiles3D#ShatteredTiles3D ret (return value: cc.ShatteredTiles3D) +-------------------------------- +-- @function [parent=#ShatteredTiles3D] clone +-- @param self +-- @return ShatteredTiles3D#ShatteredTiles3D ret (return value: cc.ShatteredTiles3D) + +-------------------------------- +-- @function [parent=#ShatteredTiles3D] update +-- @param self +-- @param #float float + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/Show.lua b/cocos/scripting/lua-bindings/auto/api/Show.lua index b787fe9124..fe81f1e7eb 100644 --- a/cocos/scripting/lua-bindings/auto/api/Show.lua +++ b/cocos/scripting/lua-bindings/auto/api/Show.lua @@ -1,9 +1,26 @@ -------------------------------- -- @module Show +-- @extend ActionInstant + -------------------------------- -- @function [parent=#Show] create -- @param self -- @return Show#Show ret (return value: cc.Show) +-------------------------------- +-- @function [parent=#Show] clone +-- @param self +-- @return Show#Show ret (return value: cc.Show) + +-------------------------------- +-- @function [parent=#Show] update +-- @param self +-- @param #float float + +-------------------------------- +-- @function [parent=#Show] reverse +-- @param self +-- @return ActionInstant#ActionInstant ret (return value: cc.ActionInstant) + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/ShuffleTiles.lua b/cocos/scripting/lua-bindings/auto/api/ShuffleTiles.lua index 013d95fbb7..9053a3efe4 100644 --- a/cocos/scripting/lua-bindings/auto/api/ShuffleTiles.lua +++ b/cocos/scripting/lua-bindings/auto/api/ShuffleTiles.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module ShuffleTiles +-- @extend TiledGrid3DAction + -------------------------------- -- @function [parent=#ShuffleTiles] placeTile -- @param self @@ -27,4 +29,19 @@ -- @param #unsigned int int -- @return ShuffleTiles#ShuffleTiles ret (return value: cc.ShuffleTiles) +-------------------------------- +-- @function [parent=#ShuffleTiles] startWithTarget +-- @param self +-- @param #cc.Node node + +-------------------------------- +-- @function [parent=#ShuffleTiles] clone +-- @param self +-- @return ShuffleTiles#ShuffleTiles ret (return value: cc.ShuffleTiles) + +-------------------------------- +-- @function [parent=#ShuffleTiles] update +-- @param self +-- @param #float float + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/SimpleAudioEngine.lua b/cocos/scripting/lua-bindings/auto/api/SimpleAudioEngine.lua index 0c41707144..7bc5880661 100644 --- a/cocos/scripting/lua-bindings/auto/api/SimpleAudioEngine.lua +++ b/cocos/scripting/lua-bindings/auto/api/SimpleAudioEngine.lua @@ -1,6 +1,7 @@ -------------------------------- -- @module SimpleAudioEngine + -------------------------------- -- @function [parent=#SimpleAudioEngine] preloadBackgroundMusic -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/Skeleton.lua b/cocos/scripting/lua-bindings/auto/api/Skeleton.lua index 26450b884b..6037658be9 100644 --- a/cocos/scripting/lua-bindings/auto/api/Skeleton.lua +++ b/cocos/scripting/lua-bindings/auto/api/Skeleton.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module Skeleton +-- @extend Node,BlendProtocol, + -------------------------------- -- @function [parent=#Skeleton] setToSetupPose -- @param self @@ -35,4 +37,17 @@ -- @function [parent=#Skeleton] setBonesToSetupPose -- @param self +-------------------------------- +-- @function [parent=#Skeleton] getBoundingBox +-- @param self +-- @return rect_table#rect_table ret (return value: rect_table) + +-------------------------------- +-- @function [parent=#Skeleton] onEnter +-- @param self + +-------------------------------- +-- @function [parent=#Skeleton] onExit +-- @param self + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/SkeletonAnimation.lua b/cocos/scripting/lua-bindings/auto/api/SkeletonAnimation.lua index 0dc15cd0e1..858e67ed53 100644 --- a/cocos/scripting/lua-bindings/auto/api/SkeletonAnimation.lua +++ b/cocos/scripting/lua-bindings/auto/api/SkeletonAnimation.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module SkeletonAnimation +-- @extend Skeleton + -------------------------------- -- @function [parent=#SkeletonAnimation] addAnimation -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/SkewBy.lua b/cocos/scripting/lua-bindings/auto/api/SkewBy.lua index 5a4c3fe0dd..e8d8b605ac 100644 --- a/cocos/scripting/lua-bindings/auto/api/SkewBy.lua +++ b/cocos/scripting/lua-bindings/auto/api/SkewBy.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module SkewBy +-- @extend SkewTo + -------------------------------- -- @function [parent=#SkewBy] create -- @param self @@ -9,4 +11,19 @@ -- @param #float float -- @return SkewBy#SkewBy ret (return value: cc.SkewBy) +-------------------------------- +-- @function [parent=#SkewBy] startWithTarget +-- @param self +-- @param #cc.Node node + +-------------------------------- +-- @function [parent=#SkewBy] clone +-- @param self +-- @return SkewBy#SkewBy ret (return value: cc.SkewBy) + +-------------------------------- +-- @function [parent=#SkewBy] reverse +-- @param self +-- @return SkewBy#SkewBy ret (return value: cc.SkewBy) + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/SkewTo.lua b/cocos/scripting/lua-bindings/auto/api/SkewTo.lua index bae9ddba3b..03c3a707e3 100644 --- a/cocos/scripting/lua-bindings/auto/api/SkewTo.lua +++ b/cocos/scripting/lua-bindings/auto/api/SkewTo.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module SkewTo +-- @extend ActionInterval + -------------------------------- -- @function [parent=#SkewTo] create -- @param self @@ -9,4 +11,24 @@ -- @param #float float -- @return SkewTo#SkewTo ret (return value: cc.SkewTo) +-------------------------------- +-- @function [parent=#SkewTo] startWithTarget +-- @param self +-- @param #cc.Node node + +-------------------------------- +-- @function [parent=#SkewTo] clone +-- @param self +-- @return SkewTo#SkewTo ret (return value: cc.SkewTo) + +-------------------------------- +-- @function [parent=#SkewTo] reverse +-- @param self +-- @return SkewTo#SkewTo ret (return value: cc.SkewTo) + +-------------------------------- +-- @function [parent=#SkewTo] update +-- @param self +-- @param #float float + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/Skin.lua b/cocos/scripting/lua-bindings/auto/api/Skin.lua index 22e20b8061..c2ca170fed 100644 --- a/cocos/scripting/lua-bindings/auto/api/Skin.lua +++ b/cocos/scripting/lua-bindings/auto/api/Skin.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module Skin +-- @extend Sprite + -------------------------------- -- @function [parent=#Skin] getBone -- @param self @@ -53,6 +55,22 @@ -- @param #string str -- @return Skin#Skin ret (return value: ccs.Skin) +-------------------------------- +-- @function [parent=#Skin] updateTransform +-- @param self + +-------------------------------- +-- @function [parent=#Skin] getNodeToWorldTransform +-- @param self +-- @return kmMat4#kmMat4 ret (return value: kmMat4) + +-------------------------------- +-- @function [parent=#Skin] draw +-- @param self +-- @param #cc.Renderer renderer +-- @param #kmMat4 kmmat4 +-- @param #bool bool + -------------------------------- -- @function [parent=#Skin] Skin -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/Slider.lua b/cocos/scripting/lua-bindings/auto/api/Slider.lua index b2793869c7..2e6bbacca6 100644 --- a/cocos/scripting/lua-bindings/auto/api/Slider.lua +++ b/cocos/scripting/lua-bindings/auto/api/Slider.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module Slider +-- @extend Widget + -------------------------------- -- @function [parent=#Slider] setPercent -- @param self @@ -94,6 +96,26 @@ -- @param self -- @return Ref#Ref ret (return value: cc.Ref) +-------------------------------- +-- @function [parent=#Slider] getVirtualRenderer +-- @param self +-- @return Node#Node ret (return value: cc.Node) + +-------------------------------- +-- @function [parent=#Slider] ignoreContentAdaptWithSize +-- @param self +-- @param #bool bool + +-------------------------------- +-- @function [parent=#Slider] getDescription +-- @param self +-- @return string#string ret (return value: string) + +-------------------------------- +-- @function [parent=#Slider] getContentSize +-- @param self +-- @return size_table#size_table ret (return value: size_table) + -------------------------------- -- @function [parent=#Slider] Slider -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/Spawn.lua b/cocos/scripting/lua-bindings/auto/api/Spawn.lua index af95c460d7..0fc18f7b83 100644 --- a/cocos/scripting/lua-bindings/auto/api/Spawn.lua +++ b/cocos/scripting/lua-bindings/auto/api/Spawn.lua @@ -1,4 +1,30 @@ -------------------------------- -- @module Spawn +-- @extend ActionInterval + +-------------------------------- +-- @function [parent=#Spawn] startWithTarget +-- @param self +-- @param #cc.Node node + +-------------------------------- +-- @function [parent=#Spawn] clone +-- @param self +-- @return Spawn#Spawn ret (return value: cc.Spawn) + +-------------------------------- +-- @function [parent=#Spawn] stop +-- @param self + +-------------------------------- +-- @function [parent=#Spawn] reverse +-- @param self +-- @return Spawn#Spawn ret (return value: cc.Spawn) + +-------------------------------- +-- @function [parent=#Spawn] update +-- @param self +-- @param #float float + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/Speed.lua b/cocos/scripting/lua-bindings/auto/api/Speed.lua index 219d9fbbde..d93ad0a6d1 100644 --- a/cocos/scripting/lua-bindings/auto/api/Speed.lua +++ b/cocos/scripting/lua-bindings/auto/api/Speed.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module Speed +-- @extend Action + -------------------------------- -- @function [parent=#Speed] setInnerAction -- @param self @@ -28,4 +30,33 @@ -- @param #float float -- @return Speed#Speed ret (return value: cc.Speed) +-------------------------------- +-- @function [parent=#Speed] startWithTarget +-- @param self +-- @param #cc.Node node + +-------------------------------- +-- @function [parent=#Speed] reverse +-- @param self +-- @return Speed#Speed ret (return value: cc.Speed) + +-------------------------------- +-- @function [parent=#Speed] clone +-- @param self +-- @return Speed#Speed ret (return value: cc.Speed) + +-------------------------------- +-- @function [parent=#Speed] stop +-- @param self + +-------------------------------- +-- @function [parent=#Speed] step +-- @param self +-- @param #float float + +-------------------------------- +-- @function [parent=#Speed] isDone +-- @param self +-- @return bool#bool ret (return value: bool) + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/SplitCols.lua b/cocos/scripting/lua-bindings/auto/api/SplitCols.lua index 821f093efa..c2398a1ca5 100644 --- a/cocos/scripting/lua-bindings/auto/api/SplitCols.lua +++ b/cocos/scripting/lua-bindings/auto/api/SplitCols.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module SplitCols +-- @extend TiledGrid3DAction + -------------------------------- -- @function [parent=#SplitCols] create -- @param self @@ -8,4 +10,19 @@ -- @param #unsigned int int -- @return SplitCols#SplitCols ret (return value: cc.SplitCols) +-------------------------------- +-- @function [parent=#SplitCols] startWithTarget +-- @param self +-- @param #cc.Node node + +-------------------------------- +-- @function [parent=#SplitCols] clone +-- @param self +-- @return SplitCols#SplitCols ret (return value: cc.SplitCols) + +-------------------------------- +-- @function [parent=#SplitCols] update +-- @param self +-- @param #float float + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/SplitRows.lua b/cocos/scripting/lua-bindings/auto/api/SplitRows.lua index f2e5566cc0..703f9b871a 100644 --- a/cocos/scripting/lua-bindings/auto/api/SplitRows.lua +++ b/cocos/scripting/lua-bindings/auto/api/SplitRows.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module SplitRows +-- @extend TiledGrid3DAction + -------------------------------- -- @function [parent=#SplitRows] create -- @param self @@ -8,4 +10,19 @@ -- @param #unsigned int int -- @return SplitRows#SplitRows ret (return value: cc.SplitRows) +-------------------------------- +-- @function [parent=#SplitRows] startWithTarget +-- @param self +-- @param #cc.Node node + +-------------------------------- +-- @function [parent=#SplitRows] clone +-- @param self +-- @return SplitRows#SplitRows ret (return value: cc.SplitRows) + +-------------------------------- +-- @function [parent=#SplitRows] update +-- @param self +-- @param #float float + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/Sprite.lua b/cocos/scripting/lua-bindings/auto/api/Sprite.lua index aa4eba19a7..a08c3271d1 100644 --- a/cocos/scripting/lua-bindings/auto/api/Sprite.lua +++ b/cocos/scripting/lua-bindings/auto/api/Sprite.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module Sprite +-- @extend Node,TextureProtocol, + -------------------------------- -- overload function: setSpriteFrame(cc.SpriteFrame) -- @@ -178,4 +180,114 @@ -- @param #cc.SpriteFrame spriteframe -- @return Sprite#Sprite ret (return value: cc.Sprite) +-------------------------------- +-- @function [parent=#Sprite] draw +-- @param self +-- @param #cc.Renderer renderer +-- @param #kmMat4 kmmat4 +-- @param #bool bool + +-------------------------------- +-- @function [parent=#Sprite] addChild +-- @param self +-- @param #cc.Node node +-- @param #int int +-- @param #int int + +-------------------------------- +-- @function [parent=#Sprite] setScaleY +-- @param self +-- @param #float float + +-------------------------------- +-- @function [parent=#Sprite] setScaleX +-- @param self +-- @param #float float + +-------------------------------- +-- @function [parent=#Sprite] isOpacityModifyRGB +-- @param self +-- @return bool#bool ret (return value: bool) + +-------------------------------- +-- @function [parent=#Sprite] setPositionZ +-- @param self +-- @param #float float + +-------------------------------- +-- @function [parent=#Sprite] setAnchorPoint +-- @param self +-- @param #point_table point + +-------------------------------- +-- @function [parent=#Sprite] setRotationSkewX +-- @param self +-- @param #float float + +-------------------------------- +-- @function [parent=#Sprite] getDescription +-- @param self +-- @return string#string ret (return value: string) + +-------------------------------- +-- @function [parent=#Sprite] setRotationSkewY +-- @param self +-- @param #float float + +-------------------------------- +-- overload function: setScale(float) +-- +-- overload function: setScale(float, float) +-- +-- @function [parent=#Sprite] setScale +-- @param self +-- @param #float float +-- @param #float float + +-------------------------------- +-- @function [parent=#Sprite] reorderChild +-- @param self +-- @param #cc.Node node +-- @param #int int + +-------------------------------- +-- @function [parent=#Sprite] removeChild +-- @param self +-- @param #cc.Node node +-- @param #bool bool + +-------------------------------- +-- @function [parent=#Sprite] sortAllChildren +-- @param self + +-------------------------------- +-- @function [parent=#Sprite] setOpacityModifyRGB +-- @param self +-- @param #bool bool + +-------------------------------- +-- @function [parent=#Sprite] setRotation +-- @param self +-- @param #float float + +-------------------------------- +-- @function [parent=#Sprite] setSkewY +-- @param self +-- @param #float float + +-------------------------------- +-- @function [parent=#Sprite] setVisible +-- @param self +-- @param #bool bool + +-------------------------------- +-- @function [parent=#Sprite] setSkewX +-- @param self +-- @param #float float + +-------------------------------- +-- @function [parent=#Sprite] ignoreAnchorPointForPosition +-- @param self +-- @param #bool bool + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/SpriteBatchNode.lua b/cocos/scripting/lua-bindings/auto/api/SpriteBatchNode.lua index 36d4238188..dc1429b7e0 100644 --- a/cocos/scripting/lua-bindings/auto/api/SpriteBatchNode.lua +++ b/cocos/scripting/lua-bindings/auto/api/SpriteBatchNode.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module SpriteBatchNode +-- @extend Node,TextureProtocol, + -------------------------------- -- @function [parent=#SpriteBatchNode] appendChild -- @param self @@ -12,17 +14,33 @@ -- @param #bool bool -------------------------------- --- @function [parent=#SpriteBatchNode] initWithTexture +-- @function [parent=#SpriteBatchNode] getTexture -- @param self --- @param #cc.Texture2D texture2d --- @param #long long --- @return bool#bool ret (return value: bool) +-- @return Texture2D#Texture2D ret (return value: cc.Texture2D) -------------------------------- --- @function [parent=#SpriteBatchNode] lowestAtlasIndexInChild +-- @function [parent=#SpriteBatchNode] setTexture +-- @param self +-- @param #cc.Texture2D texture2d + +-------------------------------- +-- @function [parent=#SpriteBatchNode] removeChildAtIndex +-- @param self +-- @param #long long +-- @param #bool bool + +-------------------------------- +-- @function [parent=#SpriteBatchNode] removeSpriteFromAtlas -- @param self -- @param #cc.Sprite sprite --- @return long#long ret (return value: long) + +-------------------------------- +-- @function [parent=#SpriteBatchNode] addSpriteWithoutQuad +-- @param self +-- @param #cc.Sprite sprite +-- @param #int int +-- @param #int int +-- @return SpriteBatchNode#SpriteBatchNode ret (return value: cc.SpriteBatchNode) -------------------------------- -- @function [parent=#SpriteBatchNode] atlasIndexForChild @@ -31,33 +49,10 @@ -- @param #int int -- @return long#long ret (return value: long) --------------------------------- --- @function [parent=#SpriteBatchNode] setTextureAtlas --- @param self --- @param #cc.TextureAtlas textureatlas - --------------------------------- --- @function [parent=#SpriteBatchNode] rebuildIndexInOrder --- @param self --- @param #cc.Sprite sprite --- @param #long long --- @return long#long ret (return value: long) - -------------------------------- -- @function [parent=#SpriteBatchNode] increaseAtlasCapacity -- @param self --------------------------------- --- @function [parent=#SpriteBatchNode] getTextureAtlas --- @param self --- @return TextureAtlas#TextureAtlas ret (return value: cc.TextureAtlas) - --------------------------------- --- @function [parent=#SpriteBatchNode] insertQuadFromSprite --- @param self --- @param #cc.Sprite sprite --- @param #long long - -------------------------------- -- overload function: init() -- @@ -70,26 +65,22 @@ -- @return bool#bool ret (retunr value: bool) -------------------------------- --- @function [parent=#SpriteBatchNode] setTexture --- @param self --- @param #cc.Texture2D texture2d - --------------------------------- --- @function [parent=#SpriteBatchNode] getTexture --- @param self --- @return Texture2D#Texture2D ret (return value: cc.Texture2D) - --------------------------------- --- @function [parent=#SpriteBatchNode] highestAtlasIndexInChild +-- @function [parent=#SpriteBatchNode] lowestAtlasIndexInChild -- @param self -- @param #cc.Sprite sprite -- @return long#long ret (return value: long) -------------------------------- --- @function [parent=#SpriteBatchNode] removeChildAtIndex +-- @function [parent=#SpriteBatchNode] initWithTexture -- @param self +-- @param #cc.Texture2D texture2d -- @param #long long --- @param #bool bool +-- @return bool#bool ret (return value: bool) + +-------------------------------- +-- @function [parent=#SpriteBatchNode] setTextureAtlas +-- @param self +-- @param #cc.TextureAtlas textureatlas -------------------------------- -- @function [parent=#SpriteBatchNode] removeAllChildrenWithCleanup @@ -97,9 +88,28 @@ -- @param #bool bool -------------------------------- --- @function [parent=#SpriteBatchNode] removeSpriteFromAtlas +-- @function [parent=#SpriteBatchNode] insertQuadFromSprite -- @param self -- @param #cc.Sprite sprite +-- @param #long long + +-------------------------------- +-- @function [parent=#SpriteBatchNode] rebuildIndexInOrder +-- @param self +-- @param #cc.Sprite sprite +-- @param #long long +-- @return long#long ret (return value: long) + +-------------------------------- +-- @function [parent=#SpriteBatchNode] getTextureAtlas +-- @param self +-- @return TextureAtlas#TextureAtlas ret (return value: cc.TextureAtlas) + +-------------------------------- +-- @function [parent=#SpriteBatchNode] highestAtlasIndexInChild +-- @param self +-- @param #cc.Sprite sprite +-- @return long#long ret (return value: long) -------------------------------- -- @function [parent=#SpriteBatchNode] create @@ -115,6 +125,48 @@ -- @param #long long -- @return SpriteBatchNode#SpriteBatchNode ret (return value: cc.SpriteBatchNode) +-------------------------------- +-- @function [parent=#SpriteBatchNode] addChild +-- @param self +-- @param #cc.Node node +-- @param #int int +-- @param #int int + +-------------------------------- +-- @function [parent=#SpriteBatchNode] draw +-- @param self +-- @param #cc.Renderer renderer +-- @param #kmMat4 kmmat4 +-- @param #bool bool + +-------------------------------- +-- @function [parent=#SpriteBatchNode] getDescription +-- @param self +-- @return string#string ret (return value: string) + +-------------------------------- +-- @function [parent=#SpriteBatchNode] visit +-- @param self +-- @param #cc.Renderer renderer +-- @param #kmMat4 kmmat4 +-- @param #bool bool + +-------------------------------- +-- @function [parent=#SpriteBatchNode] sortAllChildren +-- @param self + +-------------------------------- +-- @function [parent=#SpriteBatchNode] removeChild +-- @param self +-- @param #cc.Node node +-- @param #bool bool + +-------------------------------- +-- @function [parent=#SpriteBatchNode] reorderChild +-- @param self +-- @param #cc.Node node +-- @param #int int + -------------------------------- -- @function [parent=#SpriteBatchNode] SpriteBatchNode -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/SpriteDisplayData.lua b/cocos/scripting/lua-bindings/auto/api/SpriteDisplayData.lua index 6873c946b3..1ffa115e44 100644 --- a/cocos/scripting/lua-bindings/auto/api/SpriteDisplayData.lua +++ b/cocos/scripting/lua-bindings/auto/api/SpriteDisplayData.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module SpriteDisplayData +-- @extend DisplayData + -------------------------------- -- @function [parent=#SpriteDisplayData] copy -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/SpriteFrame.lua b/cocos/scripting/lua-bindings/auto/api/SpriteFrame.lua index 1c05dc217a..dceb052547 100644 --- a/cocos/scripting/lua-bindings/auto/api/SpriteFrame.lua +++ b/cocos/scripting/lua-bindings/auto/api/SpriteFrame.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module SpriteFrame +-- @extend Ref + -------------------------------- -- @function [parent=#SpriteFrame] clone -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/SpriteFrameCache.lua b/cocos/scripting/lua-bindings/auto/api/SpriteFrameCache.lua index 6fb668e85d..07a0e3b71d 100644 --- a/cocos/scripting/lua-bindings/auto/api/SpriteFrameCache.lua +++ b/cocos/scripting/lua-bindings/auto/api/SpriteFrameCache.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module SpriteFrameCache +-- @extend Ref + -------------------------------- -- overload function: addSpriteFramesWithFile(string, string) -- diff --git a/cocos/scripting/lua-bindings/auto/api/StopGrid.lua b/cocos/scripting/lua-bindings/auto/api/StopGrid.lua index 3d5fdb8290..0c1dee1f8d 100644 --- a/cocos/scripting/lua-bindings/auto/api/StopGrid.lua +++ b/cocos/scripting/lua-bindings/auto/api/StopGrid.lua @@ -1,9 +1,26 @@ -------------------------------- -- @module StopGrid +-- @extend ActionInstant + -------------------------------- -- @function [parent=#StopGrid] create -- @param self -- @return StopGrid#StopGrid ret (return value: cc.StopGrid) +-------------------------------- +-- @function [parent=#StopGrid] startWithTarget +-- @param self +-- @param #cc.Node node + +-------------------------------- +-- @function [parent=#StopGrid] clone +-- @param self +-- @return StopGrid#StopGrid ret (return value: cc.StopGrid) + +-------------------------------- +-- @function [parent=#StopGrid] reverse +-- @param self +-- @return StopGrid#StopGrid ret (return value: cc.StopGrid) + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/TMXLayer.lua b/cocos/scripting/lua-bindings/auto/api/TMXLayer.lua index 248fbce6a4..5414a83f07 100644 --- a/cocos/scripting/lua-bindings/auto/api/TMXLayer.lua +++ b/cocos/scripting/lua-bindings/auto/api/TMXLayer.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module TMXLayer +-- @extend SpriteBatchNode + -------------------------------- -- @function [parent=#TMXLayer] getTileGIDAt -- @param self @@ -135,6 +137,24 @@ -- @param #cc.TMXMapInfo map -- @return TMXLayer#TMXLayer ret (return value: cc.TMXLayer) +-------------------------------- +-- @function [parent=#TMXLayer] addChild +-- @param self +-- @param #cc.Node node +-- @param #int int +-- @param #int int + +-------------------------------- +-- @function [parent=#TMXLayer] getDescription +-- @param self +-- @return string#string ret (return value: string) + +-------------------------------- +-- @function [parent=#TMXLayer] removeChild +-- @param self +-- @param #cc.Node node +-- @param #bool bool + -------------------------------- -- @function [parent=#TMXLayer] TMXLayer -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/TMXLayerInfo.lua b/cocos/scripting/lua-bindings/auto/api/TMXLayerInfo.lua index be3f08f41d..42a442a924 100644 --- a/cocos/scripting/lua-bindings/auto/api/TMXLayerInfo.lua +++ b/cocos/scripting/lua-bindings/auto/api/TMXLayerInfo.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module TMXLayerInfo +-- @extend Ref + -------------------------------- -- @function [parent=#TMXLayerInfo] setProperties -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/TMXMapInfo.lua b/cocos/scripting/lua-bindings/auto/api/TMXMapInfo.lua index 73b1458bcf..17b2fe9fb4 100644 --- a/cocos/scripting/lua-bindings/auto/api/TMXMapInfo.lua +++ b/cocos/scripting/lua-bindings/auto/api/TMXMapInfo.lua @@ -1,6 +1,7 @@ -------------------------------- -- @module TMXMapInfo + -------------------------------- -- @function [parent=#TMXMapInfo] setObjectGroups -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/TMXObjectGroup.lua b/cocos/scripting/lua-bindings/auto/api/TMXObjectGroup.lua index 60f6b029a5..ddfb844b05 100644 --- a/cocos/scripting/lua-bindings/auto/api/TMXObjectGroup.lua +++ b/cocos/scripting/lua-bindings/auto/api/TMXObjectGroup.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module TMXObjectGroup +-- @extend Ref + -------------------------------- -- @function [parent=#TMXObjectGroup] setPositionOffset -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/TMXTiledMap.lua b/cocos/scripting/lua-bindings/auto/api/TMXTiledMap.lua index 637be57094..54d0d37003 100644 --- a/cocos/scripting/lua-bindings/auto/api/TMXTiledMap.lua +++ b/cocos/scripting/lua-bindings/auto/api/TMXTiledMap.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module TMXTiledMap +-- @extend Node + -------------------------------- -- @function [parent=#TMXTiledMap] setObjectGroups -- @param self @@ -86,4 +88,9 @@ -- @param #string str -- @return TMXTiledMap#TMXTiledMap ret (return value: cc.TMXTiledMap) +-------------------------------- +-- @function [parent=#TMXTiledMap] getDescription +-- @param self +-- @return string#string ret (return value: string) + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/TMXTilesetInfo.lua b/cocos/scripting/lua-bindings/auto/api/TMXTilesetInfo.lua index 1e4efd72bf..d0f6aebc64 100644 --- a/cocos/scripting/lua-bindings/auto/api/TMXTilesetInfo.lua +++ b/cocos/scripting/lua-bindings/auto/api/TMXTilesetInfo.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module TMXTilesetInfo +-- @extend Ref + -------------------------------- -- @function [parent=#TMXTilesetInfo] getRectForGID -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/TableView.lua b/cocos/scripting/lua-bindings/auto/api/TableView.lua index 75fbba115c..07e8ca642a 100644 --- a/cocos/scripting/lua-bindings/auto/api/TableView.lua +++ b/cocos/scripting/lua-bindings/auto/api/TableView.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module TableView +-- @extend ScrollView,ScrollViewDelegate, + -------------------------------- -- @function [parent=#TableView] updateCellAtIndex -- @param self @@ -62,6 +64,31 @@ -- @param self -- @return TableViewCell#TableViewCell ret (return value: cc.TableViewCell) +-------------------------------- +-- @function [parent=#TableView] onTouchMoved +-- @param self +-- @param #cc.Touch touch +-- @param #cc.Event event + +-------------------------------- +-- @function [parent=#TableView] onTouchEnded +-- @param self +-- @param #cc.Touch touch +-- @param #cc.Event event + +-------------------------------- +-- @function [parent=#TableView] onTouchCancelled +-- @param self +-- @param #cc.Touch touch +-- @param #cc.Event event + +-------------------------------- +-- @function [parent=#TableView] onTouchBegan +-- @param self +-- @param #cc.Touch touch +-- @param #cc.Event event +-- @return bool#bool ret (return value: bool) + -------------------------------- -- @function [parent=#TableView] TableView -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/TableViewCell.lua b/cocos/scripting/lua-bindings/auto/api/TableViewCell.lua index d118477c1a..edebd85ff2 100644 --- a/cocos/scripting/lua-bindings/auto/api/TableViewCell.lua +++ b/cocos/scripting/lua-bindings/auto/api/TableViewCell.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module TableViewCell +-- @extend Node + -------------------------------- -- @function [parent=#TableViewCell] reset -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/TargetedAction.lua b/cocos/scripting/lua-bindings/auto/api/TargetedAction.lua index 503d3c897f..51e2d3da6b 100644 --- a/cocos/scripting/lua-bindings/auto/api/TargetedAction.lua +++ b/cocos/scripting/lua-bindings/auto/api/TargetedAction.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module TargetedAction +-- @extend ActionInterval + -------------------------------- -- overload function: getForcedTarget() -- @@ -22,4 +24,28 @@ -- @param #cc.FiniteTimeAction finitetimeaction -- @return TargetedAction#TargetedAction ret (return value: cc.TargetedAction) +-------------------------------- +-- @function [parent=#TargetedAction] startWithTarget +-- @param self +-- @param #cc.Node node + +-------------------------------- +-- @function [parent=#TargetedAction] clone +-- @param self +-- @return TargetedAction#TargetedAction ret (return value: cc.TargetedAction) + +-------------------------------- +-- @function [parent=#TargetedAction] stop +-- @param self + +-------------------------------- +-- @function [parent=#TargetedAction] reverse +-- @param self +-- @return TargetedAction#TargetedAction ret (return value: cc.TargetedAction) + +-------------------------------- +-- @function [parent=#TargetedAction] update +-- @param self +-- @param #float float + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/Text.lua b/cocos/scripting/lua-bindings/auto/api/Text.lua index 2ad87d7508..b5d48a6e85 100644 --- a/cocos/scripting/lua-bindings/auto/api/Text.lua +++ b/cocos/scripting/lua-bindings/auto/api/Text.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module Text +-- @extend Widget + -------------------------------- -- @function [parent=#Text] getStringLength -- @param self @@ -86,6 +88,26 @@ -- @param self -- @return Ref#Ref ret (return value: cc.Ref) +-------------------------------- +-- @function [parent=#Text] setAnchorPoint +-- @param self +-- @param #point_table point + +-------------------------------- +-- @function [parent=#Text] getVirtualRenderer +-- @param self +-- @return Node#Node ret (return value: cc.Node) + +-------------------------------- +-- @function [parent=#Text] getDescription +-- @param self +-- @return string#string ret (return value: string) + +-------------------------------- +-- @function [parent=#Text] getContentSize +-- @param self +-- @return size_table#size_table ret (return value: size_table) + -------------------------------- -- @function [parent=#Text] Text -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/TextAtlas.lua b/cocos/scripting/lua-bindings/auto/api/TextAtlas.lua index 8ed5b484d0..8c95bae354 100644 --- a/cocos/scripting/lua-bindings/auto/api/TextAtlas.lua +++ b/cocos/scripting/lua-bindings/auto/api/TextAtlas.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module TextAtlas +-- @extend Widget + -------------------------------- -- @function [parent=#TextAtlas] setProperty -- @param self @@ -30,6 +32,26 @@ -- @param self -- @return Ref#Ref ret (return value: cc.Ref) +-------------------------------- +-- @function [parent=#TextAtlas] setAnchorPoint +-- @param self +-- @param #point_table point + +-------------------------------- +-- @function [parent=#TextAtlas] getVirtualRenderer +-- @param self +-- @return Node#Node ret (return value: cc.Node) + +-------------------------------- +-- @function [parent=#TextAtlas] getDescription +-- @param self +-- @return string#string ret (return value: string) + +-------------------------------- +-- @function [parent=#TextAtlas] getContentSize +-- @param self +-- @return size_table#size_table ret (return value: size_table) + -------------------------------- -- @function [parent=#TextAtlas] TextAtlas -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/TextBMFont.lua b/cocos/scripting/lua-bindings/auto/api/TextBMFont.lua index ae9242f7dd..e0efb0e9ff 100644 --- a/cocos/scripting/lua-bindings/auto/api/TextBMFont.lua +++ b/cocos/scripting/lua-bindings/auto/api/TextBMFont.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module TextBMFont +-- @extend Widget + -------------------------------- -- @function [parent=#TextBMFont] setFntFile -- @param self @@ -26,6 +28,26 @@ -- @param self -- @return Ref#Ref ret (return value: cc.Ref) +-------------------------------- +-- @function [parent=#TextBMFont] setAnchorPoint +-- @param self +-- @param #point_table point + +-------------------------------- +-- @function [parent=#TextBMFont] getVirtualRenderer +-- @param self +-- @return Node#Node ret (return value: cc.Node) + +-------------------------------- +-- @function [parent=#TextBMFont] getDescription +-- @param self +-- @return string#string ret (return value: string) + +-------------------------------- +-- @function [parent=#TextBMFont] getContentSize +-- @param self +-- @return size_table#size_table ret (return value: size_table) + -------------------------------- -- @function [parent=#TextBMFont] TextBMFont -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/TextField.lua b/cocos/scripting/lua-bindings/auto/api/TextField.lua index f42a948044..e8963cb846 100644 --- a/cocos/scripting/lua-bindings/auto/api/TextField.lua +++ b/cocos/scripting/lua-bindings/auto/api/TextField.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module TextField +-- @extend Widget + -------------------------------- -- @function [parent=#TextField] setAttachWithIME -- @param self @@ -175,6 +177,31 @@ -- @param self -- @return Ref#Ref ret (return value: cc.Ref) +-------------------------------- +-- @function [parent=#TextField] setAnchorPoint +-- @param self +-- @param #point_table point + +-------------------------------- +-- @function [parent=#TextField] getVirtualRenderer +-- @param self +-- @return Node#Node ret (return value: cc.Node) + +-------------------------------- +-- @function [parent=#TextField] getDescription +-- @param self +-- @return string#string ret (return value: string) + +-------------------------------- +-- @function [parent=#TextField] update +-- @param self +-- @param #float float + +-------------------------------- +-- @function [parent=#TextField] getContentSize +-- @param self +-- @return size_table#size_table ret (return value: size_table) + -------------------------------- -- @function [parent=#TextField] TextField -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/Texture2D.lua b/cocos/scripting/lua-bindings/auto/api/Texture2D.lua index 95e52baa3a..27d407e621 100644 --- a/cocos/scripting/lua-bindings/auto/api/Texture2D.lua +++ b/cocos/scripting/lua-bindings/auto/api/Texture2D.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module Texture2D +-- @extend Ref + -------------------------------- -- @function [parent=#Texture2D] getShaderProgram -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/TextureCache.lua b/cocos/scripting/lua-bindings/auto/api/TextureCache.lua index d8e74f724a..76013f142e 100644 --- a/cocos/scripting/lua-bindings/auto/api/TextureCache.lua +++ b/cocos/scripting/lua-bindings/auto/api/TextureCache.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module TextureCache +-- @extend Ref + -------------------------------- -- @function [parent=#TextureCache] reloadTexture -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/TextureData.lua b/cocos/scripting/lua-bindings/auto/api/TextureData.lua index 4407e185fe..5b21e3b26d 100644 --- a/cocos/scripting/lua-bindings/auto/api/TextureData.lua +++ b/cocos/scripting/lua-bindings/auto/api/TextureData.lua @@ -1,6 +1,7 @@ -------------------------------- -- @module TextureData + -------------------------------- -- @function [parent=#TextureData] getContourData -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/TileMapAtlas.lua b/cocos/scripting/lua-bindings/auto/api/TileMapAtlas.lua index 0b5d510520..1670f386e7 100644 --- a/cocos/scripting/lua-bindings/auto/api/TileMapAtlas.lua +++ b/cocos/scripting/lua-bindings/auto/api/TileMapAtlas.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module TileMapAtlas +-- @extend AtlasNode + -------------------------------- -- @function [parent=#TileMapAtlas] initWithTileFile -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/TiledGrid3D.lua b/cocos/scripting/lua-bindings/auto/api/TiledGrid3D.lua index cbb80d54dc..b4c8689f8c 100644 --- a/cocos/scripting/lua-bindings/auto/api/TiledGrid3D.lua +++ b/cocos/scripting/lua-bindings/auto/api/TiledGrid3D.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module TiledGrid3D +-- @extend GridBase + -------------------------------- -- overload function: create(size_table) -- @@ -13,6 +15,18 @@ -- @param #bool bool -- @return TiledGrid3D#TiledGrid3D ret (retunr value: cc.TiledGrid3D) +-------------------------------- +-- @function [parent=#TiledGrid3D] calculateVertexPoints +-- @param self + +-------------------------------- +-- @function [parent=#TiledGrid3D] blit +-- @param self + +-------------------------------- +-- @function [parent=#TiledGrid3D] reuse +-- @param self + -------------------------------- -- @function [parent=#TiledGrid3D] TiledGrid3D -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/TiledGrid3DAction.lua b/cocos/scripting/lua-bindings/auto/api/TiledGrid3DAction.lua index c09f4c477c..368ecf2949 100644 --- a/cocos/scripting/lua-bindings/auto/api/TiledGrid3DAction.lua +++ b/cocos/scripting/lua-bindings/auto/api/TiledGrid3DAction.lua @@ -1,9 +1,16 @@ -------------------------------- -- @module TiledGrid3DAction +-- @extend GridAction + -------------------------------- -- @function [parent=#TiledGrid3DAction] getGrid -- @param self -- @return GridBase#GridBase ret (return value: cc.GridBase) +-------------------------------- +-- @function [parent=#TiledGrid3DAction] clone +-- @param self +-- @return TiledGrid3DAction#TiledGrid3DAction ret (return value: cc.TiledGrid3DAction) + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/Timer.lua b/cocos/scripting/lua-bindings/auto/api/Timer.lua index 4565065f96..8da7c95bce 100644 --- a/cocos/scripting/lua-bindings/auto/api/Timer.lua +++ b/cocos/scripting/lua-bindings/auto/api/Timer.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module Timer +-- @extend Ref + -------------------------------- -- @function [parent=#Timer] getInterval -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/TintBy.lua b/cocos/scripting/lua-bindings/auto/api/TintBy.lua index e79b425d49..283146908d 100644 --- a/cocos/scripting/lua-bindings/auto/api/TintBy.lua +++ b/cocos/scripting/lua-bindings/auto/api/TintBy.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module TintBy +-- @extend ActionInterval + -------------------------------- -- @function [parent=#TintBy] create -- @param self @@ -10,4 +12,24 @@ -- @param #short short -- @return TintBy#TintBy ret (return value: cc.TintBy) +-------------------------------- +-- @function [parent=#TintBy] startWithTarget +-- @param self +-- @param #cc.Node node + +-------------------------------- +-- @function [parent=#TintBy] clone +-- @param self +-- @return TintBy#TintBy ret (return value: cc.TintBy) + +-------------------------------- +-- @function [parent=#TintBy] reverse +-- @param self +-- @return TintBy#TintBy ret (return value: cc.TintBy) + +-------------------------------- +-- @function [parent=#TintBy] update +-- @param self +-- @param #float float + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/TintTo.lua b/cocos/scripting/lua-bindings/auto/api/TintTo.lua index c84d250427..193e006c92 100644 --- a/cocos/scripting/lua-bindings/auto/api/TintTo.lua +++ b/cocos/scripting/lua-bindings/auto/api/TintTo.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module TintTo +-- @extend ActionInterval + -------------------------------- -- @function [parent=#TintTo] create -- @param self @@ -10,4 +12,24 @@ -- @param #unsigned char char -- @return TintTo#TintTo ret (return value: cc.TintTo) +-------------------------------- +-- @function [parent=#TintTo] startWithTarget +-- @param self +-- @param #cc.Node node + +-------------------------------- +-- @function [parent=#TintTo] clone +-- @param self +-- @return TintTo#TintTo ret (return value: cc.TintTo) + +-------------------------------- +-- @function [parent=#TintTo] reverse +-- @param self +-- @return TintTo#TintTo ret (return value: cc.TintTo) + +-------------------------------- +-- @function [parent=#TintTo] update +-- @param self +-- @param #float float + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/ToggleVisibility.lua b/cocos/scripting/lua-bindings/auto/api/ToggleVisibility.lua index c7ee14b671..d500686c5a 100644 --- a/cocos/scripting/lua-bindings/auto/api/ToggleVisibility.lua +++ b/cocos/scripting/lua-bindings/auto/api/ToggleVisibility.lua @@ -1,9 +1,26 @@ -------------------------------- -- @module ToggleVisibility +-- @extend ActionInstant + -------------------------------- -- @function [parent=#ToggleVisibility] create -- @param self -- @return ToggleVisibility#ToggleVisibility ret (return value: cc.ToggleVisibility) +-------------------------------- +-- @function [parent=#ToggleVisibility] clone +-- @param self +-- @return ToggleVisibility#ToggleVisibility ret (return value: cc.ToggleVisibility) + +-------------------------------- +-- @function [parent=#ToggleVisibility] update +-- @param self +-- @param #float float + +-------------------------------- +-- @function [parent=#ToggleVisibility] reverse +-- @param self +-- @return ToggleVisibility#ToggleVisibility ret (return value: cc.ToggleVisibility) + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/Touch.lua b/cocos/scripting/lua-bindings/auto/api/Touch.lua index c654da17e6..3994514662 100644 --- a/cocos/scripting/lua-bindings/auto/api/Touch.lua +++ b/cocos/scripting/lua-bindings/auto/api/Touch.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module Touch +-- @extend Ref + -------------------------------- -- @function [parent=#Touch] getPreviousLocationInView -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/TransitionCrossFade.lua b/cocos/scripting/lua-bindings/auto/api/TransitionCrossFade.lua index 4520edb09e..c7c9171560 100644 --- a/cocos/scripting/lua-bindings/auto/api/TransitionCrossFade.lua +++ b/cocos/scripting/lua-bindings/auto/api/TransitionCrossFade.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module TransitionCrossFade +-- @extend TransitionScene + -------------------------------- -- @function [parent=#TransitionCrossFade] create -- @param self @@ -8,4 +10,11 @@ -- @param #cc.Scene scene -- @return TransitionCrossFade#TransitionCrossFade ret (return value: cc.TransitionCrossFade) +-------------------------------- +-- @function [parent=#TransitionCrossFade] draw +-- @param self +-- @param #cc.Renderer renderer +-- @param #kmMat4 kmmat4 +-- @param #bool bool + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/TransitionEaseScene.lua b/cocos/scripting/lua-bindings/auto/api/TransitionEaseScene.lua index 467d202c96..c7603f20fd 100644 --- a/cocos/scripting/lua-bindings/auto/api/TransitionEaseScene.lua +++ b/cocos/scripting/lua-bindings/auto/api/TransitionEaseScene.lua @@ -1,6 +1,7 @@ -------------------------------- -- @module TransitionEaseScene + -------------------------------- -- @function [parent=#TransitionEaseScene] easeActionWithAction -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/TransitionFade.lua b/cocos/scripting/lua-bindings/auto/api/TransitionFade.lua index 9e0d884963..bef0cee226 100644 --- a/cocos/scripting/lua-bindings/auto/api/TransitionFade.lua +++ b/cocos/scripting/lua-bindings/auto/api/TransitionFade.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module TransitionFade +-- @extend TransitionScene + -------------------------------- -- overload function: create(float, cc.Scene) -- diff --git a/cocos/scripting/lua-bindings/auto/api/TransitionFadeBL.lua b/cocos/scripting/lua-bindings/auto/api/TransitionFadeBL.lua index c865c8c47f..3cd034acbb 100644 --- a/cocos/scripting/lua-bindings/auto/api/TransitionFadeBL.lua +++ b/cocos/scripting/lua-bindings/auto/api/TransitionFadeBL.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module TransitionFadeBL +-- @extend TransitionFadeTR + -------------------------------- -- @function [parent=#TransitionFadeBL] create -- @param self @@ -8,4 +10,10 @@ -- @param #cc.Scene scene -- @return TransitionFadeBL#TransitionFadeBL ret (return value: cc.TransitionFadeBL) +-------------------------------- +-- @function [parent=#TransitionFadeBL] actionWithSize +-- @param self +-- @param #size_table size +-- @return ActionInterval#ActionInterval ret (return value: cc.ActionInterval) + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/TransitionFadeDown.lua b/cocos/scripting/lua-bindings/auto/api/TransitionFadeDown.lua index 0b89050a82..1932dac77f 100644 --- a/cocos/scripting/lua-bindings/auto/api/TransitionFadeDown.lua +++ b/cocos/scripting/lua-bindings/auto/api/TransitionFadeDown.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module TransitionFadeDown +-- @extend TransitionFadeTR + -------------------------------- -- @function [parent=#TransitionFadeDown] create -- @param self @@ -8,4 +10,10 @@ -- @param #cc.Scene scene -- @return TransitionFadeDown#TransitionFadeDown ret (return value: cc.TransitionFadeDown) +-------------------------------- +-- @function [parent=#TransitionFadeDown] actionWithSize +-- @param self +-- @param #size_table size +-- @return ActionInterval#ActionInterval ret (return value: cc.ActionInterval) + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/TransitionFadeTR.lua b/cocos/scripting/lua-bindings/auto/api/TransitionFadeTR.lua index f1c55c7390..59744392bc 100644 --- a/cocos/scripting/lua-bindings/auto/api/TransitionFadeTR.lua +++ b/cocos/scripting/lua-bindings/auto/api/TransitionFadeTR.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module TransitionFadeTR +-- @extend TransitionScene,TransitionEaseScene, + -------------------------------- -- @function [parent=#TransitionFadeTR] easeActionWithAction -- @param self @@ -20,4 +22,11 @@ -- @param #cc.Scene scene -- @return TransitionFadeTR#TransitionFadeTR ret (return value: cc.TransitionFadeTR) +-------------------------------- +-- @function [parent=#TransitionFadeTR] draw +-- @param self +-- @param #cc.Renderer renderer +-- @param #kmMat4 kmmat4 +-- @param #bool bool + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/TransitionFadeUp.lua b/cocos/scripting/lua-bindings/auto/api/TransitionFadeUp.lua index 7cbcf4de1f..d4b61d0907 100644 --- a/cocos/scripting/lua-bindings/auto/api/TransitionFadeUp.lua +++ b/cocos/scripting/lua-bindings/auto/api/TransitionFadeUp.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module TransitionFadeUp +-- @extend TransitionFadeTR + -------------------------------- -- @function [parent=#TransitionFadeUp] create -- @param self @@ -8,4 +10,10 @@ -- @param #cc.Scene scene -- @return TransitionFadeUp#TransitionFadeUp ret (return value: cc.TransitionFadeUp) +-------------------------------- +-- @function [parent=#TransitionFadeUp] actionWithSize +-- @param self +-- @param #size_table size +-- @return ActionInterval#ActionInterval ret (return value: cc.ActionInterval) + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/TransitionFlipAngular.lua b/cocos/scripting/lua-bindings/auto/api/TransitionFlipAngular.lua index e88b257c17..4ca76ac44e 100644 --- a/cocos/scripting/lua-bindings/auto/api/TransitionFlipAngular.lua +++ b/cocos/scripting/lua-bindings/auto/api/TransitionFlipAngular.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module TransitionFlipAngular +-- @extend TransitionSceneOriented + -------------------------------- -- overload function: create(float, cc.Scene) -- diff --git a/cocos/scripting/lua-bindings/auto/api/TransitionFlipX.lua b/cocos/scripting/lua-bindings/auto/api/TransitionFlipX.lua index 2a26b2c88a..5ebc56a6d3 100644 --- a/cocos/scripting/lua-bindings/auto/api/TransitionFlipX.lua +++ b/cocos/scripting/lua-bindings/auto/api/TransitionFlipX.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module TransitionFlipX +-- @extend TransitionSceneOriented + -------------------------------- -- overload function: create(float, cc.Scene) -- diff --git a/cocos/scripting/lua-bindings/auto/api/TransitionFlipY.lua b/cocos/scripting/lua-bindings/auto/api/TransitionFlipY.lua index ab4247b725..d556455314 100644 --- a/cocos/scripting/lua-bindings/auto/api/TransitionFlipY.lua +++ b/cocos/scripting/lua-bindings/auto/api/TransitionFlipY.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module TransitionFlipY +-- @extend TransitionSceneOriented + -------------------------------- -- overload function: create(float, cc.Scene) -- diff --git a/cocos/scripting/lua-bindings/auto/api/TransitionJumpZoom.lua b/cocos/scripting/lua-bindings/auto/api/TransitionJumpZoom.lua index 2902d2f9f5..4baad2b36a 100644 --- a/cocos/scripting/lua-bindings/auto/api/TransitionJumpZoom.lua +++ b/cocos/scripting/lua-bindings/auto/api/TransitionJumpZoom.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module TransitionJumpZoom +-- @extend TransitionScene + -------------------------------- -- @function [parent=#TransitionJumpZoom] create -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/TransitionMoveInB.lua b/cocos/scripting/lua-bindings/auto/api/TransitionMoveInB.lua index 2e75878a74..90c35af2f9 100644 --- a/cocos/scripting/lua-bindings/auto/api/TransitionMoveInB.lua +++ b/cocos/scripting/lua-bindings/auto/api/TransitionMoveInB.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module TransitionMoveInB +-- @extend TransitionMoveInL + -------------------------------- -- @function [parent=#TransitionMoveInB] create -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/TransitionMoveInL.lua b/cocos/scripting/lua-bindings/auto/api/TransitionMoveInL.lua index 565a5fcc67..c5477217df 100644 --- a/cocos/scripting/lua-bindings/auto/api/TransitionMoveInL.lua +++ b/cocos/scripting/lua-bindings/auto/api/TransitionMoveInL.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module TransitionMoveInL +-- @extend TransitionScene,TransitionEaseScene, + -------------------------------- -- @function [parent=#TransitionMoveInL] action -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/TransitionMoveInR.lua b/cocos/scripting/lua-bindings/auto/api/TransitionMoveInR.lua index cad4b24418..846a14db7e 100644 --- a/cocos/scripting/lua-bindings/auto/api/TransitionMoveInR.lua +++ b/cocos/scripting/lua-bindings/auto/api/TransitionMoveInR.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module TransitionMoveInR +-- @extend TransitionMoveInL + -------------------------------- -- @function [parent=#TransitionMoveInR] create -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/TransitionMoveInT.lua b/cocos/scripting/lua-bindings/auto/api/TransitionMoveInT.lua index 7008c16a02..8b2e25d27b 100644 --- a/cocos/scripting/lua-bindings/auto/api/TransitionMoveInT.lua +++ b/cocos/scripting/lua-bindings/auto/api/TransitionMoveInT.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module TransitionMoveInT +-- @extend TransitionMoveInL + -------------------------------- -- @function [parent=#TransitionMoveInT] create -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/TransitionPageTurn.lua b/cocos/scripting/lua-bindings/auto/api/TransitionPageTurn.lua index 7a67c11b38..184fc637f3 100644 --- a/cocos/scripting/lua-bindings/auto/api/TransitionPageTurn.lua +++ b/cocos/scripting/lua-bindings/auto/api/TransitionPageTurn.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module TransitionPageTurn +-- @extend TransitionScene + -------------------------------- -- @function [parent=#TransitionPageTurn] actionWithSize -- @param self @@ -23,6 +25,13 @@ -- @param #bool bool -- @return TransitionPageTurn#TransitionPageTurn ret (return value: cc.TransitionPageTurn) +-------------------------------- +-- @function [parent=#TransitionPageTurn] draw +-- @param self +-- @param #cc.Renderer renderer +-- @param #kmMat4 kmmat4 +-- @param #bool bool + -------------------------------- -- @function [parent=#TransitionPageTurn] TransitionPageTurn -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/TransitionProgress.lua b/cocos/scripting/lua-bindings/auto/api/TransitionProgress.lua index afacb14a5a..bf6d0f748c 100644 --- a/cocos/scripting/lua-bindings/auto/api/TransitionProgress.lua +++ b/cocos/scripting/lua-bindings/auto/api/TransitionProgress.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module TransitionProgress +-- @extend TransitionScene + -------------------------------- -- @function [parent=#TransitionProgress] create -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/TransitionProgressHorizontal.lua b/cocos/scripting/lua-bindings/auto/api/TransitionProgressHorizontal.lua index 5d0b6ab882..f83c228469 100644 --- a/cocos/scripting/lua-bindings/auto/api/TransitionProgressHorizontal.lua +++ b/cocos/scripting/lua-bindings/auto/api/TransitionProgressHorizontal.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module TransitionProgressHorizontal +-- @extend TransitionProgress + -------------------------------- -- @function [parent=#TransitionProgressHorizontal] create -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/TransitionProgressInOut.lua b/cocos/scripting/lua-bindings/auto/api/TransitionProgressInOut.lua index 08be8ffbc5..b5af4cc6e3 100644 --- a/cocos/scripting/lua-bindings/auto/api/TransitionProgressInOut.lua +++ b/cocos/scripting/lua-bindings/auto/api/TransitionProgressInOut.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module TransitionProgressInOut +-- @extend TransitionProgress + -------------------------------- -- @function [parent=#TransitionProgressInOut] create -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/TransitionProgressOutIn.lua b/cocos/scripting/lua-bindings/auto/api/TransitionProgressOutIn.lua index 5f6302ce40..2a148d53a2 100644 --- a/cocos/scripting/lua-bindings/auto/api/TransitionProgressOutIn.lua +++ b/cocos/scripting/lua-bindings/auto/api/TransitionProgressOutIn.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module TransitionProgressOutIn +-- @extend TransitionProgress + -------------------------------- -- @function [parent=#TransitionProgressOutIn] create -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/TransitionProgressRadialCCW.lua b/cocos/scripting/lua-bindings/auto/api/TransitionProgressRadialCCW.lua index 08203ae5de..e11d80c6f6 100644 --- a/cocos/scripting/lua-bindings/auto/api/TransitionProgressRadialCCW.lua +++ b/cocos/scripting/lua-bindings/auto/api/TransitionProgressRadialCCW.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module TransitionProgressRadialCCW +-- @extend TransitionProgress + -------------------------------- -- @function [parent=#TransitionProgressRadialCCW] create -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/TransitionProgressRadialCW.lua b/cocos/scripting/lua-bindings/auto/api/TransitionProgressRadialCW.lua index 136c6376b2..c85f04bf3c 100644 --- a/cocos/scripting/lua-bindings/auto/api/TransitionProgressRadialCW.lua +++ b/cocos/scripting/lua-bindings/auto/api/TransitionProgressRadialCW.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module TransitionProgressRadialCW +-- @extend TransitionProgress + -------------------------------- -- @function [parent=#TransitionProgressRadialCW] create -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/TransitionProgressVertical.lua b/cocos/scripting/lua-bindings/auto/api/TransitionProgressVertical.lua index 9440f3facc..085ac3ce29 100644 --- a/cocos/scripting/lua-bindings/auto/api/TransitionProgressVertical.lua +++ b/cocos/scripting/lua-bindings/auto/api/TransitionProgressVertical.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module TransitionProgressVertical +-- @extend TransitionProgress + -------------------------------- -- @function [parent=#TransitionProgressVertical] create -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/TransitionRotoZoom.lua b/cocos/scripting/lua-bindings/auto/api/TransitionRotoZoom.lua index 0d18b28d42..d69f300786 100644 --- a/cocos/scripting/lua-bindings/auto/api/TransitionRotoZoom.lua +++ b/cocos/scripting/lua-bindings/auto/api/TransitionRotoZoom.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module TransitionRotoZoom +-- @extend TransitionScene + -------------------------------- -- @function [parent=#TransitionRotoZoom] create -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/TransitionScene.lua b/cocos/scripting/lua-bindings/auto/api/TransitionScene.lua index 24dc9cce4a..540d2e6d7a 100644 --- a/cocos/scripting/lua-bindings/auto/api/TransitionScene.lua +++ b/cocos/scripting/lua-bindings/auto/api/TransitionScene.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module TransitionScene +-- @extend Scene + -------------------------------- -- @function [parent=#TransitionScene] finish -- @param self @@ -16,4 +18,15 @@ -- @param #cc.Scene scene -- @return TransitionScene#TransitionScene ret (return value: cc.TransitionScene) +-------------------------------- +-- @function [parent=#TransitionScene] draw +-- @param self +-- @param #cc.Renderer renderer +-- @param #kmMat4 kmmat4 +-- @param #bool bool + +-------------------------------- +-- @function [parent=#TransitionScene] cleanup +-- @param self + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/TransitionSceneOriented.lua b/cocos/scripting/lua-bindings/auto/api/TransitionSceneOriented.lua index 2f42272bbc..8c10119458 100644 --- a/cocos/scripting/lua-bindings/auto/api/TransitionSceneOriented.lua +++ b/cocos/scripting/lua-bindings/auto/api/TransitionSceneOriented.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module TransitionSceneOriented +-- @extend TransitionScene + -------------------------------- -- @function [parent=#TransitionSceneOriented] create -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/TransitionShrinkGrow.lua b/cocos/scripting/lua-bindings/auto/api/TransitionShrinkGrow.lua index b270f34e37..db992667ee 100644 --- a/cocos/scripting/lua-bindings/auto/api/TransitionShrinkGrow.lua +++ b/cocos/scripting/lua-bindings/auto/api/TransitionShrinkGrow.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module TransitionShrinkGrow +-- @extend TransitionScene,TransitionEaseScene, + -------------------------------- -- @function [parent=#TransitionShrinkGrow] easeActionWithAction -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/TransitionSlideInB.lua b/cocos/scripting/lua-bindings/auto/api/TransitionSlideInB.lua index e95fb7e32c..abb0a9faa2 100644 --- a/cocos/scripting/lua-bindings/auto/api/TransitionSlideInB.lua +++ b/cocos/scripting/lua-bindings/auto/api/TransitionSlideInB.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module TransitionSlideInB +-- @extend TransitionSlideInL + -------------------------------- -- @function [parent=#TransitionSlideInB] action -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/TransitionSlideInL.lua b/cocos/scripting/lua-bindings/auto/api/TransitionSlideInL.lua index f87a7eb4e8..1cccd6b89b 100644 --- a/cocos/scripting/lua-bindings/auto/api/TransitionSlideInL.lua +++ b/cocos/scripting/lua-bindings/auto/api/TransitionSlideInL.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module TransitionSlideInL +-- @extend TransitionScene,TransitionEaseScene, + -------------------------------- -- @function [parent=#TransitionSlideInL] action -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/TransitionSlideInR.lua b/cocos/scripting/lua-bindings/auto/api/TransitionSlideInR.lua index 99997d3f72..3564c1570e 100644 --- a/cocos/scripting/lua-bindings/auto/api/TransitionSlideInR.lua +++ b/cocos/scripting/lua-bindings/auto/api/TransitionSlideInR.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module TransitionSlideInR +-- @extend TransitionSlideInL + -------------------------------- -- @function [parent=#TransitionSlideInR] action -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/TransitionSlideInT.lua b/cocos/scripting/lua-bindings/auto/api/TransitionSlideInT.lua index a66a56f0df..4f08ef63b1 100644 --- a/cocos/scripting/lua-bindings/auto/api/TransitionSlideInT.lua +++ b/cocos/scripting/lua-bindings/auto/api/TransitionSlideInT.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module TransitionSlideInT +-- @extend TransitionSlideInL + -------------------------------- -- @function [parent=#TransitionSlideInT] action -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/TransitionSplitCols.lua b/cocos/scripting/lua-bindings/auto/api/TransitionSplitCols.lua index d56417705c..c4b181288a 100644 --- a/cocos/scripting/lua-bindings/auto/api/TransitionSplitCols.lua +++ b/cocos/scripting/lua-bindings/auto/api/TransitionSplitCols.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module TransitionSplitCols +-- @extend TransitionScene,TransitionEaseScene, + -------------------------------- -- @function [parent=#TransitionSplitCols] action -- @param self @@ -19,4 +21,11 @@ -- @param #cc.Scene scene -- @return TransitionSplitCols#TransitionSplitCols ret (return value: cc.TransitionSplitCols) +-------------------------------- +-- @function [parent=#TransitionSplitCols] draw +-- @param self +-- @param #cc.Renderer renderer +-- @param #kmMat4 kmmat4 +-- @param #bool bool + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/TransitionSplitRows.lua b/cocos/scripting/lua-bindings/auto/api/TransitionSplitRows.lua index cfa9a6e10e..a745e5be5b 100644 --- a/cocos/scripting/lua-bindings/auto/api/TransitionSplitRows.lua +++ b/cocos/scripting/lua-bindings/auto/api/TransitionSplitRows.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module TransitionSplitRows +-- @extend TransitionSplitCols + -------------------------------- -- @function [parent=#TransitionSplitRows] create -- @param self @@ -8,4 +10,9 @@ -- @param #cc.Scene scene -- @return TransitionSplitRows#TransitionSplitRows ret (return value: cc.TransitionSplitRows) +-------------------------------- +-- @function [parent=#TransitionSplitRows] action +-- @param self +-- @return ActionInterval#ActionInterval ret (return value: cc.ActionInterval) + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/TransitionTurnOffTiles.lua b/cocos/scripting/lua-bindings/auto/api/TransitionTurnOffTiles.lua index 3f10345109..13a684a494 100644 --- a/cocos/scripting/lua-bindings/auto/api/TransitionTurnOffTiles.lua +++ b/cocos/scripting/lua-bindings/auto/api/TransitionTurnOffTiles.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module TransitionTurnOffTiles +-- @extend TransitionScene,TransitionEaseScene, + -------------------------------- -- @function [parent=#TransitionTurnOffTiles] easeActionWithAction -- @param self @@ -14,4 +16,11 @@ -- @param #cc.Scene scene -- @return TransitionTurnOffTiles#TransitionTurnOffTiles ret (return value: cc.TransitionTurnOffTiles) +-------------------------------- +-- @function [parent=#TransitionTurnOffTiles] draw +-- @param self +-- @param #cc.Renderer renderer +-- @param #kmMat4 kmmat4 +-- @param #bool bool + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/TransitionZoomFlipAngular.lua b/cocos/scripting/lua-bindings/auto/api/TransitionZoomFlipAngular.lua index 928ed09a9f..53b99bd974 100644 --- a/cocos/scripting/lua-bindings/auto/api/TransitionZoomFlipAngular.lua +++ b/cocos/scripting/lua-bindings/auto/api/TransitionZoomFlipAngular.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module TransitionZoomFlipAngular +-- @extend TransitionSceneOriented + -------------------------------- -- overload function: create(float, cc.Scene) -- diff --git a/cocos/scripting/lua-bindings/auto/api/TransitionZoomFlipX.lua b/cocos/scripting/lua-bindings/auto/api/TransitionZoomFlipX.lua index 5e8d601c38..df8ba501c8 100644 --- a/cocos/scripting/lua-bindings/auto/api/TransitionZoomFlipX.lua +++ b/cocos/scripting/lua-bindings/auto/api/TransitionZoomFlipX.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module TransitionZoomFlipX +-- @extend TransitionSceneOriented + -------------------------------- -- overload function: create(float, cc.Scene) -- diff --git a/cocos/scripting/lua-bindings/auto/api/TransitionZoomFlipY.lua b/cocos/scripting/lua-bindings/auto/api/TransitionZoomFlipY.lua index d7c66d7fbb..638e2f77eb 100644 --- a/cocos/scripting/lua-bindings/auto/api/TransitionZoomFlipY.lua +++ b/cocos/scripting/lua-bindings/auto/api/TransitionZoomFlipY.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module TransitionZoomFlipY +-- @extend TransitionSceneOriented + -------------------------------- -- overload function: create(float, cc.Scene) -- diff --git a/cocos/scripting/lua-bindings/auto/api/TurnOffTiles.lua b/cocos/scripting/lua-bindings/auto/api/TurnOffTiles.lua index 3a036fa401..c6ea7aec8d 100644 --- a/cocos/scripting/lua-bindings/auto/api/TurnOffTiles.lua +++ b/cocos/scripting/lua-bindings/auto/api/TurnOffTiles.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module TurnOffTiles +-- @extend TiledGrid3DAction + -------------------------------- -- @function [parent=#TurnOffTiles] turnOnTile -- @param self @@ -29,4 +31,19 @@ -- @param #unsigned int int -- @return TurnOffTiles#TurnOffTiles ret (retunr value: cc.TurnOffTiles) +-------------------------------- +-- @function [parent=#TurnOffTiles] startWithTarget +-- @param self +-- @param #cc.Node node + +-------------------------------- +-- @function [parent=#TurnOffTiles] clone +-- @param self +-- @return TurnOffTiles#TurnOffTiles ret (return value: cc.TurnOffTiles) + +-------------------------------- +-- @function [parent=#TurnOffTiles] update +-- @param self +-- @param #float float + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/Tween.lua b/cocos/scripting/lua-bindings/auto/api/Tween.lua index 4d9b1b670d..249559b14f 100644 --- a/cocos/scripting/lua-bindings/auto/api/Tween.lua +++ b/cocos/scripting/lua-bindings/auto/api/Tween.lua @@ -1,6 +1,7 @@ -------------------------------- -- @module Tween + -------------------------------- -- @function [parent=#Tween] getAnimation -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/Twirl.lua b/cocos/scripting/lua-bindings/auto/api/Twirl.lua index 2854555d06..16dd425b13 100644 --- a/cocos/scripting/lua-bindings/auto/api/Twirl.lua +++ b/cocos/scripting/lua-bindings/auto/api/Twirl.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module Twirl +-- @extend Grid3DAction + -------------------------------- -- @function [parent=#Twirl] setAmplitudeRate -- @param self @@ -41,6 +43,16 @@ -- @param #float float -- @return Twirl#Twirl ret (return value: cc.Twirl) +-------------------------------- +-- @function [parent=#Twirl] clone +-- @param self +-- @return Twirl#Twirl ret (return value: cc.Twirl) + +-------------------------------- +-- @function [parent=#Twirl] update +-- @param self +-- @param #float float + -------------------------------- -- @function [parent=#Twirl] Twirl -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/UserDefault.lua b/cocos/scripting/lua-bindings/auto/api/UserDefault.lua index a694227a02..6ab96f4d0d 100644 --- a/cocos/scripting/lua-bindings/auto/api/UserDefault.lua +++ b/cocos/scripting/lua-bindings/auto/api/UserDefault.lua @@ -1,6 +1,7 @@ -------------------------------- -- @module UserDefault + -------------------------------- -- @function [parent=#UserDefault] setIntegerForKey -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/Waves.lua b/cocos/scripting/lua-bindings/auto/api/Waves.lua index ec017b7e0a..10a03953aa 100644 --- a/cocos/scripting/lua-bindings/auto/api/Waves.lua +++ b/cocos/scripting/lua-bindings/auto/api/Waves.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module Waves +-- @extend Grid3DAction + -------------------------------- -- @function [parent=#Waves] getAmplitudeRate -- @param self @@ -32,6 +34,16 @@ -- @param #bool bool -- @return Waves#Waves ret (return value: cc.Waves) +-------------------------------- +-- @function [parent=#Waves] clone +-- @param self +-- @return Waves#Waves ret (return value: cc.Waves) + +-------------------------------- +-- @function [parent=#Waves] update +-- @param self +-- @param #float float + -------------------------------- -- @function [parent=#Waves] Waves -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/Waves3D.lua b/cocos/scripting/lua-bindings/auto/api/Waves3D.lua index 8971a94063..00bdfae641 100644 --- a/cocos/scripting/lua-bindings/auto/api/Waves3D.lua +++ b/cocos/scripting/lua-bindings/auto/api/Waves3D.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module Waves3D +-- @extend Grid3DAction + -------------------------------- -- @function [parent=#Waves3D] getAmplitudeRate -- @param self @@ -30,4 +32,14 @@ -- @param #float float -- @return Waves3D#Waves3D ret (return value: cc.Waves3D) +-------------------------------- +-- @function [parent=#Waves3D] clone +-- @param self +-- @return Waves3D#Waves3D ret (return value: cc.Waves3D) + +-------------------------------- +-- @function [parent=#Waves3D] update +-- @param self +-- @param #float float + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/WavesTiles3D.lua b/cocos/scripting/lua-bindings/auto/api/WavesTiles3D.lua index 11fccd28c5..8a7db3d07a 100644 --- a/cocos/scripting/lua-bindings/auto/api/WavesTiles3D.lua +++ b/cocos/scripting/lua-bindings/auto/api/WavesTiles3D.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module WavesTiles3D +-- @extend TiledGrid3DAction + -------------------------------- -- @function [parent=#WavesTiles3D] getAmplitudeRate -- @param self @@ -30,4 +32,14 @@ -- @param #float float -- @return WavesTiles3D#WavesTiles3D ret (return value: cc.WavesTiles3D) +-------------------------------- +-- @function [parent=#WavesTiles3D] clone +-- @param self +-- @return WavesTiles3D#WavesTiles3D ret (return value: cc.WavesTiles3D) + +-------------------------------- +-- @function [parent=#WavesTiles3D] update +-- @param self +-- @param #float float + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/Widget.lua b/cocos/scripting/lua-bindings/auto/api/Widget.lua index a0341bff7d..5bea038c34 100644 --- a/cocos/scripting/lua-bindings/auto/api/Widget.lua +++ b/cocos/scripting/lua-bindings/auto/api/Widget.lua @@ -1,6 +1,8 @@ -------------------------------- -- @module Widget +-- @extend Node + -------------------------------- -- @function [parent=#Widget] setSizePercent -- @param self @@ -308,6 +310,103 @@ -- @param self -- @return Widget#Widget ret (return value: ccui.Widget) +-------------------------------- +-- overload function: addChild(cc.Node, int) +-- +-- overload function: addChild(cc.Node) +-- +-- overload function: addChild(cc.Node, int, int) +-- +-- @function [parent=#Widget] addChild +-- @param self +-- @param #cc.Node node +-- @param #int int +-- @param #int int + +-------------------------------- +-- @function [parent=#Widget] setColor +-- @param self +-- @param #color3B_table color3b + +-------------------------------- +-- @function [parent=#Widget] removeFromParent +-- @param self + +-------------------------------- +-- @function [parent=#Widget] removeAllChildrenWithCleanup +-- @param self +-- @param #bool bool + +-------------------------------- +-- @function [parent=#Widget] removeAllChildren +-- @param self + +-------------------------------- +-- @function [parent=#Widget] sortAllChildren +-- @param self + +-------------------------------- +-- @function [parent=#Widget] removeChild +-- @param self +-- @param #cc.Node node +-- @param #bool bool + +-------------------------------- +-- overload function: getChildren() +-- +-- overload function: getChildren() +-- +-- @function [parent=#Widget] getChildren +-- @param self +-- @return array_table#array_table ret (retunr value: array_table) + +-------------------------------- +-- @function [parent=#Widget] getDescription +-- @param self +-- @return string#string ret (return value: string) + +-------------------------------- +-- @function [parent=#Widget] getChildByTag +-- @param self +-- @param #int int +-- @return Node#Node ret (return value: cc.Node) + +-------------------------------- +-- @function [parent=#Widget] removeFromParentAndCleanup +-- @param self +-- @param #bool bool + +-------------------------------- +-- @function [parent=#Widget] getColor +-- @param self +-- @return color3B_table#color3B_table ret (return value: color3B_table) + +-------------------------------- +-- @function [parent=#Widget] setOpacity +-- @param self +-- @param #unsigned char char + +-------------------------------- +-- @function [parent=#Widget] setPosition +-- @param self +-- @param #point_table point + +-------------------------------- +-- @function [parent=#Widget] removeChildByTag +-- @param self +-- @param #int int +-- @param #bool bool + +-------------------------------- +-- @function [parent=#Widget] getOpacity +-- @param self +-- @return unsigned char#unsigned char ret (return value: unsigned char) + +-------------------------------- +-- @function [parent=#Widget] getChildrenCount +-- @param self +-- @return long#long ret (return value: long) + -------------------------------- -- @function [parent=#Widget] Widget -- @param self diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp.REMOVED.git-id b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp.REMOVED.git-id index 033466eb38..7f730a1b9b 100644 --- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp.REMOVED.git-id +++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp.REMOVED.git-id @@ -1 +1 @@ -44ccccc9572e8345c6b9903e8f10abcf0937d1cc \ No newline at end of file +863b8b6206bcb9c764421840a321a2b6f04ac48c \ No newline at end of file diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp index 3e656d80e9..a180c594be 100644 --- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp +++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp @@ -1543,6 +1543,8 @@ int register_all_cocos2dx(lua_State* tolua_S); + + diff --git a/cocos/scripting/lua-bindings/proj.ios_mac/cocos2d_lua_bindings.xcodeproj/project.pbxproj b/cocos/scripting/lua-bindings/proj.ios_mac/cocos2d_lua_bindings.xcodeproj/project.pbxproj index 63eca00029..83145b2273 100644 --- a/cocos/scripting/lua-bindings/proj.ios_mac/cocos2d_lua_bindings.xcodeproj/project.pbxproj +++ b/cocos/scripting/lua-bindings/proj.ios_mac/cocos2d_lua_bindings.xcodeproj/project.pbxproj @@ -708,7 +708,7 @@ 1551A336158F2AB200E66CFE /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0500; + LastUpgradeCheck = 0510; ORGANIZATIONNAME = ""; }; buildConfigurationList = 1551A339158F2AB200E66CFE /* Build configuration list for PBXProject "cocos2d_lua_bindings" */; @@ -851,7 +851,6 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = YES; - ARCHS = "$(ARCHS_STANDARD_64_BIT)"; CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_WARN_BOOL_CONVERSION = YES; @@ -889,7 +888,6 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = YES; - ARCHS = "$(ARCHS_STANDARD_64_BIT)"; CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_WARN_BOOL_CONVERSION = YES; @@ -923,7 +921,6 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = YES; - ARCHS = "$(ARCHS_STANDARD)"; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = ""; GCC_PREPROCESSOR_DEFINITIONS = ( @@ -948,7 +945,6 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = YES; - ARCHS = "$(ARCHS_STANDARD)"; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = ""; GCC_PREPROCESSOR_DEFINITIONS = ( @@ -973,7 +969,6 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = YES; - ARCHS = "$(ARCHS_STANDARD_64_BIT)"; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = ""; GCC_PREPROCESSOR_DEFINITIONS = ( @@ -993,7 +988,6 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = YES; - ARCHS = "$(ARCHS_STANDARD_64_BIT)"; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = ""; GCC_PREPROCESSOR_DEFINITIONS = ( diff --git a/cocos/scripting/lua-bindings/proj.ios_mac/cocos2d_lua_bindings.xcodeproj/xcshareddata/xcschemes/luabindings Mac.xcscheme b/cocos/scripting/lua-bindings/proj.ios_mac/cocos2d_lua_bindings.xcodeproj/xcshareddata/xcschemes/luabindings Mac.xcscheme index 01e86ee2ce..59ef8fc5d8 100644 --- a/cocos/scripting/lua-bindings/proj.ios_mac/cocos2d_lua_bindings.xcodeproj/xcshareddata/xcschemes/luabindings Mac.xcscheme +++ b/cocos/scripting/lua-bindings/proj.ios_mac/cocos2d_lua_bindings.xcodeproj/xcshareddata/xcschemes/luabindings Mac.xcscheme @@ -1,6 +1,6 @@ (_richElements.at(i)); @@ -262,7 +262,7 @@ void RichText::handleTextRenderer(const char *text, const char *fontName, float { float overstepPercent = (-_leftSpaceWidth) / textRendererWidth; std::string curText = text; - int stringLength = curText.length(); + size_t stringLength = curText.length(); int leftLength = stringLength * (1.0f - overstepPercent); std::string leftWords = curText.substr(0, leftLength); std::string cutWords = curText.substr(leftLength, curText.length()-1); @@ -322,12 +322,12 @@ void RichText::formarRenderers() Vector* row = (_elementRenders[0]); float nextPosX = 0.0f; - for (int j=0; jsize(); j++) + for (ssize_t j=0; jsize(); j++) { Node* l = row->at(j); l->setAnchorPoint(Point::ZERO); l->setPosition(Point(nextPosX, 0.0f)); - _elementRenderersContainer->addChild(l, 1, j); + _elementRenderersContainer->addChild(l, 1, (int)j); Size iSize = l->getContentSize(); newContentSizeWidth += iSize.width; newContentSizeHeight = MAX(newContentSizeHeight, iSize.height); @@ -340,11 +340,11 @@ void RichText::formarRenderers() float newContentSizeHeight = 0.0f; float *maxHeights = new float[_elementRenders.size()]; - for (size_t i=0; i<_elementRenders.size(); i++) + for (ssize_t i=0; i<_elementRenders.size(); i++) { Vector* row = (_elementRenders[i]); float maxHeight = 0.0f; - for (int j=0; jsize(); j++) + for (ssize_t j=0; jsize(); j++) { Node* l = row->at(j); maxHeight = MAX(l->getContentSize().height, maxHeight); @@ -355,18 +355,18 @@ void RichText::formarRenderers() float nextPosY = _customSize.height; - for (size_t i=0; i<_elementRenders.size(); i++) + for (ssize_t i=0; i<_elementRenders.size(); i++) { Vector* row = (_elementRenders[i]); float nextPosX = 0.0f; nextPosY -= (maxHeights[i] + _verticalSpace); - for (int j=0; jsize(); j++) + for (ssize_t j=0; jsize(); j++) { Node* l = row->at(j); l->setAnchorPoint(Point::ZERO); l->setPosition(Point(nextPosX, nextPosY)); - _elementRenderersContainer->addChild(l, 1, i*10 + j); + _elementRenderersContainer->addChild(l, 1, (int)(i*10 + j)); nextPosX += l->getContentSize().width; } } @@ -375,7 +375,7 @@ void RichText::formarRenderers() } size_t length = _elementRenders.size(); - for (size_t i = 0; i* l = _elementRenders[i]; l->clear(); diff --git a/cocos/ui/UITextField.cpp b/cocos/ui/UITextField.cpp index 30f633503c..1a9cb28b7b 100644 --- a/cocos/ui/UITextField.cpp +++ b/cocos/ui/UITextField.cpp @@ -91,7 +91,7 @@ bool UICCTextField::onTextFieldAttachWithIME(TextFieldTTF *pSender) return false; } -bool UICCTextField::onTextFieldInsertText(TextFieldTTF *pSender, const char *text, int nLen) +bool UICCTextField::onTextFieldInsertText(TextFieldTTF *pSender, const char *text, size_t nLen) { if (nLen == 1 && strcmp(text, "\n") == 0) { @@ -121,7 +121,7 @@ bool UICCTextField::onTextFieldDetachWithIME(TextFieldTTF *pSender) return false; } -void UICCTextField::insertText(const char * text, int len) +void UICCTextField::insertText(const char * text, size_t len) { std::string input_text = text; diff --git a/cocos/ui/UITextField.h b/cocos/ui/UITextField.h index 2c61d2724e..3a3caed343 100644 --- a/cocos/ui/UITextField.h +++ b/cocos/ui/UITextField.h @@ -49,10 +49,10 @@ public: // CCTextFieldDelegate virtual bool onTextFieldAttachWithIME(TextFieldTTF *pSender) override; virtual bool onTextFieldDetachWithIME(TextFieldTTF * pSender) override; - virtual bool onTextFieldInsertText(TextFieldTTF * pSender, const char * text, int nLen) override; + virtual bool onTextFieldInsertText(TextFieldTTF * pSender, const char * text, size_t nLen) override; virtual bool onTextFieldDeleteBackward(TextFieldTTF * pSender, const char * delText, int nLen) override; - void insertText(const char* text, int len); + void insertText(const char* text, size_t len); void deleteBackward(); void openIME(); diff --git a/extensions/GUI/CCScrollView/CCScrollView.cpp b/extensions/GUI/CCScrollView/CCScrollView.cpp index e858b36cdf..ef943f9228 100644 --- a/extensions/GUI/CCScrollView/CCScrollView.cpp +++ b/extensions/GUI/CCScrollView/CCScrollView.cpp @@ -41,6 +41,7 @@ NS_CC_EXT_BEGIN #define BOUNCE_DURATION 0.15f #define INSET_RATIO 0.2f #define MOVE_INCH 7.0f/160.0f +#define BOUNCE_BACK_FACTOR 0.35f static float convertDistanceFromPointToInch(float pointDis) { @@ -679,14 +680,32 @@ void ScrollView::onTouchMoved(Touch* touch, Event* event) if (_direction == Direction::VERTICAL) { dis = moveDistance.y; + float pos = _container->getPosition().y; + if (!(minContainerOffset().y <= pos && pos <= maxContainerOffset().y)) { + moveDistance.y *= BOUNCE_BACK_FACTOR; + } } else if (_direction == Direction::HORIZONTAL) { dis = moveDistance.x; + float pos = _container->getPosition().x; + if (!(minContainerOffset().x <= pos && pos <= maxContainerOffset().x)) { + moveDistance.x *= BOUNCE_BACK_FACTOR; + } } else { dis = sqrtf(moveDistance.x*moveDistance.x + moveDistance.y*moveDistance.y); + + float pos = _container->getPosition().y; + if (!(minContainerOffset().y <= pos && pos <= maxContainerOffset().y)) { + moveDistance.y *= BOUNCE_BACK_FACTOR; + } + + pos = _container->getPosition().x; + if (!(minContainerOffset().x <= pos && pos <= maxContainerOffset().x)) { + moveDistance.x *= BOUNCE_BACK_FACTOR; + } } if (!_touchMoved && fabs(convertDistanceFromPointToInch(dis)) < MOVE_INCH ) @@ -703,7 +722,7 @@ void ScrollView::onTouchMoved(Touch* touch, Event* event) _touchPoint = newPoint; _touchMoved = true; - if (frame.containsPoint(this->convertToWorldSpace(newPoint))) + if (_dragging) { switch (_direction) { diff --git a/templates/cocos2dx_files.json.REMOVED.git-id b/templates/cocos2dx_files.json.REMOVED.git-id index 5bd936f744..d5b8ab1694 100644 --- a/templates/cocos2dx_files.json.REMOVED.git-id +++ b/templates/cocos2dx_files.json.REMOVED.git-id @@ -1 +1 @@ -4dfa7f46c2e06a4b3b95120bea3b8689f31ddad0 \ No newline at end of file +8268cc82237edfa69eff7e9ea70b629e18df071d \ No newline at end of file diff --git a/tests/cpp-tests/Classes/ConsoleTest/ConsoleTest.cpp b/tests/cpp-tests/Classes/ConsoleTest/ConsoleTest.cpp index d9c00916d0..32e000891c 100644 --- a/tests/cpp-tests/Classes/ConsoleTest/ConsoleTest.cpp +++ b/tests/cpp-tests/Classes/ConsoleTest/ConsoleTest.cpp @@ -35,6 +35,7 @@ #include #include #endif +#include "base64.h" //------------------------------------------------------------------ // @@ -261,51 +262,45 @@ void ConsoleUploadFile::uploadFile() CCLOG("ConsoleUploadFile: could not open file %s", _src_file_path.c_str()); return; } - - //read file size - fseek(fp, 0, SEEK_END); - int size = ftell(fp); - fseek(fp, 0, SEEK_SET); - char sb[32]; - sprintf(sb, "%d", size); + std::string tmp = "upload"; tmp += " "; tmp += _target_file_name; tmp += " "; - tmp += sb; - tmp += "\n"; char cmd[512]; strcpy(cmd, tmp.c_str()); send(sfd,cmd,strlen(cmd),0); - - // allocate memory to contain the whole file: - char* buffer = (char*) malloc (sizeof(char)*size); - if (buffer == NULL) + while(true) { - CCLOG("ConsoleUploadFile: memory allocate error!"); - return; + char buffer[3], *out; + unsigned char *in; + in = (unsigned char *)buffer; + // copy the file into the buffer: + int ret = fread(buffer, 1, 3, fp); + if (ret > 0) + { + base64Encode(in, ret, &out); + send(sfd, out, 4, 0); + free(out); + if(ret < 3) + { + //eof + break; + } + } + else + { + //read error + break; + } } - - // copy the file into the buffer: - int ret = fread(buffer, 1, size, fp); - if (ret != size) - { - CCLOG("ConsoleUploadFile: read file: %s error!",_src_file_path.c_str()); - return; - } - - //send to console socket - for(int i = 0; i < size; i++) - { - send(sfd, &buffer[i], 1, 0); - } - + char l = '\n'; + send(sfd, &l, 1, 0); // terminate fclose (fp); - free (buffer); - + #if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) closesocket(sfd); WSACleanup(); diff --git a/tests/cpp-tests/Classes/LabelTest/LabelTestNew.cpp b/tests/cpp-tests/Classes/LabelTest/LabelTestNew.cpp index c4f647dcfc..dbd963d0bd 100644 --- a/tests/cpp-tests/Classes/LabelTest/LabelTestNew.cpp +++ b/tests/cpp-tests/Classes/LabelTest/LabelTestNew.cpp @@ -77,7 +77,8 @@ static std::function createFunctions[] = CL(LabelCrashTest), CL(LabelTTFOldNew), CL(LabelFontNameTest), - CL(LabelAlignmentTest) + CL(LabelAlignmentTest), + CL(LabelIssue4428Test) }; #define MAX_LAYER (sizeof(createFunctions) / sizeof(createFunctions[0])) @@ -1779,3 +1780,33 @@ std::string LabelAlignmentTest::subtitle() const { return "Select the buttons on the sides to change alignment"; } + +LabelIssue4428Test::LabelIssue4428Test() +{ + auto size = Director::getInstance()->getWinSize(); + + auto label = Label::createWithBMFont( "fonts/bitmapFontTest3.fnt", "123\n456"); + label->setPosition(Point(size.width /2.0f, size.height / 2.0f)); + label->setAnchorPoint(Point::ANCHOR_BOTTOM_LEFT); + addChild(label); + + int len = label->getStringLength(); + for (int i = 0; i < len; ++i) + { + auto sprite = label->getLetter(i); + if (sprite != nullptr) + { + sprite->setFlippedY(true); + } + } +} + +std::string LabelIssue4428Test::title() const +{ + return "New Label Bugs Test"; +} + +std::string LabelIssue4428Test::subtitle() const +{ + return "Reorder issue #4428.The label should be flipped vertically."; +} diff --git a/tests/cpp-tests/Classes/LabelTest/LabelTestNew.h b/tests/cpp-tests/Classes/LabelTest/LabelTestNew.h index 6017b9e851..7ea2f570e3 100644 --- a/tests/cpp-tests/Classes/LabelTest/LabelTestNew.h +++ b/tests/cpp-tests/Classes/LabelTest/LabelTestNew.h @@ -484,6 +484,17 @@ private: TextVAlignment _vertAlign; }; +class LabelIssue4428Test : public AtlasDemoNew +{ +public: + CREATE_FUNC(LabelIssue4428Test); + + LabelIssue4428Test(); + + virtual std::string title() const override; + virtual std::string subtitle() const override; +}; + // we don't support linebreak mode #endif diff --git a/tests/cpp-tests/Classes/MenuTest/MenuTest.cpp b/tests/cpp-tests/Classes/MenuTest/MenuTest.cpp index 712935683b..bb4053c07a 100644 --- a/tests/cpp-tests/Classes/MenuTest/MenuTest.cpp +++ b/tests/cpp-tests/Classes/MenuTest/MenuTest.cpp @@ -131,6 +131,8 @@ MenuLayerMainMenu::MenuLayerMainMenu() addChild(menu); menu->setPosition(Point(s.width/2, s.height/2)); + menu->setScale(0); + menu->runAction(ScaleTo::create(1,1)); } bool MenuLayerMainMenu::onTouchBegan(Touch *touch, Event * event) diff --git a/tests/cpp-tests/proj.ios/main.m b/tests/cpp-tests/proj.ios/main.m index b94d77dc22..59bc34dfe9 100644 --- a/tests/cpp-tests/proj.ios/main.m +++ b/tests/cpp-tests/proj.ios/main.m @@ -8,8 +8,6 @@ #import -// Under iOS and the Simulator, we can use an alternate Accelerometer interface -#import "AccelerometerSimulation.h" int main(int argc, char *argv[]) { diff --git a/tools/bindings-generator b/tools/bindings-generator index 34dfbf6497..4e49198989 160000 --- a/tools/bindings-generator +++ b/tools/bindings-generator @@ -1 +1 @@ -Subproject commit 34dfbf64971a955995fe9762ab33ddbf907a1be3 +Subproject commit 4e49198989adf8e55ac70756a035fc7f195e8e36 diff --git a/tools/cocos2d-console b/tools/cocos2d-console index 79fa77ec13..368bd5dad6 160000 --- a/tools/cocos2d-console +++ b/tools/cocos2d-console @@ -1 +1 @@ -Subproject commit 79fa77ec132d6037f35110bde66fb882d82eb0de +Subproject commit 368bd5dad61df0c7610479ac67513b450ba08b45 diff --git a/tools/jenkins-scripts/cocos-console-test.py b/tools/jenkins-scripts/cocos-console-test.py index 2c67ab746d..a596fbcec9 100755 --- a/tools/jenkins-scripts/cocos-console-test.py +++ b/tools/jenkins-scripts/cocos-console-test.py @@ -4,11 +4,26 @@ import os import sys +import json + + +# get payload argvs +console_param = 'create' +# payload = '' +if os.environ.has_key('payload'): + payload_str = os.environ['payload'] + payload = json.loads(payload_str) + if payload.has_key('console'): + console_param = payload['console'] +print 'console_param:',console_param + +console_param_arr = console_param.split(' ') project_types = ['cpp', 'lua'] PROJ_SUFFIX = 'Proj' phonePlats = ['mac','ios','android'] +#need use console's position, perhaps should be set an env-param cocos_console_dir = 'tools/cocos2d-console/bin/' #now cocos2d-console suport different run on Platforms, e.g: only run android on win @@ -18,19 +33,6 @@ runSupport = { 'linux' : [0, 0, 1] } -_argvs = sys.argv -print 'input argvs:', _argvs[1], _argvs[2] -_will_create = False -_will_run = False -if _argvs[1]=='create' || _argvs[2]=='create': - _will_create = True -if _argvs[1]=='run' || _argvs[2]=='run': - _will_create = True - _will_run = True -if _will_create == False and _will_run == False: - _will_create = True - _will_run = True - curPlat = sys.platform if curPlat.find('linux') >= 0: curPlat = 'linux' @@ -47,12 +49,10 @@ def clean_project(): def create_project(): print 'will create_project: ' - idx = 0 for proj in project_types: print 'proj: ', proj - cmd = 'cocos new -l '+proj+' '+proj+PROJ_SUFFIX + cmd = './'+cocos_console_dir+'cocos new -l '+proj+' '+proj+PROJ_SUFFIX print proj,'cmd:',cmd - idx += 1 info_create = os.system(cmd) #call cmd on win is diff print 'create project',proj,' is:', not info_create def build_run(): @@ -60,7 +60,7 @@ def build_run(): for proj in project_types: idx = 0 for phone in phonePlats: - cmd = 'cocos run -p '+phone+' -s '+proj+PROJ_SUFFIX + cmd = './'+cocos_console_dir+'cocos run -p '+phone+' -s '+proj+PROJ_SUFFIX print proj,'cmd:',cmd if runSupport[curPlat][idx]: info_run = os.system(cmd) @@ -68,10 +68,9 @@ def build_run(): idx += 1 def main(): - if _will_create: - clean_project() - create_project() - if _will_run: + clean_project() + create_project() + if console_param_arr.count('run'): build_run() # -------------- main -------------- diff --git a/tools/jenkins-scripts/job-comment-trigger.py b/tools/jenkins-scripts/job-comment-trigger.py index 5d1bfd1493..f133d27f4e 100644 --- a/tools/jenkins-scripts/job-comment-trigger.py +++ b/tools/jenkins-scripts/job-comment-trigger.py @@ -26,7 +26,11 @@ def main(): print comment_body pattern = re.compile("\[ci(\s+)rebuild\]", re.I) result = pattern.search(comment_body) - if result is None: + + # will check console/console create + searchConsole = re.search('\[console.*\]', comment_body) + + if result is None and searchConsole is None: print 'skip build for pull request #' + str(pr_num) return(0) @@ -75,7 +79,15 @@ def main(): except: traceback.print_exc() - job_trigger_url = os.environ['JOB_TRIGGER_URL'] + job_trigger_url = '' + if result: + job_trigger_url = os.environ['JOB_TRIGGER_URL'] + if searchConsole: + consoleOper = searchConsole.group() + job_trigger_url = os.environ['JOB_CONSOLE_TEST_URL'] + payload_forword['console'] = consoleOper + print 'job_trigger_url is: ', job_trigger_url + #send trigger and payload post_data = {'payload':""} post_data['payload']= json.dumps(payload_forword) diff --git a/tools/jenkins-scripts/pull-request-builder.py b/tools/jenkins-scripts/pull-request-builder.py index 713315fc41..29da6146d8 100755 --- a/tools/jenkins-scripts/pull-request-builder.py +++ b/tools/jenkins-scripts/pull-request-builder.py @@ -95,7 +95,9 @@ def main(): #update submodule git_update_submodule = "git submodule update --init --force" - os.system(git_update_submodule) + ret = os.system(git_update_submodule) + if(ret != 0): + return(1) # Generate binding glue codes if(branch == 'develop'): @@ -136,7 +138,7 @@ def main(): if(branch == 'develop'): if(node_name == 'android_mac') or (node_name == 'android_win7'): print "Start build android..." - ret = os.system("python build/android-build.py -n -j10 cpp") + ret = os.system("python build/android-build.py -n -j10 all") elif(node_name == 'win32_win7'): ret = subprocess.call('"%VS110COMNTOOLS%..\IDE\devenv.com" "build\cocos2d-win32.vc2012.sln" /Build "Debug|Win32"', shell=True) elif(node_name == 'ios_mac'): diff --git a/tools/jenkins-scripts/watchdog.py b/tools/jenkins-scripts/watchdog.py index feff7a3731..d95b6b9a84 100644 --- a/tools/jenkins-scripts/watchdog.py +++ b/tools/jenkins-scripts/watchdog.py @@ -7,7 +7,7 @@ import os #check & kill dead buid def build_time(_job): #get jenkins-job-watchdog-threshold - threshold = os.environ['jenkins-job-watchdog-threshold'] + threshold = int(os.environ['jenkins-job-watchdog-threshold']) #Get last build running build = _job.get_last_build() running = build.is_running() @@ -36,8 +36,8 @@ def build_time(_job): build.stop() def main(): - username = os.environ['username'] - password = os.environ['password'] + username = os.environ['JENKINS_ADMIN'] + password = os.environ['JENKINS_ADMIN_PW'] J = Jenkins('http://115.28.134.83:8000',username,password) #get all jenkins jobs for key,job in J.iteritems():