From a6462bd0a1148df650b2648a74e8b201413772d2 Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Thu, 25 May 2023 17:39:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E6=AC=A1=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/modulebase.go   | 18 +++++++++---------
 modules/rtask/module.go |  6 +++---
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/modules/modulebase.go b/modules/modulebase.go
index 6d8e9e4e7..24b7d5ab3 100644
--- a/modules/modulebase.go
+++ b/modules/modulebase.go
@@ -445,43 +445,43 @@ func (this *ModuleBase) DispenseRes(session comm.IUserSession, res []*cfg.Gameat
 
 	if len(attrs) > 0 { //用户属性资源
 		code = this.ModuleUser.AddAttributeValues(session, attrs, bPush)
-		this.Debugf("发放用户资源: %v [%v]", attrs, code)
+		this.Debugf("发放用户资源: %v code : [%v]", attrs, code)
 	}
 	if len(items) > 0 { //道具资源
 		_, code = this.ModuleItems.AddItems(session, items, bPush)
-		this.Debugf("发放道具资源: %v [%v]", items, code)
+		this.Debugf("发放道具资源: %v code : [%v]", items, code)
 	}
 	if len(heros) > 0 { //卡片资源
 		_, _, code = this.ModuleHero.CreateRepeatHeros(session, heros, bPush)
-		this.Debugf("发放英雄资源: %v [%v]", heros, code)
+		this.Debugf("发放英雄资源: %v code : [%v]", heros, code)
 	}
 	if len(equips) > 0 {
 		_, code = this.ModuleEquipment.AddNewEquipments(session, equips, bPush)
-		this.Debugf("发放装备资源: %v [%v]", equips, code)
+		this.Debugf("发放装备资源: %v code : [%v]", equips, code)
 	}
 	if len(vip) > 0 { //卡片资源
 		for k := range vip {
 			code, _ = this.ModulePrivilege.Delivery(session, k)
-			this.Debugf("发放月卡资源: %v [%v]", k, code)
+			this.Debugf("发放月卡资源: %v code : [%v]", k, code)
 		}
 	}
 	if len(atlas) > 0 {
 		for k := range atlas {
 			this.ModuleSmithy.CheckActivateAtlasCollect(session.GetUserId(), k)
-			this.Debugf("发放图鉴资源: %v [%v]", k, code)
+			this.Debugf("发放图鉴资源: %v code : [%v]", k, code)
 		}
 	}
 	if len(panda) > 0 {
 		code = this.ModulePractice.AddItems(session, panda, bPush)
-		this.Debugf("发放武馆资源: %v [%v]", panda, code)
+		this.Debugf("发放武馆资源: %v code : [%v]", panda, code)
 	}
 	if len(mts) > 0 {
 		code = this.ModuleParkour.AddMounts(session, mts, bPush)
-		this.Debugf("发放捕羊大赛资源: %v [%v]", mts, code)
+		this.Debugf("发放捕羊大赛资源: %v code : [%v]", mts, code)
 	}
 	if len(per) > 0 {
 		code = this.ModuleUser.AddPer(session, per, bPush)
-		this.Debugf("发放用户皮肤资源资源: %v [%v]", mts, code)
+		this.Debugf("发放用户皮肤资源资源: %v code : [%v]", mts, code)
 	}
 	return
 }
diff --git a/modules/rtask/module.go b/modules/rtask/module.go
index 1fd95424b..a803c3ee0 100644
--- a/modules/rtask/module.go
+++ b/modules/rtask/module.go
@@ -405,15 +405,15 @@ func (this *ModuleRtask) CheckCondi(uid string, condiId int32, params ...int32)
 	return
 }
 
-func (this *ModuleRtask) CheckCondis(uid string, condiIds ...int32) (condIds []int32) {
+func (this *ModuleRtask) CheckCondis(uid string, condiIds ...int32) (cids []int32) {
 	record := this.modelRtaskRecord.getRecord(uid)
 	if record == nil {
 		return
 	}
 
-	for _, condId := range condIds {
+	for _, condId := range condiIds {
 		if _, ok := this.modelRtask.checkCondi(uid, condId, record); ok {
-			condIds = append(condIds, condId)
+			cids = append(cids, condId)
 		}
 	}