diff --git a/dist.rar b/dist.rar index a13e5e4..3e2aa43 100644 Binary files a/dist.rar and b/dist.rar differ diff --git a/src/pb/proto.js b/src/pb/proto.js index a2b9abc..5060e47 100644 --- a/src/pb/proto.js +++ b/src/pb/proto.js @@ -468,6 +468,7 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr HeroMaxStarLv: 1321, DrawCardTypeNotFound: 1322, HeroMaxSkillLv: 1323, + HeroAlreadyKongFuStatus: 1324, EquipmentOnFoundEquipment: 1400, EquipmentLvlimitReached: 1401, EquipmentIsWorn: 1402, @@ -500,7 +501,12 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr MartialhallInUse: 2001, MartialhallUnlocked: 2002, GourmetMoreOrderTime: 2101, - GourmetSkillMaxLv: 2102 + GourmetSkillMaxLv: 2102, + RtaskFinished: 2201, + RtaskUnFinished: 2202, + RtaskNoRtask: 2203, + RtaskRewarded: 2204, + RtaskPreNoFinish: 2205 } }, google: { @@ -2588,6 +2594,140 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr } } }, + Clang: { + fields: { + deskType: { + type: "int32", + id: 1 + }, + eTime: { + type: "int64", + id: 2 + } + } + }, + OrderClang: { + fields: { + deskType: { + type: "int32", + id: 1 + }, + count: { + type: "int32", + id: 2 + }, + needTime: { + type: "int32", + id: 3 + } + } + }, + DBSmithy: { + fields: { + id: { + type: "string", + id: 1 + }, + uid: { + type: "string", + id: 2 + }, + clang: { + type: "Clang", + id: 3 + }, + orders: { + rule: "repeated", + type: "OrderClang", + id: 4 + }, + items: { + rule: "repeated", + type: "UserAssets", + id: 5 + }, + skill: { + keyType: "int32", + type: "int32", + id: 6 + }, + stoveLv: { + type: "int32", + id: 7 + }, + orderCostTime: { + type: "int32", + id: 8 + }, + ctime: { + type: "int64", + id: 9 + }, + deskFloor: { + type: "int32", + id: 10 + }, + stoveFloor: { + type: "int32", + id: 11 + } + } + }, + SmithyGetListReq: { + fields: {} + }, + SmithyGetListResp: { + fields: { + data: { + type: "DBSmithy", + id: 1 + } + } + }, + SmithyCreateOrderReq: { + fields: { + order: { + rule: "repeated", + type: "OrderClang", + id: 1 + } + } + }, + SmithyCreateOrderResp: { + fields: { + data: { + type: "DBSmithy", + id: 1 + } + } + }, + SmithyGetRewardReq: { + fields: {} + }, + SmithyGetRewardResp: { + fields: { + data: { + type: "DBSmithy", + id: 1 + } + } + }, + SmithySkillLvReq: { + fields: { + skillType: { + type: "int32", + id: 1 + } + } + }, + SmithySkillLvResp: { + fields: { + data: { + type: "DBSmithy", + id: 1 + } + } + }, DBTask: { fields: { id: { diff --git a/src/pb/proto/errorcode.proto b/src/pb/proto/errorcode.proto index 9af0cad..426ca84 100644 --- a/src/pb/proto/errorcode.proto +++ b/src/pb/proto/errorcode.proto @@ -67,30 +67,31 @@ enum ErrorCode { ItemsUseNotSupported = 1204; //暂不支持使用 // hero - HeroNoExist = 1300; //英雄不存在 - HeroNoEnough = 1301; //英雄数量不足 - HeroMaxLv = 1302; //英雄达到最大等级 - HeroInitCreat = 1303; //初始化英雄 - HeroColorErr = 1304; // 品质不匹配 - HeroSkillUpErr = 1305; // 技能升级失败 - HeroMaxResonate = 1306; // 达到最大共鸣次数 - HeroNoResonate = 1307; // 没有共鸣 - HeroNotNeedResonate = 1308; // 不需要重置共鸣 - HeroNoEnergy = 1309; // 没有能量点数 - HeroCreate = 1310; // 创建卡失败 - HeroEquipUpdate = 1311; // 更新装备失败 - HeroMaxAwaken = 1312; // 达到最大觉醒等级 - HeroIsLock = 1313; // 英雄被锁定不能被消耗 - HeroMaxCount = 1314; // 英雄达到最大数量 - HeroCostTypeErr = 1315; // 消耗英雄参数不匹配 - HeroStarErr = 1316; // 不满足升星条件 - HeroTypeErr = 1317; // 升级英雄类型不对 - HeroExpTypeErr = 1318; // 技能升级卡类型不对 - HeroAddMaxExp = 1319; // 升级经验卡溢出 检查传入的数量 - HeroStarLvErr = 1320; // 升星等级不够 - HeroMaxStarLv = 1321; // 达到最大升星等级 - DrawCardTypeNotFound = 1322; // 抽卡类型不匹配 - HeroMaxSkillLv = 1323; // 达到最大技能等级 + HeroNoExist = 1300; //英雄不存在 + HeroNoEnough = 1301; //英雄数量不足 + HeroMaxLv = 1302; //英雄达到最大等级 + HeroInitCreat = 1303; //初始化英雄 + HeroColorErr = 1304; // 品质不匹配 + HeroSkillUpErr = 1305; // 技能升级失败 + HeroMaxResonate = 1306; // 达到最大共鸣次数 + HeroNoResonate = 1307; // 没有共鸣 + HeroNotNeedResonate = 1308; // 不需要重置共鸣 + HeroNoEnergy = 1309; // 没有能量点数 + HeroCreate = 1310; // 创建卡失败 + HeroEquipUpdate = 1311; // 更新装备失败 + HeroMaxAwaken = 1312; // 达到最大觉醒等级 + HeroIsLock = 1313; // 英雄被锁定不能被消耗 + HeroMaxCount = 1314; // 英雄达到最大数量 + HeroCostTypeErr = 1315; // 消耗英雄参数不匹配 + HeroStarErr = 1316; // 不满足升星条件 + HeroTypeErr = 1317; // 升级英雄类型不对 + HeroExpTypeErr = 1318; // 技能升级卡类型不对 + HeroAddMaxExp = 1319; // 升级经验卡溢出 检查传入的数量 + HeroStarLvErr = 1320; // 升星等级不够 + HeroMaxStarLv = 1321; // 达到最大升星等级 + DrawCardTypeNotFound = 1322; // 抽卡类型不匹配 + HeroMaxSkillLv = 1323; // 达到最大技能等级 + HeroAlreadyKongFuStatus = 1324; // 已经是练功状态 // equipment EquipmentOnFoundEquipment = 1400; // 未找到武器 @@ -134,6 +135,13 @@ enum ErrorCode { MartialhallInUse = 2001; //已经在使用 MartialhallUnlocked = 2002; //已解锁 // 美食馆 - GourmetMoreOrderTime = 2101;// 超过订单时长 - GourmetSkillMaxLv = 2102; // 技能已经达到满级 + GourmetMoreOrderTime = 2101; // 超过订单时长 + GourmetSkillMaxLv = 2102; // 技能已经达到满级 + + // rtask + RtaskFinished = 2201; //任务已完成 + RtaskUnFinished = 2202; //任务未完成 + RtaskNoRtask = 2203; //任务未开启 + RtaskRewarded = 2204; //已获取奖励 + RtaskPreNoFinish = 2205; //前置未完成 } \ No newline at end of file diff --git a/src/pb/proto/smithy_db.proto b/src/pb/proto/smithy_db.proto new file mode 100644 index 0000000..05e7fd4 --- /dev/null +++ b/src/pb/proto/smithy_db.proto @@ -0,0 +1,29 @@ +syntax = "proto3"; +option go_package = ".;pb"; +import "comm.proto"; + + +message Clang{ + int32 deskType = 1; // 台子类型 + int64 eTime = 2; +} + +// 队列里的烹饪食品 +message OrderClang{ + int32 deskType = 1; // 台子类型 + int32 count = 2; // 料理数量 + int32 needTime = 3; // 需要的时间 +} +message DBSmithy { + string id = 1; //@go_tags(`bson:"_id"`) ID + string uid = 2; //@go_tags(`bson:"uid"`) 用户ID + Clang clang = 3;// 正在制作中的数据 + repeated OrderClang orders = 4; //@go_tags(`bson:"orders"`) 订单数据 + repeated UserAssets items = 5; //@go_tags(`bson:"items"`) 已经做好装备 + map skill = 6;//@go_tags(`bson:"skill"`) 锻造台等级 + int32 stoveLv = 7; //@go_tags(`bson:"stoveLv"`) 炉子等级 + int32 orderCostTime = 8; //@go_tags(`bson:"orderCostTime"`) 订单消耗的时常 + int64 ctime = 9; // 订单创建时间 + int32 deskFloor = 10;//@go_tags(`bson:"deskFloor"`)台子保底 + int32 stoveFloor = 11;//@go_tags(`bson:"stoveFloor"`) 炉子保底 +} \ No newline at end of file diff --git a/src/pb/proto/smithy_msg.proto b/src/pb/proto/smithy_msg.proto new file mode 100644 index 0000000..75ffbbf --- /dev/null +++ b/src/pb/proto/smithy_msg.proto @@ -0,0 +1,38 @@ +syntax = "proto3"; +option go_package = ".;pb"; +import "smithy_db.proto"; + +// 查询塔进度 +message SmithyGetListReq { + +} +// 返回进度信息 +message SmithyGetListResp { + DBSmithy data = 1; +} + +// 创建订单 +message SmithyCreateOrderReq { + repeated OrderClang order = 1;// 烹饪时间不用传 后端会重新计算 +} + +message SmithyCreateOrderResp { + DBSmithy data = 1; +} + +// 领取奖励 +message SmithyGetRewardReq{ +} + +message SmithyGetRewardResp{ + DBSmithy data = 1; +} + +// 技能升级 +message SmithySkillLvReq{ + int32 skillType = 1; // 技能id +} + +message SmithySkillLvResp{ + DBSmithy data = 1; +} \ No newline at end of file diff --git a/src/views/protocol/Index.vue b/src/views/protocol/Index.vue index 95d7f3a..73364a3 100644 --- a/src/views/protocol/Index.vue +++ b/src/views/protocol/Index.vue @@ -219,6 +219,7 @@ export default defineComponent({ { mainType: 'pagoda', subs: [] }, { mainType: 'martialhall', subs: [] }, { mainType: 'gourmet', subs: [] }, + { mainType: 'smithy', subs: [] }, ]) for (const v of Object.keys(proto)) { for (const v1 of proto_models) {