Merge branch 'cn/develop' of 120.26.43.151:wasteland/server into cn/develop

liuzujun
2 parents 7104ee66 6b7ee7b1
Showing 4 changed files with 38 additions and 24 deletions Show diff stats
src/actions/HeroAction.lua
src/actions/RoleAction.lua
src/models/RolePlugin.lua
src/models/Store.lua
@@ -153,7 +153,8 @@ function _M.wakeRpc(agent, data)
 	end
  
 	if curLevel >= 4 then --自动觉醒技能
-		hero:increGeniusTree()
+		local new = hero:increGeniusTree()
+		hero:updateProperty({field = "genius", value = new})
 	end
 	hero:mylog({desc = "wake", int1 = hero:getProperty("wakeL")})
  
@@ -556,8 +557,10 @@ function _M.referRunesRpc(agent, data)
 		end
 	end
  
+	local roleId = role:getProperty("id")
 	for cheroId, cIds in pairs(used) do
-		local chero = role.heros[cheroId] 
+		local heroId = cheroId % (roleId * MAX_HERO_NUM)
+		local chero = role.heros[heroId] 
 		local hrunes = chero:getProperty("rune")
 		for slot, rId in pairs(hrunes:toNumMap()) do
 			if cIds[rId] then
@@ -809,6 +812,7 @@ function _M.drawHeroRpc(agent, data)
  
 	-- 计算抽卡消耗品
 	local cost = {}
+	local drawAddReward = {}
 	if buildTypeData["draw_coin_1"] == "" then
 		return 11
 	end
@@ -1004,10 +1008,20 @@ function _M.drawHeroRpc(agent, data)
 			table.insert(reward, {id = itemId, count = 1})
 		end
  
+		-- 招募得到的英雄追加奖励
+		local unitData = csvdb["unitCsv"][itemData.id - ItemStartId.Hero]
+		if unitData.build_award ~= "" then
+			for tId, tCount in pairs(unitData.build_award:toNumMap()) do
+				drawAddReward[tId] = (drawAddReward[tId] or 0) + tCount
+			end
+		end
+		--
+
 		dailyDrawCnt = dailyDrawCnt + 1
 		role:checkTaskEnter("DrawHeroLimitPack", {count = dailyDrawCnt})
 	end
  
+	role:award(drawAddReward, {log = {desc = "drawHero", int1 = btype}})
 	role.dailyData:setProperty("drawHeroCnt", dailyDrawCnt)
  
 	if draw_floor_back_counts then
@@ -1041,7 +1055,7 @@ function _M.drawHeroRpc(agent, data)
 	})
  
 	role:mylog("hero_action", {desc = "drawHero", int1=poolId, int2=btype, short1 = drawCount[drawType]})
-	SendPacket(actionCodes.Hero_drawHeroRpc, MsgPack.pack({reward = reward})) -- 这个 reward 是数组
+	SendPacket(actionCodes.Hero_drawHeroRpc, MsgPack.pack({reward = reward, subReward = drawAddReward})) -- 这个 reward 是数组
  
 	local feedbackId = buildTypeData["can_feedback"] or 0
 	if feedbackId ~= 0 then
@@ -1291,6 +1305,9 @@ function _M.saveGeniusTreeRpc(agent, data)
 	local hero = role.heros[tonumber(heroId)]
  
 	if not hero then  print("hero is nil") return 0 end
+
+	if wakeL and wakeL > hero:getProperty("wakeL") then return 1 end
+
 	local genius = hero:saveGeniusTree(wakeL, awake)
 	if #genius == 0 then
 		genius = ""
@@ -1063,7 +1063,7 @@ function _M.achiveRpc(agent, data)
 				if preMaxCount < pData.request and overCount >= pData.request then
 					role:sendMail(101, skynet.timex(), pData.reward, {pData.level})
 					flag = true
-					role:mylog("role_action", {desc="fux", int1=pdata.level})
+					role:mylog("role_action", {desc="fux", int1=pData.level})
 				end
 			end
 			if flag then
@@ -1388,29 +1388,24 @@ function _M.goldBuyRpc(agent, data)
 	if not costD then
 		return 1
 	end
