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

熊润斐
2 parents 6232e121 6b7ee7b1
Showing 3 changed files with 18 additions and 20 deletions Show diff stats
src/actions/HeroAction.lua
src/actions/RoleAction.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
@@ -1303,7 +1306,7 @@ function _M.saveGeniusTreeRpc(agent, data)
 	if not hero then  print("hero is nil") return 0 end
-	if wakeL > hero:getProperty("wakeL") then return 1 end
+	if wakeL and wakeL > hero:getProperty("wakeL") then return 1 end
 	local genius = hero:saveGeniusTree(wakeL, awake)
 	if #genius == 0 then
@@ -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
@@ -1391,24 +1391,19 @@ function _M.goldBuyRpc(agent, data)
 	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.Jade] = costD}, {log = {desc = "goldBuy"}})
 	local reward, change = role:award({[ItemId.Gold] = math.floor(goldC)}, {log = {desc = "goldBuy"}})
@@ -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)