Merge branch 'develop' of https://github.com/ketoo/NoahGameFrame.git …

…into develop
cntoby · Apr 21, 2016 · 48f165c · 48f165c
2 parents ca268ae + 356d12d
commit 48f165c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/NFComm/NFLuaScriptPlugin/NFCLuaScriptModule.h b/NFComm/NFLuaScriptPlugin/NFCLuaScriptModule.h
@@ -6,8 +6,8 @@
 //    @Desc             :
 // -------------------------------------------------------------------------
 
-#ifndef _NFC_LUA_SCRIPT_MODULE_H_
-#define _NFC_LUA_SCRIPT_MODULE_H_
+#ifndef NFC_LUA_SCRIPT_MODULE_H
+#define NFC_LUA_SCRIPT_MODULE_H
 
 //#include "NFComm/NFLuaScriptPlugin/luawrapper/luaWrapper.h"
 #define LUAINTF_LINK_LUA_COMPILED_IN_CXX 0

diff --git a/NFComm/NFPluginModule/NFILuaScriptModule.h b/NFComm/NFPluginModule/NFILuaScriptModule.h
@@ -6,8 +6,8 @@
 //
 // -------------------------------------------------------------------------
 
-#ifndef _NFI_LUA_SCRIPT_MODULE_H
-#define _NFI_LUA_SCRIPT_MODULE_H
+#ifndef NFI_LUA_SCRIPT_MODULE_H
+#define NFI_LUA_SCRIPT_MODULE_H
 
 #include "NFIScriptModule.h"
 

diff --git a/_Out/Server/NFDataCfg/ScriptModule/README.md b/_Out/Server/NFDataCfg/ScriptModule/README.md
@@ -9,11 +9,11 @@
 
 ##Step 1
 Create a Lua Script File, and Must Contain following functions
-1.Init()
-2.AfterInit()
-3.Execute()
-4.BeforeShut()
-5.Shut()
+- Init()
+- AfterInit()
+- Execute()
+- BeforeShut()
+- Shut()
 
 Mostly like this
 # [TestModule2.lua](https://github.com/ketoo/NoahGameFrame/tree/develop/_Out/Server/NFDataCfg/ScriptModule/TestModule2.lua)
@@ -53,4 +53,4 @@ ScriptList={
 
 load_script_file(ScriptList)
 ```
-##Enjoy it!
+##Enjoy it!