Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev

comm/imodule.go

@@ -621,4 +621,7 @@ type (
 	IPushgiftbag interface {
 		IBuriedUpdateNotify
 	}
+	IUiGame interface {
+		HDPSTodayConsum(uid string, ps int32) // 今日消耗的体力
+	}
 )

modules/activity/model_hdlist.go

@@ -35,8 +35,7 @@ func (this *modelHdList) Init(service core.IService, module core.IModule, comp c
 }
 
 func (this *modelHdList) getHdInfo() (activity map[pb.HdType]*pb.DBHuodong) {
-
+	//this.LoadActivityData() // 临时处理 活动数据完善 删除
-	this.LoadActivityData() // 临时处理 活动数据完善 删除
 	return this.activity
 }
 

modules/modulebase.go

@@ -44,6 +44,7 @@ type ModuleBase struct {
 	ModuleBuried    comm.IBuried    //触发埋点中心
 	ModuleMail      comm.Imail      //邮件
 	ModuleActivity  comm.IActivity  //活动模块
+	ModuleUiGame    comm.IUiGame    //
 }
 
 // 重构模块配置对象
@@ -151,6 +152,11 @@ func (this *ModuleBase) Start() (err error) {
 		return
 	}
 	this.ModuleActivity = module.(comm.IActivity)
+
+	if module, err = this.service.GetModule(comm.ModulePuzzle); err != nil {
+		return
+	}
+	this.ModuleUiGame = module.(comm.IUiGame)
 	return
 }
 
@@ -395,6 +401,8 @@ func (this *ModuleBase) ConsumeRes(session comm.IUserSession, res []*cfg.Gameatn
 				this.ModuleUser.ChangeUserExpand(session.GetUserId(), map[string]interface{}{
 					"consumPs": userexpand.ConsumPs,
 				})
+
+				go this.ModuleUiGame.HDPSTodayConsum(session.GetUserId(), userexpand.ConsumPs) //
 			}
 		}
 	}

modules/uigame/model_puzzle.go

@@ -50,6 +50,6 @@ func (this *modelPuzzle) getPuzzleList(uid string, hid string) (result *pb.DBPuz
 	return result, err
 }
 
-// func (this *modelPuzzle) modifyVikingDataByObjId(uid string, data map[string]interface{}) error {
+func (this *modelPuzzle) modifyPuzzleListByObjId(uid string, data map[string]interface{}) error {
-// 	return this.Change(uid, data)
+	return this.Change(uid, data)
-// }
+}

modules/uigame/module.go

@@ -4,6 +4,9 @@ import (
 	"go_dreamfactory/comm"
 	"go_dreamfactory/lego/base"
 	"go_dreamfactory/lego/core"
+	"go_dreamfactory/pb"
+	"go_dreamfactory/sys/configure"
+	cfg "go_dreamfactory/sys/configure/structs"
 
 	"go_dreamfactory/modules"
 )
@@ -44,3 +47,48 @@ func (this *UiGame) Start() (err error) {
 
 	return
 }
