Skip to content

Commit ec774c8

Browse files
author
Bin Zhang
committed
Merge pull request cocos2d#26 from quick-x-team/fix-lua-framework
fix lua framework
2 parents 3a03cd3 + 8ab5af8 commit ec774c8

File tree

7 files changed

+232
-165
lines changed

7 files changed

+232
-165
lines changed

cocos/scripting/lua-bindings/script/cocos2d/Cocos2dConstants.lua

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -497,7 +497,7 @@ cc.KeyCode.KEY_LEFT_ALT = cc.KeyCode.KEY_ALT
497497

498498
cc.EventAssetsManagerEx =
499499
{
500-
EventCode =
500+
EventCode =
501501
{
502502
ERROR_NO_LOCAL_MANIFEST = 0,
503503
ERROR_DOWNLOAD_MANIFEST = 1,
@@ -583,15 +583,15 @@ cc.MATRIX_STACK_TYPE =
583583
TEXTURE = 2,
584584
}
585585

586-
cc.LightType =
586+
cc.LightType =
587587
{
588588
DIRECTIONAL = 0,
589589
POINT = 1,
590590
SPOT = 2,
591591
AMBIENT = 3,
592592
}
593593

594-
cc.LightFlag =
594+
cc.LightFlag =
595595
{
596596
LIGHT0 = math.pow(2,0),
597597
LIGHT1 = math.pow(2,1),
@@ -611,11 +611,13 @@ cc.LightFlag =
611611
LIGHT15 = math.pow(2,15),
612612
}
613613

614+
cc.AsyncTaskPool = cc.AsyncTaskPool or {}
615+
614616
cc.AsyncTaskPool.TaskType =
615617
{
616618
TASK_IO = 0,
617619
TASK_NETWORK = 1,
618620
TASK_OTHER = 2,
619-
TASK_MAX_TYPE = 3,
621+
TASK_MAX_TYPE = 3,
620622
}
621623

0 commit comments

Comments
 (0)