修复了部分bug，

新增胜率队检测，开黑检测

Author: watchingfun

README.md

@@ -17,8 +17,10 @@
 - [x] 发送聊天
 - [ ] 游戏对局内发送聊天
 - [ ] 小黑屋功能
+- [ ] 自动ban pick英雄
+- [ ] 大乱斗自动抢英雄
 - [x] 对局分析
-- [ ] 自动检测大乱斗胜率队
+- [x] 自动检测大乱斗胜率队
 - [x] 应用检查更新功能
 
 ## 截图
@@ -74,6 +76,7 @@ npm run build
 ## 参考资料
 
 - https://hextechdocs.dev/getting-started-with-the-lcu-api/
+- https://www.mingweisamuel.com/lcu-schema/tool/#
 - https://github.com/XHXIAIEIN/LeagueCustomLobby
 - https://github.com/real-web-world/hh-lol-prophet
 - https://github.com/XilyFeAAAA/RIVEN

components.d.ts

@@ -43,7 +43,8 @@ declare module 'vue' {
 		NDropdown: (typeof import("naive-ui"))["NDropdown"];
 		NGi: (typeof import("naive-ui"))["NGi"];
 		NGlobalStyle: (typeof import("naive-ui"))["NGlobalStyle"];
-		NGrid: (typeof import("naive-u"naive-ui"d""NIcon"c;on: (typeof import("naive-ui"))["NIcon"];
+		NGrid: (typeof import("naive-ui"))["NGrid"];
+		NIcon: (typeof import("naive-ui"))["NIcon"];
 		NImage: (typeof import("naive-ui"))["NImage"];
 		NInput: (typeof import("naive-ui"))["NInput"];
 		NMessageProvider: (typeof import("naive-ui"))["NMessageProvider"];
@@ -65,6 +66,7 @@ declare module 'vue' {
 		NTabs: (typeof import("naive-ui"))["NTabs"];
 		NTag: (typeof import("naive-ui"))["NTag"];
 		NTooltip: (typeof import("naive-ui"))["NTooltip"];
+		on: (typeof import("naive-ui"))["NIcon"];
 		PerkImg: (typeof import("./src/components/img/perkImg.vue"))["default"];
 		Perks: (typeof import("./src/components/img/Perks.vue"))["default"];
 		PlayerGameInfo: (typeof import("./src/components/PlayerGameInfo.vue"))["default"];

electron/lcu/connector.ts

@@ -48,11 +48,12 @@ export function startGuardTask() {
 			sendToWebContent(Handle.connecting);
 			try {
 				await initLeagueWebSocket();
-				//这里尝试获取当前召唤师信息，获取成功了才算连接成功；因为可能客户端还未完成登录过程
-				await retryWrapper(getCurrentSummoner)();
+				//这里尝试获取当前召唤师信息，获取成功了才算连接成功；因为可能客户端还未完成登录过程,比如说一区排队的情况
+				await retryWrapper(getCurrentSummoner, 60, 5000)();
 				sendToWebContent(Handle.connected);
 				logger.info("guardTask", "connected to LeagueClient");
 			} catch (e) {
+				ws = null;
 				logger.error("guardTask", e instanceof Error ? e.message : e);
 				sendToWebContent(Handle.disconnect);
 			}

electron/lcu/lcuRequest.ts

@@ -6,6 +6,7 @@ import {
 	Conversation,
 	GameDetail,
 	GameSessionData,
+	LobbyMember,
 	MatchHistoryQueryResult,
 	RPC,
 	SummonerInfo
@@ -97,7 +98,7 @@ export async function applyRune(data: RuneConfig) {
 		method: "GET",
 		url: "lol-perks/v1/pages"
 	});
-	const current = currentRuneList.find((i) => i.current && i.isDeletable);
+	const current = currentRuneList.find((i) => i.name.startsWith("OP.GG")) || currentRuneList.find((i) => i.isDeletable);
 	if (current != undefined) {
 		// 删除当前符文页
 		await httpRequest({
@@ -249,3 +250,17 @@ export const matchmaking = async () => {
 		url: `/lol-lobby/v2/lobby/matchmaking/search`
 	});
 };
+
+//查询大厅成员
+export const getLobbyMembers = async () => {
+	return await httpRequest<LobbyMember[]>({
+		method: "GET",
+		url: "/lol-lobby/v2/lobby/members"
+	});
+};
+//检查自己是否房主
+export const checkSelfIsLobbyLeader = async () => {
+	const lobbyMembers = await getLobbyMembers();
+	const selfPuuid = (await getCurrentSummoner()).puuid;
+	return lobbyMembers.find((m) => (m.puuid = selfPuuid)).isLeader;
+};

electron/lcu/processEvent.ts

@@ -1,6 +1,13 @@
 import { createHttp1Request } from "../lib/league-connect";
 import { getCredentials } from "./connector";
-import { getCurrentQueue, getGameInfo, listenChampSelect, matchmaking, playAgain } from "./lcuRequest";
+import {
+	checkSelfIsLobbyLeader,
+	getCurrentQueue,
+	getGameInfo,
+	listenChampSelect,
+	matchmaking,
+	playAgain
+} from "./lcuRequest";
 import logger from "../lib/logger";
 import { setting } from "../config/";
 import { ChampSelectPhaseSession } from "../types/lcuType";
@@ -94,7 +101,7 @@ export async function handelEndOfGame(eventKey: string) {
 	}
 	if (setting.model.autoPlayAgain) {
 		await playAgain();
-		await matchmaking();
+		if (await checkSelfIsLobbyLeader()) await matchmaking();
 	}
 }
 

electron/types/lcuType.ts

@@ -580,6 +580,39 @@ export interface XpDiffPerMinDeltas {}
 
 export interface XpPerMinDeltas {}
 
+export interface LobbyMember {
+	allowedChangeActivity: boolean;
+	allowedInviteOthers: boolean;
+	allowedKickOthers: boolean;
+	allowedStartActivity: boolean;
+	allowedToggleInvite: boolean;
+	autoFillEligible: boolean;
+	autoFillProtectedForPromos: boolean;
+	autoFillProtectedForSoloing: boolean;
+	autoFillProtectedForStreaking: boolean;
+	botChampionId: number;
+	botDifficulty: string;
+	botId: string;
+	firstPositionPreference: string;
+	intraSubteamPosition: any;
+	isBot: boolean;
+	isLeader: boolean;
+	isSpectator: boolean;
+	playerSlots: any[];
+	puuid: string;
+	ready: boolean;
+	secondPositionPreference: string;
+	showGhostedBanner: boolean;
+	subteamIndex: any;
+	summonerIconId: number;
+	summonerId: number;
+	summonerInternalName: string;
+	summonerLevel: number;
+	summonerName: string;
+	teamId: number;
+	tftNPEQueueBypass: boolean;
+}
+
 export interface Team {
 	bans: Ban[];
 	baronKills: number;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "joi",
-  "version": "0.5.4",
+  "version": "0.5.5",
   "main": "dist-electron/main.js",
   "repository": {
     "type": "git",

src/components/gameFlow/gameAnalysis.vue

@@ -5,23 +5,24 @@ import TeamAnalysis from "@/components/gameFlow/teamAnalysis.vue";
 
 const lcuStore = useLCUStore();
 
-const { myTeam, queryMyTeamFlag, theirTeam, queryTheirTeamFlag } = storeToRefs(lcuStore);
+const { myTeam, queryMyTeamFlag, theirTeam, queryTheirTeamFlag, myTeamUpInfo, theirTeamUpInfo, theirTeamIsSuck } =
+	storeToRefs(lcuStore);
 </script>
 
 <template>
 	<div class="flex flex-1 relative">
 		<n-tabs animated>
 			<n-tab-pane tab="我方队伍" name="myTeam">
 				<n-spin :show="queryMyTeamFlag">
-					<team-analysis :teams="myTeam" />
+					<team-analysis :teams="myTeam" :team-up-info="myTeamUpInfo" />
 				</n-spin>
 			</n-tab-pane>
 			<n-tab-pane tab="对方队伍" name="theirTeam">
 				<div v-if="lcuStore.gameFlowPhase === 'ChampSelect'" class="text-2xl flex h-full items-center justify-center">
 					等待进入对局
 				</div>
 				<n-spin :show="queryTheirTeamFlag" v-else>
-					<team-analysis :teams="theirTeam" />
+					<team-analysis :teams="theirTeam" :team-up-info="theirTeamUpInfo" />
 				</n-spin>
 			</n-tab-pane>
 		</n-tabs>

src/components/gameFlow/teamAnalysis.vue

@@ -11,8 +11,8 @@ import { ComputedRef } from "vue";
 import HistoryList from "@/components/HistoryList.vue";
 import { champDict } from "@@/const/lolDataConfig";
 
-const props = defineProps<{ teams: TeamMemberInfo[] }>();
-const { teams } = toRefs(props);
+const props = defineProps<{ teams: TeamMemberInfo[]; teamUpInfo: Array<Array<string>> }>();
+const { teams, teamUpInfo } = toRefs(props);
 
 use([TooltipComponent, GridComponent, BarChart, CanvasRenderer]);
 
@@ -26,6 +26,8 @@ const teamMap = computed(() => {
 	);
 });
 
+const colorGroup = ["rgba(252,132,80,0.66)", "rgba(123,239,255,0.81)", "rgba(255,255,255,0.8)"];
+
 const championImageUrlMap = computed(() => {
 	return teams.value.reduce(
 		(p, c) => {
@@ -78,19 +80,41 @@ const option = computed(() => {
 					}) || [],
 				axisLabel: {
 					interval: 0,
-					color: "rgba(255,255,255,0.8)",
+					color: function (value, index) {
+						const cIndex = teamUpInfo.value.findIndex((group) =>
+							group.find((puuid) => puuid === teams.value[index!]?.puuid)
+						);
+						if (cIndex !== -1) {
+							return colorGroup[cIndex];
+						} else {
+							return colorGroup[2];
+						}
+					},
 					formatter: function (value, index) {
-						if (teams.value[index].championId) {
-							return `{${teams.value[index].championId!}|}\n{value|${value}}`;
+						const member = teams.value[index];
+						let str;
+						if (member.championId) {
+							str = `{${member.championId!}|}\n{value|${value}}`;
 						} else {
-							return `{value|${value}}`;
+							str = `{value|${value}}`;
+						}
+						if (member.summonerInfo.privacy === "PRIVATE") {
+							str += `\n{private|生涯隐藏}}`;
 						}
+						return str;
 					},
 					rich: {
 						...championImageUrlMap.value,
 						value: {
 							lineHeight: 30,
 							align: "center"
+						},
+						private: {
+							lineHeight: 30,
+							align: "center",
+							borderWidth: 2,
+							borderColor: "rgba(245,112,45,0.73)",
+							borderRadius: 2
 						}
 					}
 				},
@@ -144,28 +168,38 @@ function handleClick(event: any) {
 </script>
 
 <template>
-	<v-chart class="w-full h-full" :option="option" @click="handleClick" />
-	<n-modal
-		v-model:show="showDetail"
-		preset="card"
-		class="team-member-history-modal"
-		:title="showSummonerName"
-		style="
-			margin-top: 10px;
-			width: 95%;
-			height: 85vh;
-			display: flex;
-			flex-flow: column;
-			background: rgb(22 27 43 / 95%);
-			backdrop-filter: blur(4px);
-			border: 1px solid rgb(122 122 122 / 58%);
-			border-radius: 8px;
-			overflow: hidden;
-		">
-		<div class="flex flex-1 flex-col h-0" style="font-size: 12px">
-			<HistoryList :match-history-list="historyListData"></HistoryList>
+	<div class="flex flex-1 flex-col w-full h-full">
+		<div class="flex flex-row items-center gap-5 justify-center" v-if="teamUpInfo.length > 0">
+			<template v-for="(color, i) in colorGroup" :key="i">
+				<div v-if="i + 1 <= teamUpInfo.length" class="flex flex-row items-center gap-1">
+					<div :style="{ backgroundColor: color, width: '10px', height: '10px' }"></div>
+					<span>组队{{ i + 1 }}</span>
+				</div>
+			</template>
 		</div>
-	</n-modal>
+		<v-chart class="flex-1" :option="option" @click="handleClick" />
+		<n-modal
+			v-model:show="showDetail"
+			preset="card"
+			class="team-member-history-modal"
+			:title="showSummonerName"
+			style="
+				margin-top: 10px;
+				width: 95%;
+				height: 85vh;
+				display: flex;
+				flex-flow: column;
+				background: rgb(22 27 43 / 95%);
+				backdrop-filter: blur(4px);
+				border: 1px solid rgb(122 122 122 / 58%);
+				border-radius: 8px;
+				overflow: hidden;
+			">
+			<div class="flex flex-1 flex-col h-0" style="font-size: 12px">
+				<HistoryList :match-history-list="historyListData"></HistoryList>
+			</div>
+		</n-modal>
+	</div>
 </template>
 
 <style scoped></style>

src/listener/backgroundListener.ts

@@ -42,7 +42,7 @@ export function setupListener() {
 	window.ipcRenderer.on(Handle.gameSessionMyTeam, async (event: IpcRendererEvent, myTeam: TeamMemberInfo[]) => {
 		lcuStore.myTeam = myTeam;
 		lcuStore.theirTeam = [];
-		setTimeout(lcuStore.analysisMyTeam, 2000);
+		setTimeout(lcuStore.analysisMyTeam, 4000);
 	});
 
 	window.ipcRenderer.on(Handle.gameSessionRoomId, async (event: IpcRendererEvent, chatRoomId: string) => {