Merge pull request #25 from kiccer/test

Test

Author: kiccer

README.md

@@ -154,7 +154,44 @@ G键 | 功能
 `Beryl M762` | 直接切换至 `Beryl M762` 配置
 `DP-28` | 直接切换至 `DP-28` 配置
 
-> 可以绑定至 `G_bind` ，使用预设的组合键触发指令
+> 可以绑定至 `G_bind` ，使用预设的组合键触发指令。
+> 注意：是指令绑定到组合键上，而不是组合键绑定到指令。请不要修改等号前面`[""]`中的内容！
+
+### `G_bind` 指令绑定演示
+```lua
+-- G
+["G3"] = "",
+["G4"] = "",
+["G5"] = "",
+["G6"] = "5.56",
+["G7"] = "9mm",
+["G8"] = "7.62",
+["G9"] = ".45",
+["G10"] = "last",
+["G11"] = "next",
+
+-- ✖，错误的修改方式
+["G3"] = "",
+["G4"] = "", -- 下面的 G4 会覆盖这个 G4，丢失了 G6 ，按下 G6 会出错。
+["G5"] = "",
+["G4"] = "5.56", -- 绝对不可以直接修改等号前面的组合键！
+["G7"] = "9mm",
+["G8"] = "7.62",
+["G9"] = ".45",
+["G10"] = "last",
+["G11"] = "next",
+
+-- ✔，正确的修改方式
+["G3"] = "",
+["G4"] = "5.56", -- 把指令绑定到了这里
+["G5"] = "",
+["G6"] = "", -- 清空了这个指令
+["G7"] = "9mm",
+["G8"] = "7.62",
+["G9"] = ".45",
+["G10"] = "last",
+["G11"] = "next",
+```
 
 ### 硬件条件
 * 一只可编程 Logitech 鼠标（无线鼠标运行宏时很不稳定）

Soldier76.lua

@@ -214,7 +214,7 @@ pubg.xLengthForDebug = pubg.generalSensitivityRatio * 60 -- 调试模式下的
 pubg.renderDom = {
 	separator = "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n", -- 分割线
 	combo_key = "G-key", -- 组合键
-	cmd = "", -- 指令
+	cmd = "cmd", -- 指令
 	autoLog = "No operational data yet.\n", -- 压枪过程产生的数据输出
 }
 
@@ -774,7 +774,7 @@ end
 --[[ autputLog render ]]
 function pubg.outputLogRender ()
 	ClearLog()
-	OutputLogMessage(table.concat({
+	local outputScriptMessage = table.concat({
 		"\n>> [\"", pubg.renderDom.combo_key, "\"] = \"", pubg.renderDom.cmd, "\" <<\n",
 		pubg.renderDom.separator,
 		pubg.outputLogGunSwitchTable(),
@@ -783,7 +783,16 @@ function pubg.outputLogRender ()
 		pubg.renderDom.separator,
 		pubg.renderDom.autoLog,
 		pubg.renderDom.separator,
-	}))
+	})
+	OutputLogMessage(outputScriptMessage)
+
+	-- local file = io.open('C:\\Soldier76_outputScriptMessage.json', 'w+')
+	-- file:write(table.concat({
+	-- 	"{\n",
+	-- 	"\toutputScriptMessage: '", outputScriptMessage, "'\n",
+	-- 	"}\n",
+	-- }))
+	-- file:close()
 end
 
 --[[ Output switching table ]]
@@ -864,16 +873,8 @@ function pubg.autoLog (options, y)
 	pubg.renderDom.autoLog = resStr
 end
 
---[[ Listener method ]]
-function OnEvent (event, arg, family)
-
-	-- Whether to open the capitalization key or not
-	if not pubg.ok then return false end
-
-	-- OutputLogMessage("event = %s, arg = %s, family = %s\n", event, arg, family)
-	-- OutputLogMessage("event = " .. event .. ", arg = " .. arg .. ", family = " .. family .. "\n")
-
-	-- Automatic press gun
+--[[ Automatic press gun ]]
+function pubg.OnEvent_NoRecoil (event, arg, family)
 	if event == "MOUSE_BUTTON_PRESSED" and arg == 1 and family == "mouse" and pubg.ok then
 		if not pubg.runStatus() then return false end
 		if pubg.isAimingState("ADS") or pubg.isAimingState("Aim") then
@@ -892,10 +893,21 @@ function OnEvent (event, arg, family)
 	end
 
 	if event == "M_PRESSED" and arg == 1 and pubg.G1 and pubg.ok then
-		-- PressAndReleaseMouseButton(1)
 		pubg.auto(pubg.gunOptions[pubg.bulletType][pubg.gunIndex])
 		SetMKeyState(1)
 	end
+end
+
+--[[ Listener method ]]
+function OnEvent (event, arg, family)
+
+	-- Whether to open the capitalization key or not
+	if not pubg.ok then return false end
+
+	-- OutputLogMessage("event = %s, arg = %s, family = %s\n", event, arg, family)
+	-- OutputLogMessage("event = " .. event .. ", arg = " .. arg .. ", family = " .. family .. "\n")
+
+	pubg.OnEvent_NoRecoil(event, arg, family)
 
 	-- Switching arsenals according to different types of ammunition
 	if event == "MOUSE_BUTTON_PRESSED" and arg >=3 and arg <= 11 and family == "mouse" and pubg.ok then

test/MoveMouseTo.lua

@@ -0,0 +1,26 @@
+local test = false
+
+local x, y
+
+function loop ()
+  for i = 1, 500 do
+    if IsMouseButtonPressed(1) then
+      x, y = GetMousePosition()
+      y = y + 100
+      MoveMouseTo(x, y)
+      Sleep(20)
+    end
+  end
+end
+
+function OnEvent(event, arg, family)
+  if not test then return false end
+	--OutputLogMessage("event = %s, arg = %s\n", event, arg);
+  if not IsKeyLockOn("capslock") then return false end
+  if event == "MOUSE_BUTTON_PRESSED" and arg == 1 and family == "mouse" then
+    loop()
+  end
+
+end
+ClearLog()
+EnablePrimaryMouseButtonEvents(true) -- Enable left mouse button event reporting