Skip to content

Commit 419effa

Browse files
ChenChen
Chen
authored and
Chen
committed
Release 1.2.3
1 parent 8860803 commit 419effa

File tree

7 files changed

+37
-34
lines changed

7 files changed

+37
-34
lines changed

‎0Base/Base.lua‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
-- @Author: Webster
22
-- @Date: 2015-01-21 15:21:19
33
-- @Last Modified by: Webster
4-
-- @Last Modified time: 2016-01-04 20:20:59
4+
-- @Last Modified time: 2016-01-07 17:14:30
55

66
-- these global functions are accessed all the time by the event handler
77
-- so caching them is worth the effort
@@ -19,7 +19,7 @@ local ROOT_PATH = "interface/JH/0Base/"
1919
local DATA_PATH = "interface/JH/@DATA/"
2020
local SHADOW_PATH = "interface/JH/0Base/item/shadow.ini"
2121
local ADDON_PATH = "interface/JH/"
22-
local _VERSION_ = 0x1020200
22+
local _VERSION_ = 0x1020300
2323

2424
---------------------------------------------------------------------
2525
-- 多语言处理
@@ -73,7 +73,7 @@ do
7373
end
7474

7575
local _JH = {
76-
szBuildDate = "20151224",
76+
szBuildDate = "20160107",
7777
szTitle = _L["JH, JX3 Plug-in Collection"],
7878
tHotkey = {},
7979
tAnchor = {},

‎0Base/Button.lua‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,32 @@
11
-- @Author: Webster
22
-- @Date: 2015-09-16 18:12:29
33
-- @Last Modified by: Webster
4-
-- @Last Modified time: 2015-09-16 19:14:07
4+
-- @Last Modified time: 2016-01-07 13:14:17
55

6-
-- 只有存在文件的情况下才会开启
7-
local isEnable = IsFileExist(JH.GetAddonInfo().szDataPath .. "EnableButton")
8-
if isEnable then
9-
local Container = Station.Lookup("Normal/TopMenu/WndContainer_List")
10-
if Container then
11-
if not Container:Lookup("JH_Window") then
12-
local wnd = Container:AppendContentFromIni(JH.GetAddonInfo().szRootPath .. "0Base/ui/JH_Button.ini", "JH_Window")
13-
if wnd then
14-
Container:FormatAllContentPos()
6+
JH.RegisterEvent("FIRST_LOADING_END", function()
7+
local isEnable = IsFileExist(JH.GetAddonInfo().szDataPath .. "EnableButton")
8+
if isEnable or JH.bDebugClient then
9+
local Container = Station.Lookup("Normal/TopMenu/WndContainer_List")
10+
if Container then
11+
if not Container:Lookup("JH_Window") then
12+
local wnd = Container:AppendContentFromIni(JH.GetAddonInfo().szRootPath .. "0Base/ui/JH_Button.ini", "JH_Window")
13+
if wnd then
14+
Container:FormatAllContentPos()
15+
end
1516
end
16-
end
17-
local wnd = Container:Lookup("JH_Window")
18-
if wnd then
19-
local btn = wnd:Lookup("Btn_JH")
20-
RegisterEvent("RELOAD_UI_ADDON_BEGIN", function()
21-
-- free(ui)
22-
btn.OnLButtonClick = nil
23-
btn.OnRButtonClick = nil
24-
end)
25-
btn.OnLButtonClick = JH.TogglePanel
26-
btn.OnRButtonClick = function()
27-
PopupMenu(JH.GetPlayerAddonMenu()[1])
17+
local wnd = Container:Lookup("JH_Window")
18+
if wnd then
19+
local btn = wnd:Lookup("Btn_JH")
20+
RegisterEvent("RELOAD_UI_ADDON_BEGIN", function()
21+
-- free(ui)
22+
btn.OnLButtonClick = nil
23+
btn.OnRButtonClick = nil
24+
end)
25+
btn.OnLButtonClick = JH.TogglePanel
26+
btn.OnRButtonClick = function()
27+
PopupMenu(JH.GetPlayerAddonMenu()[1])
28+
end
2829
end
2930
end
3031
end
31-
end
32-
32+
end)

‎0Base/lang/zhcn.jx3dat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ data = {
5151
["Enable KG3DEngineDX11 better effect"] = "���� KG3DEngineDX11 �ɻ�ø�������Ч��",
5252
["TargetFace"] = "Ŀ�긨��",
5353
-- SkillCD.lua --
54-
["SkillCD"] = "����CD���",
54+
["SkillCD"] = "���ܼ��",
5555
["Skill ID:"] = "����ID:",
5656
["Cool Down:"] = "CDʱ��:",
5757
["Can not delete default data"] = "�ⲻ�������ӵģ�����ɾ��Ĭ�ϵļ��ܡ�",

‎AutoSetTeam/JH_CharInfo.lua‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
-- @Author: Webster
22
-- @Date: 2016-01-04 15:18:23
33
-- @Last Modified by: Webster
4-
-- @Last Modified time: 2016-01-04 19:54:19
4+
-- @Last Modified time: 2016-01-07 12:57:48
55
local _L = JH.LoadLangPack
66

77
local JH_CharInfo = {}
@@ -33,7 +33,7 @@ function JH_CharInfo.GetInfo()
3333
end
3434

3535
function JH_CharInfo.CreateFrame(dwID, szName, dwForceID)
36-
local ui = GUI.CreateFrame("JH_CharInfo" .. dwID, { w = 240, h = 400, title = szName .. g_tStrings.STR_EQUIP_ATTR, close = true })
36+
local ui = GUI.CreateFrame("JH_CharInfo" .. dwID, { w = 240, h = 400, title = g_tStrings.STR_EQUIP_ATTR, close = true })
3737
local frame = Station.Lookup("Normal/JH_CharInfo" .. dwID)
3838
local nX, nY = ui:Append("Image", { x = 20, y = 50, w = 30, h = 30 }):File(GetForceImage(dwForceID)):Pos_()
3939
ui:Append("Text", "Name", { x = nX + 5, y = 52, txt = szName })
@@ -153,6 +153,7 @@ function ViewCharInfoToPlayer(dwID)
153153
if JH.IsParty(dwID) then
154154
local team = GetClientTeam()
155155
local info = team.GetMemberInfo(dwID)
156+
local p = GetPlayer(dwID)
156157
if info then
157158
JH.BgTalk(PLAYER_TALK_CHANNEL.RAID, "CHAR_INFO", "ASK", dwID, JH.bDebugClient and "DEBUG")
158159
JH_CharInfo.CreateFrame(dwID, info.szName, info.dwForceID)

‎Cataclysm_Panel/Cataclysm_Party.lua‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
-- @Author: Webster
22
-- @Date: 2015-01-21 15:21:19
33
-- @Last Modified by: Webster
4-
-- @Last Modified time: 2016-01-04 18:14:45
4+
-- @Last Modified time: 2016-01-06 23:35:05
55
local _L = JH.LoadLangPack
66
-----------------------------------------------
77
-- 重构 @ 2015 赶时间 很多东西写的很粗略
@@ -38,6 +38,7 @@ local CTM_TTARGET
3838
local CTM_CACHE = setmetatable({}, { __mode = "v" })
3939
local CTM_LIFE_CACHE = {}
4040
local CTM_BUFF_CACHE = {}
41+
local CTM_BORDER_FRAME = Random(4)
4142
-- Package func
4243
local HIDE_FORCE = {
4344
[7] = true,
@@ -522,6 +523,7 @@ function CTM:RefreshTarget(dwOldID, nOldType, dwNewID, nNewType)
522523
if CTM_CACHE[dwNewID] and CTM_CACHE[dwNewID]:IsValid() then
523524
if CTM_CACHE[dwNewID]:Lookup("Image_Selected") and CTM_CACHE[dwNewID]:Lookup("Image_Selected"):IsValid() then
524525
CTM_CACHE[dwNewID]:Lookup("Image_Selected"):Show()
526+
CTM_CACHE[dwNewID]:Lookup("Image_Selected"):SetFrame(CTM_BORDER_FRAME)
525527
end
526528
end
527529
end

‎GKP/GKP.lua‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
-- @Author: Webster
22
-- @Date: 2015-01-21 15:21:19
33
-- @Last Modified by: Webster
4-
-- @Last Modified time: 2016-01-06 22:46:43
4+
-- @Last Modified time: 2016-01-06 23:31:26
55

66
-- 早期代码 需要重写
77

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@ local ADDON_PATH = "interface/JH/"
3737
请新增相应版本的语言文件到 ```JH/0Base/lang/```路径，根据内容翻译即可。
3838

3939
### info.ini
40-
对于inifo.ini，请做单独的翻译，需要针对不同服对文件编码进行修改。
40+
对于info.ini，请做单独的翻译，需要针对不同服对文件编码进行修改。
4141
对于较老的游戏版本，可能需要修改路径，请补全```interface/{ sid }```。
4242

4343
### 图片文件
4444
对于较老的游戏版本，可能出现图片丢失的情况，请根据源码中的路径修改相应的图片资源。
4545

4646
### 无法加载
47-
您可能需要在控制面板，把非Unicode使用的语言更改为United States (English)，并且推荐开启日志记录```./bin/{ version }/logs/```查看报错信息做对应的修改。
47+
您可能需要在控制面板，把非Unicode使用的语言更改为United States (English)，并且推荐开启日志记录```./bin/{ version }/logs/```查看报错信息做对应的修改。

0 commit comments

Comments
 (0)