diff --git a/cocos/scripting/lua-bindings/manual/CCLuaStack.cpp b/cocos/scripting/lua-bindings/manual/CCLuaStack.cpp index 81c47a5..4a67a05 100644 --- a/cocos/scripting/lua-bindings/manual/CCLuaStack.cpp +++ b/cocos/scripting/lua-bindings/manual/CCLuaStack.cpp @@ -687,15 +687,10 @@ int LuaStack::luaLoadChunksFromZIP(lua_State *L) unsigned char *zbuffer = zip->getFileData(filename.c_str(), &bufferSize); if (bufferSize) { if (luaLoadBuffer(L, (char*)zbuffer, (int)bufferSize, filename.c_str()) == 0) { - // special fix for protobuf find path in zip. - int offset = 0; - if (filename.find("framework.protobuf.") != std::string::npos) { - offset = 19; - } - lua_setfield(L, -3, filename.c_str() + offset); + lua_setfield(L, -3, filename.c_str()); // clear loaded, make the next require run the new module. lua_pushnil(L); - lua_setfield(L, -2, filename.c_str() + offset); + lua_setfield(L, -2, filename.c_str()); ++count; } free(zbuffer); diff --git a/templates/src/framework/protobuf/containers.lua b/templates/src/framework/protobuf/containers.lua index 54ac71e..f62f728 100644 --- a/templates/src/framework/protobuf/containers.lua +++ b/templates/src/framework/protobuf/containers.lua @@ -20,7 +20,7 @@ local table = table local rawset = rawset local error = error -module "containers" +module "framework.protobuf.containers" local _RCFC_meta = { add = function(self) diff --git a/templates/src/framework/protobuf/decoder.lua b/templates/src/framework/protobuf/decoder.lua index 02d26f0..f24b853 100644 --- a/templates/src/framework/protobuf/decoder.lua +++ b/templates/src/framework/protobuf/decoder.lua @@ -23,9 +23,9 @@ local error = error local print = print local pb = require "pb" -local encoder = require "encoder" -local wire_format = require "wire_format" -module "decoder" +local encoder = require "framework.protobuf.encoder" +local wire_format = require "framework.protobuf.wire_format" +module "framework.protobuf.decoder" local _DecodeVarint = pb.varint_decoder local _DecodeSignedVarint = pb.signed_varint_decoder diff --git a/templates/src/framework/protobuf/descriptor.lua b/templates/src/framework/protobuf/descriptor.lua index 6b20072..acb32ea 100644 --- a/templates/src/framework/protobuf/descriptor.lua +++ b/templates/src/framework/protobuf/descriptor.lua @@ -16,7 +16,7 @@ -------------------------------------------------------------------------------- -- -module "descriptor" +module "framework.protobuf.descriptor" FieldDescriptor = { TYPE_DOUBLE = 1, diff --git a/templates/src/framework/protobuf/encoder.lua b/templates/src/framework/protobuf/encoder.lua index f2a542b..91d9466 100644 --- a/templates/src/framework/protobuf/encoder.lua +++ b/templates/src/framework/protobuf/encoder.lua @@ -21,8 +21,9 @@ local ipairs = ipairs local assert =assert local pb = require "pb" -local wire_format = require "wire_format" -module "encoder" +local wire_format = require "framework.protobuf.wire_format" + +module "framework.protobuf.encoder" function _VarintSize(value) if value <= 0x7f then return 1 end diff --git a/templates/src/framework/protobuf/listener.lua b/templates/src/framework/protobuf/listener.lua index 1c00eae..c649a73 100644 --- a/templates/src/framework/protobuf/listener.lua +++ b/templates/src/framework/protobuf/listener.lua @@ -17,7 +17,7 @@ -- local setmetatable = setmetatable -module "listener" +module "framework.protobuf.listener" local _null_listener = { Modified = function() diff --git a/templates/src/framework/protobuf/protobuf.lua b/templates/src/framework/protobuf/protobuf.lua index 72b5bd2..d346804 100644 --- a/templates/src/framework/protobuf/protobuf.lua +++ b/templates/src/framework/protobuf/protobuf.lua @@ -29,17 +29,17 @@ local tostring = tostring local type = type local pb = require "pb" -local wire_format = require "wire_format" -local type_checkers = require "type_checkers" -local encoder = require "encoder" -local decoder = require "decoder" -local listener_mod = require "listener" -local containers = require "containers" -local descriptor = require "descriptor" +local wire_format = require "framework.protobuf.wire_format" +local type_checkers = require "framework.protobuf.type_checkers" +local encoder = require "framework.protobuf.encoder" +local decoder = require "framework.protobuf.decoder" +local listener_mod = require "framework.protobuf.listener" +local containers = require "framework.protobuf.containers" +local descriptor = require "framework.protobuf.descriptor" local FieldDescriptor = descriptor.FieldDescriptor -local text_format = require "text_format" +local text_format = require "framework.protobuf.text_format" -module("protobuf") +module("framework.protobuf.protobuf") local function make_descriptor(name, descriptor, usable_key) local meta = { diff --git a/templates/src/framework/protobuf/text_format.lua b/templates/src/framework/protobuf/text_format.lua index b3e6181..00210eb 100644 --- a/templates/src/framework/protobuf/text_format.lua +++ b/templates/src/framework/protobuf/text_format.lua @@ -22,9 +22,9 @@ local table = table local ipairs = ipairs local tostring = tostring -local descriptor = require "descriptor" +local descriptor = require "framework.protobuf.descriptor" -module "text_format" +module "framework.protobuf.text_format" function format(buffer) local len = string.len( buffer ) diff --git a/templates/src/framework/protobuf/type_checkers.lua b/templates/src/framework/protobuf/type_checkers.lua index 6b21055..9ec7bb1 100644 --- a/templates/src/framework/protobuf/type_checkers.lua +++ b/templates/src/framework/protobuf/type_checkers.lua @@ -20,7 +20,8 @@ local type = type local error = error local string = string -module "type_checkers" +module "framework.protobuf.type_checkers" + function TypeChecker(acceptable_types) local acceptable_types = acceptable_types diff --git a/templates/src/framework/protobuf/wire_format.lua b/templates/src/framework/protobuf/wire_format.lua index 6774c72..d583e84 100644 --- a/templates/src/framework/protobuf/wire_format.lua +++ b/templates/src/framework/protobuf/wire_format.lua @@ -16,7 +16,8 @@ -- local pb = require "pb" -module "wire_format" + +module "framework.protobuf.wire_format" WIRETYPE_VARINT = 0 WIRETYPE_FIXED64 = 1 diff --git a/templates/src/main.lua b/templates/src/main.lua index 93d3365..af09dbf 100644 --- a/templates/src/main.lua +++ b/templates/src/main.lua @@ -6,5 +6,5 @@ function __G__TRACKBACK__(errorMessage) print("----------------------------------------") end -package.path = "src/?.lua;src/framework/protobuf/?.lua" +package.path = "src/?.lua" require("app.MyApp").new():run() diff --git a/tests/src/main.lua b/tests/src/main.lua index 93d3365..af09dbf 100644 --- a/tests/src/main.lua +++ b/tests/src/main.lua @@ -6,5 +6,5 @@ function __G__TRACKBACK__(errorMessage) print("----------------------------------------") end -package.path = "src/?.lua;src/framework/protobuf/?.lua" +package.path = "src/?.lua" require("app.MyApp").new():run()