Release 1.2.4

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: 2016-01-13 08:47:31
+-- @Last Modified time: 2016-01-14 00:29:42
 
 -- 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_   = 0x1020300
+local _VERSION_   = 0x1020400
 
 ---------------------------------------------------------------------
 -- 多语言处理
@@ -73,7 +73,7 @@ do
 end
 
 local _JH = {
-	szBuildDate  = "20160107",
+	szBuildDate  = "20160114",
 	szTitle      = _L["JH, JX3 Plug-in Collection"],
 	tHotkey      = {},
 	tAnchor      = {},
@@ -2558,7 +2558,6 @@ function _GUI.Wnd:Autocomplete(fnTable, fnCallBack, fnRecovery, nMaxOption)
 			for k, v in ipairs(tTab) do
 				local txt = type(v) ~= "table" and tostring(v) or v.bRichText and v.option or v.szOption
 				if txt and txt:find(szText) and (txt ~= szText or type(v) == "table" and v.self) then
-
 					table.insert(tList, v)
 				elseif type(v) == "table" and v.bDevide then
 					table.insert(tList, v)
@@ -2594,10 +2593,11 @@ function _GUI.Wnd:Autocomplete(fnTable, fnCallBack, fnRecovery, nMaxOption)
 						end
 					end
 					if fnRecovery then
-						t.szLayer  = "ICON_RIGHT"
-						t.nFrame   = 86
-						t.szIcon   = "ui/Image/UICommon/Feedanimials.uitex"
-						t.fnClickIcon = function()
+						t.szLayer         = "ICON_RIGHTMOST"
+						t.nFrame          = 86
+						t.nMouseOverFrame = 87
+						t.szIcon          = "ui/Image/UICommon/Feedanimials.uitex"
+						t.fnClickIcon     = function()
 							JH.Confirm(FormatString(g_tStrings.MSG_DELETE_NAME, t.szOption), function()
 								local _this = this
 								this = wnd

JH_CombatText/JH_CombatText.lua

@@ -1,7 +1,7 @@
 -- @Author: Webster
 -- @Date:   2015-12-06 02:44:30
 -- @Last Modified by:   Webster
--- @Last Modified time: 2016-01-13 19:12:06
+-- @Last Modified time: 2016-01-14 00:28:39
 
 -- 战斗浮动文字设计思路
 --[[
@@ -307,6 +307,9 @@ function CombatText.OnFrameRender()
 				elseif tScale[nBefore] < tScale[nAfter] then
 					fScale = fScale + ((tScale[nAfter] - tScale[nBefore]) * fDiff)
 				end
+				if v.nType == SKILL_RESULT_TYPE.THERAPY and v.bCriticalStrike then
+					fScale = fScale * 0.8
+				end
 			end
 			-- draw
 			local r, g, b = unpack(v.col)