新增国内战令系统

script/core/ObjHuman.lua

@@ -83,6 +83,8 @@ local MoshouLogic = require("moshou.MoshouLogic")
 local RoleSystemDefine = require("roleSystem.RoleSystemDefine")
 local LostTempleLogic = require("lostTemple.lostTempleLogic")
 local DrawCardV2Excel = require("excel.drawCard").drawCardV2
+local WarOrder = require("shop.WarOrder")
+
 local Json = require("common.Json")
 
 fds				= fds or {}				-- fd->obj_id,包括创角中+游戏中
@@ -612,6 +614,10 @@ function sendHumanInfo(human,isNew)
     mm.openDay = subDay or 0
 	mm.guideState= GuideLogic.checkAllFinish(human)
 	mm.isFrist = isNew and 1 or 0
+	for  i = 1,#mm.warOrder do 
+		mm.warOrder[0] = i
+		WarOrder.getWarOrderInfo(human,i,mm.warOrder[i] )
+	end
 
     local drawCardRateList = {}
     local drawCardV2Confs = DrawCardV2Excel

script/module/battle/BattleLogic.lua

@@ -58,7 +58,7 @@ local HeroLogLogic = require("absAct.HeroLogLogic")
 local DropExchangeLogic = require("absAct.DropExchangeLogic")
 local MengxinLogic = require("present.MengxinLogic")
 --local GiftLogic = require("topup.GiftLogic")
---local WarOrder = require("shop.WarOrder")
+local WarOrder = require("shop.WarOrder")
 local Log = require("common.Log")
 
 BATTLE_HANG_EXP_OUT_PERIOD = 60 -- 经验产出时间间隔
@@ -1400,7 +1400,7 @@ function onFightEnd(human, result, fightTypeID, param1, combatInfo)
     end
     -- 触发事件
     --GiftLogic.trigger(human,PRINCIPAL_LINE_EVNET,{id = battleID})
-    --WarOrder.trigger(human,BATTLE_ORDER_TYPE)
+    WarOrder.trigger(human,BATTLE_ORDER_TYPE)
 end
 
 function setBattleID(human, guajiID)

script/module/huanjingTower/HuanjingTowerLogic.lua

@@ -43,6 +43,7 @@ local JibanLogic = require("combat.JibanLogic")
 local RoleDBLogic = require("role.RoleDBLogic")
 local MengxinLogic = require("present.MengxinLogic")
 local YunYingLogic = require("yunying.YunYingLogic")
+local WarOrder = require("shop.WarOrder")
 
 TOWER_LV_HEAD_MAX = 15 -- 每层 储存 玩家头像数据
 TILI_MAX_CNT = 10 -- 最大体力
@@ -53,6 +54,10 @@ TILI_RECOVER_TIME = 1800 -- 体力恢复时间
 BUY_TILI_BUY_ZUANSHI = {20, 30, 40}
 TILI_FREE = 2 -- 每天最大 免费次数
 
+-- 用于弹窗触发类型 @ma 是否需要同意定义枚举
+local EVAL_TOWER_EVENT = 2
+local DEVIL_ORDER_TYPE = 2
+
 -- 奖励状态
 REWARD_STATUS_NONE = 0 -- 不可领
 REWARD_STATUS_GET = 1 -- 可领
