Merge pull request #9531 from samuele3hu/v3_4_bug

Synchronize the KeyCode Enum to Lua
This commit is contained in:
minggo 2014-12-17 11:32:20 +08:00
commit e7fc2a5607
1 changed files with 6 additions and 0 deletions

View File

@ -327,8 +327,11 @@ cc.KeyCodeKey =
"KEY_RETURN", "KEY_RETURN",
"KEY_CAPS_LOCK", "KEY_CAPS_LOCK",
"KEY_SHIFT", "KEY_SHIFT",
"KEY_RIGHT_SHIFT",
"KEY_CTRL", "KEY_CTRL",
"KEY_RIGHT_CTRL",
"KEY_ALT", "KEY_ALT",
"KEY_RIGHT_ALT",
"KEY_MENU", "KEY_MENU",
"KEY_HYPER", "KEY_HYPER",
"KEY_INSERT", "KEY_INSERT",
@ -488,6 +491,9 @@ for k,v in ipairs(cc.KeyCodeKey) do
end end
cc.KeyCode.KEY_BACK = cc.KeyCode.KEY_ESCAPE cc.KeyCode.KEY_BACK = cc.KeyCode.KEY_ESCAPE
cc.KeyCode.KEY_LEFT_SHIFT = cc.KeyCode.KEY_SHIFT
cc.KeyCode.KEY_LEFT_CTRL = cc.KeyCode.KEY_CTRL
cc.KeyCode.KEY_LEFT_ALT = cc.KeyCode.KEY_ALT
cc.EventAssetsManagerEx = cc.EventAssetsManagerEx =
{ {