Merge pull request #13102 from CocosRobot/update_lua_bindings_1438227193

[ci skip][AUTO]: updating luabinding & jsbinding automatically
This commit is contained in:
子龙山人 2015-07-30 11:40:32 +08:00
commit 815c8d91f0
1 changed files with 8 additions and 41 deletions

View File

@ -410,20 +410,6 @@
-- @param #unsigned int flags -- @param #unsigned int flags
-- @return Label#Label self (return value: cc.Label) -- @return Label#Label self (return value: cc.Label)
--------------------------------
--
-- @function [parent=#Label] setScaleY
-- @param self
-- @param #float scaleY
-- @return Label#Label self (return value: cc.Label)
--------------------------------
--
-- @function [parent=#Label] setScaleX
-- @param self
-- @param #float scaleX
-- @return Label#Label self (return value: cc.Label)
-------------------------------- --------------------------------
-- --
-- @function [parent=#Label] isOpacityModifyRGB -- @function [parent=#Label] isOpacityModifyRGB
@ -432,15 +418,19 @@
-------------------------------- --------------------------------
-- --
-- @function [parent=#Label] getScaleY -- @function [parent=#Label] setCameraMask
-- @param self -- @param self
-- @return float#float ret (return value: float) -- @param #unsigned short mask
-- @param #bool applyChildren
-- @return Label#Label self (return value: cc.Label)
-------------------------------- --------------------------------
-- --
-- @function [parent=#Label] getScaleX -- @function [parent=#Label] removeChild
-- @param self -- @param self
-- @return float#float ret (return value: float) -- @param #cc.Node child
-- @param #bool cleanup
-- @return Label#Label self (return value: cc.Label)
-------------------------------- --------------------------------
-- --
@ -464,13 +454,6 @@
-- @param #bool isOpacityModifyRGB -- @param #bool isOpacityModifyRGB
-- @return Label#Label self (return value: cc.Label) -- @return Label#Label self (return value: cc.Label)
--------------------------------
--
-- @function [parent=#Label] setScale
-- @param self
-- @param #float scale
-- @return Label#Label self (return value: cc.Label)
-------------------------------- --------------------------------
-- --
-- @function [parent=#Label] updateDisplayedOpacity -- @function [parent=#Label] updateDisplayedOpacity
@ -478,14 +461,6 @@
-- @param #unsigned char parentOpacity -- @param #unsigned char parentOpacity
-- @return Label#Label self (return value: cc.Label) -- @return Label#Label self (return value: cc.Label)
--------------------------------
--
-- @function [parent=#Label] removeChild
-- @param self
-- @param #cc.Node child
-- @param #bool cleanup
-- @return Label#Label self (return value: cc.Label)
-------------------------------- --------------------------------
-- --
-- @function [parent=#Label] getContentSize -- @function [parent=#Label] getContentSize
@ -505,12 +480,4 @@
-- @param #color3b_table parentColor -- @param #color3b_table parentColor
-- @return Label#Label self (return value: cc.Label) -- @return Label#Label self (return value: cc.Label)
--------------------------------
--
-- @function [parent=#Label] setCameraMask
-- @param self
-- @param #unsigned short mask
-- @param #bool applyChildren
-- @return Label#Label self (return value: cc.Label)
return nil return nil