世界任务GM

cmd/v2/ui/views/reputation.go

@@ -37,7 +37,17 @@ func (d *ReputationView) CreateView(t *model.TestCase) fyne.CanvasObject {
 		)
 
 		form.OnSubmit = func() {
-
+			if err := service.GetPttService().SendToClient(
+				t.MainType,
+				"talenttest",
+				&pb.ReputationTalenttestReq{
+					RaceType:    cast.ToInt32(zy),
+					FriendValue: cast.ToInt32(fv),
+				},
+			); err != nil {
+				logrus.Error(err)
+				return
+			}
 		}
 
 		paiWin := dialog.NewCustom("升级", "关闭", form, d.w)
@@ -69,7 +79,11 @@ func (d *ReputationView) CreateView(t *model.TestCase) fyne.CanvasObject {
 		paiWin.Show()
 	})
 
-	topBtns := container.NewHBox(swBtn, upgradeBtn)
+	resetBtn := widget.NewButton("重置", func() {
+
+	})
+
+	topBtns := container.NewHBox(swBtn, upgradeBtn, resetBtn)
 	c := container.NewBorder(topBtns, nil, nil, nil, d.itemList.ItemList)
 	return c
 }

modules/worldtask/module.go

@@ -144,8 +144,6 @@ func (this *Worldtask) GetMyWorldtask(uid string) *pb.DBWorldtask {
 // bingo世界任务跳跃 支持回退
 func (this *Worldtask) BingoJumpTask(session comm.IUserSession, groupId, taskId int32) error {
 	uid := session.GetUserId()
-	// 更新数据
-	update := make(map[string]interface{})
 
 	mytask, err := this.modelWorldtask.getWorldtask(uid)
 	if err != nil {
@@ -185,7 +183,7 @@ func (this *Worldtask) BingoJumpTask(session comm.IUserSession, groupId, taskId
 		mytask.TaskList = append(mytask.TaskList, taskId)
 	}
 
-	update = map[string]interface{}{
+	update := map[string]interface{}{
 		"taskList": mytask.TaskList,
 	}
 
@@ -200,6 +198,7 @@ func (this *Worldtask) BingoJumpTask(session comm.IUserSession, groupId, taskId
 		mytask.CurrentTask[groupId] = &pb.Worldtask{
 			TaskId: nextTaskIds[0],
 		}
+		update["currentTask"] = mytask.CurrentTask
 	}
 
 	if err := this.modelWorldtask.Change(uid, update); err != nil {

pb/reputation_msg.pb.go

@@ -294,6 +294,83 @@ func (x *ReputationTalentResp) GetCamp() *Camp {
 	return nil
 }
 
+// 天赋树重置
+type ReputationTalentresetReq struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+}
+
+func (x *ReputationTalentresetReq) Reset() {
+	*x = ReputationTalentresetReq{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_reputation_reputation_msg_proto_msgTypes[6]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *ReputationTalentresetReq) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ReputationTalentresetReq) ProtoMessage() {}
+
+func (x *ReputationTalentresetReq) ProtoReflect() protoreflect.Message {
+	mi := &file_reputation_reputation_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 ReputationTalentresetReq.ProtoReflect.Descriptor instead.
+func (*ReputationTalentresetReq) Descriptor() ([]byte, []int) {
+	return file_reputation_reputation_msg_proto_rawDescGZIP(), []int{6}
+}
+
+type ReputationTalentresetResp struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+}
+
+func (x *ReputationTalentresetResp) Reset() {
+	*x = ReputationTalentresetResp{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_reputation_reputation_msg_proto_msgTypes[7]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *ReputationTalentresetResp) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ReputationTalentresetResp) ProtoMessage() {}
+
+func (x *ReputationTalentresetResp) ProtoReflect() protoreflect.Message {
+	mi := &file_reputation_reputation_msg_proto_msgTypes[7]
+	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 ReputationTalentresetResp.ProtoReflect.Descriptor instead.
+func (*ReputationTalentresetResp) Descriptor() ([]byte, []int) {
+	return file_reputation_reputation_msg_proto_rawDescGZIP(), []int{7}
+}
+
 var File_reputation_reputation_msg_proto protoreflect.FileDescriptor
 
 var file_reputation_reputation_msg_proto_rawDesc = []byte{
@@ -320,8 +397,11 @@ var file_reputation_reputation_msg_proto_rawDesc = []byte{
 	0x28, 0x0b, 0x32, 0x09, 0x2e, 0x43, 0x61, 0x6d, 0x70, 0x41, 0x74, 0x74, 0x72, 0x52, 0x0a, 0x61,
 	0x74, 0x74, 0x72, 0x47, 0x6c, 0x6f, 0x62, 0x61, 0x6c, 0x12, 0x19, 0x0a, 0x04, 0x63, 0x61, 0x6d,
 	0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x05, 0x2e, 0x43, 0x61, 0x6d, 0x70, 0x52, 0x04,
-	0x63, 0x61, 0x6d, 0x70, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72,
+	0x63, 0x61, 0x6d, 0x70, 0x22, 0x1a, 0x0a, 0x18, 0x72, 0x65, 0x70, 0x75, 0x74, 0x61, 0x74, 0x69,
-	0x6f, 0x74, 0x6f, 0x33,
+	0x6f, 0x6e, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x72, 0x65, 0x73, 0x65, 0x74, 0x52, 0x65, 0x71,
+	0x22, 0x1b, 0x0a, 0x19, 0x72, 0x65, 0x70, 0x75, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x61,
+	0x6c, 0x65, 0x6e, 0x74, 0x72, 0x65, 0x73, 0x65, 0x74, 0x52, 0x65, 0x73, 0x70, 0x42, 0x06, 0x5a,
+	0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -336,20 +416,22 @@ func file_reputation_reputation_msg_proto_rawDescGZIP() []byte {
 	return file_reputation_reputation_msg_proto_rawDescData
 }
 
-var file_reputation_reputation_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 6)
+var file_reputation_reputation_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 8)
 var file_reputation_reputation_msg_proto_goTypes = []interface{}{
-	(*ReputationTalenttestReq)(nil),  // 0: reputationTalenttestReq
+	(*ReputationTalenttestReq)(nil),   // 0: reputationTalenttestReq
-	(*ReputationTalenttestResp)(nil), // 1: reputationTalenttestResp
+	(*ReputationTalenttestResp)(nil),  // 1: reputationTalenttestResp
-	(*ReputationUpgradeReq)(nil),     // 2: reputationUpgradeReq
+	(*ReputationUpgradeReq)(nil),      // 2: reputationUpgradeReq
-	(*ReputationUpgradeResp)(nil),    // 3: reputationUpgradeResp
+	(*ReputationUpgradeResp)(nil),     // 3: reputationUpgradeResp
-	(*ReputationTalentReq)(nil),      // 4: reputationTalentReq
+	(*ReputationTalentReq)(nil),       // 4: reputationTalentReq
-	(*ReputationTalentResp)(nil),     // 5: reputationTalentResp
+	(*ReputationTalentResp)(nil),      // 5: reputationTalentResp
-	(*CampAttr)(nil),                 // 6: CampAttr
+	(*ReputationTalentresetReq)(nil),  // 6: reputationTalentresetReq
-	(*Camp)(nil),                     // 7: Camp
+	(*ReputationTalentresetResp)(nil), // 7: reputationTalentresetResp
+	(*CampAttr)(nil),                  // 8: CampAttr
+	(*Camp)(nil),                      // 9: Camp
 }
 var file_reputation_reputation_msg_proto_depIdxs = []int32{
-	6, // 0: reputationTalentResp.attrGlobal:type_name -> CampAttr
+	8, // 0: reputationTalentResp.attrGlobal:type_name -> CampAttr
-	7, // 1: reputationTalentResp.camp:type_name -> Camp
+	9, // 1: reputationTalentResp.camp:type_name -> Camp
 	2, // [2:2] is the sub-list for method output_type
 	2, // [2:2] is the sub-list for method input_type
 	2, // [2:2] is the sub-list for extension type_name
@@ -436,6 +518,30 @@ func file_reputation_reputation_msg_proto_init() {
 				return nil
 			}
 		}
+		file_reputation_reputation_msg_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ReputationTalentresetReq); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_reputation_reputation_msg_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ReputationTalentresetResp); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
 	}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
@@ -443,7 +549,7 @@ func file_reputation_reputation_msg_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_reputation_reputation_msg_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   6,
+			NumMessages:   8,
 			NumExtensions: 0,
 			NumServices:   0,
 		},