修改秘宝对勇者试炼奖励的加成

script/module/drill/DrillLogic.lua

@@ -111,8 +111,8 @@ local CHALLENGE_DIAMONS = 500  -- 使用钻石通过当前关卡需要的钻石
 
 --秘宝加成
 local function getTalismanAdd(human)
-	local jinbiAdd = (TalismanLogic.getTalismanAdd(human, TalismanLogic.OTHER_EFFECT_TBL.DRILL_JINBI) or 0) / 100
-	return jinbiAdd
+	local heroExpMul = (TalismanLogic.getTalismanAdd(human, TalismanLogic.OTHER_EFFECT_TBL.DRILL_HERO_EXP) or 0) / 100
+	return heroExpMul
 end
 
 
@@ -308,7 +308,7 @@ function checkSaoDang(human, diff, lastDiff, lastId)
     local rewardCnt = double and 2 or 1
 
 	--秘宝加成
-	local talismanAdd_jinbi = getTalismanAdd(human)
+	local heroExpMul = getTalismanAdd(human)
 
 	if lastDiff and lastDiff == diff and lastId > 10 then
 		id = lastId - 10
@@ -320,8 +320,8 @@ function checkSaoDang(human, diff, lastDiff, lastId)
 			for _, item in ipairs(drillItems) do
 				local itemID = item[1]
 				local itemCnt = item[2] * rewardCnt
-				if itemID == ItemDefine.ITEM_JINBI_ID then
-					itemCnt = itemCnt + math.ceil(itemCnt * talismanAdd_jinbi)
+				if itemID == ItemDefine.ITEM_GREEN_EXP_ID then
+					itemCnt = itemCnt + math.ceil(itemCnt * heroExpMul)
 				end
 
 				drillDB.dayGet = drillDB.dayGet or {}
