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

测试
2 parents e0d725cc 5db4c63a
Showing 8 changed files with 149 additions and 47 deletions Show diff stats
src/GlobalVar.lua
src/ProtocolCode.lua
src/actions/RoleAction.lua
src/models/Role.lua
src/models/RoleLog.lua
src/models/RolePlugin.lua
src/models/RoleTask.lua
src/models/Store.lua
@@ -388,6 +388,7 @@ TriggerEventType = {
     FoodSell = 11,  -- 循环卖菜
     RuneUp = 12,    -- 循环强化符文
     CostDiamond = 13,   -- 循环消耗钻石
+    BuyLimitPack = 14, --购买指定id礼包 触发
 }
  
 DrawCardType = {
@@ -440,4 +441,12 @@ ItemOccupy = {
 	Spark = 5, --火花
     Other = 6,
 	CanUsed = 7, --可使用
+}
+
+-- 世界变动积分
+ItemWorldLine = {
+	RouletteCount = 1, --抽轮盘次数
+	Points = 2, --积分
+	CostDiamond = 3, --消耗钻石
+    CostJade = 4, --消耗红光玉
 }
 \ No newline at end of file
@@ -62,6 +62,8 @@ actionCodes = {
     Role_setFriendTeamRpc = 143,   	-- 设置好友切磋队伍
     Role_setBgRpc = 144,   	-- 设置看板娘
 	Role_itemConvertMonthCardRpc = 145, -- 兑换月卡/战令道具
+	Role_worldLineRoulette = 146, --世界线抽轮盘
+	Role_worldLineReward = 147, -- 世界线一键领取奖励
  
 	Adv_startAdvRpc = 151,
 	Adv_startHangRpc = 152,
@@ -1741,7 +1741,68 @@ function _M.itemConvertMonthCardRpc(agent, data)
 	end
  
 	SendPacket(actionCodes.Role_itemConvertMonthCardRpc, MsgPack.pack(role:packReward(reward)))
-    return status
+    return true
+end
+
+function _M.worldLineRoulette(agent, data)
+	local role = agent.role
+
+	local worldChangePoints = role:getProperty("worldChangePoints") or {}
+    local rouletteCount =  worldChangePoints[ItemWorldLine.RouletteCount] or 0
+	if rouletteCount == 0 then return 1 end
+
+	local worldline_gift_base_10, worldline_gift_base_1, worldline_gift_magnification_10, worldline_gift_magnification_1 = {}, {}, {}, {}
+	for k, v in pairs(globalCsv.worldline_gift_base_10) do
+		worldline_gift_base_10[k] = {v}
+	end
+	for k, v in pairs(globalCsv.worldline_gift_base_1) do
+		worldline_gift_base_1[k] = {v}
+	end
+	for k, v in pairs(globalCsv.worldline_gift_magnification_10) do
+		worldline_gift_magnification_10[k] = {v}
+	end
+	for k, v in pairs(globalCsv.worldline_gift_magnification_1) do
+		worldline_gift_magnification_1[k] = {v}
+	end
+
+    local gift_base_10 = (math.randWeight(worldline_gift_base_10, 1) or 0) * 10
+	local gift_base_1 = math.randWeight(worldline_gift_base_1, 1) or 0
+
+	local gift_magnification_10 = (math.randWeight(worldline_gift_magnification_10, 1) or 0) * 10
+	local gift_magnification_1 = math.randWeight(worldline_gift_magnification_1, 1) or 0
+
+	local points = (gift_base_10 + gift_base_1) * (gift_magnification_10 + gift_magnification_1)
+	worldChangePoints[ItemWorldLine.RouletteCount] = worldChangePoints[ItemWorldLine.RouletteCount] - 1
+	worldChangePoints[ItemWorldLine.Points] = worldChangePoints[ItemWorldLine.Points] + points
+    role:updateProperty({field = "worldChangePoints", value = worldChangePoints})
+
+	SendPacket(actionCodes.Role_worldLineRoulette, MsgPack.pack(worldChangePoints))
+    return true
+end
+
+function _M.worldLineReward(agent, data)
+	local role = agent.role
+    local worldLineReward = role:getProperty("worldLineReward") or {}
+	local worldChangePoints = role:getProperty("worldChangePoints") or {}
+	local points =  worldChangePoints[ItemWorldLine.Points] or 0
+
+	local reward, change = {}
+	for key, val in pairs(csvdb["worldline_rewardCsv"]) do
+		if points >= key and not worldLineReward[key] then
+			for k, v in pairs(val.award:toNumMap()) do
+				reward[k] = (reward[k] or 0) + v
+			end
+			worldLineReward[key] = 1
+		end
+	end
+
+	role:updateProperty({field = "worldLineReward", value = worldLineReward})
+
+	if next(reward) then
+		reward, change = role:award(reward,  {log = {desc = "worldLine", int1 = role:getProperty("id")}})
+	end
+	SendPacket(actionCodes.Role_worldLineReward, MsgPack.pack(role:packReward(reward, change)))
+	return true
 end
  
 return _M
 \ No newline at end of file
@@ -214,6 +214,9 @@ Role.schema = {
 	heroCnt			    = {"number", 0},	-- 英雄数量
 	friendTeam			= {"table", {}},	-- 好友切磋队伍信息 {bInfo = {}, team = {}, v = 0}
 	bgId			    = {"number", 0},	-- 看板娘id
+
+	worldChangePoints   = {"table", {}}, 	-- 世界变动积分 {[1]= 转盘抽取次数, [2]= 获得的积分, [3]=魔导石消耗, [4]= 虹光玉消耗}
+    worldLineReward 	= {"table", {}},    -- 世界积分 领取记录 {[id] = 1}
 }
  
  
@@ -457,6 +460,8 @@ function Role:data()
 		unlockChap	= self:getProperty("unlockChap"),	-- 解锁的章节
 		friendTeam	= self:getProperty("friendTeam"),
 		bgId	= self:getProperty("bgId"),
+		worldChangePoints = self:getProperty("worldChangePoints"),
+		worldLineReward = self:getProperty("worldLineReward"),
 	}
 end
  
@@ -163,6 +163,8 @@ local ItemReason = {
 	CapsuleReward = 1411, --扭蛋机奖励
 	CapsuleConvert = 1412, --扭蛋机 消耗票 兑换
 	CapsuleCoinCost = 1413, --抽扭蛋机消耗
+
+	worldLine = 1500, --世界线积分
 }
  
  
@@ -574,12 +574,14 @@ function RolePlugin.bind(Role)
 		self:notifyUpdateProperty("diamond", self:getAllDiamond())
  
 		self:checkTaskEnter("CostDiamond", {count = count})
+        self:checkWorldChangePoints({[ItemWorldLine.CostDiamond]=count})
 		return true
 	end
  
 	function Role:costJade(param)
         self:addItem(param)
 		self:checkTaskEnter("CostJade", {count = - param.count})
+		self:checkWorldChangePoints({[ItemWorldLine.CostJade]= -param.count})
 	end
  
 	function Role:increBy(field, val)
@@ -2455,7 +2457,8 @@ function RolePlugin.bind(Role)
 		elseif rechargeData.shop == 3 then  -- 礼包商店
 			reward, _ = self:award(rechargeData.itemFirst, {isRecharge = true, log = {desc = "recharge", int1 = id}})
  
-            --增加购买记录
+			self:checkTaskEnter("BuyLimitPack", {id = id})
+			--增加购买记录
 			local buyRecord = self.storeData:getProperty("buyR") or {}
 			buyRecord[id] = (buyRecord[id] or 0) + 1
 			self.storeData:updateProperty({field = "buyR", value = buyRecord})
@@ -3263,6 +3266,24 @@ function RolePlugin.bind(Role)
  
 		return capsule:getSpecialNotify(roleId)
 	end
+
+	function Role:checkWorldChangePoints(param)
+        local worldChangePoints = self:getProperty("worldChangePoints") or {}
+		if param[ItemWorldLine.CostJade] then
+			worldChangePoints[ItemWorldLine.CostJade] = (worldChangePoints[ItemWorldLine.CostJade] or 0) + param[ItemWorldLine.CostJade]
+			local cost = math.floor(worldChangePoints[ItemWorldLine.CostJade] / globalCsv.worldline_gift)
+			worldChangePoints[ItemWorldLine.CostJade] = worldChangePoints[ItemWorldLine.CostJade] - cost * globalCsv.worldline_gift
+			worldChangePoints[ItemWorldLine.RouletteCount] = (worldChangePoints[ItemWorldLine.RouletteCount] or 0) + cost
+		end
+
+		if param[ItemWorldLine.CostDiamond] then
+			worldChangePoints[ItemWorldLine.CostDiamond] = (worldChangePoints[ItemWorldLine.CostDiamond] or 0) + param[ItemWorldLine.CostDiamond]
+            local cost = math.floor(worldChangePoints[ItemWorldLine.CostDiamond] / globalCsv.worldline_count_currency)
+			worldChangePoints[ItemWorldLine.CostDiamond] = worldChangePoints[ItemWorldLine.CostDiamond] - cost * globalCsv.worldline_count_currency
+			worldChangePoints[ItemWorldLine.Points] = (worldChangePoints[ItemWorldLine.Points] or 0) + cost
+		end
+		self:setProperty("worldChangePoints", worldChangePoints)
+	end
 end
  
 return RolePlugin
 \ No newline at end of file
@@ -116,6 +116,7 @@ local TaskType = {
 	Appoint = 912, 				-- 触发限时礼包，指定id
 	Rename = 913,				-- 重命名
     CostJade = 914, 			-- 消耗虹光玉
+	BuyLimitPack = 915, 		-- 购买指定id礼包触发
  
 	--功能未实现 todo
 	AdvShop = 1002,				-- 冒险商城
@@ -280,6 +281,7 @@ local StoreListener = {
 		[TaskType.FoodSell]= {{TriggerEventType.FoodSell, f("count")}},
 		[TaskType.RuneUp] = {{TriggerEventType.RuneUp, 1}},
 		[TaskType.CostDiamond] = {{TriggerEventType.CostDiamond, f("count")}},
+		[TaskType.BuyLimitPack] = {{TriggerEventType.BuyLimitPack, f("id")}},
 	}
 }
  
@@ -610,56 +610,56 @@ function Store:OnTriggerLimitTimePack(eventType, param)
             break
         end
     end
-    if config ~= nil then
-        -- 每日循环弹窗
-        local typeMap = {[TriggerEventType.DrawHero] = 1, [TriggerEventType.FoodSell] = 1, [TriggerEventType.RuneUp] = 1, [TriggerEventType.CostDiamond] = 1}
-        if typeMap[eventType] then
-            local dayInfo = self:getProperty("dayLimitInfo")
-            local info = dayInfo[eventType] or {} 
-            local count = (info["count"] or 0) + param
-            local triggerCount = info["trigger"] or 0
-            local flag = nil
-            if count >= config.condition then
-                if triggerCount < config.triggerLimit then
-                    info["trigger"] = triggerCount + 1
-                    info["count"] = 0
-                    flag = true
-                else
-                    info["count"] = config.condition - 1
-                end
+    if not config then return end
+
+    -- 每日循环弹窗
+    local typeMap = {[TriggerEventType.DrawHero] = 1, [TriggerEventType.FoodSell] = 1, [TriggerEventType.RuneUp] = 1, [TriggerEventType.CostDiamond] = 1}
+    if typeMap[eventType] then
+        local dayInfo = self:getProperty("dayLimitInfo")
+        local info = dayInfo[eventType] or {}
+        local count = (info["count"] or 0) + param
+        local triggerCount = info["trigger"] or 0
+        local flag = nil
+        if count >= config.condition then
+            if triggerCount < config.triggerLimit then
+                info["trigger"] = triggerCount + 1
+                info["count"] = 0
+                flag = true
             else
-                info["count"] = count
-            end
-            dayInfo[eventType] = info
-            self:updateProperty({field = "dayLimitInfo", value = dayInfo})
-            if not flag then
-                return
+                info["count"] = config.condition - 1
             end
+        else
+            info["count"] = count
         end
-        local rechargeCfg = csvdb["shop_normalCsv"][config.packId]
-        if rechargeCfg then
-            limitPack[rechargeCfg.id] = {timeNow + rechargeCfg.time, config.id}
-            self.owner:log("push_gift", {
-                gift_id = rechargeCfg.id, --礼包ID
-                gift_name = rechargeCfg.descId,   --礼包名称
-            })
-            if config.isLoop ~= 0 then
-                local payR = self:getProperty("payR")
-                if payR[rechargeCfg.id] then
-                    payR[rechargeCfg.id] = nil
-                    self:updateProperty({field = "payR", value = payR})
-                end
+        dayInfo[eventType] = info
+        self:updateProperty({field = "dayLimitInfo", value = dayInfo})
+        if not flag then
+            return
+        end
+    end
+    local rechargeCfg = csvdb["shop_rechargeCsv"][config.packId]
+    if rechargeCfg then
+        limitPack[rechargeCfg.id] = {timeNow + rechargeCfg.time, config.id}
+        self.owner:log("push_gift", {
+            gift_id = rechargeCfg.id, --礼包ID
+            gift_name = rechargeCfg.descId,   --礼包名称
+        })
+        if config.isLoop ~= 0 then
+            local payR = self:getProperty("payR")
+            if payR[rechargeCfg.id] then
+                payR[rechargeCfg.id] = nil
+                self:updateProperty({field = "payR", value = payR})
             end
-            -- 每日抽卡限时礼包 触发重置
-            --if eventType == TriggerEventType.DrawHeroCnt then
-            --    local payR = self:getProperty("buyR")
-            --    if payR[rechargeCfg.id] then
-            --        payR[rechargeCfg.id] = nil
-            --        self:updateProperty({field = "buyR", value = payR})
-            --    end
-            --end
-            self:updateProperty({field = "limitTPack", value = limitPack})
         end
+        -- 每日抽卡限时礼包 触发重置
+        --if eventType == TriggerEventType.DrawHeroCnt then
+        --    local payR = self:getProperty("buyR")
+        --    if payR[rechargeCfg.id] then
+        --        payR[rechargeCfg.id] = nil
+        --        self:updateProperty({field = "buyR", value = payR})
+        --    end
+        --end
+        self:updateProperty({field = "limitTPack", value = limitPack})
     end
     --if next(result) then
     --    self:updateProperty({field = "packTrigger", value = triggerRecord})