From a147523d006ddf519c049aa598a5c534f74b9b04 Mon Sep 17 00:00:00 2001
From: liwei <2211068034@qq.com>
Date: Mon, 24 Jul 2023 16:53:57 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=B4=97=E7=BB=83?=
 =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E5=B1=9E=E6=80=A7=E7=AE=97=E6=B3=95=E4=B8=8D?=
 =?UTF-8?q?=E4=B8=80=E8=87=B4=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/equipment/api_washconfirm.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/equipment/api_washconfirm.go b/modules/equipment/api_washconfirm.go
index fe39293af..23768c0a7 100644
--- a/modules/equipment/api_washconfirm.go
+++ b/modules/equipment/api_washconfirm.go
@@ -63,7 +63,7 @@ func (this *apiComp) WashConfirm(session comm.IUserSession, req *pb.EquipmentWas
 			Lv:        v.Lv,
 			AttrName:  attrlibrary.Attrkey,
 			BaseValue: attrlibrary.Attrvar,
-			Value:     attrlibrary.Attrvar + int32(float64(attrlibrary.Addition[equip.AdverbEntry[i].Lv-1])/1000.0*float64(attrlibrary.AttrvarCorrect)),
+			Value:     attrlibrary.Attrvar + int32(float64(attrlibrary.Addition[equip.AdverbEntry[i].Lv-1])/1000.0*float64(attrlibrary.Attrvar)),
 		}
 	}
 	if err = this.module.modelEquipment.ChangeList(session.GetUserId(), equip.Id, map[string]interface{}{

From 3df2f8019f0061a5a00990d3a6d4b3bf674325e9 Mon Sep 17 00:00:00 2001
From: liwei <2211068034@qq.com>
Date: Mon, 24 Jul 2023 18:21:02 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=A4=84=E7=90=86=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E8=BF=9B=E5=BA=A6=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/sociaty/api_cross_tasklist.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/sociaty/api_cross_tasklist.go b/modules/sociaty/api_cross_tasklist.go
index 1663025ac..d2d2a9fd3 100644
--- a/modules/sociaty/api_cross_tasklist.go
+++ b/modules/sociaty/api_cross_tasklist.go
@@ -39,9 +39,9 @@ func (this *apiComp) TaskList(session comm.IUserSession, req *pb.SociatyTaskList
 		return
 	}
 	for _, v := range sociatyTask.TaskList {
-		if v.Status == 0 {
-			tasklist = append(tasklist, v.TaskId)
-		}
+		// if v.Status == 0 {
+		tasklist = append(tasklist, v.TaskId)
+		// }
 	}
 	condis, err = this.module.ModuleBuried.CheckCondition(session.GetUserId(), tasklist...)
 	if err != nil {