Merge remote-tracking branch 'origin/cn/develop' into cn/develop

zhangqijia
2 parents e639a6b9 1dfcef53
Showing 4 changed files with 20 additions and 17 deletions Show diff stats
src/actions/FriendAction.lua
src/actions/GmAction.lua
src/actions/RoleAction.lua
src/csvdata
@@ -118,7 +118,6 @@ function _M.applyRpc(agent, data)
 	local msg = MsgPack.unpack(data)
 	local objectId = msg.roleId
-	dump(msg)
 	if objectId == roleId then
 		return
@@ -130,7 +129,6 @@ function _M.applyRpc(agent, data)
 		red:sismember(FRIEND_BLACK_KEY:format(objectId), roleId)
 		red:sismember(FRIEND_BLACK_KEY:format(roleId), objectId)
 	end)
-	dump(redret)
 	-- 玩家id不存在
 	if not result and not roleExists(objectId) then
@@ -647,18 +645,19 @@ function _M.randomRpc(agent, data)
 	for idx, objId in ipairs(needRoleIds) do
 		if not redret[idx] then
 			local online, info = getRoleInfo(objId)
-			table.insert(randomRoles, table_merge({
-				roleId = objId, 
-				online = online,  
-				hadApply = hadApply,
-				inBlack = inBlack,
-			}, info, {
-
-			}))
-			if #randomRoles >= globalCsv.friendRecommendLimit then break end
+			if next(info) then
+				table.insert(randomRoles, table_merge({
+					roleId = objId, 
+					online = online,  
+					hadApply = hadApply,
+					inBlack = inBlack,
+				}, info, {
+
+				}))
+				if #randomRoles >= globalCsv.friendRecommendLimit then break end
+			end
 		end
 	end
-
 	SendPacket(actionCodes.Friend_randomRpc, MsgPack.pack({list = randomRoles}))
 	return true
 end
@@ -301,9 +301,13 @@ function _M.get(role, pms)
 			end
 		end
 	elseif pms.pm1 == "HERO" then
-		for itemId = 400 , 700 do
+		local unitCsv = csvdb["unitCsv"]
+		for itemId = 400 , 800 do
 			if csvdb["itemCsv"][itemId] then
-				role:award({[itemId] = 1}, {log = {desc = "gm"}})
+				local heroUnit = unitCsv[itemId - 300]
+				if heroUnit.open == 1 then
+					role:award({[itemId] = 1}, {log = {desc = "gm"}})
+				end
 			end
 		end
 	elseif pms.pm1 == "MAXHERO" then
@@ -1431,7 +1431,7 @@ function _M.diamondConvertRpc(agent, data)
 	role:costDiamond({count = cost, log = {desc = "convert", int1 = oper, int2 = get}})
 	local reward, change
 	if oper == 1 then -- 钻石兑换成虹光玉
-		reward, change = role:award({[ItemId.Jade] = get}, {log = {desc = "convert"}})
+		reward, change = role:award({[ItemId.Jade] = get}, {log = {desc = "convert", short1=oper}})
 	elseif oper == 2 then -- 钻石兑换成虹光玉再兑换成招募券
 		local old = role:getItemCount(ItemId.Jade)
 		get = old + get
@@ -1444,7 +1444,7 @@ function _M.diamondConvertRpc(agent, data)
 			allReward[ItemId.Jade] = remain - old
 		elseif remain == old then
 		else
-			role:costItems({[ItemId.Jade] = old - remain}, {log = {desc = "convert"}})
+			role:costItems({[ItemId.Jade] = old - remain}, {log = {desc = "convert", short1=oper}})
 		end
 		if quan > 0 then
-Subproject commit bd3277759c409eff4355ef89ad2922db13bdd4db
+Subproject commit 423f19786662b906ac46231e20c36aa5ae35205b