Release 1.2.1

Author: Chen

0Base/Base.lua

@@ -1,7 +1,7 @@
 -- @Author: Webster
 -- @Date:   2015-01-21 15:21:19
 -- @Last Modified by:   Webster
--- @Last Modified time: 2015-12-10 04:21:54
+-- @Last Modified time: 2015-12-15 11:59:54
 
 -- these global functions are accessed all the time by the event handler
 -- so caching them is worth the effort
@@ -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_   = 0x1020000
+local _VERSION_   = 0x1020100
 
 ---------------------------------------------------------------------
 -- 多语言处理
@@ -73,7 +73,7 @@ do
 end
 
 local _JH = {
-	szBuildDate  = "20151208",
+	szBuildDate  = "20151215",
 	szTitle      = _L["JH, JX3 Plug-in Collection"],
 	tHotkey      = {},
 	tAnchor      = {},

0Base/lang/zhcn.jx3dat

@@ -229,7 +229,7 @@ data = {
 	["Format content"] = "��ʽ������",
 	["Export success %s"] = "�����ɹ���%s",
 	["Import success %s"] = "����ɹ���%s",
-	["Import failed %s"] = "����ʧ�ܣ������ļ��Ƿ���ڻ��ļ���ʽ�Ƿ���ȷ\n%s",
+	["Import failed %s"] = "����ʧ�ܣ�%s",
 	["Import mode"] = "����ģʽ",
 	["Cover"] = "���ǣ��Ƽ���",
 	["Merge"] = "�ϲ�",
@@ -253,6 +253,9 @@ data = {
 	["Use common data"] = "ʹ��ͨ�����ݣ�����ǰ��ɫ��������ɫ����ͬһ�����ݣ�",
 	["life has left"] = "��Ѫ��ʣ��",
 	["mana has reached"] = "�������ﵽ",
+	["the file does not exist"] = "�ļ������ڣ�",
+	["can not read data file."] = "�ļ���ʽ������޷���ȡ��",
+	["please select interface path."] = "��ѡ��interfaceĿ¼�µ��ļ���",
 	-- ST.class.lua --
 	["Countdown format Error"] = "����ʱ��ʽ����",
 	["[%s] left over %d."] = "��%s�� ʣ�� %d �롣",
@@ -756,5 +759,5 @@ data = {
 	["Skill Style"] = "����������ʽ",
 	["Damage Style"] = "����������ʽ",
 	["Therapy Style"] = "����������ʽ",
-	["CombatText Tips"] = "С��ʾ��$name�ͷ������֣�$sn��������$crit���ģ�$val��ֵ��"
+	["CombatText Tips"] = "С��ʾ��$name�ͷ������֣�$sn��������$crit���ģ�$val��ֵ��",
 }

0Base/lang/zhtw.jx3dat

@@ -1,7 +1,7 @@
 -- language data (zhcn) updated at 2015/02/23 10:11:27
 data = {
 	-- TS.lua --
-	["Well done! %s in %d group first to attack %s!!"] = "%d小隊的 %s 率先攻擊了 %s！獲取不壹定準確，僅供參考！",
+	["Well done! %s in %d group first to attack %s!!"] = "%d小隊的 %s 率先攻擊了 %s！獲取不壹定準確，僅供慘考！",
 	["Loading..."] = "Loading...",
 	["** You Threat more than %d, 120% is Out of Taunt! **"] = "** 妳的仇恨超過了 %d％ 達到 120％ 則ＯＴ！**",
 	["SOUND_nat_view2"] = "data/sound/場景/view/nat_view2.wav",
@@ -46,7 +46,7 @@ data = {
 	["Show TTarget Name"] = "顯示目標的目標名稱",
 	["Text Scale"] = "文字縮放",
 	["Show Target Hatred"] = "顯示目標仇恨",
-	["Lock Panel"] = "鎖定位置",
+	["Lock Panel"] = "瑣定位置",
 	["Show Background"] = "顯示背景圖片",
 	["Enable KG3DEngineDX11 better effect"] = "啟用 KG3DEngineDX11 可獲得更清晰的效果",
 	["TargetFace"] = "目標輔助",
@@ -129,7 +129,7 @@ data = {
 	["Self KungFu require"] = "自身心法要求",
 	["no request"] = "沒有要求",
 	["infinite"] = "∞",
-	["raw data, Please be careful"] = "查看原始數據（僅供參考）",
+	["raw data, Please be careful"] = "查看原始數據（僅供慘考）",
 	["%s Call Name"] = "被【%s】點名了",
 	["JX3 DBM Plug-in"] = "《劍網3》DBM插件設置面板",
 	["BUFF"] = "增益效果",
@@ -229,7 +229,7 @@ data = {
 	["Format content"] = "格式化內容",
 	["Export success %s"] = "導出成功：%s",
 	["Import success %s"] = "導入成功：%s",
-	["Import failed %s"] = "導入失敗，請檢查文件是否存在或文件格式是否正確\n%s",
+	["Import failed %s"] = "導入失敗，%s",
 	["Import mode"] = "導入模式",
 	["Cover"] = "覆蓋（推薦）",
 	["Merge"] = "合並",
@@ -253,6 +253,9 @@ data = {
 	["Use common data"] = "使用通用數據（即當前角色和其他角色共用同壹個數據）",
 	["life has left"] = "的血量剩余",
 	["mana has reached"] = "的內力達到",
+	["the file does not exist"] = "文件不存在，",
+	["can not read data file."] = "文件格式錯誤或無法讀取。",
+	["please select interface path."] = "請選擇interface目錄下的文件。",
 	-- ST.class.lua --
 	["Countdown format Error"] = "倒計時格式錯誤",
 	["[%s] left over %d."] = "【%s】 剩余 %d 秒。",
@@ -263,10 +266,10 @@ data = {
 	["Other data"] = "其他數據",
 	["My Data"] = "我的數據",
 	["Logout"] = "退出",
-	["Login Web Account"] = "登陸插件官網",
-	["Enter User ID"] = "輸入用戶UID！不是用戶名（不要在公共場合登陸）",
+	["Login Web Account"] = "登六插件官網",
+	["Enter User ID"] = "輸入用護UID！不是用護名（不要在公共場合登六）",
 	["Please enter numbers"] = "請輸入數字",
-	["Enter password"] = "輸入密碼（不要在公共場合登陸）",
+	["Enter password"] = "輸入密碼（不要在公共場合登六）",
 	["request failed"] = "請求失敗",
 	["Enter thread ID"] = "請輸入數據ID",
 	["now"] = "剛剛",
@@ -288,8 +291,8 @@ data = {
 	["Hi, I seem to meet you somewhere ago"] = "海，我好像在哪兒見過妳 #欣喜",
 	["Lover of JX3"] = "情緣劍俠3",
 	["Some people fancy you"] = "東邊日出西邊雨，道是無晴卻有晴；有人看上妳",
-	["Other side terminate love you"] = "我本將心向明月，奈何明月照溝渠；TA斬情緣了",
-	["Some people fall in love with you"] = "春色滿園關不住，壹枝紅杏出墻來；有人戀上妳",
+	["Other side terminate love you"] = "我本將心向明月，奈何明月照鉤渠；TA斬情緣了",
+	["Some people fall in love with you"] = "春色滿員關不住，壹枝紅杏出墻來；有人戀上妳",
 	["Other side gave up love you"] = "還君明珠淚雙垂，恨不相逢未嫁時；TA斬情緣了",
 	["Mutual love"] = "相戀",
 	["Blind love"] = "單戀",
@@ -299,27 +302,27 @@ data = {
 	["%d day %d hour"] = "%d天%d小時",
 	["%d year %d day"] = "%d年%d天",
 	["From now on, my heart lover is [%s]"] = "#玫瑰 從現在起，我的心動情緣是 [%s] #親親",
-	["Sorry, I decided to just a swordman, bye my plugin lover"] = "對不起，我決定只劍俠不情緣了，別了插件情緣 #可憐",
+	["Sorry, I decided to just a swordman, bye my plugin lover"] = "對不起，我抉定只劍俠不情緣了，別了插件情緣 #可憐",
 	["A blade and cut, no longer meet with [%s]"] = "#心碎 手起刀落，它日與 [%s] 江湖不見",
 	["Congratulations, do not repeat the same mistakes ah"] = "恭喜出城，別再重蹈覆轍啊",
 	["Lover must be a online friend"] = "情緣對象必須是在線好友",
 	["Inadequate conditions, requiring Lv6 friend/party/4-feet distance/%s"] = "雙向條件不足，要求6重好感/組隊距離4尺內/揣1個%s",
 	["Love request has been sent to [%s], wait please"] = "情緣請求已發給 [%s]，請等候回應",
 	["Love can not run a red-light, [%d] seconds left"] = "情緣不能闖紅燈，再等[%d]秒",
-	["Are you sure to cut love with [%s]?"] = "妳確定要斬斷與[%s]的情緣麽？",
-	["Past five hundred times looking back only in exchange for a chance encounter this life, you really decided?"] = "前世五百次回眸才換來今生壹次偶遇，妳真的決定了？",
+	["Are you sure to cut love with [%s]?"] = "妳確定要斬斷與[%s]的情緣麼？",
+	["Past five hundred times looking back only in exchange for a chance encounter this life, you really decided?"] = "前世五百次回眸才換來今生壹次偶遇，妳真的抉定了？",
 	["You do not really want to cut off love it, really sure?"] = "妳不會真的要斬斷情緣吧，真的確定嗎？",
 	["Repair feature only supports mutual love!"] = "修復功能只支持雙向情緣！",
 	["Both sides must in a team to be repaired!"] = "雙方必須組隊在壹起才能進行修復！",
 	["Repair request has been sent, wait please"] = "情緣修復請求已發送給對方，請稍候",
 	["Do you want to love with [%s]?"] = "確定要與 [%s] 情緣嗎？",
-	["<Non-avaiable>"] = "<無合適人選>",
+	["<Non-avaiable>"] = "<無合這人選>",
 	["Save signature failed, please add some friends."] = "保存簽名失敗，請先多結交幾個好友。",
 	["'s Lover"] = "的情緣",
 	["...Loading..."] = "…載入中…",
 	["'s Love signature:"] = "的情緣宣言：",
 	["If it is always loading, the target may not install plugin or turn on quiet mode, strongly recommend to query after team up."] = "如果壹直顯示載入中，可能是對方沒有安裝插件或開啟免打擾，強烈推薦組隊後查詢。",
-	["This guy is very lazy, nothing left!"] = "這個家夥很懶，什麽也沒留下！",
+	["This guy is very lazy, nothing left!"] = "這個家夥很懶，什麼也沒留下！",
 	["Strike up her"] = "勾搭她",
 	["Strike up him"] = "勾搭他",
 	[" in fighting, no time for you"] = "正在戰鬥中，無暇搭理妳",
@@ -334,7 +337,7 @@ data = {
 	["want to repair love relation with you, OK?"] = "請求修復與您的雙向情緣關系？",
 	["Congratulations, love relation with [%s] has been fixed!"] = "恭喜您，成功修復與 [%s] 的情緣關系！",
 	["Unfortunately the other has lover, but you can still blind love him!"] = "很遺憾對方已有情緣，但妳仍可以選擇單戀 Ta！",
-	["The other refused you without reason, but you can still blind love him!"] = "不知為什麽對方拒絕了妳，但妳仍可以選擇單戀 Ta！",
+	["The other refused you without reason, but you can still blind love him!"] = "不知為什麼對方拒絕了妳，但妳仍可以選擇單戀 Ta！",
 	["Congratulations, success to attach love with [%s]!"] = "恭喜您，與 [%s] 結緣成功！",
 	["Lover <link0>"] = "情緣<link 0>",
 	["online, hurry doing needy doing.\n"] = "上線啦，該幹嘛趕緊幹嘛。\n",
@@ -387,7 +390,7 @@ data = {
 	["Clear Record"] = "清空記錄",
 	["Loading Record"] = "加載記錄",
 	["Manual SYNC"] = "手動同步",
-	["Keep Account to:"] = "記賬到：",
+	["Keep Account to:"] = "記帳到：",
 	["Name of the Item:"] = "物品名稱：",
 	["Route of Acquiring:"] = "獲得途徑：",
 	["Auction Price:"] = "拍賣價格：",
@@ -465,16 +468,16 @@ data = {
 	["Reall Salary: %d Gold."] = "實際工資：%d金。",
 	["Amount of People with Settle Account: %d"] = "結算人數：%d",
 	["Actual per person: %d Gold."] = "實際每人：%d金。",
-	["The Account is Negative, no money is coming out!"] = "記賬的人肯定是豬，賬是負的發不出錢了！",
-	["GKP_TIPS"] = "《GKP拾取列表》操作指南，作為壹個靠譜的團長請仔細閱讀。\n1、本拾取列表為GKP插件提供，插件安裝後關閉了官方自帶的拾取列表，如想恢復請不要加載GKP插件。\n2、拾取列表對特定的道具擁有分配記憶功能，例如小鐵和裂石等，只需要按住Shift點擊閃爍邊框的道具即可分配給上壹個人。\n3、拾取列表左上角有更換樣式的按鈕，可以自由選擇喜歡的樣式。\n4、分配時按住Shift會阻止彈出記錄界面，達到快速分配的目的。\n5、如果分配時勾選了散件老板，那麽會出現壹鍵分配所有物品給這個成員的選項，在關閉按鈕旁邊。\n6、按住Alt可以實現預覽裝備，按住Ctrl可以實現貼出Link。\n7、本提示僅出現壹次。",
+	["The Account is Negative, no money is coming out!"] = "記帳的人肯定是豬，帳是負的發不出錢了！",
+	["GKP_TIPS"] = "《GKP拾取列表》操作指南，作為壹個靠譜的團長請仔細閱讀。\n1、本拾取列表為GKP插件提供，插件安裝後關閉了官方自帶的拾取列表，如想恢復請不要加載GKP插件。\n2、拾取列表對特定的道具擁有分配記憶功能，例如小鐵和裂石等，只需要按住Shift點擊閃爍邊框的道具即可分配給上壹個人。\n3、拾取列表左上角有更換洋式的按鈕，可以自由選擇喜歡的洋式。\n4、分配時按住Shift會阻止彈出記錄界面，達到快速分配的目的。\n5、如果分配時勾選了散件老板，那麼會出現壹鍵分配所有物品給這個成員的選項，在關閉按鈕旁邊。\n6、按住Alt可以實現預覽裝備，按住Ctrl可以實現貼出Link。\n7、本提示僅出現壹次。",
 	["Roll the dice if you wang"] = " 要的Roll點。",
 	[" %d Gold Start Bidding, off a price if you want."] = " %d 金起拍，要的出價。",
 	["You already distrubute [%s] with [%s], you can press Shift and select the object to make a fast distrubution, you can also make distribution to he or her by clicking this menu. \n"] = "上次妳已經把 [%s] 分配給了 [%s] ，下次可以直接在物品圖標上按住Shift快速分配給 [%s] ，也可以點擊這個菜單分配給TA。\n",
 	["No Equiptment left for Equiptment Boss"] = "沒有剩余的裝備可以分配給散件老板。",
 	["Are you sure you want the following item\n"] = "妳確定要將以下物品\n",
 	["All distrubute to"] = "全部分配給",
 	["Please entry the name of the item"] = "請輸入物品名稱",
-	["Select a member who is in charge of account and put money in his account."] = "選擇壹個記賬的成員把錢記到他頭上啊，妳真笨！",
+	["Select a member who is in charge of account and put money in his account."] = "選擇壹個記帳的成員把錢記到他頭上啊，妳真笨！",
 	[" Distribute to "] = " 分配給 ",
 	["Make changes to the record."] = " 對記錄做了修改。",
 	["Manually make record to"] = " 手動記錄到 ",
@@ -540,7 +543,7 @@ data = {
 	["Show ManaCount"] = "顯示內力數值",
 	["Attack Warning"] = "被攻擊提示",
 	["& Icon"] = "和圖標顯示方案",
-	["Show Format value"] = "顯示精簡數值",
+	["Show Format value"] = "顯示精間數值",
 	["Show Percentage value"] = "顯示百分比數",
 	["Show full value"] = "顯示具體數值",
 	["Show Force Icon"] = "顯示門派圖標",
@@ -553,7 +556,7 @@ data = {
 	["Edit Distance Level"] = "編輯距離等級",
 	["distance, distance, ..."] = "8,20,22,24,30, ...",
 	["Max buff count"] = "BUFF最大顯示數量",
-	["Font Style"] = "文字樣式設置",
+	["Font Style"] = "文字洋式設置",
 	["Restore Default"] = "恢復默認",
 	["Interface Width"] = "界面寬度比例",
 	["Interface Height"] = "界面高度比例",
@@ -565,7 +568,7 @@ data = {
 	["Two lines: 4/1"] = "兩行：四列/壹列",
 	["Don't show Tip in fight"] = "戰鬥中不顯示玩家TIP",
 	["Faster Refresh HP(Greater performance loss)"] = "更快的血量刷新（目前官方有BUG，暫時關閉）",
-	["Grid Style"] = "格子樣式",
+	["Grid Style"] = "格子洋式",
 	["Panel"] = "面板",
 	["configure"] = "配置（如果希望不共用設置，請隨意修改為任意字符，否則請勿修改）",
 	["Configuration name"] = "配置文件名稱",
@@ -618,7 +621,7 @@ data = {
 	["Shear"] = "剪刀",
 	["Stick"] = "棒槌",
 	["Jade"] = "如意",
-	["Dart"] = "飛鏢",
+	["Dart"] = "飛膘",
 	["Fan"] = "扇子",
 	["You are not in a team"] = "妳不在團隊中",
 	["Team list data saved"] = "團隊列表數據已保存",
@@ -752,9 +755,9 @@ data = {
 	["CombatText Color 4"] = "毒性",
 	["CombatText Color 5"] = "反彈",
 	["CombatText Color 6"] = "治療",
-	["Text Style"] = "戰鬥文字樣式設置",
-	["Skill Style"] = "技能文字樣式",
-	["Damage Style"] = "受傷文字樣式",
-	["Therapy Style"] = "治療文字樣式",
-	["CombatText Tips"] = "小提示：$name釋放者名字，$sn技能名，$crit會心，$val數值。"
+	["Text Style"] = "戰鬥文字洋式設置",
+	["Skill Style"] = "技能文字洋式",
+	["Damage Style"] = "受傷文字洋式",
+	["Therapy Style"] = "治療文字洋式",
+	["CombatText Tips"] = "小提示：$name釋放者名字，$sn技能名，$crit會心，$val數值。",
 }

DBM/DBM_Core.lua

@@ -1,7 +1,7 @@
 -- @Author: Webster
 -- @Date:   2015-05-13 16:06:53
 -- @Last Modified by:   Webster
--- @Last Modified time: 2015-12-11 21:58:36
+-- @Last Modified time: 2015-12-15 11:41:57
 
 local _L = JH.LoadLangPack
 local ipairs, pairs, select = ipairs, pairs, select
@@ -1493,11 +1493,14 @@ end
 function D.LoadConfigureFile(config)
 	local root, path = GetRootPath(), "\\".. JH.GetAddonInfo().szRootPath .. "DBM\\data\\" .. config.szFileName
 	local szFullPath = config.bFullPath and config.szFileName or path
-	-- local szFilePath = config.bFullPath and config.szFileName:gsub(root, "") or path
+	local szFilePath = config.bFullPath and config.szFileName:gsub(root, "") or path
 	szFullPath = szFullPath:gsub("\\", "/")
-	local data = LoadLUAData(szFullPath)
+	if not IsFileExist(szFullPath) then
+		return false, "the file does not exist"
+	end
+	local data = LoadLUAData(szFilePath)
 	if not data then
-		return false, szFullPath
+		return false, "can not read data file."
 	else
 		if config.nMode == 1 then
 			if config.tList["CIRCLE"] then
@@ -1729,3 +1732,4 @@ JH.RegisterEvent("LOGIN_GAME", D.Init)
 JH.RegisterEvent("PLAYER_ENTER_GAME", D.LoadUserData)
 JH.RegisterExit(D.SaveData)
 JH.RegisterBgMsg("DBM_SHARE", D.OnShare)
+

DBM/DBM_UI.lua

@@ -1,7 +1,7 @@
 -- @Author: Webster
 -- @Date:   2015-05-14 13:59:19
 -- @Last Modified by:   Webster
--- @Last Modified time: 2015-12-11 22:07:48
+-- @Last Modified time: 2015-12-15 11:45:37
 
 local _L = JH.LoadLangPack
 local ipairs, pairs, select = ipairs, pairs, select
@@ -608,9 +608,13 @@ function DBMUI.OpenImportPanel(szDefault, szTitle, fnAction)
 	nX = ui:Append("WndEdit", "FilePtah", { x = 30, y = nY + 10, w = 450, h = 25, txt = szTitle, enable = false }):Pos_()
 	nX, nY = ui:Append("WndButton2", { x = nX + 5, y = nY + 10, txt = _L["browse"], enable = not szDefault }):Click(function()
 		local szFile = GetOpenFileName()
-		ui:Fetch("FilePtah"):Text(szFile)
+		if szFile:find(GetRootPath() .. "\\interface") then
+			ui:Fetch("FilePtah"):Text(szFile)
+		else
+			ui:Fetch("FilePtah"):Text("")
+			JH.Alert(_L["please select interface path."])
+		end
 	end):Pos_()
-
 	nX, nY = ui:Append("Text", { x = 20, y = nY, txt = _L["Import mode"], font = 27 }):Pos_()
 	local nType = 1
 	nX = ui:Append("WndRadioBox", { x = 30, y = nY + 10, txt = _L["Cover"], group = "type", checked = true }):Click(function()
@@ -631,15 +635,15 @@ function DBMUI.OpenImportPanel(szDefault, szTitle, fnAction)
 				config.tList[v] = true
 			end
 		end
-		local bStatus, szFullPath = DBM_API.LoadConfigureFile(config)
+		local bStatus, szMsg = DBM_API.LoadConfigureFile(config)
 		if bStatus then
-			JH.Alert(_L("Import success %s", szTitle or szFullPath))
+			JH.Alert(_L("Import success %s", szTitle or szMsg))
 			ui:Remove()
 			if fnAction then
 				fnAction()
 			end
 		else
-			JH.Alert(_L("Import failed %s", szTitle or szFullPath))
+			JH.Alert(_L("Import failed %s", szTitle or _L[szMsg]))
 		end
 	end)
 end

GKP/GKP.lua

@@ -1,7 +1,7 @@
 -- @Author: Webster
 -- @Date:   2015-01-21 15:21:19
 -- @Last Modified by:   Webster
--- @Last Modified time: 2015-12-10 00:07:19
+-- @Last Modified time: 2015-12-14 20:15:33
 
 -- 早期代码 需要重写
 
@@ -981,6 +981,7 @@ JH.RegisterBgMsg("GKP", function(nChannel, dwID, szName, data, bIsSelf)
 					JH.Topmsg(_L["Sychoronization Complete"])
 					local tData, err = JH.JsonDecode(str)
 					if err then
+						JH.Debug(err)
 						return _GKP.Sysmsg(_L["Abnormal with Data Sharing, Please contact and make feed back with the writer."])
 					end
 					JH.Confirm(_L("Data Sharing Finished, you have one last chance to confirm wheather cover the current data or not? \n data of team bidding: %s\n transation data: %s", #tData.GKP_Record, #tData.GKP_Account), function()

JH_CHANGELOG.txt

@@ -1,6 +1,6 @@
  * 新增：[战斗文字] 允许自定义文字结构了。
- * 新增：[战斗文字] 配置文件中允许忽略显示部分技能（例平砍）。
- * 新增：[DBM] 导入本地数据可以选择文件了。
+ * 新增：[战斗文字] 配置文件中允许忽略显示部分技能（如平砍）。
+ * 新增：[DBM] 导入本地数据可以直接选择文件了。
  * 修复：[头顶报警] 内力监控对长歌无效的问题。
  * 修复：[基础库] 因官方修改图片导致选项卡比较奇怪的问题。
  -----------------------------------------