diff --git a/.gitignore b/.gitignore index e4808ab..3574cf6 100644 --- a/.gitignore +++ b/.gitignore @@ -66,10 +66,3 @@ launch.json deploy/HellMapManager.app/Contents/MacOS/* macsign.sh -code/Dll/*.so -code/Dll/*.o -code/Dll/*.obj -code/Dll/*.dll -code/Dll/*.exp -code/Dll/*.lib -code/Dll/*.bat \ No newline at end of file diff --git a/code/Dll/HellMapManager.so b/code/Dll/HellMapManager.so new file mode 100644 index 0000000..4dfd5ae Binary files /dev/null and b/code/Dll/HellMapManager.so differ diff --git a/code/Dll/hmm-test.lua b/code/Dll/hmm-test.lua index 332344f..65d67cd 100644 --- a/code/Dll/hmm-test.lua +++ b/code/Dll/hmm-test.lua @@ -1,27 +1,37 @@ local lu = require('luaunit') local hmm = require('hmmlua') -local json=require('json') +local json = require('json') function TestDLL() - local closed=json.decode(hmm.close("",0)) - lu.assertEquals(closed,false) - local created=json.decode(hmm.create("",0)) - lu.assertEquals(created,true) + local closed = json.decode(hmm.close("", 0)) + lu.assertEquals(closed, false) + local created = json.decode(hmm.create("", 0)) + lu.assertEquals(created, true) end + +function TestImport() + local closed = json.decode(hmm.close("", 0)) + lu.assertEquals(closed, true) + local data = [[HMM1.0>UTF8 +Info>Test地图|1773938371|]] + local imported = json.decode(hmm.import(data, 0)) + lu.assertEquals(imported, true) +end + function TestVersion() - hmm.close("",0) - hmm.create("",0) - local result=json.decode(hmm.version("",0)) - lu.assertEquals(result,1006) + hmm.close("", 0) + hmm.create("", 0) + local result = json.decode(hmm.version("", 0)) + lu.assertEquals(result, 1006) end function TestInfo() - hmm.close("",0) - local created=json.decode(hmm.create("",0)) - lu.assertEquals(created,true) - local result=json.decode(hmm.info("",0)) - lu.assertEquals(result.Name,"") - lu.assertEquals(result.Desc,"") + hmm.close("", 0) + local created = json.decode(hmm.create("", 0)) + lu.assertEquals(created, true) + local result = json.decode(hmm.info("", 0)) + lu.assertEquals(result.Name, "") + lu.assertEquals(result.Desc, "") end -- function TestEscape() @@ -83,4 +93,4 @@ end -- lu.assertEquals("\\n", cc:Unescape("\\\\n")); -- end --- os.exit(lu.LuaUnit.run()) \ No newline at end of file +-- os.exit(lu.LuaUnit.run()) diff --git a/code/Dll/hmmlua.o b/code/Dll/hmmlua.o new file mode 100644 index 0000000..c03ebd0 Binary files /dev/null and b/code/Dll/hmmlua.o differ diff --git a/code/Dll/hmmlua.so b/code/Dll/hmmlua.so new file mode 100755 index 0000000..cbb6745 Binary files /dev/null and b/code/Dll/hmmlua.so differ