From bea34c2b0ea9e973caa48acf10330c01a20fcb35 Mon Sep 17 00:00:00 2001
From: liwei1dao <liwei1dao@gmail.com>
Date: Thu, 11 Jan 2024 18:57:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=9F=8B=E7=82=B9=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90=E6=8E=A8=E9=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/buried/module.go | 38 +++++++++++++++++++++++---------------
 1 file changed, 23 insertions(+), 15 deletions(-)

diff --git a/modules/buried/module.go b/modules/buried/module.go
index b45939907..a69c2a43e 100644
--- a/modules/buried/module.go
+++ b/modules/buried/module.go
@@ -94,13 +94,14 @@ func (this *Buried) Rpc_ModuleBuriedTrigger(ctx context.Context, req *pb.Rpc_Mod
 //完成任务
 func (this *Buried) CompleteCondition(session comm.IUserSession, condiId int32) (err error) {
 	var (
-		uid    string
-		model  *buriedModel
-		bdatas *pb.DBBuried
-		bitem  *pb.DBBuriedConItem
-		conf   *cfg.GameBuriedCondiData
-		ok     bool
-		bdata  *pb.DBBuriedItem
+		uid      string
+		model    *buriedModel
+		bdatas   *pb.DBBuried
+		bitem    *pb.DBBuriedConItem
+		conf     *cfg.GameBuriedCondiData
+		ok       bool
+		bdata    *pb.DBBuriedItem
+		progress []*pb.ConIProgress
 	)
 	uid = session.GetUserId()
 	if model, err = this.modelBuried.getburiedModel(uid); err != nil {
@@ -137,6 +138,7 @@ func (this *Buried) CompleteCondition(session comm.IUserSession, condiId int32)
 					}
 					v1.Value = conf.Value
 					v1.Finish = pb.BuriedItemFinishState_buried_finish
+					progress = append(progress, comm.GetBuriedConIProgress(conf, v1))
 				}
 			}
 		}
@@ -166,11 +168,13 @@ func (this *Buried) CompleteCondition(session comm.IUserSession, condiId int32)
 			bitem.State = pb.BuriedItemState_Sleep
 		}
 		bdata.Condi = append(bdata.Condi, bitem)
+		progress = append(progress, comm.GetBuriedConIProgress(conf, bitem))
 	}
 	if err = model.updateUserBurieds(uid, bdatas); err != nil {
 		this.Error("更新用户埋点数据错误!", log.Field{Key: "err", Value: err.Error()})
 		return
 	}
+	session.SendMsg(string(this.GetType()), "change", &pb.BuriedChangePush{Conitems: progress})
 	return
 }
 
@@ -393,14 +397,15 @@ func (this *Buried) CheckCondition(session comm.IUserSession, condiIds ...int32)
 // 设置任务完成状态并校验
 func (this *Buried) FinishConditionAndCheck(session comm.IUserSession, finishcondiIds []int32, condiIds ...int32) (condis []*pb.ConIProgress, err error) {
 	var (
-		uid     string
-		model   *buriedModel
-		bdatas  *pb.DBBuried
-		bitem   *pb.DBBuriedConItem
-		conf    *cfg.GameBuriedCondiData
-		ok      bool
-		chanage bool
-		bdata   *pb.DBBuriedItem
+		uid      string
+		model    *buriedModel
+		bdatas   *pb.DBBuried
+		bitem    *pb.DBBuriedConItem
+		conf     *cfg.GameBuriedCondiData
+		ok       bool
+		chanage  bool
+		progress []*pb.ConIProgress
+		bdata    *pb.DBBuriedItem
 	)
 	uid = session.GetUserId()
 	if model, err = this.modelBuried.getburiedModel(uid); err != nil {
@@ -445,6 +450,7 @@ func (this *Buried) FinishConditionAndCheck(session comm.IUserSession, finishcon
 						v1.Value = conf.Value
 						v1.Finish = pb.BuriedItemFinishState_buried_finish
 						chanage = true
+						progress = append(progress, comm.GetBuriedConIProgress(conf, v1))
 					}
 				}
 			}
@@ -475,6 +481,7 @@ func (this *Buried) FinishConditionAndCheck(session comm.IUserSession, finishcon
 			}
 			bdata.Condi = append(bdata.Condi, bitem)
 			chanage = true
+			progress = append(progress, comm.GetBuriedConIProgress(conf, bitem))
 		}
 	}
 
@@ -538,6 +545,7 @@ func (this *Buried) FinishConditionAndCheck(session comm.IUserSession, finishcon
 			this.Error("更新用户埋点数据错误!", log.Field{Key: "err", Value: err.Error()})
 			return
 		}
+		session.SendMsg(string(this.GetType()), "change", &pb.BuriedChangePush{Conitems: progress})
 	}
 
 	return