diff --git a/scripting/lua/cocos2dx_support/LuaScriptHandlerMgr.cpp b/scripting/lua/cocos2dx_support/LuaScriptHandlerMgr.cpp index e58deec115..465275193f 100644 --- a/scripting/lua/cocos2dx_support/LuaScriptHandlerMgr.cpp +++ b/scripting/lua/cocos2dx_support/LuaScriptHandlerMgr.cpp @@ -326,6 +326,7 @@ int tolua_Cocos2d_registerScriptTouchHandler00(lua_State* tolua_S) touchesMode = Touch::DispatchMode::ONE_BY_ONE; self->setTouchMode(touchesMode); self->setTouchPriority(priority); + self->setSwallowsTouches(swallowTouches); ScriptHandlerMgr::getInstance()->addObjectHandler((void*)self, handler, ScriptHandlerMgr::kTouchesHandler); } return 0; diff --git a/scripting/lua/script/Deprecated.lua b/scripting/lua/script/Deprecated.lua index ac62100799..e1d09a6de4 100644 --- a/scripting/lua/script/Deprecated.lua +++ b/scripting/lua/script/Deprecated.lua @@ -708,17 +708,6 @@ rawset(SimpleAudioEngine,"sharedEngine",SimpleAudioEngineDeprecated.sharedEngine --functions of SimpleAudioEngine will be deprecated end ---functions of WebSocket will be deprecated begin -local WebSocketDeprecated = { } -function WebSocketDeprecated.sendBinaryMsg(self,table,size) - deprecatedTip("sendBinaryMsg","sendBinaryStringMsg") - local strMsg = string.char(unpack(table)) - return self:sendBinaryStringMsg(strMsg) -end -rawset(WebSocket,"sendBinaryMsg",WebSocketDeprecated.sendBinaryMsg) ---functions of WebSocket will be deprecated end - - --functions of CCTMXTiledMap will be deprecated begin local CCTMXTiledMapDeprecated = { } function CCTMXTiledMapDeprecated.layerNamed(self,layerName)