-	if costD ~= 0 and not role:checkItemEnough({[ItemId.Diamond] = costD}) then
+	if costD ~= 0 and not role:checkItemEnough({[ItemId.Jade] = costD}) then
 		return 2
 	end
+
+    --特权卡倍数
 	local goldC = 0
-	local hangPass = role:getProperty("hangPass")
-	for i = 1, 3 do
-		if hangPass[i] then
-			local carbonData = csvdb["idle_battleCsv"][hangPass[i]]
-			goldC = math.max(goldC, carbonData.money * globalCsv.idle_quickMoney_effect)
-		end
-	end
-	local carbonId = role:getProperty("hangInfo").carbonId
-	if carbonId then
-		local carbonData = csvdb["idle_battleCsv"][carbonId]
-		goldC = math.max(goldC, carbonData.money * globalCsv.idle_quickMoney_effect)
-	end
-	if goldC == 0 then
+    local multiple = role.storeData:getGearExchangeCoef()
+
+    local hangInfo = role:getProperty("hangInfo")
+    local expCarbon_Data = hangInfo.expData or globalCsv.oriCarbonData
+    goldC = expCarbon_Data.money * globalCsv.idle_quickMoney_effect * multiple
+
+    if goldC == 0 then
 		return 3
 	end
-	local coef = role.storeData:getGearExchangeCoef()
-	goldC = goldC * coef
+
 	role.dailyData:updateProperty({field = "goldBuyT", value = curT + 1})
-	role:costItems({[ItemId.Diamond] = costD}, {log = {desc = "goldBuy"}})
+	role:costItems({[ItemId.Jade] = costD}, {log = {desc = "goldBuy"}})
 	local reward, change = role:award({[ItemId.Gold] = math.floor(goldC)}, {log = {desc = "goldBuy"}})
 	SendPacket(actionCodes.Role_goldBuyRpc, MsgPack.pack(role:packReward(reward, change)))
 	return true
@@ -836,7 +836,7 @@ function RolePlugin.bind(Role)
 			newRune:create()
 			newRune:generateAttrs()
 			newRune.owner = self
-			self.runeBag[runeUid] = newRune
+			self.runeBag[roleId * MAX_RUNE_NUM + runeUid] = newRune
 			if not params.notNotify then
 				local response = {}
 				table.insert(response, newRune:data())
@@ -887,7 +887,7 @@ function RolePlugin.bind(Role)
 			newSpark:create()
 			newSpark:addAttr(data.attr:toNumMap())
 			newSpark.owner = self
-			self.sparkBag[sparkUid] = newSpark
+			self.sparkBag[roleId * MAX_SPARK_NUM + sparkUid] = newSpark
 			if not params.notNotify then
 				local response = {}
 				table.insert(response, newSpark:data())
@@ -1777,6 +1777,7 @@ function RolePlugin.bind(Role)
 			info.type = hero:getProperty("type")
 			info.level = hero:getProperty("level")
 			info.wakeL = hero:getProperty("wakeL")
+			info.genius = hero:getProperty("genius")
 			info.blockLevel = hero:getSkillLevel(4)
 			info.specialLevel = hero:getSkillLevel(1)
 			info.passiveLevel = hero:getSkillLevel(3)
@@ -1800,6 +1801,7 @@ function RolePlugin.bind(Role)
 				type = hero:getProperty("type"),
 				level = hero:getProperty("level"),
 				wakeL = hero:getProperty("wakeL"),
+				genius = hero:getProperty("genius"),
 			}
 		end
 		format.heros = heros
@@ -301,7 +301,7 @@ function Store:onBuyCard(type, duration, id, actid)
         actData["unlock"] = 1
         if actCfg.condition ~= 0 then
             actData["lvl"] = (actData["lvl"] or 0) + actCfg.condition
-            role:mylog("act_action", {desc="buyBcLvl", int1=actCfg.condition, int2=actData["lvl"]})
+            self.owner:mylog("act_action", {desc="buyBcLvl", int1=actCfg.condition, int2=actData["lvl"]})
         end
         self.owner:mylog("act_action", {desc="buyBc", int1=id, int2=actData["lvl"] or 0})
         self.owner.activity:updateActData("BattleCommand", actData)