diff --git a/bin/json/game_opencond.json b/bin/json/game_opencond.json index 37937a2f7..5e4ccf7be 100644 --- a/bin/json/game_opencond.json +++ b/bin/json/game_opencond.json @@ -11,7 +11,6 @@ "param": 1 } ], - "optional": "", "wkqbx": 0, "kqbx": 0, "img": "zc_icon_01", @@ -35,7 +34,6 @@ "param": 1 } ], - "optional": "", "wkqbx": 1, "kqbx": 0, "img": "zc_icon_01", @@ -59,7 +57,6 @@ "param": 1 } ], - "optional": "", "wkqbx": 1, "kqbx": 0, "img": "zc_icon_01", @@ -83,7 +80,6 @@ "param": 1 } ], - "optional": "", "wkqbx": 2, "kqbx": 0, "img": "zc_icon_01", @@ -107,7 +103,6 @@ "param": 1 } ], - "optional": "", "wkqbx": 2, "kqbx": 0, "img": "zc_icon_01", @@ -131,7 +126,6 @@ "param": 1 } ], - "optional": "", "wkqbx": 2, "kqbx": 0, "img": "zc_icon_01", @@ -155,7 +149,6 @@ "param": 1 } ], - "optional": "", "wkqbx": 0, "kqbx": 0, "img": "zc_icon_01", @@ -179,7 +172,6 @@ "param": 1 } ], - "optional": "", "wkqbx": 2, "kqbx": 0, "img": "zc_icon_01", @@ -203,7 +195,6 @@ "param": 1 } ], - "optional": "", "wkqbx": 2, "kqbx": 0, "img": "zc_icon_01", @@ -227,7 +218,6 @@ "param": 1 } ], - "optional": "", "wkqbx": 0, "kqbx": 0, "img": "zc_icon_01", @@ -251,7 +241,6 @@ "param": 1 } ], - "optional": "", "wkqbx": 0, "kqbx": 0, "img": "zc_icon_01", @@ -275,7 +264,6 @@ "param": 1 } ], - "optional": "", "wkqbx": 2, "kqbx": 0, "img": "zc_icon_01", @@ -299,7 +287,6 @@ "param": 1 } ], - "optional": "", "wkqbx": 0, "kqbx": 0, "img": "zc_icon_01", @@ -323,7 +310,6 @@ "param": 1 } ], - "optional": "", "wkqbx": 2, "kqbx": 0, "img": "zc_icon_01", @@ -347,7 +333,6 @@ "param": 1 } ], - "optional": "", "wkqbx": 2, "kqbx": 0, "img": "zc_icon_01", @@ -371,7 +356,6 @@ "param": 1 } ], - "optional": "", "wkqbx": 0, "kqbx": 0, "img": "zc_icon_01", @@ -395,7 +379,6 @@ "param": 1 } ], - "optional": "", "wkqbx": 0, "kqbx": 0, "img": "zc_icon_01", @@ -419,7 +402,6 @@ "param": 1 } ], - "optional": "", "wkqbx": 0, "kqbx": 0, "img": "zc_icon_01", @@ -443,7 +425,6 @@ "param": 1 } ], - "optional": "", "wkqbx": 0, "kqbx": 0, "img": "zc_icon_01", @@ -467,7 +448,6 @@ "param": 1 } ], - "optional": "", "wkqbx": 2, "kqbx": 0, "img": "zc_icon_01", @@ -491,7 +471,6 @@ "param": 1 } ], - "optional": "", "wkqbx": 2, "kqbx": 0, "img": "zc_icon_01", @@ -515,7 +494,6 @@ "param": 1 } ], - "optional": "", "wkqbx": 2, "kqbx": 0, "img": "zc_icon_01", @@ -539,7 +517,6 @@ "param": 1 } ], - "optional": "", "wkqbx": 2, "kqbx": 0, "img": "zc_icon_01", @@ -563,7 +540,6 @@ "param": 1 } ], - "optional": "", "wkqbx": 2, "kqbx": 0, "img": "zc_icon_01", @@ -587,7 +563,6 @@ "param": 1 } ], - "optional": "", "wkqbx": 2, "kqbx": 0, "img": "zc_icon_01", @@ -611,7 +586,6 @@ "param": 1 } ], - "optional": "", "wkqbx": 2, "kqbx": 0, "img": "zc_icon_01", @@ -635,7 +609,6 @@ "param": 1 } ], - "optional": "", "wkqbx": 2, "kqbx": 0, "img": "zc_icon_01", @@ -659,7 +632,6 @@ "param": 1 } ], - "optional": "", "wkqbx": 0, "kqbx": 0, "img": "zc_icon_01", @@ -683,7 +655,6 @@ "param": 1 } ], - "optional": "", "wkqbx": 0, "kqbx": 0, "img": "zc_icon_01", @@ -707,7 +678,6 @@ "param": 1 } ], - "optional": "", "wkqbx": 0, "kqbx": 0, "img": "zc_icon_01", @@ -731,7 +701,6 @@ "param": 1 } ], - "optional": "", "wkqbx": 0, "kqbx": 0, "img": "zc_icon_01", @@ -755,7 +724,6 @@ "param": 1 } ], - "optional": "", "wkqbx": 0, "kqbx": 0, "img": "zc_icon_01", @@ -779,7 +747,6 @@ "param": 1 } ], - "optional": "", "wkqbx": 0, "kqbx": 0, "img": "zc_icon_01", @@ -803,7 +770,6 @@ "param": 1 } ], - "optional": "", "wkqbx": 0, "kqbx": 0, "img": "zc_icon_01", @@ -827,7 +793,6 @@ "param": 1 } ], - "optional": "", "wkqbx": 0, "kqbx": 0, "img": "zc_icon_01", @@ -851,7 +816,6 @@ "param": 1 } ], - "optional": "", "wkqbx": 0, "kqbx": 0, "img": "zc_icon_01", @@ -875,7 +839,6 @@ "param": 1 } ], - "optional": "", "wkqbx": 0, "kqbx": 0, "img": "zc_icon_01", @@ -899,7 +862,6 @@ "param": 1 } ], - "optional": "", "wkqbx": 0, "kqbx": 0, "img": "zc_icon_01", @@ -923,7 +885,6 @@ "param": 1 } ], - "optional": "", "wkqbx": 2, "kqbx": 0, "img": "zc_icon_01", @@ -947,7 +908,6 @@ "param": 1 } ], - "optional": "", "wkqbx": 1, "kqbx": 0, "img": "zc_icon_01", @@ -971,7 +931,6 @@ "param": 1 } ], - "optional": "", "wkqbx": 2, "kqbx": 0, "img": "zc_icon_01", @@ -995,7 +954,6 @@ "param": 1 } ], - "optional": "", "wkqbx": 2, "kqbx": 0, "img": "zc_icon_01", @@ -1019,7 +977,6 @@ "param": 1 } ], - "optional": "", "wkqbx": 1, "kqbx": 0, "img": "zc_icon_01", @@ -1043,7 +1000,6 @@ "param": 1 } ], - "optional": "", "wkqbx": 2, "kqbx": 0, "img": "zc_icon_01", @@ -1067,7 +1023,6 @@ "param": 1 } ], - "optional": "", "wkqbx": 1, "kqbx": 0, "img": "zc_icon_01", @@ -1091,7 +1046,6 @@ "param": 1 } ], - "optional": "", "wkqbx": 1, "kqbx": 0, "img": "zc_icon_01", @@ -1115,7 +1069,6 @@ "param": 1 } ], - "optional": "", "wkqbx": 2, "kqbx": 0, "img": "zc_icon_01", @@ -1139,7 +1092,6 @@ "param": 1 } ], - "optional": "", "wkqbx": 0, "kqbx": 0, "img": "zc_icon_01", @@ -1163,7 +1115,6 @@ "param": 1 } ], - "optional": "", "wkqbx": 0, "kqbx": 0, "img": "zc_icon_01", @@ -1187,7 +1138,6 @@ "param": 1 } ], - "optional": "", "wkqbx": 0, "kqbx": 0, "img": "zc_icon_01", @@ -1211,7 +1161,6 @@ "param": 1 } ], - "optional": "", "wkqbx": 0, "kqbx": 0, "img": "zc_icon_01", @@ -1235,7 +1184,6 @@ "param": 1 } ], - "optional": "", "wkqbx": 0, "kqbx": 0, "img": "zc_icon_01", @@ -1259,7 +1207,6 @@ "param": 1 } ], - "optional": "", "wkqbx": 0, "kqbx": 0, "img": "zc_icon_01", @@ -1283,7 +1230,6 @@ "param": 1 } ], - "optional": "", "wkqbx": 0, "kqbx": 0, "img": "zc_icon_01", @@ -1307,7 +1253,6 @@ "param": 1 } ], - "optional": "", "wkqbx": 2, "kqbx": 0, "img": "zc_icon_01", @@ -1331,7 +1276,6 @@ "param": 1 } ], - "optional": "", "wkqbx": 2, "kqbx": 0, "img": "zc_icon_01", @@ -1355,7 +1299,6 @@ "param": 1 } ], - "optional": "", "wkqbx": 2, "kqbx": 0, "img": "zc_icon_01", @@ -1379,7 +1322,6 @@ "param": 1 } ], - "optional": "", "wkqbx": 2, "kqbx": 0, "img": "zc_icon_01", @@ -1403,7 +1345,6 @@ "param": 1 } ], - "optional": "", "wkqbx": 1, "kqbx": 0, "img": "zc_icon_01", @@ -1427,7 +1368,6 @@ "param": 1 } ], - "optional": "", "wkqbx": 1, "kqbx": 0, "img": "zc_icon_01", @@ -1451,7 +1391,6 @@ "param": 1 } ], - "optional": "", "wkqbx": 1, "kqbx": 0, "img": "zc_icon_01", @@ -1475,7 +1414,6 @@ "param": 1 } ], - "optional": "", "wkqbx": 0, "kqbx": 0, "img": "", @@ -1499,7 +1437,6 @@ "param": 1 } ], - "optional": "", "wkqbx": 0, "kqbx": 0, "img": "", @@ -1523,7 +1460,6 @@ "param": 1 } ], - "optional": "", "wkqbx": 0, "kqbx": 0, "img": "", @@ -1547,7 +1483,6 @@ "param": 1 } ], - "optional": "", "wkqbx": 1, "kqbx": 0, "img": "", @@ -1571,7 +1506,6 @@ "param": 1 } ], - "optional": "", "wkqbx": 0, "kqbx": 0, "img": "", @@ -1597,7 +1531,6 @@ "param": 20010 } ], - "optional": "", "wkqbx": 0, "kqbx": 0, "img": "", @@ -1623,7 +1556,6 @@ "param": 20020 } ], - "optional": "", "wkqbx": 0, "kqbx": 0, "img": "", @@ -1649,7 +1581,6 @@ "param": 2 } ], - "optional": "", "wkqbx": 0, "kqbx": 0, "img": "", @@ -1668,7 +1599,6 @@ "text": "经验副本" }, "main": [], - "optional": "", "wkqbx": 0, "kqbx": 0, "img": "", @@ -1692,7 +1622,6 @@ "param": 10 } ], - "optional": "", "wkqbx": 3, "kqbx": 0, "img": "", @@ -1716,7 +1645,6 @@ "param": 10 } ], - "optional": "", "wkqbx": 0, "kqbx": 0, "img": "", @@ -1725,7 +1653,7 @@ "text": "" }, "uiid": 0, - "activateType": 0, + "activateType": 2, "notify": [] } ] \ No newline at end of file diff --git a/cmd/v2/ui/views/sys_funclist.go b/cmd/v2/ui/views/sys_funclist.go index ed5cb39da..53e29e8f4 100644 --- a/cmd/v2/ui/views/sys_funclist.go +++ b/cmd/v2/ui/views/sys_funclist.go @@ -21,7 +21,7 @@ func (this *SysFuncListView) CreateView(t *model.TestCase) fyne.CanvasObject { this.form.AppendItem(widget.NewFormItem("Key", keyEntry)) this.form.OnSubmit = func() { s := strings.SplitN(keyEntry.Text, ",", 2) - req := &pb.SysFuncListReq{} + req := &pb.SysFuncGetListReq{} if s[0] == "" { req.Keys = []string{} } else { diff --git a/modules/sys/api_func.go b/modules/sys/api_func.go deleted file mode 100644 index 150410944..000000000 --- a/modules/sys/api_func.go +++ /dev/null @@ -1,48 +0,0 @@ -package sys - -import ( - "go_dreamfactory/comm" - "go_dreamfactory/pb" -) - -func (this *apiComp) FunclistCheck(session comm.IUserSession, req *pb.SysFuncListReq) (code pb.ErrorCode) { - return -} - -func (this *apiComp) Funclist(session comm.IUserSession, req *pb.SysFuncListReq) (code pb.ErrorCode, data *pb.ErrorData) { - rsp := &pb.SysFuncListResp{} - - iuser := this.module.ModuleUser - user := iuser.GetUser(session.GetUserId()) - if user == nil { - code = pb.ErrorCode_UserSessionNobeing - return - } - - if len(req.Keys) == 0 { - confList := this.module.configure.getOpencondList() - for _, v := range confList { - id := this.module.modelSys.validCond(session.GetUserId(), v) - if id != "" { - rsp.FuncIds = append(rsp.FuncIds, id) - } - } - } else { - for _, key := range req.Keys { - opencfg, err := this.module.configure.getOpencondCfg() - if err != nil { - continue - } - if conf, ok := opencfg.GetDataMap()[key]; ok { - id := this.module.modelSys.validCond(session.GetUserId(), conf) - if id != "" { - rsp.FuncIds = append(rsp.FuncIds, id) - } - } - } - } - if err := session.SendMsg(string(this.module.GetType()), SysSubTypeFunc, rsp); err != nil { - code = pb.ErrorCode_SystemError - } - return -} diff --git a/modules/sys/api_getlist.go b/modules/sys/api_getlist.go index 7799eb3ed..0ab2b46eb 100644 --- a/modules/sys/api_getlist.go +++ b/modules/sys/api_getlist.go @@ -30,7 +30,6 @@ func (this *apiComp) FuncGetList(session comm.IUserSession, req *pb.SysFuncGetLi rsp.Cond[id] = 1 } } - } } else { for _, key := range req.Keys { diff --git a/modules/sys/model_sys.go b/modules/sys/model_sys.go index faddee198..6ddc07ef8 100644 --- a/modules/sys/model_sys.go +++ b/modules/sys/model_sys.go @@ -48,68 +48,61 @@ func (this *ModelSys) IsAccess(funName string, uid string) (code pb.ErrorCode) { } func (this *ModelSys) validCond(uid string, condData *cfg.GameOpencondData) string { - var flag bool for _, conf := range condData.Main { switch conf.Key { case 1: //等级 iuser := this.moduleSys.ModuleUser user := iuser.GetUser(uid) if user == nil { - flag = false return "" } if user.Lv >= conf.Param { - flag = true } else { - flag = false + return "" } + case 2: //关卡ID iuser := this.moduleSys.ModuleUser ex, err := iuser.GetUserExpand(uid) if err != nil { - flag = false return "" } if ex.Uid == "" { - flag = false return "" } if v, ok := ex.Mline[1]; ok { if v >= conf.Param { - flag = true } else { - flag = false } } else { - flag = false + return "" } case 3: //世界任务ID module, err := this.service.GetModule(comm.ModuleWorldtask) if err != nil { this.moduleSys.Debugln(err) - flag = false return "" } if i, ok := module.(comm.IWorldtask); ok { d := i.GetMyWorldtask(uid) + bFound := false for _, taskId := range d.TaskList { if taskId == conf.Param { - flag = true - continue + bFound = true + break } } + if !bFound { + return "" + } } else { - flag = false + return "" } } } - - if flag { - return condData.Id - } - return "" + return condData.Id } func (this *ModelSys) GetOpenCondList(uid string) (result *pb.DBOpenCond, err error) { diff --git a/pb/privilege_msg.pb.go b/pb/privilege_msg.pb.go index 59f8d93ec..88aaba5cf 100644 --- a/pb/privilege_msg.pb.go +++ b/pb/privilege_msg.pb.go @@ -381,6 +381,53 @@ func (x *PrivilegeVipListResp) GetData() *DBVip { return nil } +type PrivilegeChangePush struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Privilege map[int32]*PrivilegeList `protobuf:"bytes,1,rep,name=privilege,proto3" json:"privilege" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` +} + +func (x *PrivilegeChangePush) Reset() { + *x = PrivilegeChangePush{} + if protoimpl.UnsafeEnabled { + mi := &file_privilege_privilege_msg_proto_msgTypes[8] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *PrivilegeChangePush) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*PrivilegeChangePush) ProtoMessage() {} + +func (x *PrivilegeChangePush) ProtoReflect() protoreflect.Message { + mi := &file_privilege_privilege_msg_proto_msgTypes[8] + 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 PrivilegeChangePush.ProtoReflect.Descriptor instead. +func (*PrivilegeChangePush) Descriptor() ([]byte, []int) { + return file_privilege_privilege_msg_proto_rawDescGZIP(), []int{8} +} + +func (x *PrivilegeChangePush) GetPrivilege() map[int32]*PrivilegeList { + if x != nil { + return x.Privilege + } + return nil +} + var File_privilege_privilege_msg_proto protoreflect.FileDescriptor var file_privilege_privilege_msg_proto_rawDesc = []byte{ @@ -409,8 +456,19 @@ var file_privilege_privilege_msg_proto_rawDesc = []byte{ 0x65, 0x56, 0x69, 0x70, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x22, 0x32, 0x0a, 0x14, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x56, 0x69, 0x70, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1a, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x0b, 0x32, 0x06, 0x2e, 0x44, 0x42, 0x56, 0x69, 0x70, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x42, - 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x0b, 0x32, 0x06, 0x2e, 0x44, 0x42, 0x56, 0x69, 0x70, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, + 0xa6, 0x01, 0x0a, 0x13, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x43, 0x68, 0x61, + 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x41, 0x0a, 0x09, 0x70, 0x72, 0x69, 0x76, 0x69, + 0x6c, 0x65, 0x67, 0x65, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x50, 0x72, 0x69, + 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, + 0x2e, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, + 0x09, 0x70, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x1a, 0x4c, 0x0a, 0x0e, 0x50, 0x72, + 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, + 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x24, + 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, + 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x05, 0x76, + 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, + 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -425,7 +483,7 @@ func file_privilege_privilege_msg_proto_rawDescGZIP() []byte { return file_privilege_privilege_msg_proto_rawDescData } -var file_privilege_privilege_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 8) +var file_privilege_privilege_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 10) var file_privilege_privilege_msg_proto_goTypes = []interface{}{ (*PrivilegeGetListReq)(nil), // 0: PrivilegeGetListReq (*PrivilegeGetListResp)(nil), // 1: PrivilegeGetListResp @@ -435,19 +493,24 @@ var file_privilege_privilege_msg_proto_goTypes = []interface{}{ (*PrivilegeBuyGiftResp)(nil), // 5: PrivilegeBuyGiftResp (*PrivilegeVipListReq)(nil), // 6: PrivilegeVipListReq (*PrivilegeVipListResp)(nil), // 7: PrivilegeVipListResp - (*DBPrivilege)(nil), // 8: DBPrivilege - (*DBVip)(nil), // 9: DBVip + (*PrivilegeChangePush)(nil), // 8: PrivilegeChangePush + nil, // 9: PrivilegeChangePush.PrivilegeEntry + (*DBPrivilege)(nil), // 10: DBPrivilege + (*DBVip)(nil), // 11: DBVip + (*PrivilegeList)(nil), // 12: PrivilegeList } var file_privilege_privilege_msg_proto_depIdxs = []int32{ - 8, // 0: PrivilegeGetListResp.data:type_name -> DBPrivilege - 8, // 1: PrivilegeBuyYuekaResp.data:type_name -> DBPrivilege - 9, // 2: PrivilegeBuyGiftResp.data:type_name -> DBVip - 9, // 3: PrivilegeVipListResp.data:type_name -> DBVip - 4, // [4:4] is the sub-list for method output_type - 4, // [4:4] is the sub-list for method input_type - 4, // [4:4] is the sub-list for extension type_name - 4, // [4:4] is the sub-list for extension extendee - 0, // [0:4] is the sub-list for field type_name + 10, // 0: PrivilegeGetListResp.data:type_name -> DBPrivilege + 10, // 1: PrivilegeBuyYuekaResp.data:type_name -> DBPrivilege + 11, // 2: PrivilegeBuyGiftResp.data:type_name -> DBVip + 11, // 3: PrivilegeVipListResp.data:type_name -> DBVip + 9, // 4: PrivilegeChangePush.privilege:type_name -> PrivilegeChangePush.PrivilegeEntry + 12, // 5: PrivilegeChangePush.PrivilegeEntry.value:type_name -> PrivilegeList + 6, // [6:6] is the sub-list for method output_type + 6, // [6:6] is the sub-list for method input_type + 6, // [6:6] is the sub-list for extension type_name + 6, // [6:6] is the sub-list for extension extendee + 0, // [0:6] is the sub-list for field type_name } func init() { file_privilege_privilege_msg_proto_init() } @@ -553,6 +616,18 @@ func file_privilege_privilege_msg_proto_init() { return nil } } + file_privilege_privilege_msg_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*PrivilegeChangePush); 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{ @@ -560,7 +635,7 @@ func file_privilege_privilege_msg_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_privilege_privilege_msg_proto_rawDesc, NumEnums: 0, - NumMessages: 8, + NumMessages: 10, NumExtensions: 0, NumServices: 0, }, diff --git a/pb/sys_msg.pb.go b/pb/sys_msg.pb.go index 3e8a06f00..cd9b6a0a9 100644 --- a/pb/sys_msg.pb.go +++ b/pb/sys_msg.pb.go @@ -20,100 +20,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -type SysFuncListReq struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Keys []string `protobuf:"bytes,1,rep,name=keys,proto3" json:"keys"` //功能ID -} - -func (x *SysFuncListReq) Reset() { - *x = SysFuncListReq{} - if protoimpl.UnsafeEnabled { - mi := &file_sys_sys_msg_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *SysFuncListReq) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*SysFuncListReq) ProtoMessage() {} - -func (x *SysFuncListReq) ProtoReflect() protoreflect.Message { - mi := &file_sys_sys_msg_proto_msgTypes[0] - 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 SysFuncListReq.ProtoReflect.Descriptor instead. -func (*SysFuncListReq) Descriptor() ([]byte, []int) { - return file_sys_sys_msg_proto_rawDescGZIP(), []int{0} -} - -func (x *SysFuncListReq) GetKeys() []string { - if x != nil { - return x.Keys - } - return nil -} - -type SysFuncListResp struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - FuncIds []string `protobuf:"bytes,1,rep,name=funcIds,proto3" json:"funcIds"` //功能ID -} - -func (x *SysFuncListResp) Reset() { - *x = SysFuncListResp{} - if protoimpl.UnsafeEnabled { - mi := &file_sys_sys_msg_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *SysFuncListResp) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*SysFuncListResp) ProtoMessage() {} - -func (x *SysFuncListResp) ProtoReflect() protoreflect.Message { - mi := &file_sys_sys_msg_proto_msgTypes[1] - 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 SysFuncListResp.ProtoReflect.Descriptor instead. -func (*SysFuncListResp) Descriptor() ([]byte, []int) { - return file_sys_sys_msg_proto_rawDescGZIP(), []int{1} -} - -func (x *SysFuncListResp) GetFuncIds() []string { - if x != nil { - return x.FuncIds - } - return nil -} - type SysFuncGetListReq struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -125,7 +31,7 @@ type SysFuncGetListReq struct { func (x *SysFuncGetListReq) Reset() { *x = SysFuncGetListReq{} if protoimpl.UnsafeEnabled { - mi := &file_sys_sys_msg_proto_msgTypes[2] + mi := &file_sys_sys_msg_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -138,7 +44,7 @@ func (x *SysFuncGetListReq) String() string { func (*SysFuncGetListReq) ProtoMessage() {} func (x *SysFuncGetListReq) ProtoReflect() protoreflect.Message { - mi := &file_sys_sys_msg_proto_msgTypes[2] + mi := &file_sys_sys_msg_proto_msgTypes[0] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -151,7 +57,7 @@ func (x *SysFuncGetListReq) ProtoReflect() protoreflect.Message { // Deprecated: Use SysFuncGetListReq.ProtoReflect.Descriptor instead. func (*SysFuncGetListReq) Descriptor() ([]byte, []int) { - return file_sys_sys_msg_proto_rawDescGZIP(), []int{2} + return file_sys_sys_msg_proto_rawDescGZIP(), []int{0} } func (x *SysFuncGetListReq) GetKeys() []string { @@ -172,7 +78,7 @@ type SysFuncGetListResp struct { func (x *SysFuncGetListResp) Reset() { *x = SysFuncGetListResp{} if protoimpl.UnsafeEnabled { - mi := &file_sys_sys_msg_proto_msgTypes[3] + mi := &file_sys_sys_msg_proto_msgTypes[1] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -185,7 +91,7 @@ func (x *SysFuncGetListResp) String() string { func (*SysFuncGetListResp) ProtoMessage() {} func (x *SysFuncGetListResp) ProtoReflect() protoreflect.Message { - mi := &file_sys_sys_msg_proto_msgTypes[3] + mi := &file_sys_sys_msg_proto_msgTypes[1] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -198,7 +104,7 @@ func (x *SysFuncGetListResp) ProtoReflect() protoreflect.Message { // Deprecated: Use SysFuncGetListResp.ProtoReflect.Descriptor instead. func (*SysFuncGetListResp) Descriptor() ([]byte, []int) { - return file_sys_sys_msg_proto_rawDescGZIP(), []int{3} + return file_sys_sys_msg_proto_rawDescGZIP(), []int{1} } func (x *SysFuncGetListResp) GetCond() map[string]int32 { @@ -220,7 +126,7 @@ type SysFuncActivateReq struct { func (x *SysFuncActivateReq) Reset() { *x = SysFuncActivateReq{} if protoimpl.UnsafeEnabled { - mi := &file_sys_sys_msg_proto_msgTypes[4] + mi := &file_sys_sys_msg_proto_msgTypes[2] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -233,7 +139,7 @@ func (x *SysFuncActivateReq) String() string { func (*SysFuncActivateReq) ProtoMessage() {} func (x *SysFuncActivateReq) ProtoReflect() protoreflect.Message { - mi := &file_sys_sys_msg_proto_msgTypes[4] + mi := &file_sys_sys_msg_proto_msgTypes[2] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -246,7 +152,7 @@ func (x *SysFuncActivateReq) ProtoReflect() protoreflect.Message { // Deprecated: Use SysFuncActivateReq.ProtoReflect.Descriptor instead. func (*SysFuncActivateReq) Descriptor() ([]byte, []int) { - return file_sys_sys_msg_proto_rawDescGZIP(), []int{4} + return file_sys_sys_msg_proto_rawDescGZIP(), []int{2} } func (x *SysFuncActivateReq) GetCid() string { @@ -267,7 +173,7 @@ type SysFuncActivateResp struct { func (x *SysFuncActivateResp) Reset() { *x = SysFuncActivateResp{} if protoimpl.UnsafeEnabled { - mi := &file_sys_sys_msg_proto_msgTypes[5] + mi := &file_sys_sys_msg_proto_msgTypes[3] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -280,7 +186,7 @@ func (x *SysFuncActivateResp) String() string { func (*SysFuncActivateResp) ProtoMessage() {} func (x *SysFuncActivateResp) ProtoReflect() protoreflect.Message { - mi := &file_sys_sys_msg_proto_msgTypes[5] + mi := &file_sys_sys_msg_proto_msgTypes[3] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -293,7 +199,7 @@ func (x *SysFuncActivateResp) ProtoReflect() protoreflect.Message { // Deprecated: Use SysFuncActivateResp.ProtoReflect.Descriptor instead. func (*SysFuncActivateResp) Descriptor() ([]byte, []int) { - return file_sys_sys_msg_proto_rawDescGZIP(), []int{5} + return file_sys_sys_msg_proto_rawDescGZIP(), []int{3} } func (x *SysFuncActivateResp) GetCid() string { @@ -307,29 +213,23 @@ var File_sys_sys_msg_proto protoreflect.FileDescriptor var file_sys_sys_msg_proto_rawDesc = []byte{ 0x0a, 0x11, 0x73, 0x79, 0x73, 0x2f, 0x73, 0x79, 0x73, 0x5f, 0x6d, 0x73, 0x67, 0x2e, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x22, 0x24, 0x0a, 0x0e, 0x53, 0x79, 0x73, 0x46, 0x75, 0x6e, 0x63, 0x4c, 0x69, - 0x73, 0x74, 0x52, 0x65, 0x71, 0x12, 0x12, 0x0a, 0x04, 0x6b, 0x65, 0x79, 0x73, 0x18, 0x01, 0x20, - 0x03, 0x28, 0x09, 0x52, 0x04, 0x6b, 0x65, 0x79, 0x73, 0x22, 0x2b, 0x0a, 0x0f, 0x53, 0x79, 0x73, - 0x46, 0x75, 0x6e, 0x63, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x18, 0x0a, 0x07, - 0x66, 0x75, 0x6e, 0x63, 0x49, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x07, 0x66, - 0x75, 0x6e, 0x63, 0x49, 0x64, 0x73, 0x22, 0x27, 0x0a, 0x11, 0x53, 0x79, 0x73, 0x46, 0x75, 0x6e, - 0x63, 0x47, 0x65, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x12, 0x12, 0x0a, 0x04, 0x6b, - 0x65, 0x79, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x04, 0x6b, 0x65, 0x79, 0x73, 0x22, - 0x80, 0x01, 0x0a, 0x12, 0x53, 0x79, 0x73, 0x46, 0x75, 0x6e, 0x63, 0x47, 0x65, 0x74, 0x4c, 0x69, - 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x31, 0x0a, 0x04, 0x63, 0x6f, 0x6e, 0x64, 0x18, 0x01, - 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x53, 0x79, 0x73, 0x46, 0x75, 0x6e, 0x63, 0x47, 0x65, - 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x43, 0x6f, 0x6e, 0x64, 0x45, 0x6e, - 0x74, 0x72, 0x79, 0x52, 0x04, 0x63, 0x6f, 0x6e, 0x64, 0x1a, 0x37, 0x0a, 0x09, 0x43, 0x6f, 0x6e, - 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, - 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, - 0x38, 0x01, 0x22, 0x26, 0x0a, 0x12, 0x53, 0x79, 0x73, 0x46, 0x75, 0x6e, 0x63, 0x41, 0x63, 0x74, - 0x69, 0x76, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x63, 0x69, 0x64, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x63, 0x69, 0x64, 0x22, 0x27, 0x0a, 0x13, 0x53, 0x79, - 0x73, 0x46, 0x75, 0x6e, 0x63, 0x41, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, - 0x70, 0x12, 0x10, 0x0a, 0x03, 0x63, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, - 0x63, 0x69, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x33, + 0x6f, 0x74, 0x6f, 0x22, 0x27, 0x0a, 0x11, 0x53, 0x79, 0x73, 0x46, 0x75, 0x6e, 0x63, 0x47, 0x65, + 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x12, 0x12, 0x0a, 0x04, 0x6b, 0x65, 0x79, 0x73, + 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x04, 0x6b, 0x65, 0x79, 0x73, 0x22, 0x80, 0x01, 0x0a, + 0x12, 0x53, 0x79, 0x73, 0x46, 0x75, 0x6e, 0x63, 0x47, 0x65, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, + 0x65, 0x73, 0x70, 0x12, 0x31, 0x0a, 0x04, 0x63, 0x6f, 0x6e, 0x64, 0x18, 0x01, 0x20, 0x03, 0x28, + 0x0b, 0x32, 0x1d, 0x2e, 0x53, 0x79, 0x73, 0x46, 0x75, 0x6e, 0x63, 0x47, 0x65, 0x74, 0x4c, 0x69, + 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x43, 0x6f, 0x6e, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, + 0x52, 0x04, 0x63, 0x6f, 0x6e, 0x64, 0x1a, 0x37, 0x0a, 0x09, 0x43, 0x6f, 0x6e, 0x64, 0x45, 0x6e, + 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, + 0x26, 0x0a, 0x12, 0x53, 0x79, 0x73, 0x46, 0x75, 0x6e, 0x63, 0x41, 0x63, 0x74, 0x69, 0x76, 0x61, + 0x74, 0x65, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x63, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x03, 0x63, 0x69, 0x64, 0x22, 0x27, 0x0a, 0x13, 0x53, 0x79, 0x73, 0x46, 0x75, + 0x6e, 0x63, 0x41, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, + 0x0a, 0x03, 0x63, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x63, 0x69, 0x64, + 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -344,18 +244,16 @@ func file_sys_sys_msg_proto_rawDescGZIP() []byte { return file_sys_sys_msg_proto_rawDescData } -var file_sys_sys_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 7) +var file_sys_sys_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 5) var file_sys_sys_msg_proto_goTypes = []interface{}{ - (*SysFuncListReq)(nil), // 0: SysFuncListReq - (*SysFuncListResp)(nil), // 1: SysFuncListResp - (*SysFuncGetListReq)(nil), // 2: SysFuncGetListReq - (*SysFuncGetListResp)(nil), // 3: SysFuncGetListResp - (*SysFuncActivateReq)(nil), // 4: SysFuncActivateReq - (*SysFuncActivateResp)(nil), // 5: SysFuncActivateResp - nil, // 6: SysFuncGetListResp.CondEntry + (*SysFuncGetListReq)(nil), // 0: SysFuncGetListReq + (*SysFuncGetListResp)(nil), // 1: SysFuncGetListResp + (*SysFuncActivateReq)(nil), // 2: SysFuncActivateReq + (*SysFuncActivateResp)(nil), // 3: SysFuncActivateResp + nil, // 4: SysFuncGetListResp.CondEntry } var file_sys_sys_msg_proto_depIdxs = []int32{ - 6, // 0: SysFuncGetListResp.cond:type_name -> SysFuncGetListResp.CondEntry + 4, // 0: SysFuncGetListResp.cond:type_name -> SysFuncGetListResp.CondEntry 1, // [1:1] is the sub-list for method output_type 1, // [1:1] is the sub-list for method input_type 1, // [1:1] is the sub-list for extension type_name @@ -370,30 +268,6 @@ func file_sys_sys_msg_proto_init() { } if !protoimpl.UnsafeEnabled { file_sys_sys_msg_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SysFuncListReq); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_sys_sys_msg_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SysFuncListResp); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_sys_sys_msg_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*SysFuncGetListReq); i { case 0: return &v.state @@ -405,7 +279,7 @@ func file_sys_sys_msg_proto_init() { return nil } } - file_sys_sys_msg_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + file_sys_sys_msg_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*SysFuncGetListResp); i { case 0: return &v.state @@ -417,7 +291,7 @@ func file_sys_sys_msg_proto_init() { return nil } } - file_sys_sys_msg_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { + file_sys_sys_msg_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*SysFuncActivateReq); i { case 0: return &v.state @@ -429,7 +303,7 @@ func file_sys_sys_msg_proto_init() { return nil } } - file_sys_sys_msg_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + file_sys_sys_msg_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*SysFuncActivateResp); i { case 0: return &v.state @@ -448,7 +322,7 @@ func file_sys_sys_msg_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_sys_sys_msg_proto_rawDesc, NumEnums: 0, - NumMessages: 7, + NumMessages: 5, NumExtensions: 0, NumServices: 0, }, diff --git a/sys/configure/structs/game.opencondData.go b/sys/configure/structs/game.opencondData.go index 88cc4d548..648ea6ed9 100644 --- a/sys/configure/structs/game.opencondData.go +++ b/sys/configure/structs/game.opencondData.go @@ -14,7 +14,6 @@ type GameOpencondData struct { Id string Name string Main []*GameOpenedCond - Optional string Wkqbx int32 Kqbx int32 Img string @@ -47,7 +46,6 @@ func (_v *GameOpencondData)Deserialize(_buf map[string]interface{}) (err error) } } - { var _ok_ bool; if _v.Optional, _ok_ = _buf["optional"].(string); !_ok_ { err = errors.New("optional error"); return } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["wkqbx"].(float64); !_ok_ { err = errors.New("wkqbx error"); return }; _v.Wkqbx = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["kqbx"].(float64); !_ok_ { err = errors.New("kqbx error"); return }; _v.Kqbx = int32(_tempNum_) } { var _ok_ bool; if _v.Img, _ok_ = _buf["img"].(string); !_ok_ { err = errors.New("img error"); return } }