Fixed HideGF

yeckham · Apr 29, 2017 · 0ab6d29 · 0ab6d29
1 parent 8987183
commit 0ab6d29
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 22 deletions.
diff --git a/HM_0Base/skill_ex.jx3dat b/HM_0Base/skill_ex.jx3dat
diff --git a/HM_Camp/HM_Camp.lua b/HM_Camp/HM_Camp.lua
@@ -15,7 +15,7 @@ HM_Camp = {
 	bQuestAccept = true,	-- 自动接日常
 	bBossTime = false,			-- boss 刷新提醒
 	bBossTimeGF = true,		-- 攻防 BOSS 计时
-	bAutoCampQueue = true,	-- 攻防排队自动进
+	--bAutoCampQueue = true,	-- 攻防排队自动进
 	bForgetGoods = true,	-- 跑商忘记买货时提醒：城防物资/独山玉/湘莲/和田玉雕/紫砂/普洱，（100个以下）
 	tBossList = {
 		[_n(6219)--[[方超]]] = 5,
@@ -624,7 +624,7 @@ end
 
 -- 地图加载完毕，判断是否在浩气、恶人
 _HM_Camp.OnLoadingEnd = function()
-	local dwMapID = GetClientPlayer().GetScene().dwMapID
+	local dwMapID = GetClientPlayer().GetMapID()
 	if dwMapID == 27 or dwMapID == 25 then
 		_HM_Camp.HookCampPanel()
 		RegisterMsgMonitor(_HM_Camp.OnNpcYell, { "MSG_NPC_YELL" })
@@ -633,6 +633,16 @@ _HM_Camp.OnLoadingEnd = function()
 	end
 	-- remove unused
 	HM_Camp.tBossList[_n(36505)--[[库瓦察姆]]] = nil
+	-- hide gf
+	if HM_Camp.bHideEnable then
+		_HM_Camp.HideGF(_HM_Camp.bEnter == true, _HM_Camp.bEnter == true)
+		if not _HM_Camp.bEnter then
+			if HM_Camp.bHideForever then
+				_HM_Camp.HideGF(true, false)
+			end
+			_HM_Camp.bEnter = true
+		end
+	end
 end
 
 -------------------------------------
@@ -730,11 +740,11 @@ _HM_Camp.PS.OnPanelActive = function(frame)
 	:Text(_L["Record BOSS time in camp fight (click icons of camp bar)"]):Click(function(bChecked)
 		HM_Camp.bBossTimeGF = bChecked
 	end)
-	ui:Append("WndCheckBox", { x = 10, y = 296, checked = HM_Camp.bAutoCampQueue })
-	:Text(_L["Auto enter map when over of the queue"]):Click(function(bChecked)
-		HM_Camp.bAutoCampQueue = bChecked
-	end)
-	ui:Append("WndCheckBox", { x = 10, y = 324, checked = HM_Camp.bForgetGoods })
+	--ui:Append("WndCheckBox", { x = 10, y = 296, checked = HM_Camp.bAutoCampQueue })
+	--:Text(_L["Auto enter map when over of the queue"]):Click(function(bChecked)
+	--	HM_Camp.bAutoCampQueue = bChecked
+	--end)
+	ui:Append("WndCheckBox", { x = 10, y = 296, checked = HM_Camp.bForgetGoods })
 	:Text(_L["Alert when forget buy goods for trade quest"]):Click(function(bChecked)
 		HM_Camp.bForgetGoods = bChecked
 	end)
@@ -769,17 +779,6 @@ HM.RegisterEvent("PARTY_UPDATE_MEMBER_INFO", function()
 		_HM_Camp.OnPartyAdd(arg1)
 	end
 end)
-HM.RegisterEvent("SYNC_ROLE_DATA_END", function()
-	if HM_Camp.bHideEnable then
-		_HM_Camp.HideGF(_HM_Camp.bEnter == true, _HM_Camp.bEnter == true)
-		if not _HM_Camp.bEnter then
-			if HM_Camp.bHideForever then
-				_HM_Camp.HideGF(true, false)
-			end
-			_HM_Camp.bEnter = true
-		end
-	end
-end)
 HM.RegisterEvent("ON_CAN_ENTER_MAP_NOTIFY", function()
 	if HM_Camp.bAutoCampQueue and (arg0 == 25 or arg0 == 27) then
 		HM.DoMessageBox("entermap")

diff --git a/HM_Secret/HM_Secret.lua b/HM_Secret/HM_Secret.lua
@@ -461,8 +461,10 @@ _HM_Secret.PS.OnPanelActive = function(frame)
 	--nX = ui:Append("WndButton", { x = nX, y = 0, txt = "发布秘密" }):Click(_HM_Secret.PostNew):Pos_()
 	-- Tips
 	ui:Append("Text", { x = 0, y = 0, txt = "关于官网", font = 27 })
-	ui:Append("Text", { x = 0, y = 28, txt = "海鳗插件官网由海鳗鳗及其团队开发并维护，与剑网3游戏官方无关。在游戏之外及手机端提供相关辅助功能，包括数据查询、成就百科、科举答题、开服监控、日常提醒、情缘证书、玩家交流等。", multi = true, w = 520, h = 70 })
-	nX = ui:Append("Text", { x = 0, y = 100, font = 214, txt = "<https://haimanchajian.com>" }):Color(6, 204, 178):Pos_()
+	ui:Append("Text", { x = 0, y = 28, txt = "海鳗插件官网由海鳗鳗及其团队开发并维护，与剑网3游戏官方无关。在游戏之外提供相关辅助功能，包括数据查询、成就百科、科举答题、开服监控、日常提醒、情缘证书、玩家交流等。", multi = true, w = 520, h = 70 })
+	nX = ui:Append("Text", { x = 0, y = 100, font = 214, txt = "网址 <https://haimanchajian.com>" }):Color(6, 204, 178):Click(function()
+		OpenInternetExplorer("https://haimanchajian.com")
+	end):Pos_()
 	--ui:Append("Text", {x = nX + 5,  y = 100, txt = "或公众号【海鳗插件】"}):Color(6, 204, 178)
 	local bY = 142
 	ui:Append("Text", { x = 0, y = bY, txt = "海鳗茶馆", font = 27 })
@@ -661,4 +663,4 @@ HM.RegisterEvent("FIRST_LOADING_END", function()
 end)
 
 -- add to HM collector
-HM.RegisterPanel(_HM_Secret.szName, 656, _L["Recreation"], _HM_Secret.PS)
+HM.RegisterPanel(_HM_Secret.szName, 2651, _L["Recreation"], _HM_Secret.PS)