@@ -528,6 +533,7 @@ function onFightEnd(human, result, fightTypeID, param, combatInfo, args)
                 BagLogic.addItem(human, itemID, itemCnt, "tower_win_reward")
                 combatInfo.rewardItem[#combatInfo.rewardItem + 1] = {itemID, itemCnt}
             end
+            WarOrder.trigger(human,DEVIL_ORDER_TYPE)
         end
 
         --TODO:记录恶魔之塔

script/module/jjc/JjcLogic.lua

@@ -52,6 +52,9 @@ local HeroGrowUp = require("absAct.HeroGrowUp")
 local MengxinLogic = require("present.MengxinLogic")
 local YunYingLogic = require("yunying.YunYingLogic")
 local Timer = require("core.Timer")
+local WarOrder = require("shop.WarOrder")
+
+local ARENA_ORDER_TYPE = 4
 
 JJC_TARGET_CNT = 15		            -- 每次找15个对手
 JJC_FREE_DAILY_CNT = 3	            -- 每天3次免费战斗次数
@@ -991,6 +994,7 @@ function onFightEnd(human, result, combatType, defUuid, combatInfo)
         
 	    HeroGrowUp.onCallback(human, HeroGrowUp.TASKTYPE7, 1)
 	    HeroGrowUp.onCallback(human, HeroGrowUp.TASKTYPE11, combatInfo)
+		WarOrder.trigger(human,ARENA_ORDER_TYPE)
 	else
 		human.jjcWinCount = nil
 	end

script/module/role/NewLogic.lua

@@ -24,6 +24,7 @@ local XingYaoGongMing        = require("xingYaoMen.XingYaoGongMing")
 local SkillExcel             = require("excel.skill")
 local BufferExcel            = require("excel.buffer")
 local ItemDefine             = require("bag.ItemDefine")
+local WarOrder               = require("shop.WarOrder")
 
 AD_DRAW_REWARD_TYPE          = 10 --观看广告领取召唤券
 QUERY_MERGE_INFO_TYPE        = 11 --获取融合信息

script/module/scene/Proto.lua

@@ -54,6 +54,7 @@ GC_ZZ_HUMAN_INFO = {
     {"openDay",			1, "short"},	-- 开服天数
 	{"guideState",      1, "byte"},
     {"drawCardRateList",      1, "string"}, -- 抽奖等级概率列表
+	{"warOrder" ,       4, WarOrder},         -- 战令信息
 }
 GC_ENTER_CITY = {}
 

script/module/topup/BuyLogic.lua

@@ -37,6 +37,8 @@ local YunYingLogic = require("yunying.YunYingLogic")
 local DoubleChargeLogic = require("absAct.DoubleChargeLogic")
 local MoshouLogic = require("moshou.MoshouLogic")
 local HeroSkinLogic = require("present.HeroSkinLogic")
+local OrderExcel = require("excel.warOrder")
+local WarOrderLogic = require("shop.WarOrder")
 
 BUY_CODE_NORMAL = 0   -- 正常调平台的充值接口
 BUY_CODE_WX_KEFU = 1  -- 微信小程序客服充值接口
@@ -219,6 +221,16 @@ function cmd.heroSkin(human,buyConf)
 	return HeroSkinLogic.buy(human,buyId)
 end
 
+function cmd.warOrder(human,buyConf)
+	local buyId = buyConf.id
+	for _,cfg in pairs(OrderExcel.desc) do 
+		if cfg.buyId == buyId then 
+			WarOrderLogic.warOrderUnlock(human,cfg.type)
+			break
+		end
+	end
+end
+
 -------------------------------- cmd结束 ----------------------------------
 
 function checkBuy(human, ret)

script/module/union/UnionEctypeLogic.lua

@@ -63,6 +63,8 @@ local STATU_BOSS_DIE = 0
 local STATU_BOSS_ING = 1
 local STATU_BOSS_READY = 2
 
+local CLAN_ORDER_TYPE = 3
+
 -- 初始化副本
 -- unionUuid  公会Uuid
 -- level      关卡等级
@@ -753,7 +755,8 @@ function onFightEnd(human, result, combatType, bossData, combatInfo)
                 end
             end
         end
-   
+        local WarOrder = require("shop.WarOrder")
+        WarOrder.trigger(human,CLAN_ORDER_TYPE)
     end
     
     if bKill then
@@ -898,7 +901,8 @@ function saodang(human, level, touch)
     MengxinLogic.onCallBack(human,MengxinLogic.MX_TASK_TYPE_11,1)
     RoleSystemLogic.onDot(human, RoleSystemDefine.ROLE_SYS_ID_1002)
     RoleSystemLogic.onDot(human, RoleSystemDefine.ROLE_SYS_ID_1001)
-
+    local WarOrder = require("shop.WarOrder")
+    WarOrder.trigger(human,CLAN_ORDER_TYPE)
     YunYingLogic.onCallBack(human, "onUnionEctypeFight", killCnt or 0)
 end