优化抽卡增加最欧最非

plugins/genshin/model/gachaLog.js

@@ -44,7 +44,7 @@ export default class GachaLog extends base {
     } else if (type === "weapon" || type === "武器" || type === "光锥") {
       let weapon = Weapon.get(name, game)
       if (!weapon) {
-        console.log("not-found-weapon",`[${name}]`, game)
+        console.log("not-found-weapon", `[${name}]`, game)
       }
       return weapon?.imgs?.icon || ""
     }
@@ -133,8 +133,7 @@ export default class GachaLog extends base {
     let url = txt.match(/auth_appid=webview_gacha(.*)hk4e_cn/)
 
     /** 删除文件 */
-    fs.unlink(textPath, () => {
-    })
+    fs.unlink(textPath, () => { })
 
     if (!url || !url[0]) {
       return false
@@ -269,7 +268,7 @@ export default class GachaLog extends base {
       return false
     }
 
-    logger.mark(`${this.e.logFnc}[uid:${this.uid}] 开始获取：${this.typeName}记录...`)
+    logger.mark(`${this.e.logFnc}[UID:${this.uid}] 开始获取：${this.typeName}记录...`)
     let all = []
 
     let logJson = this.readJson()
@@ -315,14 +314,14 @@ export default class GachaLog extends base {
     }
 
     if (!res?.data?.list || res.data.list.length <= 0) {
-      logger.mark(`${this.e.logFnc}[uid:${this.uid}] 获取${this.typeName}记录完成，共${Number(page) - 1}页`)
+      logger.mark(`${this.e.logFnc}[UID:${this.uid}] 获取${this.typeName}记录完成，共${Number(page) - 1}页`)
       return { hasErr: false, list: [] }
     }
 
     let list = []
     for (let val of res.data.list) {
       if (ids.get(String(val.id))) {
-        logger.mark(`${this.e.logFnc}[uid:${this.uid}] 获取${this.typeName}记录完成，暂无新记录`)
+        logger.mark(`${this.e.logFnc}[UID:${this.uid}] 获取${this.typeName}记录完成，暂无新记录`)
         return { hasErr: false, list }
       } else {
         list.push(val)
@@ -633,9 +632,7 @@ export default class GachaLog extends base {
         num: fourLog[i]
       })
     }
-    four = four.sort((a, b) => {
-      return b.num - a.num
-    })
+    four = four.sort((a, b) => { return b.num - a.num })
 
     if (four.length <= 0) {
       four.push({ name: "无", num: 0 })
@@ -644,23 +641,23 @@ export default class GachaLog extends base {
     let fiveAvg = 0
     let fourAvg = 0
     if (fiveNum > 0) {
-      fiveAvg = ((allNum - noFiveNum) / fiveNum).toFixed(2)
+      fiveAvg = Math.round((allNum - noFiveNum) / fiveNum);
     }
     if (fourNum > 0) {
-      fourAvg = ((allNum - noFourNum) / fourNum).toFixed(2)
+      fourAvg = Math.round((allNum - noFourNum) / fourNum);
     }
     // 有效抽卡
     let isvalidNum = 0
 
     if (fiveNum > 0 && fiveNum > wai) {
       if (fiveLog.length > 0 && !fiveLog[0].isUp) {
-        isvalidNum = (allNum - noFiveNum - fiveLog[0].num) / (fiveNum - wai)
+        isvalidNum = Math.round((allNum - noFiveNum - fiveLog[0].num) / (fiveNum - wai));
       } else {
-        isvalidNum = (allNum - noFiveNum) / (fiveNum - wai)
+        isvalidNum = Math.round((allNum - noFiveNum) / (fiveNum - wai));
       }
-      isvalidNum = isvalidNum.toFixed(2)
     }
 
+
     let upYs = isvalidNum * 160
     if (upYs >= 10000) {
       upYs = (upYs / 10000).toFixed(2) + "w"
@@ -737,17 +734,30 @@ export default class GachaLog extends base {
     const max = type === 12 || type === 302 ? 80 : 90
     let line = []
     let weapon = this.e.isSr ? "光锥" : "武器"
+    //最非，最欧
+    const filteredFiveLog = data.fiveLog.filter(item => item.num !== 0);
+    let maxValue, minValue;
+
+    if (filteredFiveLog.length > 0) {
+      maxValue = Math.max(...filteredFiveLog.map(item => item.num));
+      minValue = Math.min(...filteredFiveLog.map(item => item.num));
+    } else {
+      maxValue = fiveLog[0].num;
+      minValue = fiveLog[0].num;
+    }
     if ([301, 11].includes(type)) {
       line = [[
         { lable: "未出五星", num: data.noFiveNum, unit: "抽" },
         { lable: "五星", num: data.fiveNum, unit: "个" },
         { lable: "五星平均", num: data.fiveAvg, unit: "抽", color: data.fiveColor },
-        { lable: "小保底不歪", num: data.noWaiRate + "%", unit: "" }
+        { lable: "小保底不歪", num: data.noWaiRate + "%", unit: "" },
+        { lable: "最非", num: maxValue, unit: "抽" }
       ], [
         { lable: "未出四星", num: data.noFourNum, unit: "抽" },
         { lable: "五星常驻", num: data.wai, unit: "个" },
         { lable: "UP平均", num: data.isvalidNum, unit: "抽" },
-        { lable: `UP花费${this?.e?.isSr ? "星琼" : "原石"}`, num: data.upYs, unit: "" }
+        { lable: `UP花费${this?.e?.isSr ? "星琼" : "原石"}`, num: data.upYs, unit: "" },
+        { lable: "最欧", num: minValue, unit: "抽" }
       ]]
     }
     // 常驻池
@@ -756,12 +766,14 @@ export default class GachaLog extends base {
         { lable: "未出五星", num: data.noFiveNum, unit: "抽" },
         { lable: "五星", num: data.fiveNum, unit: "个" },
         { lable: "五星平均", num: data.fiveAvg, unit: "抽", color: data.fiveColor },
-        { lable: `五星${weapon}`, num: data.weaponNum, unit: "个" }
+        { lable: `五星${weapon}`, num: data.weaponNum, unit: "个" },
+        { lable: "最非", num: maxValue, unit: "抽" }
       ], [
         { lable: "未出四星", num: data.noFourNum, unit: "抽" },
         { lable: "四星", num: data.fourNum, unit: "个" },
         { lable: "四星平均", num: data.fourAvg, unit: "抽" },
-        { lable: "四星最多", num: data.maxFour.num, unit: data.maxFour.name }
+        { lable: "四星最多", num: data.maxFour.num, unit: data.maxFour.name.slice(0, 4) },
+        { lable: "最欧", num: minValue, unit: "抽" }
       ]]
     }
     // 武器池
@@ -770,12 +782,14 @@ export default class GachaLog extends base {
         { lable: "未出五星", num: data.noFiveNum, unit: "抽" },
         { lable: "五星", num: data.fiveNum, unit: "个" },
         { lable: "五星平均", num: data.fiveAvg, unit: "抽", color: data.fiveColor },
-        { lable: `四星${weapon}`, num: data.weaponFourNum, unit: "个" }
+        { lable: `四星${weapon}`, num: data.weaponFourNum, unit: "个" },
+        { lable: "最非", num: maxValue, unit: "抽" }
       ], [
         { lable: "未出四星", num: data.noFourNum, unit: "抽" },
         { lable: "四星", num: data.fourNum, unit: "个" },
         { lable: "四星平均", num: data.fourAvg, unit: "抽" },
-        { lable: "四星最多", num: data.maxFour.num, unit: data.maxFour.name }
+        { lable: "四星最多", num: data.maxFour.num, unit: data.maxFour.name.slice(0, 4) },
+        { lable: "最欧", num: minValue, unit: "抽" }
       ]]
     }
     // 新手池
@@ -784,12 +798,14 @@ export default class GachaLog extends base {
         { lable: "未出五星", num: data.noFiveNum, unit: "抽" },
         { lable: "五星", num: data.fiveNum, unit: "个" },
         { lable: "五星平均", num: data.fiveAvg, unit: "抽", color: data.fiveColor },
-        { lable: `五星${weapon}`, num: data.weaponNum, unit: "个" }
+        { lable: `五星${weapon}`, num: data.weaponNum, unit: "个" },
+        { lable: "最非", num: maxValue, unit: "抽" }
       ], [
         { lable: "未出四星", num: data.noFourNum, unit: "抽" },
         { lable: "四星", num: data.fourNum, unit: "个" },
         { lable: "四星平均", num: data.fourAvg, unit: "抽" },
-        { lable: "四星最多", num: data.maxFour.num, unit: data.maxFour.name }
+        { lable: "四星最多", num: data.maxFour.num, unit: data.maxFour.name.slice(0, 4) },
+        { lable: "最欧", num: minValue, unit: "抽" }
       ]]
     }
     let hasMore = false

