Skip to content

Commit e7a9ffb

Browse files
CocosRobotminggo
CocosRobot
authored and
minggo
committed
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17780)
1 parent 6dcaa9f commit e7a9ffb

File tree

3 files changed

+28
-87
lines changed

3 files changed

+28
-87
lines changed

‎cocos/scripting/lua-bindings/auto/api/Timer.lua

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,6 @@
44
-- @extend Ref
55
-- @parent_module cc
66

7-
--------------------------------
8-
-- get interval in seconds
9-
-- @function [parent=#Timer] getInterval
10-
-- @param self
11-
-- @return float#float ret (return value: float)
12-
137
--------------------------------
148
--
159
-- @function [parent=#Timer] setupTimerWithInterval
@@ -19,13 +13,6 @@
1913
-- @param #float delay
2014
-- @return Timer#Timer self (return value: cc.Timer)
2115

22-
--------------------------------
23-
-- set interval in seconds
24-
-- @function [parent=#Timer] setInterval
25-
-- @param self
26-
-- @param #float interval
27-
-- @return Timer#Timer self (return value: cc.Timer)
28-
2916
--------------------------------
3017
-- triggers the timer
3118
-- @function [parent=#Timer] update
@@ -39,6 +26,12 @@
3926
-- @param self
4027
-- @return bool#bool ret (return value: bool)
4128

29+
--------------------------------
30+
--
31+
-- @function [parent=#Timer] isExhausted
32+
-- @param self
33+
-- @return bool#bool ret (return value: bool)
34+
4235
--------------------------------
4336
--
4437
-- @function [parent=#Timer] trigger

‎cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp

Lines changed: 22 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -17188,53 +17188,6 @@ int lua_register_cocos2dx_Director(lua_State* tolua_S)
1718817188
return 1;
1718917189
}
1719017190

17191-
int lua_cocos2dx_Timer_getInterval(lua_State* tolua_S)
17192-
{
17193-
int argc = 0;
17194-
cocos2d::Timer* cobj = nullptr;
17195-
bool ok = true;
17196-
17197-
#if COCOS2D_DEBUG >= 1
17198-
tolua_Error tolua_err;
17199-
#endif
17200-
17201-
17202-
#if COCOS2D_DEBUG >= 1
17203-
if (!tolua_isusertype(tolua_S,1,"cc.Timer",0,&tolua_err)) goto tolua_lerror;
17204-
#endif
17205-
17206-
cobj = (cocos2d::Timer*)tolua_tousertype(tolua_S,1,0);
17207-
17208-
#if COCOS2D_DEBUG >= 1
17209-
if (!cobj)
17210-
{
17211-
tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_Timer_getInterval'", nullptr);
17212-
return 0;
17213-
}
17214-
#endif
17215-
17216-
argc = lua_gettop(tolua_S)-1;
17217-
if (argc == 0)
17218-
{
17219-
if(!ok)
17220-
{
17221-
tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_Timer_getInterval'", nullptr);
17222-
return 0;
17223-
}
17224-
double ret = cobj->getInterval();
17225-
tolua_pushnumber(tolua_S,(lua_Number)ret);
17226-
return 1;
17227-
}
17228-
luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.Timer:getInterval",argc, 0);
17229-
return 0;
17230-
17231-
#if COCOS2D_DEBUG >= 1
17232-
tolua_lerror:
17233-
tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Timer_getInterval'.",&tolua_err);
17234-
#endif
17235-
17236-
return 0;
17237-
}
1723817191
int lua_cocos2dx_Timer_setupTimerWithInterval(lua_State* tolua_S)
1723917192
{
1724017193
int argc = 0;
@@ -17291,7 +17244,7 @@ int lua_cocos2dx_Timer_setupTimerWithInterval(lua_State* tolua_S)
1729117244

1729217245
return 0;
1729317246
}
17294-
int lua_cocos2dx_Timer_setInterval(lua_State* tolua_S)
17247+
int lua_cocos2dx_Timer_update(lua_State* tolua_S)
1729517248
{
1729617249
int argc = 0;
1729717250
cocos2d::Timer* cobj = nullptr;
@@ -17311,7 +17264,7 @@ int lua_cocos2dx_Timer_setInterval(lua_State* tolua_S)
1731117264
#if COCOS2D_DEBUG >= 1
1731217265
if (!cobj)
1731317266
{
17314-
tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_Timer_setInterval'", nullptr);
17267+
tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_Timer_update'", nullptr);
1731517268
return 0;
1731617269
}
1731717270
#endif
@@ -17321,27 +17274,27 @@ int lua_cocos2dx_Timer_setInterval(lua_State* tolua_S)
1732117274
{
1732217275
double arg0;
1732317276

17324-
ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Timer:setInterval");
17277+
ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Timer:update");
1732517278
if(!ok)
1732617279
{
17327-
tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_Timer_setInterval'", nullptr);
17280+
tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_Timer_update'", nullptr);
1732817281
return 0;
1732917282
}
17330-
cobj->setInterval(arg0);
17283+
cobj->update(arg0);
1733117284
lua_settop(tolua_S, 1);
1733217285
return 1;
1733317286
}
17334-
luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.Timer:setInterval",argc, 1);
17287+
luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.Timer:update",argc, 1);
1733517288
return 0;
1733617289

1733717290
#if COCOS2D_DEBUG >= 1
1733817291
tolua_lerror:
17339-
tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Timer_setInterval'.",&tolua_err);
17292+
tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Timer_update'.",&tolua_err);
1734017293
#endif
1734117294

1734217295
return 0;
1734317296
}
17344-
int lua_cocos2dx_Timer_update(lua_State* tolua_S)
17297+
int lua_cocos2dx_Timer_isAborted(lua_State* tolua_S)
1734517298
{
1734617299
int argc = 0;
1734717300
cocos2d::Timer* cobj = nullptr;
@@ -17361,37 +17314,34 @@ int lua_cocos2dx_Timer_update(lua_State* tolua_S)
1736117314
#if COCOS2D_DEBUG >= 1
1736217315
if (!cobj)
1736317316
{
17364-
tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_Timer_update'", nullptr);
17317+
tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_Timer_isAborted'", nullptr);
1736517318
return 0;
1736617319
}
1736717320
#endif
1736817321

1736917322
argc = lua_gettop(tolua_S)-1;
17370-
if (argc == 1)
17323+
if (argc == 0)
1737117324
{
17372-
double arg0;
17373-
17374-
ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Timer:update");
1737517325
if(!ok)
1737617326
{
17377-
tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_Timer_update'", nullptr);
17327+
tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_Timer_isAborted'", nullptr);
1737817328
return 0;
1737917329
}
17380-
cobj->update(arg0);
17381-
lua_settop(tolua_S, 1);
17330+
bool ret = cobj->isAborted();
17331+
tolua_pushboolean(tolua_S,(bool)ret);
1738217332
return 1;
1738317333
}
17384-
luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.Timer:update",argc, 1);
17334+
luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.Timer:isAborted",argc, 0);
1738517335
return 0;
1738617336

1738717337
#if COCOS2D_DEBUG >= 1
1738817338
tolua_lerror:
17389-
tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Timer_update'.",&tolua_err);
17339+
tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Timer_isAborted'.",&tolua_err);
1739017340
#endif
1739117341

1739217342
return 0;
1739317343
}
17394-
int lua_cocos2dx_Timer_isAborted(lua_State* tolua_S)
17344+
int lua_cocos2dx_Timer_isExhausted(lua_State* tolua_S)
1739517345
{
1739617346
int argc = 0;
1739717347
cocos2d::Timer* cobj = nullptr;
@@ -17411,7 +17361,7 @@ int lua_cocos2dx_Timer_isAborted(lua_State* tolua_S)
1741117361
#if COCOS2D_DEBUG >= 1
1741217362
if (!cobj)
1741317363
{
17414-
tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_Timer_isAborted'", nullptr);
17364+
tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_Timer_isExhausted'", nullptr);
1741517365
return 0;
1741617366
}
1741717367
#endif
@@ -17421,19 +17371,19 @@ int lua_cocos2dx_Timer_isAborted(lua_State* tolua_S)
1742117371
{
1742217372
if(!ok)
1742317373
{
17424-
tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_Timer_isAborted'", nullptr);
17374+
tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_Timer_isExhausted'", nullptr);
1742517375
return 0;
1742617376
}
17427-
bool ret = cobj->isAborted();
17377+
bool ret = cobj->isExhausted();
1742817378
tolua_pushboolean(tolua_S,(bool)ret);
1742917379
return 1;
1743017380
}
17431-
luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.Timer:isAborted",argc, 0);
17381+
luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.Timer:isExhausted",argc, 0);
1743217382
return 0;
1743317383

1743417384
#if COCOS2D_DEBUG >= 1
1743517385
tolua_lerror:
17436-
tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Timer_isAborted'.",&tolua_err);
17386+
tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Timer_isExhausted'.",&tolua_err);
1743717387
#endif
1743817388

1743917389
return 0;
@@ -17594,11 +17544,10 @@ int lua_register_cocos2dx_Timer(lua_State* tolua_S)
1759417544
tolua_cclass(tolua_S,"Timer","cc.Timer","cc.Ref",nullptr);
1759517545

1759617546
tolua_beginmodule(tolua_S,"Timer");
17597-
tolua_function(tolua_S,"getInterval",lua_cocos2dx_Timer_getInterval);
1759817547
tolua_function(tolua_S,"setupTimerWithInterval",lua_cocos2dx_Timer_setupTimerWithInterval);
17599-
tolua_function(tolua_S,"setInterval",lua_cocos2dx_Timer_setInterval);
1760017548
tolua_function(tolua_S,"update",lua_cocos2dx_Timer_update);
1760117549
tolua_function(tolua_S,"isAborted",lua_cocos2dx_Timer_isAborted);
17550+
tolua_function(tolua_S,"isExhausted",lua_cocos2dx_Timer_isExhausted);
1760217551
tolua_function(tolua_S,"trigger",lua_cocos2dx_Timer_trigger);
1760317552
tolua_function(tolua_S,"cancel",lua_cocos2dx_Timer_cancel);
1760417553
tolua_function(tolua_S,"setAborted",lua_cocos2dx_Timer_setAborted);

‎cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2250,7 +2250,6 @@ int register_all_cocos2dx(lua_State* tolua_S);
22502250

22512251

22522252

2253-
22542253

22552254

22562255
#endif // __cocos2dx_h__

0 commit comments

Comments
 (0)