+func (this *UiGame) HDPSTodayConsum(uid string, ps int32) {
+	activity := this.ModuleActivity.GetAllHdInfo()
+	curTime := configure.Now().Unix()
+	if v, ok := activity[pb.HdType_HdPuzzle]; ok { // 拼图小游戏
+		if v.Stime >= curTime && curTime <= v.Etime { // 活动时间范围内
+			if rst, err := this.modelPuzzle.getPuzzleList(uid, v.Id); err == nil {
+				if conf, err := this.configure.GetPuzzleConsumConf(); err != nil {
+					if conf.Getmax > rst.Val { // 超过今日上限
+						tmp := ps / conf.Usepawer
+						if tmp > rst.Val {
+							l := rst.Val
+							rst.Val = tmp
+							if conf.Getmax < rst.Val { // 超过今日上限
+								rst.Val = conf.Getmax
+							}
+							sub := rst.Val - l // 增长的
+							s, ok := this.GetUserSession(uid)
+							if sub > 0 {
+								var res *cfg.Gameatn
+								res = &cfg.Gameatn{
+									A: conf.Itemget.A,
+									T: conf.Itemget.T,
+									N: conf.Itemget.N * sub,
+								}
+								this.DispenseRes(s, []*cfg.Gameatn{res}, true)
+							}
+
+							update := make(map[string]interface{})
+							update["val"] = rst.Val
+
+							this.modelPuzzle.modifyPuzzleListByObjId(uid, update)
+							// 推送活动数据进度变化
+							if ok {
+								s.SendMsg(string(this.GetType()), "puzzlechange", &pb.UiGamePuzzleChangePush{
+									Data: rst,
+								})
+								s.Push()
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+}

pb/uigame_msg.pb.go

@@ -338,6 +338,54 @@ func (x *UiGamePuzzleRewardResp) GetAtno() []*UserAtno {
 	return nil
 }
 
+// 进度变化推送
+type UiGamePuzzleChangePush struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Data *DBPuzzleData `protobuf:"bytes,1,opt,name=data,proto3" json:"data"`
+}
+
+func (x *UiGamePuzzleChangePush) Reset() {
+	*x = UiGamePuzzleChangePush{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_uigame_uigame_msg_proto_msgTypes[6]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *UiGamePuzzleChangePush) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*UiGamePuzzleChangePush) ProtoMessage() {}
+
+func (x *UiGamePuzzleChangePush) ProtoReflect() protoreflect.Message {
+	mi := &file_uigame_uigame_msg_proto_msgTypes[6]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use UiGamePuzzleChangePush.ProtoReflect.Descriptor instead.
+func (*UiGamePuzzleChangePush) Descriptor() ([]byte, []int) {
+	return file_uigame_uigame_msg_proto_rawDescGZIP(), []int{6}
+}
+
+func (x *UiGamePuzzleChangePush) GetData() *DBPuzzleData {
+	if x != nil {
+		return x.Data
+	}
+	return nil
+}
+
 /////////////////////
 type UiGameGetLatticeReq struct {
 	state         protoimpl.MessageState
@@ -350,7 +398,7 @@ type UiGameGetLatticeReq struct {
 func (x *UiGameGetLatticeReq) Reset() {
 	*x = UiGameGetLatticeReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_uigame_uigame_msg_proto_msgTypes[6]
+		mi := &file_uigame_uigame_msg_proto_msgTypes[7]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -363,7 +411,7 @@ func (x *UiGameGetLatticeReq) String() string {
 func (*UiGameGetLatticeReq) ProtoMessage() {}
 
 func (x *UiGameGetLatticeReq) ProtoReflect() protoreflect.Message {
-	mi := &file_uigame_uigame_msg_proto_msgTypes[6]
+	mi := &file_uigame_uigame_msg_proto_msgTypes[7]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -376,7 +424,7 @@ func (x *UiGameGetLatticeReq) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use UiGameGetLatticeReq.ProtoReflect.Descriptor instead.
 func (*UiGameGetLatticeReq) Descriptor() ([]byte, []int) {
-	return file_uigame_uigame_msg_proto_rawDescGZIP(), []int{6}
+	return file_uigame_uigame_msg_proto_rawDescGZIP(), []int{7}
 }
 
 func (x *UiGameGetLatticeReq) GetHdid() string {
@@ -398,7 +446,7 @@ type UiGameGetLatticeResp struct {
 func (x *UiGameGetLatticeResp) Reset() {
 	*x = UiGameGetLatticeResp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_uigame_uigame_msg_proto_msgTypes[7]
+		mi := &file_uigame_uigame_msg_proto_msgTypes[8]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -411,7 +459,7 @@ func (x *UiGameGetLatticeResp) String() string {
 func (*UiGameGetLatticeResp) ProtoMessage() {}
 
 func (x *UiGameGetLatticeResp) ProtoReflect() protoreflect.Message {
-	mi := &file_uigame_uigame_msg_proto_msgTypes[7]
+	mi := &file_uigame_uigame_msg_proto_msgTypes[8]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -424,7 +472,7 @@ func (x *UiGameGetLatticeResp) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use UiGameGetLatticeResp.ProtoReflect.Descriptor instead.
 func (*UiGameGetLatticeResp) Descriptor() ([]byte, []int) {
-	return file_uigame_uigame_msg_proto_rawDescGZIP(), []int{7}
+	return file_uigame_uigame_msg_proto_rawDescGZIP(), []int{8}
 }
 
 func (x *UiGameGetLatticeResp) GetData() *DBLatticeData {
@@ -434,7 +482,7 @@ func (x *UiGameGetLatticeResp) GetData() *DBLatticeData {
 	return nil
 }
 
-// 拼图
+// 走迷宫格子
 type UiGameLatticeGridReq struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -447,7 +495,7 @@ type UiGameLatticeGridReq struct {
 func (x *UiGameLatticeGridReq) Reset() {
 	*x = UiGameLatticeGridReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_uigame_uigame_msg_proto_msgTypes[8]
+		mi := &file_uigame_uigame_msg_proto_msgTypes[9]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -460,7 +508,7 @@ func (x *UiGameLatticeGridReq) String() string {
 func (*UiGameLatticeGridReq) ProtoMessage() {}
 
 func (x *UiGameLatticeGridReq) ProtoReflect() protoreflect.Message {
-	mi := &file_uigame_uigame_msg_proto_msgTypes[8]
+	mi := &file_uigame_uigame_msg_proto_msgTypes[9]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -473,7 +521,7 @@ func (x *UiGameLatticeGridReq) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use UiGameLatticeGridReq.ProtoReflect.Descriptor instead.
 func (*UiGameLatticeGridReq) Descriptor() ([]byte, []int) {
-	return file_uigame_uigame_msg_proto_rawDescGZIP(), []int{8}
+	return file_uigame_uigame_msg_proto_rawDescGZIP(), []int{9}
 }
 
 func (x *UiGameLatticeGridReq) GetHdid() string {
@@ -502,7 +550,7 @@ type UiGameLatticeGridResp struct {
 func (x *UiGameLatticeGridResp) Reset() {
 	*x = UiGameLatticeGridResp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_uigame_uigame_msg_proto_msgTypes[9]
+		mi := &file_uigame_uigame_msg_proto_msgTypes[10]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -515,7 +563,7 @@ func (x *UiGameLatticeGridResp) String() string {
 func (*UiGameLatticeGridResp) ProtoMessage() {}
 
 func (x *UiGameLatticeGridResp) ProtoReflect() protoreflect.Message {
-	mi := &file_uigame_uigame_msg_proto_msgTypes[9]
+	mi := &file_uigame_uigame_msg_proto_msgTypes[10]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -528,7 +576,7 @@ func (x *UiGameLatticeGridResp) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use UiGameLatticeGridResp.ProtoReflect.Descriptor instead.
 func (*UiGameLatticeGridResp) Descriptor() ([]byte, []int) {
-	return file_uigame_uigame_msg_proto_rawDescGZIP(), []int{9}
+	return file_uigame_uigame_msg_proto_rawDescGZIP(), []int{10}
 }
 
 func (x *UiGameLatticeGridResp) GetData() *DBLatticeData {
@@ -545,20 +593,20 @@ func (x *UiGameLatticeGridResp) GetAtno() []*UserAtno {
 	return nil
 }
 
-// 拼图领取奖励
+// 迷宫领取进度奖励
 type UiGameLatticeRewardReq struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Hdid string `protobuf:"bytes,1,opt,name=hdid,proto3" json:"hdid"` // 拼图活动ID
+	Hdid string `protobuf:"bytes,1,opt,name=hdid,proto3" json:"hdid"` // 活动ID
 	Id   int32  `protobuf:"varint,2,opt,name=id,proto3" json:"id"`
 }
 
 func (x *UiGameLatticeRewardReq) Reset() {
 	*x = UiGameLatticeRewardReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_uigame_uigame_msg_proto_msgTypes[10]
+		mi := &file_uigame_uigame_msg_proto_msgTypes[11]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -571,7 +619,7 @@ func (x *UiGameLatticeRewardReq) String() string {
 func (*UiGameLatticeRewardReq) ProtoMessage() {}
 
 func (x *UiGameLatticeRewardReq) ProtoReflect() protoreflect.Message {
-	mi := &file_uigame_uigame_msg_proto_msgTypes[10]
+	mi := &file_uigame_uigame_msg_proto_msgTypes[11]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -584,7 +632,7 @@ func (x *UiGameLatticeRewardReq) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use UiGameLatticeRewardReq.ProtoReflect.Descriptor instead.
 func (*UiGameLatticeRewardReq) Descriptor() ([]byte, []int) {
-	return file_uigame_uigame_msg_proto_rawDescGZIP(), []int{10}
+	return file_uigame_uigame_msg_proto_rawDescGZIP(), []int{11}
 }
 
 func (x *UiGameLatticeRewardReq) GetHdid() string {
@@ -601,7 +649,6 @@ func (x *UiGameLatticeRewardReq) GetId() int32 {
 	return 0
 }
 
-// 获取活动列表
 type UiGameLatticeRewardResp struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -614,7 +661,7 @@ type UiGameLatticeRewardResp struct {
 func (x *UiGameLatticeRewardResp) Reset() {
 	*x = UiGameLatticeRewardResp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_uigame_uigame_msg_proto_msgTypes[11]
+		mi := &file_uigame_uigame_msg_proto_msgTypes[12]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -627,7 +674,7 @@ func (x *UiGameLatticeRewardResp) String() string {
 func (*UiGameLatticeRewardResp) ProtoMessage() {}
 
 func (x *UiGameLatticeRewardResp) ProtoReflect() protoreflect.Message {
-	mi := &file_uigame_uigame_msg_proto_msgTypes[11]
+	mi := &file_uigame_uigame_msg_proto_msgTypes[12]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -640,7 +687,7 @@ func (x *UiGameLatticeRewardResp) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use UiGameLatticeRewardResp.ProtoReflect.Descriptor instead.
 func (*UiGameLatticeRewardResp) Descriptor() ([]byte, []int) {
-	return file_uigame_uigame_msg_proto_rawDescGZIP(), []int{11}
+	return file_uigame_uigame_msg_proto_rawDescGZIP(), []int{12}
 }
 
 func (x *UiGameLatticeRewardResp) GetData() *DBLatticeData {
@@ -690,33 +737,37 @@ var file_uigame_uigame_msg_proto_rawDesc = []byte{
 	0x50, 0x75, 0x7a, 0x7a, 0x6c, 0x65, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61,
 	0x12, 0x1d, 0x0a, 0x04, 0x61, 0x74, 0x6e, 0x6f, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09,
 	0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x04, 0x61, 0x74, 0x6e, 0x6f, 0x22,
-	0x29, 0x0a, 0x13, 0x55, 0x69, 0x47, 0x61, 0x6d, 0x65, 0x47, 0x65, 0x74, 0x4c, 0x61, 0x74, 0x74,
+	0x3b, 0x0a, 0x16, 0x55, 0x69, 0x47, 0x61, 0x6d, 0x65, 0x50, 0x75, 0x7a, 0x7a, 0x6c, 0x65, 0x43,
-	0x69, 0x63, 0x65, 0x52, 0x65, 0x71, 0x12, 0x12, 0x0a, 0x04, 0x68, 0x64, 0x69, 0x64, 0x18, 0x01,
+	0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x21, 0x0a, 0x04, 0x64, 0x61, 0x74,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x68, 0x64, 0x69, 0x64, 0x22, 0x3a, 0x0a, 0x14, 0x55, 0x69,
+	0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x50, 0x75, 0x7a, 0x7a,
-	0x47, 0x61, 0x6d, 0x65, 0x47, 0x65, 0x74, 0x4c, 0x61, 0x74, 0x74, 0x69, 0x63, 0x65, 0x52, 0x65,
+	0x6c, 0x65, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x29, 0x0a, 0x13,
-	0x73, 0x70, 0x12, 0x22, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
+	0x55, 0x69, 0x47, 0x61, 0x6d, 0x65, 0x47, 0x65, 0x74, 0x4c, 0x61, 0x74, 0x74, 0x69, 0x63, 0x65,
-	0x32, 0x0e, 0x2e, 0x44, 0x42, 0x4c, 0x61, 0x74, 0x74, 0x69, 0x63, 0x65, 0x44, 0x61, 0x74, 0x61,
+	0x52, 0x65, 0x71, 0x12, 0x12, 0x0a, 0x04, 0x68, 0x64, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x3e, 0x0a, 0x14, 0x55, 0x69, 0x47, 0x61, 0x6d, 0x65,
+	0x09, 0x52, 0x04, 0x68, 0x64, 0x69, 0x64, 0x22, 0x3a, 0x0a, 0x14, 0x55, 0x69, 0x47, 0x61, 0x6d,
-	0x4c, 0x61, 0x74, 0x74, 0x69, 0x63, 0x65, 0x47, 0x72, 0x69, 0x64, 0x52, 0x65, 0x71, 0x12, 0x12,
+	0x65, 0x47, 0x65, 0x74, 0x4c, 0x61, 0x74, 0x74, 0x69, 0x63, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12,
-	0x0a, 0x04, 0x68, 0x64, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x68, 0x64,
-	0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x67, 0x72, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05,
-	0x52, 0x04, 0x67, 0x72, 0x69, 0x64, 0x22, 0x5a, 0x0a, 0x15, 0x55, 0x69, 0x47, 0x61, 0x6d, 0x65,
-	0x4c, 0x61, 0x74, 0x74, 0x69, 0x63, 0x65, 0x47, 0x72, 0x69, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12,
 	0x22, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e,
 	0x44, 0x42, 0x4c, 0x61, 0x74, 0x74, 0x69, 0x63, 0x65, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x64,
-	0x61, 0x74, 0x61, 0x12, 0x1d, 0x0a, 0x04, 0x61, 0x74, 0x6e, 0x6f, 0x18, 0x02, 0x20, 0x03, 0x28,
+	0x61, 0x74, 0x61, 0x22, 0x3e, 0x0a, 0x14, 0x55, 0x69, 0x47, 0x61, 0x6d, 0x65, 0x4c, 0x61, 0x74,
-	0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x04, 0x61, 0x74,
+	0x74, 0x69, 0x63, 0x65, 0x47, 0x72, 0x69, 0x64, 0x52, 0x65, 0x71, 0x12, 0x12, 0x0a, 0x04, 0x68,
-	0x6e, 0x6f, 0x22, 0x3c, 0x0a, 0x16, 0x55, 0x69, 0x47, 0x61, 0x6d, 0x65, 0x4c, 0x61, 0x74, 0x74,
+	0x64, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x68, 0x64, 0x69, 0x64, 0x12,
-	0x69, 0x63, 0x65, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x12, 0x0a, 0x04,
+	0x12, 0x0a, 0x04, 0x67, 0x72, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x67,
-	0x68, 0x64, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x68, 0x64, 0x69, 0x64,
+	0x72, 0x69, 0x64, 0x22, 0x5a, 0x0a, 0x15, 0x55, 0x69, 0x47, 0x61, 0x6d, 0x65, 0x4c, 0x61, 0x74,
-	0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64,
+	0x74, 0x69, 0x63, 0x65, 0x47, 0x72, 0x69, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x22, 0x0a, 0x04,
-	0x22, 0x5c, 0x0a, 0x17, 0x55, 0x69, 0x47, 0x61, 0x6d, 0x65, 0x4c, 0x61, 0x74, 0x74, 0x69, 0x63,
+	0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x4c,
-	0x65, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x22, 0x0a, 0x04, 0x64,
+	0x61, 0x74, 0x74, 0x69, 0x63, 0x65, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61,
-	0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x4c, 0x61,
+	0x12, 0x1d, 0x0a, 0x04, 0x61, 0x74, 0x6e, 0x6f, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09,
-	0x74, 0x74, 0x69, 0x63, 0x65, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12,
+	0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x04, 0x61, 0x74, 0x6e, 0x6f, 0x22,
-	0x1d, 0x0a, 0x04, 0x61, 0x74, 0x6e, 0x6f, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e,
+	0x3c, 0x0a, 0x16, 0x55, 0x69, 0x47, 0x61, 0x6d, 0x65, 0x4c, 0x61, 0x74, 0x74, 0x69, 0x63, 0x65,
-	0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x04, 0x61, 0x74, 0x6e, 0x6f, 0x42, 0x06,
+	0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x12, 0x0a, 0x04, 0x68, 0x64, 0x69,
-	0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x68, 0x64, 0x69, 0x64, 0x12, 0x0e, 0x0a,
+	0x02, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x22, 0x5c, 0x0a,
+	0x17, 0x55, 0x69, 0x47, 0x61, 0x6d, 0x65, 0x4c, 0x61, 0x74, 0x74, 0x69, 0x63, 0x65, 0x52, 0x65,
+	0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x22, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x4c, 0x61, 0x74, 0x74, 0x69,
+	0x63, 0x65, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x1d, 0x0a, 0x04,
+	0x61, 0x74, 0x6e, 0x6f, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65,
+	0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x04, 0x61, 0x74, 0x6e, 0x6f, 0x42, 0x06, 0x5a, 0x04, 0x2e,
+	0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -731,7 +782,7 @@ func file_uigame_uigame_msg_proto_rawDescGZIP() []byte {
 	return file_uigame_uigame_msg_proto_rawDescData
 }
 
-var file_uigame_uigame_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 12)
+var file_uigame_uigame_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 13)
 var file_uigame_uigame_msg_proto_goTypes = []interface{}{
 	(*UiGameGetPuzzleReq)(nil),      // 0: UiGameGetPuzzleReq
 	(*UiGameGetPuzzleResp)(nil),     // 1: UiGameGetPuzzleResp
@@ -739,32 +790,34 @@ var file_uigame_uigame_msg_proto_goTypes = []interface{}{
 	(*UiGamePuzzleGridResp)(nil),    // 3: UiGamePuzzleGridResp
 	(*UiGamePuzzleRewardReq)(nil),   // 4: UiGamePuzzleRewardReq
 	(*UiGamePuzzleRewardResp)(nil),  // 5: UiGamePuzzleRewardResp
-	(*UiGameGetLatticeReq)(nil),     // 6: UiGameGetLatticeReq
+	(*UiGamePuzzleChangePush)(nil),  // 6: UiGamePuzzleChangePush
-	(*UiGameGetLatticeResp)(nil),    // 7: UiGameGetLatticeResp
+	(*UiGameGetLatticeReq)(nil),     // 7: UiGameGetLatticeReq
-	(*UiGameLatticeGridReq)(nil),    // 8: UiGameLatticeGridReq
+	(*UiGameGetLatticeResp)(nil),    // 8: UiGameGetLatticeResp
-	(*UiGameLatticeGridResp)(nil),   // 9: UiGameLatticeGridResp
+	(*UiGameLatticeGridReq)(nil),    // 9: UiGameLatticeGridReq
-	(*UiGameLatticeRewardReq)(nil),  // 10: UiGameLatticeRewardReq
+	(*UiGameLatticeGridResp)(nil),   // 10: UiGameLatticeGridResp
-	(*UiGameLatticeRewardResp)(nil), // 11: UiGameLatticeRewardResp
+	(*UiGameLatticeRewardReq)(nil),  // 11: UiGameLatticeRewardReq
-	(*DBPuzzleData)(nil),            // 12: DBPuzzleData
+	(*UiGameLatticeRewardResp)(nil), // 12: UiGameLatticeRewardResp
-	(*UserAtno)(nil),                // 13: UserAtno
+	(*DBPuzzleData)(nil),            // 13: DBPuzzleData
-	(*DBLatticeData)(nil),           // 14: DBLatticeData
+	(*UserAtno)(nil),                // 14: UserAtno
+	(*DBLatticeData)(nil),           // 15: DBLatticeData
 }
 var file_uigame_uigame_msg_proto_depIdxs = []int32{
-	12, // 0: UiGameGetPuzzleResp.data:type_name -> DBPuzzleData
+	13, // 0: UiGameGetPuzzleResp.data:type_name -> DBPuzzleData
-	12, // 1: UiGamePuzzleGridResp.data:type_name -> DBPuzzleData
+	13, // 1: UiGamePuzzleGridResp.data:type_name -> DBPuzzleData
-	13, // 2: UiGamePuzzleGridResp.atno:type_name -> UserAtno
+	14, // 2: UiGamePuzzleGridResp.atno:type_name -> UserAtno
-	12, // 3: UiGamePuzzleRewardResp.data:type_name -> DBPuzzleData
+	13, // 3: UiGamePuzzleRewardResp.data:type_name -> DBPuzzleData
-	13, // 4: UiGamePuzzleRewardResp.atno:type_name -> UserAtno
+	14, // 4: UiGamePuzzleRewardResp.atno:type_name -> UserAtno
-	14, // 5: UiGameGetLatticeResp.data:type_name -> DBLatticeData
+	13, // 5: UiGamePuzzleChangePush.data:type_name -> DBPuzzleData
-	14, // 6: UiGameLatticeGridResp.data:type_name -> DBLatticeData
+	15, // 6: UiGameGetLatticeResp.data:type_name -> DBLatticeData
-	13, // 7: UiGameLatticeGridResp.atno:type_name -> UserAtno
+	15, // 7: UiGameLatticeGridResp.data:type_name -> DBLatticeData
-	14, // 8: UiGameLatticeRewardResp.data:type_name -> DBLatticeData
+	14, // 8: UiGameLatticeGridResp.atno:type_name -> UserAtno
-	13, // 9: UiGameLatticeRewardResp.atno:type_name -> UserAtno
+	15, // 9: UiGameLatticeRewardResp.data:type_name -> DBLatticeData
-	10, // [10:10] is the sub-list for method output_type
+	14, // 10: UiGameLatticeRewardResp.atno:type_name -> UserAtno
-	10, // [10:10] is the sub-list for method input_type
+	11, // [11:11] is the sub-list for method output_type
-	10, // [10:10] is the sub-list for extension type_name
+	11, // [11:11] is the sub-list for method input_type
-	10, // [10:10] is the sub-list for extension extendee
+	11, // [11:11] is the sub-list for extension type_name
-	0,  // [0:10] is the sub-list for field type_name
+	11, // [11:11] is the sub-list for extension extendee
+	0,  // [0:11] is the sub-list for field type_name
 }
 
 func init() { file_uigame_uigame_msg_proto_init() }
@@ -848,7 +901,7 @@ func file_uigame_uigame_msg_proto_init() {
 			}
 		}
 		file_uigame_uigame_msg_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*UiGameGetLatticeReq); i {
+			switch v := v.(*UiGamePuzzleChangePush); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -860,7 +913,7 @@ func file_uigame_uigame_msg_proto_init() {
 			}
 		}
 		file_uigame_uigame_msg_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*UiGameGetLatticeResp); i {
+			switch v := v.(*UiGameGetLatticeReq); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -872,7 +925,7 @@ func file_uigame_uigame_msg_proto_init() {
 			}
 		}
 		file_uigame_uigame_msg_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*UiGameLatticeGridReq); i {
+			switch v := v.(*UiGameGetLatticeResp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -884,7 +937,7 @@ func file_uigame_uigame_msg_proto_init() {
 			}
 		}
 		file_uigame_uigame_msg_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*UiGameLatticeGridResp); i {
+			switch v := v.(*UiGameLatticeGridReq); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -896,7 +949,7 @@ func file_uigame_uigame_msg_proto_init() {
 			}
 		}
 		file_uigame_uigame_msg_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*UiGameLatticeRewardReq); i {
+			switch v := v.(*UiGameLatticeGridResp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -908,6 +961,18 @@ func file_uigame_uigame_msg_proto_init() {
 			}
 		}
 		file_uigame_uigame_msg_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*UiGameLatticeRewardReq); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_uigame_uigame_msg_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*UiGameLatticeRewardResp); i {
 			case 0:
 				return &v.state
@@ -926,7 +991,7 @@ func file_uigame_uigame_msg_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_uigame_uigame_msg_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   12,
+			NumMessages:   13,
 			NumExtensions: 0,
 			NumServices:   0,
 		},