头顶报警显示标记名称

luckyyyyy · Nov 13, 2016 · 814010b · 814010b
1 parent 10cdea3
commit 814010b
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 19 deletions.
diff --git a/0Base/Base.lua b/0Base/Base.lua
@@ -1,7 +1,7 @@
 -- @Author: Webster
 -- @Date:   2015-01-21 15:21:19
 -- @Last Modified by:   Administrator
--- @Last Modified time: 2016-10-05 18:02:34
+-- @Last Modified time: 2016-11-13 15:57:31
 
 ---------------------------------------
 --          JH Plugin - Base         --
@@ -1853,6 +1853,12 @@ JH.RegisterEvent("PLAYER_ENTER_GAME", function()
 	for _, v in ipairs(_JH.tHotkey) do
 		Hotkey.AddBinding(v.szName, v.szTitle, "", v.fnAction, nil)
 	end
+	for k, v in ipairs(JH_MARK_NAME) do
+		Hotkey.AddBinding("JH_AutoSetTeam" .. k, _L["Mark"] .. " [" .. v .. "]", "", function()
+			local dwID = select(2, Target_GetTargetData())
+			GetClientTeam().SetTeamMark(k, dwID)
+		end, nil)
+	end
 	-- 注册玩家头像菜单
 	Player_AppendAddonMenu({ _JH.GetPlayerAddonMenu })
 	-- 注册右上角菜单

diff --git a/0Base/Compatible.lua b/0Base/Compatible.lua
@@ -1,7 +1,9 @@
 -- @Author: Webster
 -- @Date:   2015-01-21 15:21:19
 -- @Last Modified by:   Administrator
--- @Last Modified time: 2016-10-18 13:06:20
+-- @Last Modified time: 2016-11-13 15:53:46
+
+local _L = JH.LoadLangPack
 
 DBM_TYPE = {
 	OTHER           = 0,
@@ -113,6 +115,8 @@ JH_MAP_NAME_FIX = {
 	[195] = 196,
 }
 
+JH_MARK_NAME = { _L["Cloud"], _L["Sword"], _L["Ax"], _L["Hook"], _L["Drum"], _L["Shear"], _L["Stick"], _L["Jade"], _L["Dart"], _L["Fan"] }
+
 BigBagPanel_nCount = 6
 
 --帮会仓库界面虚拟一个背包位置

diff --git a/0Base/lang/zhcn.jx3dat b/0Base/lang/zhcn.jx3dat
@@ -66,6 +66,7 @@ data = {
 	["Draw School Color"] = "����������ɫ",
 	["less life/mana HeadAlert"] = "ս���е�Ѫ��ͷ������",
 	["Enable"] = "����",
+	["[%s]"] = "��%s��",
 	["While HP less than"] = "Ѫ������",
 	["While MP less than"] = "��������",
 	["Manually add (One per line)"] = "�ֶ�����BUFF���ƣ�ÿ��һ����",

diff --git a/AutoSetTeam/JH_AppendMark.lua b/AutoSetTeam/JH_AppendMark.lua
@@ -1,11 +1,10 @@
 -- @Author: Webster
 -- @Date:   2016-01-04 14:35:16
--- @Last Modified by:   Webster
--- @Last Modified time: 2016-04-28 16:55:19
+-- @Last Modified by:   Administrator
+-- @Last Modified time: 2016-11-13 15:55:37
 
 local _L = JH.LoadLangPack
 local MARK = {}
-local MARK_NAME = { _L["Cloud"], _L["Sword"], _L["Ax"], _L["Hook"], _L["Drum"], _L["Shear"], _L["Stick"], _L["Jade"], _L["Dart"], _L["Fan"] }
 
 JH_AppendMark = {
 	bEnable = true,
@@ -91,11 +90,3 @@ function JH_AppendMark.GetEvent()
 	end
 end
 
-do
-	for k, v in ipairs(MARK_NAME) do
-		JH.AddHotKey("AutoSetTeam" .. k, _L["Mark"] .. " [" .. v .. "]", function()
-			local dwID = select(2, Target_GetTargetData())
-			GetClientTeam().SetTeamMark(k, dwID)
-		end)
-	end
-end
diff --git a/DBM/DBM_SA.class.lua b/DBM/DBM_SA.class.lua
@@ -1,14 +1,13 @@
 -- @Author: Webster
 -- @Date:   2015-12-04 20:17:03
 -- @Last Modified by:   Administrator
--- @Last Modified time: 2016-11-13 15:18:08
+-- @Last Modified time: 2016-11-13 15:53:40
 
 local pairs, ipairs, select = pairs, ipairs, select
 local GetClientPlayer, GetPlayer, GetNpc, GetDoodad, IsPlayer = GetClientPlayer, GetPlayer, GetNpc, GetDoodad, IsPlayer
 local PostThreadCall = PostThreadCall
 local tinsert = table.insert
 local mmax = math.max
-local UI_SCALED = 1
 DBM_SA = {
 	bAlert     = false,
 	bOnlySelf  = true,
@@ -20,6 +19,8 @@ DBM_SA = {
 JH.RegisterCustomData("DBM_SA")
 
 local _L = JH.LoadLangPack
+local UI_SCALED = 1
+local JH_MARK_NAME = JH_MARK_NAME
 local HANDLE
 local CACHE = {
 	[TARGET.DOODAD] = {},
@@ -99,6 +100,8 @@ end
 function ScreenArrow.OnBreathe()
 	local me = GetClientPlayer()
 	if not me then return end
+	local team = GetClientTeam()
+	local tTeamMark = team.GetTeamMark() or {}
 	for dwType, tab in pairs(CACHE) do
 		for dwID, v in pairs(tab) do
 			local object, tInfo = select(2, ScreenArrow.GetObject(dwType, dwID))
@@ -113,6 +116,9 @@ function ScreenArrow.OnBreathe()
 					szName = JH.GetTemplateName(object)
 				end
 				szName = obj.szName or szName
+				if tTeamMark[dwID] then
+					szName = szName .. _L("[%s]", MARK_NAME[tTeamMark[dwID]])
+				end
 				local txt = ""
 				if obj.szClass == "BUFF" or obj.szClass == "DEBUFF" then
 					local KBuff = JH.GetBuff(obj.dwBuffID, object) -- 只判断dwID 反正不可能同时获得不同lv

diff --git a/DBM/DBM_UI.lua b/DBM/DBM_UI.lua
@@ -1,7 +1,7 @@
 -- @Author: Webster
 -- @Date:   2015-05-14 13:59:19
 -- @Last Modified by:   Administrator
--- @Last Modified time: 2016-11-10 21:07:06
+-- @Last Modified time: 2016-11-13 15:54:21
 
 local _L = JH.LoadLangPack
 local ipairs, pairs, select = ipairs, pairs, select
@@ -1299,9 +1299,8 @@ function DBMUI.OpenSettingPanel(data, szType)
 	end
 	local function GetMarkMenu(nClass)
 		local menu = {}
-		local tMarkName = { _L["Cloud"], _L["Sword"], _L["Ax"], _L["Hook"], _L["Drum"], _L["Shear"], _L["Stick"], _L["Jade"], _L["Dart"], _L["Fan"] }
 		for k, v in ipairs_c(PARTY_MARK_ICON_FRAME_LIST) do
-			table.insert(menu, { szOption = tMarkName[k], szIcon = PARTY_MARK_ICON_PATH, nFrame = v, szLayer = "ICON_RIGHT", bCheck = true, bChecked = data[nClass] and data[nClass].tMark and data[nClass].tMark[k], fnAction = function(_, bCheck)
+			table.insert(menu, { szOption = JH_MARK_NAME[k], szIcon = PARTY_MARK_ICON_PATH, nFrame = v, szLayer = "ICON_RIGHT", bCheck = true, bChecked = data[nClass] and data[nClass].tMark and data[nClass].tMark[k], fnAction = function(_, bCheck)
 				if bCheck then
 					data[nClass] = data[nClass] or {}
 					if not data[nClass].tMark then

diff --git a/JH_CHANGELOG.txt b/JH_CHANGELOG.txt
@@ -1,4 +1,8 @@
- * 新增：[基础库] 对霸刀的支持。
+ * 优化：[DBM] 头顶报警支持显示职业颜色，默认不开启。
+ * 优化：[DBM] 头顶报警的名称显示自动追加标记名称。
+ * 优化：[基础库] 快捷键顺序修改。
+ -----------------------------------------
+ * 新增：[基础库] 对霸刀的支持。
  * 优化：[团队工具] 对团队的分值又进一步做了优化。
  * 修复：[团队工具] 橙武等重要武器可以正常结算分数了。
  -----------------------------------------