From fab4a9748647cc6fde3c143dafa4c9871167b0f7 Mon Sep 17 00:00:00 2001
From: luying <luying@bantus.cn>
Date: Fri, 30 Jul 2021 18:00:28 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A3=85=E5=A4=87=EF=BC=9A=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E6=B7=AC=E7=81=AB=E6=9F=A5=E8=AF=A2=E5=93=81=E7=9B=B8bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 game-server/app/servers/role/handler/equipHandler.ts | 2 +-
 shared/pubUtils/data.ts                              | 3 ++-
 shared/pubUtils/taskUtil.ts                          | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/game-server/app/servers/role/handler/equipHandler.ts b/game-server/app/servers/role/handler/equipHandler.ts
index f49c585da..933016c7d 100644
--- a/game-server/app/servers/role/handler/equipHandler.ts
+++ b/game-server/app/servers/role/handler/equipHandler.ts
@@ -489,7 +489,7 @@ export class EquipHandler {
         if (!dicGoods) return resResult(STATUS.DIC_DATA_NOT_FOUND);
         let dicQuench = gameData.quenchByQuality.get(dicGoods.quality)?.get(grade);
         console.log(dicQuench, dicGoods.quality, grade)
-        if (!dicQuench) return resResult(STATUS.DIC_DATA_NOT_FOUND);
+        if (!dicQuench) return resResult(STATUS.EQUIP_QUENCH_MAX);
 
         let logs: QuenchLogParam[] = [], times = 0;
         while(
diff --git a/shared/pubUtils/data.ts b/shared/pubUtils/data.ts
index 51ab70ed5..349ff2f31 100644
--- a/shared/pubUtils/data.ts
+++ b/shared/pubUtils/data.ts
@@ -730,10 +730,11 @@ export function getDicSuitByTypeAndLv(suitType: number, starLevel: number) {
 }
 
 export function getQuenchGradeByValue(quality: number, value: number) {
+    
     let dicQuench = gameData.quenchByQuality.get(quality)||[];
     let grade = 0;
     for(let [_grade, { singleRatioMin, singleRatioMax }] of dicQuench) {
-        if(value >= singleRatioMin && value < singleRatioMax ) {
+        if((value >= singleRatioMin && value < singleRatioMax) || (value == singleRatioMin && value == singleRatioMax) ) {
             grade = _grade;
         }
     }
diff --git a/shared/pubUtils/taskUtil.ts b/shared/pubUtils/taskUtil.ts
index af4600aa2..f02a29f87 100644
--- a/shared/pubUtils/taskUtil.ts
+++ b/shared/pubUtils/taskUtil.ts
@@ -904,7 +904,7 @@ export async function accomplishTask(serverId: number, roleId: string, taskType:
    *
    */
 
-export function isComplete(roleId: string, taskType: TASK_TYPE, taskParam: string, count: number, activityId: number, paramObj?: any, recordData?: any): any {
+export function isComplete(_roleId: string, taskType: TASK_TYPE, taskParam: string, count: number, _activityId: number, paramObj?: any, recordData?: any): any {
     // console.log('达成任务标准', roleId, taskType, taskParam, count, activityId, paramObj)
     let param = splitString(taskParam, '&');
     let addCount: number = 0; // 条件是否满足