From 898822736ddc269a89fdd1ddeac707613d54d58e Mon Sep 17 00:00:00 2001
From: liwei1dao <liwei1dao@gmail.com>
Date: Tue, 19 Sep 2023 16:41:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=97=A5=E5=B8=B8=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/combat/api_drop.go     |  8 +++++---
 modules/dailytask/module.go    |  6 ++----
 modules/sys/api_funcgetList.go | 16 ++++++++++++++++
 modules/user/module.go         |  1 +
 4 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/modules/combat/api_drop.go b/modules/combat/api_drop.go
index c3aabf602..6e52c1d4d 100644
--- a/modules/combat/api_drop.go
+++ b/modules/combat/api_drop.go
@@ -20,6 +20,7 @@ func (this *apiComp) Drop(session comm.IUserSession, req *pb.CombatDropReq) (err
 		lv   *pb.DBCombatLevel
 		box  *cfg.GameCombatBoxData
 		atns []*pb.UserAssets
+		user *pb.DBUser
 		ok   bool
 		err  error
 	)
@@ -71,7 +72,7 @@ func (this *apiComp) Drop(session comm.IUserSession, req *pb.CombatDropReq) (err
 		}
 		return
 	}
-	user, err := this.module.ModuleUser.GetUser(session.GetUserId())
+	user, err = this.module.ModuleUser.GetUser(session.GetUserId())
 	if err != nil {
 		errdata = &pb.ErrorData{
 			Code:    pb.ErrorCode_DBError,
@@ -82,7 +83,6 @@ func (this *apiComp) Drop(session comm.IUserSession, req *pb.CombatDropReq) (err
 	}
 	reward := this.module.ModuleTools.GetGroupDataByLottery(box.Drop, user.Vip, user.Lv)
 	if len(reward) == 0 {
-		//if prop = this.module.configure.GetDropData(itemcf.BoxId); prop == nil {
 		errdata = &pb.ErrorData{
 			Code:    pb.ErrorCode_ConfigNoFound,
 			Title:   pb.ErrorCode_ConfigNoFound.ToString(),
@@ -90,7 +90,9 @@ func (this *apiComp) Drop(session comm.IUserSession, req *pb.CombatDropReq) (err
 		}
 		return
 	}
-	this.module.DispenseRes(session, reward, true)
+	if errdata = this.module.DispenseRes(session, reward, true); errdata != nil {
+		return
+	}
 	atns = make([]*pb.UserAssets, len(reward))
 	for i, v := range reward {
 		atns[i] = &pb.UserAssets{
diff --git a/modules/dailytask/module.go b/modules/dailytask/module.go
index a46fa8df9..b7ac33779 100644
--- a/modules/dailytask/module.go
+++ b/modules/dailytask/module.go
@@ -61,16 +61,14 @@ func (this *Dailytask) OnInstallComp() {
 // 用户登录
 func (this *Dailytask) EventUserLogin(session comm.IUserSession) {
 	var (
-		errdata *pb.ErrorData
-		isopen  bool
+		isopen bool
 	)
 
 	if db.IsCross() { //跨服不支持
 		return
 	}
 
-	if isopen, errdata = this.ModuleSys.CheckOpenCondCfgById(session.GetUserId(), "annulartask"); isopen {
-		this.Errorln(errdata)
+	if isopen, _ = this.ModuleSys.CheckOpenCondCfgById(session.GetUserId(), "annulartask"); !isopen {
 		return
 	}
 	this.refreshtask(session)
diff --git a/modules/sys/api_funcgetList.go b/modules/sys/api_funcgetList.go
index 7a16fb903..298ef1561 100644
--- a/modules/sys/api_funcgetList.go
+++ b/modules/sys/api_funcgetList.go
@@ -2,6 +2,7 @@ package sys
 
 import (
 	"go_dreamfactory/comm"
+	"go_dreamfactory/lego/core"
 	"go_dreamfactory/pb"
 )
 
@@ -81,6 +82,21 @@ func (this *apiComp) FuncGetList(session comm.IUserSession, req *pb.SysFuncGetLi
 	if len(change) > 0 {
 		go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
 			this.module.wtask.OpenCmdNotice(session, change...)
+			//手动激活通知模块
+			for _, m := range change {
+				opencfg, _ := this.module.configure.GetOpenCondCfgById(m)
+				for _, v := range opencfg.Notify {
+					i, err := this.service.GetModule(core.M_Modules(v))
+					if err != nil {
+						this.module.Errorln(err)
+						continue
+					}
+					if ic, ok := i.(comm.IOpenCmdNotice); ok {
+						ic.OpenCmdNotice(session, m)
+					}
+				}
+
+			}
 		})
 
 	}
diff --git a/modules/user/module.go b/modules/user/module.go
index fb85bd547..62d812b17 100644
--- a/modules/user/module.go
+++ b/modules/user/module.go
@@ -948,6 +948,7 @@ func (this *User) BingoSetUserLv(session comm.IUserSession, lv int32) error {
 			)
 		}
 	}
+	this.ModuleSys.CheckOpenCond(session, comm.OpencondTypePlatlv, lv)
 	return nil
 }