@@ -479,7 +479,7 @@ function queryDrillId(human, drillData, openPanel)
 	local boxCount = math.min(#DrillExcel.box, 5)
 	msgRet.box[0] = boxCount
 	--秘宝加成
-	local talismanAdd_jinbi = getTalismanAdd(human)
+	local heroExpMul = getTalismanAdd(human)
 	for k = 1, boxCount do
 		local config = DrillExcel.box[k]
 		local net = msgRet.box[k]	
@@ -496,14 +496,14 @@ function queryDrillId(human, drillData, openPanel)
 		net.state = getBoxState(drill,  k)
 		local itemID1  = config["items"..diff][1][1]
 		local itemCnt1 = config["items"..diff][1][2]
-		if itemID1 == ItemDefine.ITEM_JINBI_ID and talismanAdd_jinbi > 0 then
-			itemCnt1 = itemCnt1 + math.ceil(itemCnt1 * talismanAdd_jinbi)
+		if itemID1 == ItemDefine.ITEM_GREEN_EXP_ID and heroExpMul > 0 then
+			itemCnt1 = itemCnt1 + math.ceil(itemCnt1 * heroExpMul)
 		end
 
 		local itemID2  = config["items"..diff][2][1]
 		local itemCnt2 = config["items"..diff][2][2]
-		if itemID2 == ItemDefine.ITEM_JINBI_ID and talismanAdd_jinbi > 0 then
-			itemCnt2 = itemCnt1 + math.ceil(itemCnt2 * talismanAdd_jinbi)
+		if itemID2 == ItemDefine.ITEM_GREEN_EXP_ID and heroExpMul > 0 then
+			itemCnt2 = itemCnt1 + math.ceil(itemCnt2 * heroExpMul)
 		end
 
 		Grid.makeItem(net.reward[1], itemID1,  itemCnt1 )
@@ -513,8 +513,8 @@ function queryDrillId(human, drillData, openPanel)
 		if config["items"..diff][3] then
 			local itemID3  = config["items"..diff][3][1]
 			local itemCnt3 = config["items"..diff][3][2]
-			if itemID3 == ItemDefine.ITEM_JINBI_ID and talismanAdd_jinbi > 0 then
-				itemCnt3 = itemCnt1 + math.ceil(itemCnt3 * talismanAdd_jinbi)
+			if itemID3 == ItemDefine.ITEM_GREEN_EXP_ID and heroExpMul > 0 then
+				itemCnt3 = itemCnt1 + math.ceil(itemCnt3 * heroExpMul)
 			end
 
 			Grid.makeItem(net.reward[3], itemID3,  itemCnt3 )
@@ -614,7 +614,7 @@ function query(human, drillId)
 	end
 
 	--秘宝加成
-	local talismanAdd_jinbi = getTalismanAdd(human)
+	local heroExpMul = getTalismanAdd(human)
 
 	local double = RoleSystemLogic.isDouble(human, RoleSystemDefine.ROLE_SYS_ID_1204)
 	local rewardCnt = double and 2 or 1
@@ -636,8 +636,8 @@ function query(human, drillId)
 	for _, item in pairs(itemConfig) do
 		msgRet.reward[0] = msgRet.reward[0] + 1
 		local itemCnt = item[2] * rewardCnt
-		if item[1] == ItemDefine.ITEM_JINBI_ID then
-			itemCnt = itemCnt + math.ceil(itemCnt * talismanAdd_jinbi)
+		if item[1] == ItemDefine.ITEM_GREEN_EXP_ID then
+			itemCnt = itemCnt + math.ceil(itemCnt * heroExpMul)
 		end
 		Grid.makeItem(msgRet.reward[msgRet.reward[0]], item[1], itemCnt)
 		--Grid.makeItem(msgRet.reward[msgRet.reward[0]], item[1], item[2] * rewardCnt)
@@ -786,13 +786,13 @@ function drillBoxGet(human, index)
 	end
 
 	--秘宝加成
-	local talismanAdd_jinbi = getTalismanAdd(human)
+	local heroExpMul = getTalismanAdd(human)
 	local awardVec = {}
 	for i, v in ipairs(itemConfig) do
 		local itemID = v[1]
 		local itemCnt = v[2]
-		if itemID == ItemDefine.ITEM_JINBI_ID and talismanAdd_jinbi > 0 then
-			itemCnt = itemCnt + math.ceil(itemCnt * talismanAdd_jinbi)
+		if itemID == ItemDefine.ITEM_GREEN_EXP_ID and heroExpMul > 0 then
+			itemCnt = itemCnt + math.ceil(itemCnt * heroExpMul)
 		end
 		awardVec[i]= {itemID, itemCnt}
 	end
@@ -813,7 +813,7 @@ function rewardPreview(human)
     msgRet.list[0] = 0
 
 	--秘宝加成
-	local talismanAdd_jinbi = getTalismanAdd(human)
+	local heroExpMul = getTalismanAdd(human)
 
     for drillId, cf in pairs(DrillExcel.drill) do 
     	msgRet.list[0] = msgRet.list[0] + 1
@@ -823,8 +823,8 @@ function rewardPreview(human)
 		for i, item in ipairs(cf.items) do
 		    local itemID = item[1]
 		    local itemCnt = item[2]
-			if itemID == ItemDefine.ITEM_JINBI_ID and talismanAdd_jinbi > 0 then
-				itemCnt = itemCnt + math.ceil(itemCnt * talismanAdd_jinbi)
+			if itemID == ItemDefine.ITEM_GREEN_EXP_ID and heroExpMul > 0 then
+				itemCnt = itemCnt + math.ceil(itemCnt * heroExpMul)
 			end
 	        Grid.makeItem(net.items[i], itemID, itemCnt)
 		end
@@ -1609,15 +1609,15 @@ function onFightEnd(human, result, combatType, cbParam, combatInfo)
 	combatInfo.double = double and 2 or 0
 
 	--秘宝加成
-	local talismanAdd_jinbi = getTalismanAdd(human)
+	local heroExpMul = getTalismanAdd(human)
 
 	-- 关卡奖励		
 	local itemList = {}
 	for k, item in ipairs(drillItems) do
 		local itemID = item[1]
 		local itemCnt = item[2] * rewardCnt
-		if itemID == ItemDefine.ITEM_JINBI_ID and talismanAdd_jinbi > 0 then
-			itemCnt = itemCnt + math.ceil(itemCnt * talismanAdd_jinbi)
+		if itemID == ItemDefine.ITEM_GREEN_EXP_ID and heroExpMul > 0 then
+			itemCnt = itemCnt + math.ceil(itemCnt * heroExpMul)
 		end
 
 		itemList[k] = {}
@@ -1766,15 +1766,15 @@ function ChallengeLevelByDiamond(human, levelId)
 	local rewardCnt = double and 2 or 1
 
 	--秘宝加成
-	local talismanAdd_jinbi = getTalismanAdd(human)
+	local heroExpMul = getTalismanAdd(human)
 
 	-- 关卡奖励		
 	local itemArray = {}
 	for k, item in ipairs(drillItems) do
 		local itemID = item[1]
 		local itemCnt = item[2] * rewardCnt
-		if itemID == ItemDefine.ITEM_JINBI_ID and talismanAdd_jinbi > 0 then
-			itemCnt = itemCnt + math.ceil(itemCnt * talismanAdd_jinbi)
+		if itemID == ItemDefine.ITEM_GREEN_EXP_ID and heroExpMul > 0 then
+			itemCnt = itemCnt + math.ceil(itemCnt * heroExpMul)
 		end
 
 		itemArray[k] = {itemID, itemCnt}
@@ -1903,7 +1903,7 @@ function oneClickSaodang(human)
 	local rewardCnt = double and 2 or 1
 	
 	-- 秘宝加成
-	local talismanAdd_jinbi = getTalismanAdd(human)
+	local heroExpMul = getTalismanAdd(human)
 	
 	-- 初始化今日奖励
 	drill.dayGet = drill.dayGet or {}
@@ -1918,8 +1918,8 @@ function oneClickSaodang(human)
 			for _, item in ipairs(drillItems) do
 				local itemID = item[1]
 				local itemCnt = item[2] * rewardCnt
-				if itemID == ItemDefine.ITEM_JINBI_ID then
-					itemCnt = itemCnt + math.ceil(itemCnt * talismanAdd_jinbi)
+				if itemID == ItemDefine.ITEM_GREEN_EXP_ID then
+					itemCnt = itemCnt + math.ceil(itemCnt * heroExpMul)
 				end
 				
 				-- 累加奖励到列表

script/module/talisman/TalismanLogic.lua

@@ -42,7 +42,7 @@ OTHER_EFFECT_TBL = {
     ["NW_JB"] = "NW_JB",                            --女巫森林金币类型
     ["NW_HERO_EXP"] = "NW_HERO_EXP",                --女巫森林英雄经验类型
     ["NW_LHS"] = "NW_LHS",                          --女巫森林龙魂石
-    ["DRILL_JINBI"] = "DRILL_JINBI",                --勇者试炼金币类型
+    ["DRILL_HERO_EXP"] = "DRILL_HERO_EXP",          --勇者试炼英雄经验
     ["ZHANBU_MAX_POINTS"] = "ZHANBU_MAX_POINTS",    --占卜最大积分类型
     ["JYZH_LOTTERY10"] = "JYZH_LOTTERY10",          --精英召唤10连类型
     ["NW_FWJH"] = "NW_FWJH",                        --女巫森林符文精华