Optimize reader of wiki

yeckham · Apr 16, 2017 · aecd05f · aecd05f
1 parent fd399a4
commit aecd05f
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 4 deletions.
diff --git a/HM_0Base/HM_About.lua b/HM_0Base/HM_About.lua
@@ -276,11 +276,21 @@ _HM_About.PS.OnPanelActive = function(frame)
 	ui:Append("Text", { txt = _L["About HMM"], x = 0, y = 188, font = 27 })
 	ui:Append("Text", { x = 0, y = 216, w = 500, h = 20, multi = true }):Align(0, 0):Text(_L["A pure PVP TianCe player of evil camp. Third-class operation, but first-class crazy and lazy!"])
 	-- other
+	nX = 0
 	ui:Append("Text", { txt = _L["Others"], x = 0, y = 244, font = 27 })
 	--nX = ui:Append("WndCheckBox", { x = 0, y = 272, checked = HM_About.bPlayOpen })
 	--:Text(_L["Play music on hourly first time to open panel"]):Click(function(bChecked) HM_About.bPlayOpen = bChecked end):Pos_()
-	ui:Append("WndCheckBox", { x = 0, y = 272, checked = HM_About.bDebug == true })
-	:Text("Enable Debug"):Click(function(bChecked) HM_About.bDebug = bChecked end)
+	nX = ui:Append("WndCheckBox", { x = nX, y = 272, checked = HM_About.bDebug == true }):Text("Enable Debug"):Click(function(bChecked)
+		HM_About.bDebug = bChecked
+	end):Pos_()
+	ui:Append("Text", { x = nX + 10, y = 272, txt = "<" .. _L["Haiman Site"] .. ">" }):Click(function()
+		if HM_Secret then
+			HM.OpenPanel(_L["Haiman Site"])
+		else
+			HM.Sysmsg("https://haimanchajian.com 或微信公众号【海鳗插件】")
+			HM.Sysmsg("https://haimanchajian.com 或微信公众号【海鳗插件】")
+		end
+	end)	
 end
 
 -- author
@@ -311,7 +321,7 @@ _HM_About.PS.OnTaboxCheck = function(frame, nIndex, szTitle)
 		ui:Append("Text", { x = 5, y = 5, font = 239,  w = 532, h = 100, txt = "海鳗插件官网" }):Align(1, 1):Click(function()
 			if szLang == "zhcn" then
 				if HM_Secret then
-					HM.OpenPanel("海鳗官网")
+					HM.OpenPanel(_L["Haiman Site"])
 				else
 					HM.Sysmsg("https://haimanchajian.com 或微信公众号【海鳗插件】")
 					HM.Sysmsg("https://haimanchajian.com 或微信公众号【海鳗插件】")

diff --git a/HM_0Base/lang/zhcn.jx3dat b/HM_0Base/lang/zhcn.jx3dat
@@ -3,6 +3,7 @@ data = {
 	-- HM.lua --
 	["HM, JX3 Plug-in Collection"] = "������ʵ�ò����",
 	["HM Plug"] = "�������",
+	["Haiman Site"] = "��������",
 	["General"] = "����",
 	["Target"] = "Ŀ��",
 	["Battle"] = "ս��",

diff --git a/HM_0Base/lang/zhtw.jx3dat b/HM_0Base/lang/zhtw.jx3dat
@@ -3,6 +3,7 @@ data = {
 	-- HM.lua --
 	["HM, JX3 Plug-in Collection"] = "海鰻、實用插件集",
 	["HM Plug"] = "海鰻插件",
+	["Haiman Site"] = "海鰻官網",
 	["General"] = "常用",
 	["Target"] = "目標",
 	["Battle"] = "戰斗",

diff --git a/HM_AchieveWiki/HM_AchieveWiki.lua b/HM_AchieveWiki/HM_AchieveWiki.lua
@@ -6,6 +6,7 @@ local ACHI_ROOT_URL = "https://haimanchajian.com"
 local ACHI_CLIENT_LANG = select(3, GetVersion())
 local Achievement = {}
 local tinsert = table.insert
+local bConfirm = false
 
 HM_AchieveWiki = {
 	bAutoSync = false,
@@ -96,6 +97,7 @@ function HM_AchieveWiki.OnLButtonClick()
 		end):fail(function()
 			HM.Sysmsg(_L["Request failed"])
 		end)
+		bConfirm = true
 	end
 end
 
@@ -264,6 +266,12 @@ function Achievement.OpenEncyclopedia(dwID, dwIcon, szTitle, szDesc)
 	PlaySound(SOUND.UI_SOUND, g_sound.OpenFrame)
 	frame.warn:Show()
 	frame.view:Show()
+	if bConfirm then
+		local _this = this
+		this = frame.view
+		HM_AchieveWiki.OnLButtonClick()
+		this = _this
+	end
 end
 
 function Achievement.AppendBoxEvent(handle)

diff --git a/HM_Secret/HM_Secret.lua b/HM_Secret/HM_Secret.lua
@@ -11,7 +11,7 @@ HM.RegisterCustomData("HM_Secret")
 -- 本地函数和变量
 ---------------------------------------------------------------------
 local _HM_Secret = {
-	szName = "海鳗官网",
+	szName = _L["Haiman Site"],
 	szIniFile = "interface\\HM\\HM_Secret\\HM_Secret.ini",
 }