plugins/genshin/resources/html/gacha/gacha-log.css

@@ -76,7 +76,7 @@ body {
   border-radius: 15px;
   margin-top: 20px;
   margin-bottom: 20px;
-  padding: 20px 0px 5px 5px;
+  padding: 20px 0px 5px 10px;
   background: #fff;
   box-shadow: 0 5px 10px 0 rgba(0, 0, 0, 0.15);
   position: relative;
@@ -88,6 +88,7 @@ body {
   background: #d4b98c;
   color: #fff;
   font-size: 14px;
+  font-family: "HYWenHei-55W";
   padding: 3px 10px;
   border-radius: 15px 0px 15px 15px;
   z-index: 20;
@@ -130,7 +131,7 @@ body {
   /* margin-top: 20px; */
   margin-bottom: 20px;
   padding: 6px 0px 5px 10px;
-  background: #fff;
+  /* background: #fff; */
   box-shadow: 0 5px 10px 0 rgba(0, 0, 0, 0.15);
   position: relative;
 }
@@ -146,12 +147,11 @@ body {
   height: 90px;
   position: relative;
   overflow: hidden;
-  background: #e7e5d9;
+  /* background: #e7e5d9; */
 }
 .item .role_img {
   width: 70px;
   height: 70px;
-  border-radius: 7px 7px 20px 0;
   display: inline-block;
   background-size: auto 100%;
   background-repeat: no-repeat;
@@ -159,7 +159,6 @@ body {
 }
 .card_list .item.star5 {
   background-image: url(../../img/other/bg5.png);
-  /*filter: brightness(1.1);*/
   background-size: 100%;
   background-repeat: no-repeat;
 }
@@ -184,13 +183,13 @@ body {
 .card_list .item .name,
 .card_list .item .num_name {
   position: absolute;
-  top: 71px;
+  top: 70.4px;
   left: 0px;
   z-index: 9;
   font-size: 12px;
   text-align: center;
   width: 100%;
-  height: 18px;
+  height: 30px;
   line-height: 18px;
 }
 .card_list .item .num_name {
@@ -210,7 +209,7 @@ body {
   border-radius: 1px;
   left: 0;
   top: 0;
-  background: #d3bc8d;
+  background: #bca87e;
 }
 .label_301 {
   background-color: #eb6a4b;
@@ -277,7 +276,8 @@ body {
   display: flex;
   justify-content: space-between;
   align-items: center;
-  font-size: 12px;
+  font-size: 15px;
+  font-family: "HYWenHei-55W";
   color: #7d7d7d;
   padding-bottom: 5px;
 }