Merge branch 'develop' into tr/qa

熊润斐
2 parents 73246ace 366dcc54
Showing 5 changed files with 57 additions and 23 deletions Show diff stats
src/actions/HeroAction.lua
src/csvdata
src/models/RoleTask.lua
src/models/Store.lua
src/utils/StringUtil.lua
@@ -820,26 +820,44 @@ function _M.drawHeroRpc(agent, data)
 			end
 		end
-		for itemId, oneData in pairs(isFloorBack and csvdb["build_floorCsv"] or csvdb["build_poolCsv"]) do
-			local pool_str = "pool_" .. poolId
-			if oneData[pool_str] and oneData[pool_str] ~= "" then
-				local itemData = csvdb["itemCsv"][itemId]
-				while itemData do
-					if itemData.type ~= ItemType.Hero then break end
-					local heroData = csvdb["unitCsv"][itemData.id - ItemStartId.Hero]
-					if not heroData then break end
-					local ok = true
-					-- 保底是全随机，不用比较类型
-					if not isFloorBack then
-						for idx, field in ipairs(condition) do
-							if heroData[field] ~= values[idx] then ok = false break end
+		local weight = 0
+		local up_pool = nil
+		local rand_v = math.randomInt(1, 100)
+		if values[1] == HeroQuality.SR then
+			weight = unitPool["up_sr_weight"]
+			up_pool = unitPool["up_sr_id"]
+		elseif values[1] == HeroQuality.SSR then
+			weight = unitPool["up_ssr_weight"]
+			up_pool = unitPool["up_ssr_id"]
+		end
+		--print(poolId, rand_v, weight, up_pool, values[1])
+		if rand_v < weight and up_pool then
+			up_pool = up_pool:toArray(true, "=")
+			for k, v in ipairs(up_pool) do
+				resultPool[v] = {1}
+			end
+		else
+			for itemId, oneData in pairs(isFloorBack and csvdb["build_floorCsv"] or csvdb["build_poolCsv"]) do
+				local pool_str = "pool_" .. poolId
+				if oneData[pool_str] and oneData[pool_str] ~= "" then
+					local itemData = csvdb["itemCsv"][itemId]
+					while itemData do
+						if itemData.type ~= ItemType.Hero then break end
+						local heroData = csvdb["unitCsv"][itemData.id - ItemStartId.Hero]
+						if not heroData then break end
+						local ok = true
+						-- 保底是全随机，不用比较类型
+						if not isFloorBack then
+							for idx, field in ipairs(condition) do
+								if heroData[field] ~= values[idx] then ok = false break end
+							end
 						end
+						if not ok then break end
+						if oneData[pool_str] > 0 then
+							resultPool[itemId] = {oneData[pool_str]}  -- itemId, count, 概率
+						end
+						break
 					end
-					if not ok then break end
-					if oneData[pool_str] > 0 then
-						resultPool[itemId] = {oneData[pool_str]}  -- itemId, count, 概率
-					end
-					break
 				end
 			end
 		end
@@ -874,7 +892,7 @@ function _M.drawHeroRpc(agent, data)
 		if itemData.quality == HeroQuality.SSR then
 			ssrCount = ssrCount + 1
 			if not guideHero then
-				-- STODO 广播获得ssr英雄
+				-- 广播获得ssr英雄
 				local ntf = {heroId = itemData.id - ItemStartId.Hero, nick = role:getProperty("name")}
 				mcast_util.pub_world(actionCodes.Role_broadGetSSR, MsgPack.pack(ntf))
 			end
-Subproject commit a79b3296ccaa4f24e2263de83dc8dc581f1eb75a
+Subproject commit dc9c77c295fa031753140e45dd2d793735c5bdfa
@@ -633,7 +633,7 @@ function RoleTask.bind(Role)
 										count = count + 1
 									end
 								end
-								if calTask[id] < count then
+								if (calTask[id] or 0) < count then
 									calTask[id] = count
 								end
 							elseif cfg.type == 16 then	-- 英雄星级收集进度
@@ -643,7 +643,7 @@ function RoleTask.bind(Role)
 										count = count + 1
 									end
 								end
-								if calTask[id] < count then
+								if (calTask[id] or 0) < count then
 									calTask[id] = count
 								end
 							elseif cfg.type == 18 then	-- 挂机累计收获id,y个
@@ -176,7 +176,7 @@ end
 -- 挂机道具掉落系数 特权卡挂机掉落系数
 function Store:getHangDropCoef()
     if self:isPrivCardExpire() then
-        return 0, 0
+        return 1, 1
     end
     return (1 + globalCsv.hang_drop_exp_coef) or 1, (1 + globalCsv.hang_drop_item_coef) or 1
@@ -347,4 +347,20 @@ function string.toMap(str, tonum, sep)
 		end
 	end
 	return tab
+end
+
+--[[
+from: 1=2=3=4
+to: {1,2,3,4}
+]]
+function string.toMap(str, tonum, sep)
+	local str_vec = string.split(str, " ")
+	local tab = {}
+	for _, v in pairs(str_vec) do
+		local vec = string.split(v, sep)
+		if #vec == 2 then
+			tab[vec[1]] = tonum and tonumber(vec[2]) or vec[2]
+		end
+	end
+	return tab
 end
 \ No newline at end of file