Merge branch 'cn/develop' into cn/publish/preview

熊润斐
2 parents 9e2e5c31 da555218
Showing 3 changed files with 60 additions and 25 deletions Show diff stats
src/actions/CarAction.lua
src/actions/PvpAction.lua
src/models/HeroPlugin.lua
@@ -209,6 +209,7 @@ function _M.saleRuneRpc(agent, data )
 	local reward, change = {}
 	local count = 0
+	local returnRune = {}
 	for _, uid in pairs(backs) do
 		count = count + 1
 		local rune = role.runeBag[uid]
@@ -223,15 +224,21 @@ function _M.saleRuneRpc(agent, data )
 		--分解铭文返还强化所需铭文碎片的60%
 		local level = rune:getProperty("level")
-		for i = 1, level do
-			local lvData = csvdb["rune_buildCsv"][i]
-			local cost = lvData.cost:toNumMap()
-			for k, v in pairs(cost) do
-				reward[k] = (reward[k] or 0) + v*0.6
+		if level > 0 then
+			for i = 0, level - 1 do
+				local lvData = csvdb["rune_buildCsv"][i]
+				local cost = lvData.cost:toNumMap()
+				for k, v in pairs(cost) do
+					returnRune[k] = (returnRune[k] or 0) + v
+				end
 			end
 		end
 	end
+	for k, v in pairs(returnRune) do
+		reward[k] = (reward[k] or 0) + math.ceil(v*0.6)
+	end
+
 	role:delRunes(backs, {log = {desc = "saleRune"}})
 	role:checkTaskEnter("DecoRune", {count = count})
 	reward, change = role:award(reward, {log = {desc = "saleRune"}})
@@ -371,6 +371,18 @@ function _M.endBattleRpc(agent, data)
 	if revenge then
 		match = _pvpRecordInfoCacheC[msg.idx]
 		_revengeRecord[match.id] = now + RevengeWaitTime  -- 1分钟内不能再打
+
+        if isWin then
+            -- 次数扣一波
+            local pvpFree = role.dailyData:getProperty("pvpFree")
+            if pvpFree >= globalCsv.pvp_battle_free_count then
+                local cost = {[ItemId.PvpKey] = 1}
+                if not role:checkItemEnough(cost) then return 5 end
+                role:costItems(cost, {log = {desc = "startPvp", int1 = 1}})
+            else
+                role.dailyData:updateProperty({field = "pvpFree", delta = 1})
+            end
+        end
 	else
 		local pvpMC = role:getProperty("pvpMC")
 		match = pvpMC[msg.idx]
@@ -630,6 +642,18 @@ function _M.endBattleHRpc(agent, data)
 	if revenge then
 		match = _pvpRecordInfoCacheH[msg.idx]
 		_revengeRecord[match.id] = now + RevengeWaitTime  -- 1分钟内不能再打
+
+        if isWin then
+            -- 次数扣一波
+            local pvpFreeH = role.dailyData:getProperty("pvpFreeH")
+            if pvpFreeH >= globalCsv.pvp_battle_free_count_high then
+                local cost = {[ItemId.PvpKey] = globalCsv.pvp_battle_high_cost}
+                if not role:checkItemEnough(cost) then return 5 end
+                role:costItems(cost, {log = {desc = "startPvp", int1 = 2}})
+            else
+                role.dailyData:updateProperty({field = "pvpFreeH", delta = 1})
+            end
+        end
 	else
 		local pvpMH = role:getProperty("pvpMH")
 		match = pvpMH[msg.idx]
@@ -185,26 +185,30 @@ function HeroPlugin.bind(Hero)
 	    for _, uid in pairs(self:getProperty("rune"):toNumMap()) do
 	        if uid > 0 then
 	            local rune = self.owner.runeBag[uid]
-	            local csvData = csvdb["runeCsv"][rune:getProperty("type")][rune:getProperty("id")]
-	            local runeRareData = csvdb["rune_rareCsv"][csvData.rarity]
-	            local buildData = csvdb["rune_buildCsv"][rune:getProperty("level")]
-	            for k, v in pairs(rune:getProperty("attrs"):toNumMap()) do
-	                local attName = AttsEnumEx[k]
-	                --零件的加成属性有特殊需求 填的是 10倍的值
-	                --rare的effect不影响 特殊属性
-
-	                --铭文单件普通属性=attr*(1+[rune_build表effect]/100*[rune_rare表effect]/100)
-					--铭文单件特殊属性=attr+[rune_build表effect]
-
-	                local effect = buildData[attName]
-	                if not PercentAttr[attName] then
-	                    effect = buildData[attName] * runeRareData.effect / 100
-	                end
-	                attrs.value[attName] = attrs.value[attName] + (v / 100) + addAttr(v / 100, effect, 1, attName)
-	            end
-	            
-	            if not suits[csvData.suit] then suits[csvData.suit] = {} end
-	            table.insert(suits[csvData.suit],csvData)
+                if not rune then
+                    skynet.error(string.format("rune not exist,uid:%s,hero:%s,roleId:%s", uid, self:getProperty("id"), self:getProperty("roleid")))
+                else
+                    local csvData = csvdb["runeCsv"][rune:getProperty("type")][rune:getProperty("id")]
+                    local runeRareData = csvdb["rune_rareCsv"][csvData.rarity]
+                    local buildData = csvdb["rune_buildCsv"][rune:getProperty("level")]
+                    for k, v in pairs(rune:getProperty("attrs"):toNumMap()) do
+                        local attName = AttsEnumEx[k]
+                        --零件的加成属性有特殊需求 填的是 10倍的值
+                        --rare的effect不影响 特殊属性
+
+                        --铭文单件普通属性=attr*(1+[rune_build表effect]/100*[rune_rare表effect]/100)
+                        --铭文单件特殊属性=attr+[rune_build表effect]
+
+                        local effect = buildData[attName]
+                        if not PercentAttr[attName] then
+                            effect = buildData[attName] * runeRareData.effect / 100
+                        end
+                        attrs.value[attName] = attrs.value[attName] + (v / 100) + addAttr(v / 100, effect, 1, attName)
+                    end
+                    
+                    if not suits[csvData.suit] then suits[csvData.suit] = {} end
+                    table.insert(suits[csvData.suit],csvData)
+                end
 	        end
 	    end
 		-- 零件套装效果