提交未开放不显示战役类型，和荣耀任务订阅

script/module/combat/CombatPosLogic.lua

@@ -634,33 +634,38 @@ function posQuery(human, combatType, group, param, flag)
 	-- 购买新首充所有礼包后, 所有战斗都可以第一回合跳过
 	local isAllQuick = NewFirstChargeLogic.IsBuyAllgift(human)
 
-
+	-- local moduleFn = CombatLogic.getModule(msg.type)
+	
 	if group and group ~= 0 then
 		for k,v in pairs(CombatExcel.combat) do
-			if v.group == group then
-				len = len + 1
-				msgRet.list[len].type = k
-				msgRet.list[len].name = v.name
-                -- msgRet.list[len].isQuickTime = v.isQuickTime
-				if isAllQuick then
-					msgRet.list[len].isQuickTime = v.isQuickTime2
-				else
-					msgRet.list[len].isQuickTime = newIsQuickTime and newIsQuickTime or v.isQuickTime
+			if v.group == group and v.nRoleID then
+				local bOpen = RoleSystemLogic.checkOpenByID(human, v.nRoleID)
+				
+				if true == bOpen then
+					len = len + 1
+					msgRet.list[len].type = k
+					msgRet.list[len].name = v.name
+					-- msgRet.list[len].isQuickTime = v.isQuickTime
+					if isAllQuick then
+						msgRet.list[len].isQuickTime = v.isQuickTime2
+					else
+						msgRet.list[len].isQuickTime = newIsQuickTime and newIsQuickTime or v.isQuickTime
+					end
+					msgRet.list[len].needLv = RoleSystemLogic.getOpenLv(v.systemID)
 				end
-				msgRet.list[len].needLv = RoleSystemLogic.getOpenLv(v.systemID)
 			end
 		end
 	else
 		len = len + 1
 		msgRet.list[len].type = combatType
 		msgRet.list[len].name = combatConfig.name
-        -- msgRet.list[len].isQuickTime = combatConfig.isQuickTime
+		-- msgRet.list[len].isQuickTime = combatConfig.isQuickTime
 		if isAllQuick then
 			msgRet.list[len].isQuickTime = combatConfig.isQuickTime2
 		else
 			msgRet.list[len].isQuickTime = newIsQuickTime and newIsQuickTime or combatConfig.isQuickTime
 		end
-        msgRet.list[len].needLv = RoleSystemLogic.getOpenLv(combatConfig.systemID)
+		msgRet.list[len].needLv = RoleSystemLogic.getOpenLv(combatConfig.systemID)
 	end
 	msgRet.type = combatType
     msgRet.teamType = combatConfig.teamType

script/module/dailyTask/HonorJourney.lua

@@ -1011,6 +1011,7 @@ local function HonorJourney_OnLoginSubEvent(human)
 
     -- 获取指定英雄
     HonorJourney_SubEvent(uuid, TriggerDefine.EVENT_TYPE_GETPOINTHERO)
+    HonorJourney_SubEvent(uuid, TriggerDefine.EVENT_TYPE_JINGLING_GET)
 
     HonorJourney_SubEvent(uuid, TriggerDefine.EVENT_TYPE_JINGLING_STAR)
 end

script/module/roleSystem/RoleSystemLogic.lua

@@ -320,4 +320,14 @@ end
 
 function checkMailTips(human)
     DrillLogic.sendDrillTip(human)
+end
+
+function checkOpenByID(human, nID)
+
+	local bOpen = isOpen(human, nID)
+	if not bOpen then
+		return false
+	end
+
+	return bOpen
 end