Skip to content

Commit

Permalink
Release 1.2.3
Browse files Browse the repository at this point in the history
  • Loading branch information
Chen authored and Chen committed Jan 7, 2016
1 parent 8860803 commit 419effa
Show file tree
Hide file tree
Showing 7 changed files with 37 additions and 34 deletions.
6 changes: 3 additions & 3 deletions 0Base/Base.lua
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
-- @Author: Webster
-- @Date: 2015-01-21 15:21:19
-- @Last Modified by: Webster
-- @Last Modified time: 2016-01-04 20:20:59
-- @Last Modified time: 2016-01-07 17:14:30

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

---------------------------------------------------------------------
-- 多语言处理
Expand Down Expand Up @@ -73,7 +73,7 @@ do
end

local _JH = {
szBuildDate = "20151224",
szBuildDate = "20160107",
szTitle = _L["JH, JX3 Plug-in Collection"],
tHotkey = {},
tAnchor = {},
Expand Down
48 changes: 24 additions & 24 deletions 0Base/Button.lua
Original file line number Diff line number Diff line change
@@ -1,32 +1,32 @@
-- @Author: Webster
-- @Date: 2015-09-16 18:12:29
-- @Last Modified by: Webster
-- @Last Modified time: 2015-09-16 19:14:07
-- @Last Modified time: 2016-01-07 13:14:17

-- 只有存在文件的情况下才会开启
local isEnable = IsFileExist(JH.GetAddonInfo().szDataPath .. "EnableButton")
if isEnable then
local Container = Station.Lookup("Normal/TopMenu/WndContainer_List")
if Container then
if not Container:Lookup("JH_Window") then
local wnd = Container:AppendContentFromIni(JH.GetAddonInfo().szRootPath .. "0Base/ui/JH_Button.ini", "JH_Window")
if wnd then
Container:FormatAllContentPos()
JH.RegisterEvent("FIRST_LOADING_END", function()
local isEnable = IsFileExist(JH.GetAddonInfo().szDataPath .. "EnableButton")
if isEnable or JH.bDebugClient then
local Container = Station.Lookup("Normal/TopMenu/WndContainer_List")
if Container then
if not Container:Lookup("JH_Window") then
local wnd = Container:AppendContentFromIni(JH.GetAddonInfo().szRootPath .. "0Base/ui/JH_Button.ini", "JH_Window")
if wnd then
Container:FormatAllContentPos()
end
end
end
local wnd = Container:Lookup("JH_Window")
if wnd then
local btn = wnd:Lookup("Btn_JH")
RegisterEvent("RELOAD_UI_ADDON_BEGIN", function()
-- free(ui)
btn.OnLButtonClick = nil
btn.OnRButtonClick = nil
end)
btn.OnLButtonClick = JH.TogglePanel
btn.OnRButtonClick = function()
PopupMenu(JH.GetPlayerAddonMenu()[1])
local wnd = Container:Lookup("JH_Window")
if wnd then
local btn = wnd:Lookup("Btn_JH")
RegisterEvent("RELOAD_UI_ADDON_BEGIN", function()
-- free(ui)
btn.OnLButtonClick = nil
btn.OnRButtonClick = nil
end)
btn.OnLButtonClick = JH.TogglePanel
btn.OnRButtonClick = function()
PopupMenu(JH.GetPlayerAddonMenu()[1])
end
end
end
end
end

end)
2 changes: 1 addition & 1 deletion 0Base/lang/zhcn.jx3dat
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ data = {
["Enable KG3DEngineDX11 better effect"] = "���� KG3DEngineDX11 �ɻ�ø�������Ч��",
["TargetFace"] = "Ŀ�긨��",
-- SkillCD.lua --
["SkillCD"] = "����CD���",
["SkillCD"] = "���ܼ��",
["Skill ID:"] = "����ID:",
["Cool Down:"] = "CDʱ��:",
["Can not delete default data"] = "�ⲻ�������ӵģ�����ɾ��Ĭ�ϵļ��ܡ�",
Expand Down
5 changes: 3 additions & 2 deletions AutoSetTeam/JH_CharInfo.lua
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
-- @Author: Webster
-- @Date: 2016-01-04 15:18:23
-- @Last Modified by: Webster
-- @Last Modified time: 2016-01-04 19:54:19
-- @Last Modified time: 2016-01-07 12:57:48
local _L = JH.LoadLangPack

local JH_CharInfo = {}
Expand Down Expand Up @@ -33,7 +33,7 @@ function JH_CharInfo.GetInfo()
end

function JH_CharInfo.CreateFrame(dwID, szName, dwForceID)
local ui = GUI.CreateFrame("JH_CharInfo" .. dwID, { w = 240, h = 400, title = szName .. g_tStrings.STR_EQUIP_ATTR, close = true })
local ui = GUI.CreateFrame("JH_CharInfo" .. dwID, { w = 240, h = 400, title = g_tStrings.STR_EQUIP_ATTR, close = true })
local frame = Station.Lookup("Normal/JH_CharInfo" .. dwID)
local nX, nY = ui:Append("Image", { x = 20, y = 50, w = 30, h = 30 }):File(GetForceImage(dwForceID)):Pos_()
ui:Append("Text", "Name", { x = nX + 5, y = 52, txt = szName })
Expand Down Expand Up @@ -153,6 +153,7 @@ function ViewCharInfoToPlayer(dwID)
if JH.IsParty(dwID) then
local team = GetClientTeam()
local info = team.GetMemberInfo(dwID)
local p = GetPlayer(dwID)
if info then
JH.BgTalk(PLAYER_TALK_CHANNEL.RAID, "CHAR_INFO", "ASK", dwID, JH.bDebugClient and "DEBUG")
JH_CharInfo.CreateFrame(dwID, info.szName, info.dwForceID)
Expand Down
4 changes: 3 additions & 1 deletion Cataclysm_Panel/Cataclysm_Party.lua
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
-- @Author: Webster
-- @Date: 2015-01-21 15:21:19
-- @Last Modified by: Webster
-- @Last Modified time: 2016-01-04 18:14:45
-- @Last Modified time: 2016-01-06 23:35:05
local _L = JH.LoadLangPack
-----------------------------------------------
-- 重构 @ 2015 赶时间 很多东西写的很粗略
Expand Down Expand Up @@ -38,6 +38,7 @@ local CTM_TTARGET
local CTM_CACHE = setmetatable({}, { __mode = "v" })
local CTM_LIFE_CACHE = {}
local CTM_BUFF_CACHE = {}
local CTM_BORDER_FRAME = Random(4)
-- Package func
local HIDE_FORCE = {
[7] = true,
Expand Down Expand Up @@ -522,6 +523,7 @@ function CTM:RefreshTarget(dwOldID, nOldType, dwNewID, nNewType)
if CTM_CACHE[dwNewID] and CTM_CACHE[dwNewID]:IsValid() then
if CTM_CACHE[dwNewID]:Lookup("Image_Selected") and CTM_CACHE[dwNewID]:Lookup("Image_Selected"):IsValid() then
CTM_CACHE[dwNewID]:Lookup("Image_Selected"):Show()
CTM_CACHE[dwNewID]:Lookup("Image_Selected"):SetFrame(CTM_BORDER_FRAME)
end
end
end
Expand Down
2 changes: 1 addition & 1 deletion GKP/GKP.lua
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
-- @Author: Webster
-- @Date: 2015-01-21 15:21:19
-- @Last Modified by: Webster
-- @Last Modified time: 2016-01-06 22:46:43
-- @Last Modified time: 2016-01-06 23:31:26

-- 早期代码 需要重写

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@ local ADDON_PATH = "interface/JH/"
请新增相应版本的语言文件到 ```JH/0Base/lang/```路径,根据内容翻译即可。

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

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

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

0 comments on commit 419effa

Please sign in to comment.