Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev

lua/app/module/gm/gm_const.lua

@@ -31,18 +31,28 @@ Example: clear_item]],
 		type = "clear_item"
 	},
 	{
-		title = "添加英雄",
-		desc = [[添加英雄 type:add_hero
-arg1:英雄id
-Example: add_hero 1]],
-		type = "add_hero"
+		title = "每日重置",
+		desc = [[每日重置 type:reset_by_day
+Example: reset_by_day]],
+		type = "reset_by_day"
 	},
 	{
-		title = "设置通关章节",
-		desc = [[添加英雄 type:pass_chapter
-arg1:章节id
-Example: pass_chapter 1]],
-		type = "pass_chapter"
+		title = "设置时间",
+		desc = [[设置时间 type:time
+Example: time 2023-3-9 18:10:59]],
+		type = "time"
+	},
+	{
+		title = "重置时间差",
+		desc = [[重置时间差 type:time_diff
+Example: time_diff 0]],
+		type = "time_diff"
+	},
+	{
+		title = "调整时间差",
+		desc = [[调整时间差 type:add_time_diff
+Example: add_time_diff 1000]],
+		type = "add_time_diff"
 	},
 }
 

lua/app/ui/gm/gm_tool_ui.lua

@@ -89,12 +89,15 @@ function GMToolUI:sendMsg(gmCommand)
 	else
 		local args = {}
 		args.args = string.split(gmCommand, " ")
-		-- :dealGM(args, function()
-		-- 	:dataOperate(GConst..DATA_OP_BEHAVIOR.SYNC_DATA, GConst.EMPTY_TABLE, function(msgData)
-		-- 		DataManager:initWithServerData(msgData)
-		-- 		ModuleManager.MaincityManager:firstEnterMainCity()
-		-- 	end)
-		-- end)
+		if args.args[1] == "time" then -- 特殊处理
+			local args1 = {}
+			args1.args = {}
+			args1.args[1] = args.args[1]
+			args1.args[2] = args.args[2] .. " " .. args.args[3]
+			ModuleManager.DevToolManager:dealGM(args1)
+		else
+			ModuleManager.DevToolManager:dealGM(args)
+		end
 	end
 end