Merge branch 'cn/develop' into cn/player

熊润斐
2 parents 38f21794 6f2c24ed
Showing 4 changed files with 77 additions and 33 deletions Show diff stats
src/actions/HeroAction.lua
src/actions/PvpAction.lua
src/utils/CommonFunc.lua
src/utils/MysqlUtil.lua
@@ -867,7 +867,7 @@ function _M.drawHeroRpc(agent, data)
 	if not unitPool then return 7 end
     -- ssr硬性保底
     local isSSRup = false
-    if unitPool["rare_"..HeroQuality.SSR] or 0 > 0 then
+    if (unitPool["rare_"..HeroQuality.SSR] or 0) > 0 then
         isSSRup = true
     end
@@ -878,34 +878,57 @@ function _M.drawHeroRpc(agent, data)
 		local values = {}
         -- check ssr up
-        if isSSRup then
-            local ssrUpMap = role:getProperty("ssrUp") or {}
-            local ssrFloorCnt = ssrUpMap[poolId] or 0
-            if ssrFloorCnt >= (globalCsv.draw_ssr_guarantee or 40) - 1 then
+        local ssrUpMap = role:getProperty("ssrUp") or {}
+        local ssrFloorCnt = ssrUpMap[poolId] or 0
+        if isSSRup and (ssrFloorCnt >= (globalCsv.draw_ssr_guarantee or 40) - 1) then
+            --if ssrFloorCnt >= (globalCsv.draw_ssr_guarantee or 40) - 1 then
                 values[1] = HeroQuality.SSR
                 ssrUpMap[poolId] = 0
-            else
-                for idx, field in ipairs(condition) do
-                    if not values[idx] then
-                        local lpool = {}
-                        local curIdx = 1
-                        while unitPool[field .. "_" .. curIdx] do
-                            lpool[curIdx] = {unitPool[field .. "_" .. curIdx]}
-                            curIdx = curIdx + 1
-                        end
-
-                        if next(lpool) then
-                            values[idx] =  math.randWeight(lpool, 1)
-                        end
+            --else
+            --    for idx, field in ipairs(condition) do
+            --        if not values[idx] then
+            --            local lpool = {}
+            --            local curIdx = 1
+            --            while unitPool[field .. "_" .. curIdx] do
+            --                lpool[curIdx] = {unitPool[field .. "_" .. curIdx]}
+            --                curIdx = curIdx + 1
+            --            end
+
+            --            if next(lpool) then
+            --                values[idx] =  math.randWeight(lpool, 1)
+            --            end
+            --        end
+            --    end
+            --    if values[1] == HeroQuality.SSR then
+            --        ssrUpMap[poolId] = 0
+            --    else
+            --        ssrUpMap[poolId] = ssrFloorCnt + 1
+            --    end
+            --end
+            role:updateProperty({field="ssrUp", value = ssrUpMap, notNotify = true})
+        else
+            for idx, field in ipairs(condition) do
+                if not values[idx] then
+                    local lpool = {}
+                    local curIdx = 1
+                    while unitPool[field .. "_" .. curIdx] do
+                        lpool[curIdx] = {unitPool[field .. "_" .. curIdx]}
+                        curIdx = curIdx + 1
+                    end
+
+                    if next(lpool) then
+                        values[idx] =  math.randWeight(lpool, 1)
                     end
                 end
+            end
+            if isSSRup then
                 if values[1] == HeroQuality.SSR then
                     ssrUpMap[poolId] = 0
                 else
                     ssrUpMap[poolId] = ssrFloorCnt + 1
                 end
+                role:updateProperty({field="ssrUp", value = ssrUpMap, notNotify = true})
             end
-            role:updateProperty({field="ssrUp", value = ssrUpMap, notNotify = true})
         end
@@ -325,7 +325,7 @@ function _M.startBattleRpc(agent, data)
 	if not result and not matchInfo then return 4 end
-	if not result then
+	if not revenge then
 		-- 次数扣一波
 		local pvpFree = role.dailyData:getProperty("pvpFree")
 		if pvpFree >= globalCsv.pvp_battle_free_count then
@@ -335,7 +335,9 @@ function _M.startBattleRpc(agent, data)
 		else
 			role.dailyData:updateProperty({field = "pvpFree", delta = 1})
 		end
+	end
+	if not result then
 		key = tostring(math.random())
 		_pvpStartBattleCacheC = {idx = idx, key = key, revenge = revenge, pvpTC = pvpTC}
@@ -574,8 +576,9 @@ function _M.startBattleHRpc(agent, data)
 	if not result and not enemyTeamRecord then return 4 end
-	if not result then
+	if not revenge then
 		-- 次数扣一波
+        print("xxxxx")
 		local pvpFreeH = role.dailyData:getProperty("pvpFreeH")
 		if pvpFreeH >= globalCsv.pvp_battle_free_count_high then
 			local cost = {[ItemId.PvpKey] = globalCsv.pvp_battle_high_cost}
@@ -584,7 +587,9 @@ function _M.startBattleHRpc(agent, data)
 		else
 			role.dailyData:updateProperty({field = "pvpFreeH", delta = 1})
 		end
+	end
+	if not result then
 		-- 只发送指定的那个敌人
 		if enemyTeamRecord.robot then
@@ -643,17 +648,6 @@ function _M.endBattleHRpc(agent, data)
 		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]
@@ -728,6 +722,17 @@ function _M.endBattleHRpc(agent, data)
 		}))
 		return true
 	end
+	if revenge and 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
 	-- 战斗结束了发奖 
 	local temp = string.randWeight(csvdb["player_expCsv"][role:getProperty("level")].pvpgroupBonus, true)
@@ -349,4 +349,15 @@ function httpGetFormatData(params)
 	end
 	return table.concat(body, "&")
-end
 \ No newline at end of file
+end
+
+function logdump(obj, prefix)
+	for k,v in pairs(obj) do
+        local vt = type(v)
+		if vt == "table" then
+			logdump(v, prefix..':'..k)
+        elseif vt == 'string' or vt == 'number' then
+            skynet.error(prefix..':'..k..'='..v)
+		end
+	end
+end
 local skynet = require "skynet"
 local mysqlproxy = require "shared.mysqlproxy"
+require "utils.CommonFunc"
 function getDbCfgVal(tbName, keyName, fieldName)
@@ -29,20 +30,24 @@ end
 function addFriend(roleId, friendId)
 	local stmt_csp = mysqlproxy:prepare("call add_friends(?, ?, ?)")
+    --logdump(stmt_csp, '')
     local r = mysqlproxy:execute(stmt_csp, roleId, friendId, skynet.timex())
     if r[1][1]["t_error"] == 0 then
 		rpcRole(roleId, "addFriend", friendId)
 		rpcRole(friendId, "addFriend", roleId)
     end
+    mysqlproxy:stmt_close(stmt_csp)
 end
 function delFriend(roleId, friendId)
 	local stmt_csp = mysqlproxy:prepare("call del_friends(?, ?)")
+    --logdump(stmt_csp, '')
     local r = mysqlproxy:execute(stmt_csp, roleId, friendId)
     if r[1][1]["t_error"] == 0 then
 		rpcRole(roleId, "delFriend", friendId)
 		rpcRole(friendId, "delFriend", roleId)
     end
+    mysqlproxy:stmt_close(stmt_csp)
 end
 function roleExists(roleId)