show match history (99%)

Author: Java-S12138

frankElectron/matchHistory.js

@@ -34,21 +34,28 @@ export const createMatchHistoryWindow = async (userHeader) => {
 }
 
 export const matchHistoryIpc = (userHeader) => {
-  let matchHistoryWindow
   // 展示战力分析窗口
   ipcMain.on('showCharts',async (event,clientStatus) => {
-    matchHistoryWindow = await createMatchHistoryWindow(userHeader)
+    const matchHistoryWindow = await createMatchHistoryWindow(userHeader)
     if (clientStatus==='"InProgress"'){
       matchHistoryWindow.webContents.send('query-enemy-summoner')
     }
   })
 // 移动游戏历史窗口
   ipcMain.on('move-match-history-window', (event, pos) => {
-    matchHistoryWindow.setBounds({ x: pos.x, y: pos.y, width: 1024, height: 576 })
+    for (const currentWindow of BrowserWindow.getAllWindows()) {
+      if (currentWindow.title === 'MatchHistory'){
+        currentWindow.setBounds({ x: pos.x, y: pos.y, width: 1024, height: 576 })
+      }
+    }
   })
 // 最小化游戏历史窗口
   ipcMain.on('match-history-window-min', () => {
-    matchHistoryWindow.minimize()
+    for (const currentWindow of BrowserWindow.getAllWindows()) {
+      if (currentWindow.title === 'MatchHistory'){
+        currentWindow.minimize()
+      }
+    }
   })
 // 关闭游戏历史窗口
   ipcMain.on('close-match-history-window', () => {
@@ -68,20 +75,4 @@ export const creatMatchAfterStartGame = async (userHeader) => {
   }
   const matchWin = await createMatchHistoryWindow(userHeader)
   matchWin.webContents.send('query-enemy-summoner')
-  // 移动游戏历史窗口
-  ipcMain.on('move-match-history-window', (event, pos) => {
-    matchWin.setBounds({ x: pos.x, y: pos.y, width: 1024, height: 576 })
-  })
-// 最小化游戏历史窗口
-  ipcMain.on('match-history-window-min', () => {
-    matchWin.minimize()
-  })
-// 关闭游戏历史窗口
-  ipcMain.on('close-match-history-window', () => {
-    for (const currentWindow of BrowserWindow.getAllWindows()) {
-      if (currentWindow.title === 'MatchHistory'){
-        currentWindow.close()
-      }
-    }
-  })
 }

frankElectron/queryMatch.js

@@ -15,7 +15,6 @@ const createQueryMatchWindow = async (userHeader) => {
       contextIsolation: false,
       enableRemoteModule: true,
       webSecurity: false,
-      // devTools:false
     }
   })
   queryMatchWindow.on('ready-to-show', () => {
@@ -37,8 +36,8 @@ export const queryMatchIpc = async (mainWindow,userHeader) => {
   let queryMatchWindow
   // 展示查询战绩窗口
   ipcMain.on('show-query-match',async () => {
-    queryMatchWindow = await createQueryMatchWindow(userHeader)
     mainWindow.hide()
+    queryMatchWindow = await createQueryMatchWindow(userHeader)
   })
 // 移动游戏历史窗口
   ipcMain.on('move-query-match-window', (event, pos) => {

src/render/components/assist/assistWindow.vue

@@ -1,5 +1,6 @@
 <template>
-  <n-tabs type="segment" :animated=true ref="tabsInstRef" :value="transValue">
+  <n-tabs type="segment" :animated=true
+          ref="tabsInstRef" :value="transValue">
     <n-tab name="champRank" tab="英雄数据" @click="transValue='champRank'"></n-tab>
     <n-tab name="match" tab="查看战绩" @click="showMatch"></n-tab>
     <n-tab v-if="isSwitchBlacklist" name="blacklist" tab="排位笔记" @click="transValue='blacklist'"></n-tab>
@@ -115,7 +116,6 @@ const showMatch = async () => {
     method: "GET",
     url: `/lol-gameflow/v1/gameflow-phase/`,
   }, appConfig.get('credentials'))).json()
-  // clientStatus == '"ChampSelect"' || clientStatus == '"GameStart"'
   if (clientStatus == '"ChampSelect"' ||  clientStatus == '"InProgress"'){
     ipcRenderer.send('showCharts',clientStatus)
     message.success('获取战绩成功 !')

src/render/components/matchHistory/leftCard.vue

@@ -110,7 +110,7 @@ const getEnemyInfo = async () => {
   enemySummonerInfo.value = await getSummonerNickName(credentials, enemyIdList)
   getEnemyChartsData(enemySummonerInfo.value)
 }
-getEnemyInfo()
+// getEnemyInfo()
 
 const getEnemyChartsData = (res) => {
   enemyEchartsData.value = {name: [], data: [], kdaHistory: [], horse: [], summonerId: []}

src/render/components/matchHistory/loadingAnime.vue

@@ -0,0 +1,46 @@
+<template>
+  <div>
+    <i></i>
+    <i></i>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "loadingAnime"
+}
+</script>
+
+<style scoped>
+i {
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  width: 40vmin;
+  height: 40vmin;
+  border-radius: 50%;
+  transform: translate(-50%, -50%);
+  animation: move 10s forwards infinite;
+  background: linear-gradient(15deg,#42d392 25%,#647eff);
+}
+
+i:nth-child(2) {
+  animation-delay: -2s;
+  background: rgba(255,255,255,.3);
+  box-shadow: 0 0 1rem rgba(255,255,255,.7),
+  0 0 0 1px rgba(255,255,255,.1);
+  backdrop-filter: blur(30px);
+}
+
+@keyframes move {
+  0%, 100% {
+    transform: translate(-50%, -50%) rotate(0) translateY(-30%);
+  }
+  25% {
+    transform: translate(-50%, -50%) rotate(-90deg) translateY(-30%);
+  }
+  50% {
+    transform: translate(-50%, -50%) rotate(180deg) translateY(-30%);
+  }
+}
+</style>

src/render/components/matchHistory/recentGame.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
-    <n-card class="boxShadow mainCard" content-style="padding:20px 10px 20px 10px">
-      <n-grid x-gap="20" :cols="5" style="margin-top: 15px">
+    <n-card class="boxShadow mainCard" content-style="padding:20px 10px 20px 10px" >
+      <n-grid x-gap="20" :cols="5" style="margin-top: 15px" v-if="summonerInfo.length!==0">
         <n-gi v-for="summoner in (currentTeam === 1 ? summonerInfo:enemySummonerInfo)">
           <n-space vertical :size="[10,4]" class="alignCenter">
             <n-avatar
@@ -39,9 +39,8 @@
             </div>
           </n-space>
         </n-gi>
-
       </n-grid>
-
+      <loading-anime v-else></loading-anime>
       <div class="suspension">
         <n-space>
           <n-button
@@ -82,8 +81,8 @@
           </n-popover>
         </n-space>
       </div>
-
     </n-card>
+
   </div>
 </template>
 
@@ -102,6 +101,7 @@ import {matchStore} from "@/render/store";
 import {storeToRefs} from "pinia/dist/pinia";
 import {ChevronsDownLeft, CircleX, Ballon,PictureInPictureTop} from '@vicons/tabler'
 import {ipcRenderer} from "electron";
+import LoadingAnime from "@/render/components/matchHistory/loadingAnime";
 
 const emits = defineEmits(['changePage','summonerId','toGameDetailsPage'])
 const store = matchStore()

src/utils/main/gameScore.js

@@ -18,25 +18,26 @@ const queryCurrentGameMode = async (credentials) => {
 }
 
 // 获取最近的比赛记录
-const getRencentMatchHistoty = async (credentials,session,summonerId) => {
+const getRencentMatchHistoty = async (credentials, session, summonerId) => {
   const matchList = (await createHttp2Request({
     method: "GET",
-    url: `/lol-match-history/v3/matchlist/account/${summonerId}`,
+    url: `/lol-match-history/v3/matchlist/account/${summonerId}?begIndex=0&endIndex=10`,
   }, session, credentials)).json()['games']['games'].reverse()
-  return matchList.slice(0,10)
+  return matchList
 }
 
-// 查询比赛记录 (最近5场排位)
-const queryMatchHistory = async (credentials,session,summonerId) => {
+// 查询比赛记录 (最近10场排位)
+const queryMatchHistory = async (credentials, session, summonerId) => {
   const currentGameMode = await queryCurrentGameMode(credentials)
   console.log('当前游戏模式:', currentGameMode)
-  if (currentGameMode === null){
-    return await getRencentMatchHistoty(credentials,session,summonerId)
+  if (currentGameMode === null) {
+    return await getRencentMatchHistoty(credentials, session, summonerId)
   }
 
   let classicMode = []
   let matchCount = 0
   for (let i = 0; i < 100; i += 20) {
+    console.log(123)
     const matchList = (await createHttp2Request({
       method: "GET",
       url: `/lol-match-history/v3/matchlist/account/${summonerId}?begIndex=${i}&endIndex=${i + 20}`,
@@ -46,29 +47,33 @@ const queryMatchHistory = async (credentials,session,summonerId) => {
       if (matchListElement.queueId == currentGameMode && matchCount < 10) {
         matchCount += 1
         classicMode.push(matchListElement)
+      } else if (matchCount === 10) {
+        return classicMode
       }
     }
-    if (matchCount === 10) {
-      break
-    }
   }
   return classicMode
 }
 
 // 获取召唤师游戏评分分数
-export const getGameScore = async (credentials, summonerId,session) => {
-  let classicModeGames = await queryMatchHistory(credentials,session, summonerId)
+export const getGameScore = async (credentials, summonerId, session) => {
+  let classicModeGames = await queryMatchHistory(credentials, session, summonerId)
   const simpleMatchHistory = getSimpleMatchHistory(classicModeGames)
   let gameScore = 0
-  let gameCount = classicModeGames.length
+  let gameCount = classicModeGames.slice(0,5).length
   let kdaHistory = ''
-  for (const modeGame of classicModeGames) {
+  for (const modeGame of classicModeGames.slice(0,5)) {
     gameScore += analyseSingleMatch(modeGame.participants[0].stats)
     let tempKad = `${modeGame.participants[0].stats.kills}/${modeGame.participants[0].stats.deaths}/${modeGame.participants[0].stats.assists}  `
     kdaHistory += tempKad
   }
   gameScore = parseInt(gameScore / gameCount)
-  return {score: gameScore, horse: jundgeHorse(gameScore), kdaHistory: kdaHistory,simpleMatchHistory:simpleMatchHistory}
+  return {
+    score: gameScore,
+    horse: jundgeHorse(gameScore),
+    kdaHistory: kdaHistory,
+    simpleMatchHistory: simpleMatchHistory
+  }
 }
 
 // 获取简单的历史战绩信息
@@ -78,39 +83,42 @@ const getSimpleMatchHistory = (matchList) => {
   let simpleMatch = []
   for (const match of matchList) {
     simpleMatch.push({
-      champImg:`https://game.gtimg.cn/images/lol/act/img/champion/${champDict[String(match.participants[0].championId)].alias}.png`,
-      position:match.participants[0].timeline.lane,
-      kill:match.participants[0].stats.kills,
-      deaths:match.participants[0].stats.deaths,
-      assists:match.participants[0].stats.assists,
-      isWin:match.participants[0].stats.win,
-      gameId:match.gameId
+      champImg: `https://game.gtimg.cn/images/lol/act/img/champion/${champDict[String(match.participants[0].championId)].alias}.png`,
+      position: match.participants[0].timeline.lane,
+      kill: match.participants[0].stats.kills,
+      deaths: match.participants[0].stats.deaths,
+      assists: match.participants[0].stats.assists,
+      isWin: match.participants[0].stats.win,
+      gameId: match.gameId
     })
     position.push(match.participants[0].timeline.lane)
     winOrLoss.push(match.participants[0].stats.win)
   }
   const winInfo = inferMatchWinRat(winOrLoss)
   const regularPostion = inferRegularPosition(position)
-  return {winInfo,regularPostion,simpleMatch}
+  return {winInfo, regularPostion, simpleMatch}
 }
 
 // 判断最近战绩情况
 const inferMatchWinRat = (arr) => {
   const firstMatch = arr[0]
   let count = 0
   for (const arrElement of arr) {
-    if (arrElement === firstMatch){
-      count +=1
-    }else {
+    if (arrElement === firstMatch) {
+      count += 1
+    } else {
       break
     }
   }
-  if (count ===1){
-    return firstMatch === true ? {'info':'一胜一负',isWin:firstMatch}  : {'info':'一负一胜',isWin:firstMatch}
-  }else if(count ===0){
-    return {'info':'暂无数据',isWin:firstMatch}
+  if (count === 1) {
+    return firstMatch === true ? {'info': '一胜一负', isWin: firstMatch} : {'info': '一负一胜', isWin: firstMatch}
+  } else if (count === 0) {
+    return {'info': '暂无数据', isWin: firstMatch}
   } else {
-    return firstMatch === true ? {'info':`${count}连胜中`,isWin:firstMatch} :{'info':`${count}连败中`,isWin:firstMatch}
+    return firstMatch === true ? {'info': `${count}连胜中`, isWin: firstMatch} : {
+      'info': `${count}连败中`,
+      isWin: firstMatch
+    }
   }
 }
 
@@ -121,10 +129,10 @@ const inferRegularPosition = (arr) => {
   let res = {}
   let maxNum = 0
   let maxValue = null
-  for(let i = 0; i < arr.length;i++) {
+  for (let i = 0; i < arr.length; i++) {
     let val = arr[i]
     res[val] === undefined ? res[val] = 1 : res[val]++
-    if(res[val] > maxNum) {
+    if (res[val] > maxNum) {
       maxNum = res[val]
       maxValue = val
     }
@@ -172,11 +180,16 @@ const jundgeHorse = (score) => {
 // 判断玩家位置
 const querySummonerPosition = (lane) => {
   switch (lane) {
-    case 'MIDDLE' : return '中单';
-    case 'JUNGLE' : return '打野';
-    case 'BOTTOM' : return '下路';
-    case 'TOP' : return '上单';
-    case 'NONE': return '未知'
+    case 'MIDDLE' :
+      return '中单';
+    case 'JUNGLE' :
+      return '打野';
+    case 'BOTTOM' :
+      return '下路';
+    case 'TOP' :
+      return '上单';
+    case 'NONE':
+      return '未知'
   }
   return '未知'
 }