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

modules/gourmet/api.go

@@ -6,15 +6,16 @@ import (
 )
 
 const (
-	GourmetGetListResp  = "getlist"
+	GourmetGetListResp     = "getlist"
-	PagodaChallengeResp = "challenge"
+	GourmetCreateOrderResp = "createorder"
-	PagodaGetRewardResp = "getreward"
+	PagodaGetRewardResp    = "getreward"
 )
 
 type apiComp struct {
 	modules.MCompGate
-	service core.IService
+	service   core.IService
-	module  *Gourmet
+	configure *configureComp
+	module    *Gourmet
 }
 
 //组件初始化接口

modules/gourmet/api_createorder.go

@@ -3,6 +3,8 @@ package gourmet
 import (
 	"go_dreamfactory/comm"
 	"go_dreamfactory/pb"
+	cfg "go_dreamfactory/sys/configure/structs"
+	"time"
 
 	"google.golang.org/protobuf/proto"
 )
@@ -18,11 +20,84 @@ func (this *apiComp) CreateOrderCheck(session comm.IUserSession, req *pb.Gourmet
 
 ///美食城创建订单
 func (this *apiComp) CreateOrder(session comm.IUserSession, req *pb.GourmetCreateOrderReq) (code pb.ErrorCode, data proto.Message) {
-
+	var (
+		res      []*cfg.Gameatn
+		costTime int32
+	)
 	code = this.CreateOrderCheck(session, req)
 	if code != pb.ErrorCode_Success {
 		return // 参数校验失败直接返回
 	}
+	_gourmet, err := this.module.modelGourmet.getGourmetList(session.GetUserId())
+	if err != nil {
+		code = pb.ErrorCode_DBError
+		return
+	}
 
+	for _, order := range req.Order {
+		if order.FoodCount == 0 {
+			continue
+		}
+		foodtype := order.FoodType //
+		// 获取技能等级
+		skillLv := _gourmet.Skill[foodtype]
+
+		// 计算出需要的时间
+		_skillCfg := this.module.configure.GetGourmetSkillConfigData(foodtype, skillLv)
+		costTime += _skillCfg.Needtime * order.FoodCount
+	}
+	if _gourmet.Foods == nil { // 队列数据为nil 直接将订单数据给ta
+		_gourmet.Foods = req.Order
+	} else {
+		for _, v := range _gourmet.Foods {
+			for _, v1 := range req.Order {
+				if v.FoodType == v1.FoodType {
+					v.FoodCount += v1.FoodCount // 加对应的数量
+					break
+				}
+			}
+		}
+	}
+	if _gourmet.CookingFood == nil || (_gourmet.CookingFood != nil && _gourmet.CookingFood.ETime == 0) {
+		for _, v := range _gourmet.Foods {
+			if v.FoodCount > 0 {
+				v.FoodCount--
+				// 获取生产时间
+				_skillCfg := this.module.configure.GetGourmetSkillConfigData(v.FoodType, _gourmet.Skill[v.FoodType])
+				_gourmet.CookingFood = &pb.Cooking{
+					FoodType: v.FoodType,
+					ETime:    time.Now().Unix() + int64(_skillCfg.Needtime),
+				}
+				break
+			}
+		}
+	}
+	if _gourmet.CookingFood != nil && _gourmet.CookingFood.ETime == 0 {
+		_gourmet.CookingFood = nil
+	}
+	// 获取总的下单时长
+	cfgCom := this.module.configure.GetGlobalConf()
+	if cfgCom == nil {
+		return
+	}
+	if cfgCom.Gourmet < _gourmet.OrderCostTime+costTime { // 大于总时长是不允许的
+		code = pb.ErrorCode_GourmetMoreOrderTime
+		return
+	}
+	if code = this.module.ConsumeRes(session, res, true); code != pb.ErrorCode_Success { // 消耗校验
+		return
+	}
+
+	if code = this.module.DispenseRes(session, res, true); code != pb.ErrorCode_Success { // 真正消耗
+		return
+	}
+	// 校验通过 写数据
+	mapData := make(map[string]interface{}, 0)
+	mapData["foods"] = _gourmet.Foods
+	mapData["orderCostTime"] = _gourmet.OrderCostTime
+	mapData["cookingFood"] = _gourmet.CookingFood // 正在做的
+	code = this.module.ModifyGourmetData(session.GetUserId(), mapData)
+
+	session.SendMsg(string(this.module.GetType()), GourmetCreateOrderResp, &pb.GourmetCreateOrderResp{Data: _gourmet})
 	return
 }

modules/gourmet/api_getlist.go

@@ -25,7 +25,8 @@ func (this *apiComp) GetList(session comm.IUserSession, req *pb.GourmetGetListRe
 		code = pb.ErrorCode_DBError
 		return
 	}
-
+	// 计算订单信息
+	this.module.modelGourmet.CalculationGourmet(_gourmet)
 	session.SendMsg(string(this.module.GetType()), GourmetGetListResp, &pb.GourmetGetListResp{Data: _gourmet})
 	return
 }

modules/gourmet/api_skilllv.go

@@ -0,0 +1,25 @@
+package gourmet
+
+import (
+	"go_dreamfactory/comm"
+	"go_dreamfactory/pb"
+
+	"google.golang.org/protobuf/proto"
+)
+
+//参数校验
+func (this *apiComp) SkillLvCheck(session comm.IUserSession, req *pb.GourmetSkillLvReq) (code pb.ErrorCode) {
+
+	return
+}
+
+///美食城领取奖励
+func (this *apiComp) SkillLv(session comm.IUserSession, req *pb.GourmetSkillLvReq) (code pb.ErrorCode, data proto.Message) {
+
+	code = this.SkillLvCheck(session, req)
+	if code != pb.ErrorCode_Success {
+		return // 参数校验失败直接返回
+	}
+
+	return
+}

modules/gourmet/comp_configure.go

@@ -4,6 +4,7 @@ import (
 	"go_dreamfactory/lego/core"
 	"go_dreamfactory/lego/core/cbase"
 	"go_dreamfactory/lego/sys/log"
+	"go_dreamfactory/modules"
 	"go_dreamfactory/sys/configure"
 	cfg "go_dreamfactory/sys/configure/structs"
 	"sync"
@@ -17,7 +18,8 @@ const (
 ///配置管理基础组件
 type configureComp struct {
 	cbase.ModuleCompBase
-	hlock            sync.RWMutex
+	hlock sync.RWMutex
+	modules.MCompConfigure
 	_gourmetMap      map[int64]*cfg.GameGourmetData
 	_gourmetSkillMap map[int64]*cfg.GameGourmetSkillData
 }
@@ -75,6 +77,18 @@ func (this *configureComp) GetGourmetSkillConfigData(gourmetType int32, level in
 	return this._gourmetSkillMap[int64(gourmetType<<16)+int64(level)]
 }
 
+// 通过技能id 查询技能配置表
+func (this *configureComp) GetGourmetSkillConfigBySkillID(skillId int) (data *cfg.GameGourmetSkillData) {
+
+	if v, err := this.GetConfigure(game_gourmetskill); err == nil {
+		if configure, ok := v.(*cfg.GameGourmetSkill); ok {
+			data = configure.Get(int32(skillId))
+			return
+		}
+	}
+	return
+}
+
 //加载多个配置文件
 func (this *configureComp) LoadMultiConfigure(confs map[string]interface{}) (err error) {
 	for k, v := range confs {

modules/gourmet/model_gourmet.go

@@ -6,6 +6,7 @@ import (
 	"go_dreamfactory/lego/sys/redis"
 	"go_dreamfactory/modules"
 	"go_dreamfactory/pb"
+	"time"
 )
 
 type modelGourmet struct {
@@ -26,6 +27,12 @@ func (this *modelGourmet) getGourmetList(uid string) (result *pb.DBGourmet, err
 	if err = this.Get(uid, result); err != nil {
 		if redis.RedisNil != err { // 没有数据直接创建新的数据
 			result.Uid = uid
+			result.Skill = make(map[int32]int32, 0)
+			result.Skill[10011] = 1
+			result.Skill[10021] = 1
+			result.Skill[10031] = 1
+			result.Skill[10041] = 1        // 需要后续查询初始为1 的技能id 临时push
+			result.ProductionSkill = 10051 // 通用技能
 			if err = this.Add(uid, result); err != nil {
 				this.module.Errorf("err:%v", err)
 				err = nil
@@ -37,3 +44,59 @@ func (this *modelGourmet) getGourmetList(uid string) (result *pb.DBGourmet, err
 	err = nil
 	return result, err
 }
+func (this *modelGourmet) modifyGourmetDataByObjId(uid string, data map[string]interface{}) error {
+	return this.Change(uid, data)
+}
+
+// todo 调用drop 表 获取掉落信息
+func GetDropReward(count, dropId int32) (res []*pb.UserAssets) {
+	return
+}
+
+// 计算订单信息
+func (this *modelGourmet) CalculationGourmet(gourmet *pb.DBGourmet) {
+	var (
+		bCooking bool
+		costTime int32
+		curTime  int32
+	)
+	if gourmet.CookingFood != nil && gourmet.CookingFood.ETime == 0 {
+		costTime = int32(time.Now().Unix() - gourmet.CookingFood.ETime) // 当前过去的时间
+		if costTime < 0 {                                               // 没有完成 不做处理
+			return
+		}
+	}
+	for _, order := range gourmet.Foods {
+		if order.FoodCount == 0 {
+			continue
+		}
+		foodtype := order.FoodType
+		// 获取技能等级
+		skillLv := gourmet.Skill[foodtype]
+
+		// 计算出需要的时间
+		_skillCfg := this.module.configure.GetGourmetSkillConfigData(foodtype, skillLv) // 技能配置表
+		_gourmetcfg := this.module.configure.GetGourmetConfigData(foodtype, skillLv)    // 美食家配置表
+		for i := 1; i < int(order.FoodCount+1); i++ {
+			curTime += _skillCfg.Needtime //* order.FoodCount
+			if curTime > costTime {
+				// 转时间戳
+				eTimd := time.Now().Unix() + int64(curTime-costTime)
+				gourmet.CookingFood.FoodType = order.FoodType
+				gourmet.CookingFood.ETime = eTimd
+				bCooking = true
+
+				// 记录下订单时间
+				gourmet.Ctime = time.Now().Unix()
+				break
+			}
+			order.FoodCount--
+			gourmet.Items = GetDropReward(_gourmetcfg.Using, _gourmetcfg.Propsgroup)
+			// 累计时间也减少
+			gourmet.OrderCostTime += curTime
+		}
+	}
+	if !bCooking { // 经过计算没有烹饪食物的时候
+		gourmet.CookingFood = nil
+	}
+}

modules/gourmet/module.go

@@ -36,7 +36,10 @@ func (this *Gourmet) OnInstallComp() {
 }
 
 // 接口信息
-func (this *Gourmet) ModifyGourmetData(uid string, objId string, data map[string]interface{}) (code pb.ErrorCode) {
+func (this *Gourmet) ModifyGourmetData(uid string, data map[string]interface{}) (code pb.ErrorCode) {
-
+	err := this.modelGourmet.modifyGourmetDataByObjId(uid, data)
+	if err != nil {
+		code = pb.ErrorCode_DBError
+	}
 	return
 }

modules/hero/api_strengthenUplv.go

@@ -119,6 +119,9 @@ func (this *apiComp) StrengthenUplv(session comm.IUserSession, req *pb.HeroStren
 		}
 		curExp += addExp // 先把经验加上
 		for {
+			if len(_data.Heroexp) == 0 {
+				break
+			}
 			if maxLv <= _hero.Lv && curExp >= _data.Heroexp[0].N { // 设置最大经验和等级
 				// 超过的经验值
 				leftExp := curExp - _data.Heroexp[0].N
@@ -131,7 +134,7 @@ func (this *apiComp) StrengthenUplv(session comm.IUserSession, req *pb.HeroStren
 				curExp = _data.Heroexp[0].N
 				break
 			}
-			if _data.Heroexp[0].N > curExp { // 经验不够升级则不能执行升级操作
+			if len(_data.Heroexp) == 0 || _data.Heroexp[0].N > curExp { // 经验不够升级则不能执行升级操作
 				break
 			} else { // 升级操作
 				curExp -= _data.Heroexp[0].N

modules/hero/model_hero.go

@@ -480,6 +480,9 @@ func (this *ModelHero) AddCardExp(uid string, hero *pb.DBHero, exp int32) (newhe
 		}
 		curExp += exp // 先把经验加上
 		for {         // 死循环判断一键升级
+			if len(_data.Heroexp) == 0 {
+				break
+			}
 			if maxLv <= hero.Lv && curExp >= _data.Heroexp[0].N { // 设置最大经验和等级
 				curLv = maxLv
 				curExp = _data.Heroexp[0].N

pb/errorcode.pb.go

@@ -146,6 +146,8 @@ const (
 	ErrorCode_MartialhallNotUnlocked ErrorCode = 2000 //没有解锁
 	ErrorCode_MartialhallInUse       ErrorCode = 2001 //已经在使用
 	ErrorCode_MartialhallUnlocked    ErrorCode = 2002 //已解锁
+	// 美食馆
+	ErrorCode_GourmetMoreOrderTime ErrorCode = 2101 // 超过订单时长
 )
 
 // Enum value maps for ErrorCode.
@@ -263,6 +265,7 @@ var (
 		2000: "MartialhallNotUnlocked",
 		2001: "MartialhallInUse",
 		2002: "MartialhallUnlocked",
+		2101: "GourmetMoreOrderTime",
 	}
 	ErrorCode_value = map[string]int32{
 		"Success":                   0,
@@ -377,6 +380,7 @@ var (
 		"MartialhallNotUnlocked":    2000,
 		"MartialhallInUse":          2001,
 		"MartialhallUnlocked":       2002,
+		"GourmetMoreOrderTime":      2101,
 	}
 )
 
@@ -411,7 +415,7 @@ var File_errorcode_proto protoreflect.FileDescriptor
 
 var file_errorcode_proto_rawDesc = []byte{
 	0x0a, 0x0f, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x2a, 0xd9, 0x12, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12,
+	0x6f, 0x2a, 0xf4, 0x12, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12,
 	0x0b, 0x0a, 0x07, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x10, 0x00, 0x12, 0x11, 0x0a, 0x0d,
 	0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x64, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x10, 0x0a, 0x12,
 	0x1b, 0x0a, 0x17, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x64, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
@@ -560,8 +564,10 @@ var file_errorcode_proto_rawDesc = []byte{
 	0x74, 0x55, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x65, 0x64, 0x10, 0xd0, 0x0f, 0x12, 0x15, 0x0a, 0x10,
 	0x4d, 0x61, 0x72, 0x74, 0x69, 0x61, 0x6c, 0x68, 0x61, 0x6c, 0x6c, 0x49, 0x6e, 0x55, 0x73, 0x65,
 	0x10, 0xd1, 0x0f, 0x12, 0x18, 0x0a, 0x13, 0x4d, 0x61, 0x72, 0x74, 0x69, 0x61, 0x6c, 0x68, 0x61,
-	0x6c, 0x6c, 0x55, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x65, 0x64, 0x10, 0xd2, 0x0f, 0x42, 0x06, 0x5a,
+	0x6c, 0x6c, 0x55, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x65, 0x64, 0x10, 0xd2, 0x0f, 0x12, 0x19, 0x0a,
-	0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x14, 0x47, 0x6f, 0x75, 0x72, 0x6d, 0x65, 0x74, 0x4d, 0x6f, 0x72, 0x65, 0x4f, 0x72, 0x64, 0x65,
+	0x72, 0x54, 0x69, 0x6d, 0x65, 0x10, 0xb5, 0x10, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62,
+	0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (

pb/gourmet_db.pb.go

@@ -20,15 +20,14 @@ const (
 	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
 )
 
-// 烹饪
+// 正在烹饪的食物
 type Cooking struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	FoodType  int32 `protobuf:"varint,1,opt,name=foodType,proto3" json:"foodType"`   // 料理类型
+	FoodType int32 `protobuf:"varint,1,opt,name=foodType,proto3" json:"foodType"` // 料理类型
-	FoodCount int32 `protobuf:"varint,2,opt,name=foodCount,proto3" json:"foodCount"` // 料理数量
+	ETime    int64 `protobuf:"varint,2,opt,name=eTime,proto3" json:"eTime"`       // 结束时间戳
-	CookTime  int32 `protobuf:"varint,3,opt,name=cookTime,proto3" json:"cookTime"`   // 烹饪时间
 }
 
 func (x *Cooking) Reset() {
@@ -70,14 +69,71 @@ func (x *Cooking) GetFoodType() int32 {
 	return 0
 }
 
-func (x *Cooking) GetFoodCount() int32 {
+func (x *Cooking) GetETime() int64 {
+	if x != nil {
+		return x.ETime
+	}
+	return 0
+}
+
+// 队列里的烹饪食品
+type OrderCook struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	FoodType  int32 `protobuf:"varint,1,opt,name=foodType,proto3" json:"foodType"`   // 料理类型
+	FoodCount int32 `protobuf:"varint,2,opt,name=foodCount,proto3" json:"foodCount"` // 料理数量
+	CookTime  int32 `protobuf:"varint,3,opt,name=cookTime,proto3" json:"cookTime"`   // 剩余烹饪时间
+}
+
+func (x *OrderCook) Reset() {
+	*x = OrderCook{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_gourmet_gourmet_db_proto_msgTypes[1]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *OrderCook) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*OrderCook) ProtoMessage() {}
+
+func (x *OrderCook) ProtoReflect() protoreflect.Message {
+	mi := &file_gourmet_gourmet_db_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 OrderCook.ProtoReflect.Descriptor instead.
+func (*OrderCook) Descriptor() ([]byte, []int) {
+	return file_gourmet_gourmet_db_proto_rawDescGZIP(), []int{1}
+}
+
+func (x *OrderCook) GetFoodType() int32 {
+	if x != nil {
+		return x.FoodType
+	}
+	return 0
+}
+
+func (x *OrderCook) GetFoodCount() int32 {
 	if x != nil {
 		return x.FoodCount
 	}
 	return 0
 }
 
-func (x *Cooking) GetCookTime() int32 {
+func (x *OrderCook) GetCookTime() int32 {
 	if x != nil {
 		return x.CookTime
 	}
@@ -89,20 +145,21 @@ type DBGourmet struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Id            string          `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"`                                                                                          //ID
+	Id              string          `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"`                                                                                                   //ID
-	Uid           string          `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid" bson:"uid"`                                                                                        //用户ID
+	Uid             string          `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid" bson:"uid"`                                                                                                 //用户ID
-	CookingFood   *Cooking        `protobuf:"bytes,3,opt,name=cookingFood,proto3" json:"cookingFood"`                                                                                   // 正在烹饪的食品
+	CookingFood     *Cooking        `protobuf:"bytes,3,opt,name=cookingFood,proto3" json:"cookingFood" bson:"cookingFood"`                                                                         //正在烹饪的食品
-	Foods         []*Cooking      `protobuf:"bytes,4,rep,name=foods,proto3" json:"foods"`                                                                                               // 等待烹饪的食品
+	Foods           []*OrderCook    `protobuf:"bytes,4,rep,name=foods,proto3" json:"foods"`                                                                                                        // 等待烹饪的食品
-	Items         []*UserAssets   `protobuf:"bytes,5,rep,name=items,proto3" json:"items"`                                                                                               // 已经做好的食品
+	Items           []*UserAssets   `protobuf:"bytes,5,rep,name=items,proto3" json:"items"`                                                                                                        // 已经做好的食品
-	Skilllv       map[int32]int32 `protobuf:"bytes,6,rep,name=skilllv,proto3" json:"skilllv" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 技能等级
+	Skill           map[int32]int32 `protobuf:"bytes,6,rep,name=skill,proto3" json:"skill" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3" bson:"skill"` //技能ID
-	Ordercosttime int32           `protobuf:"varint,7,opt,name=ordercosttime,proto3" json:"ordercosttime"`                                                                              // 订单消耗的时常
+	ProductionSkill int32           `protobuf:"varint,7,opt,name=productionSkill,proto3" json:"productionSkill"`                                                                                   // 通用技能
-	Ctime         int64           `protobuf:"varint,8,opt,name=ctime,proto3" json:"ctime"`                                                                                              // 订单创建时间
+	OrderCostTime   int32           `protobuf:"varint,8,opt,name=orderCostTime,proto3" json:"orderCostTime" bson:"orderCostTime"`                                                                  //订单消耗的时常
+	Ctime           int64           `protobuf:"varint,9,opt,name=ctime,proto3" json:"ctime"`                                                                                                       // 订单创建时间
 }
 
 func (x *DBGourmet) Reset() {
 	*x = DBGourmet{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_gourmet_gourmet_db_proto_msgTypes[1]
+		mi := &file_gourmet_gourmet_db_proto_msgTypes[2]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -115,7 +172,7 @@ func (x *DBGourmet) String() string {
 func (*DBGourmet) ProtoMessage() {}
 
 func (x *DBGourmet) ProtoReflect() protoreflect.Message {
-	mi := &file_gourmet_gourmet_db_proto_msgTypes[1]
+	mi := &file_gourmet_gourmet_db_proto_msgTypes[2]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -128,7 +185,7 @@ func (x *DBGourmet) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use DBGourmet.ProtoReflect.Descriptor instead.
 func (*DBGourmet) Descriptor() ([]byte, []int) {
-	return file_gourmet_gourmet_db_proto_rawDescGZIP(), []int{1}
+	return file_gourmet_gourmet_db_proto_rawDescGZIP(), []int{2}
 }
 
 func (x *DBGourmet) GetId() string {
@@ -152,7 +209,7 @@ func (x *DBGourmet) GetCookingFood() *Cooking {
 	return nil
 }
 
-func (x *DBGourmet) GetFoods() []*Cooking {
+func (x *DBGourmet) GetFoods() []*OrderCook {
 	if x != nil {
 		return x.Foods
 	}
@@ -166,16 +223,23 @@ func (x *DBGourmet) GetItems() []*UserAssets {
 	return nil
 }
 
-func (x *DBGourmet) GetSkilllv() map[int32]int32 {
+func (x *DBGourmet) GetSkill() map[int32]int32 {
 	if x != nil {
-		return x.Skilllv
+		return x.Skill
 	}
 	return nil
 }
 
-func (x *DBGourmet) GetOrdercosttime() int32 {
+func (x *DBGourmet) GetProductionSkill() int32 {
 	if x != nil {
-		return x.Ordercosttime
+		return x.ProductionSkill
+	}
+	return 0
+}
+
+func (x *DBGourmet) GetOrderCostTime() int32 {
+	if x != nil {
+		return x.OrderCostTime
 	}
 	return 0
 }
@@ -192,35 +256,41 @@ var File_gourmet_gourmet_db_proto protoreflect.FileDescriptor
 var file_gourmet_gourmet_db_proto_rawDesc = []byte{
 	0x0a, 0x18, 0x67, 0x6f, 0x75, 0x72, 0x6d, 0x65, 0x74, 0x2f, 0x67, 0x6f, 0x75, 0x72, 0x6d, 0x65,
 	0x74, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0a, 0x63, 0x6f, 0x6d, 0x6d,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x5f, 0x0a, 0x07, 0x43, 0x6f, 0x6f, 0x6b, 0x69, 0x6e,
+	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x3b, 0x0a, 0x07, 0x43, 0x6f, 0x6f, 0x6b, 0x69, 0x6e,
 	0x67, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x6f, 0x6f, 0x64, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x05, 0x52, 0x08, 0x66, 0x6f, 0x6f, 0x64, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1c, 0x0a,
+	0x01, 0x28, 0x05, 0x52, 0x08, 0x66, 0x6f, 0x6f, 0x64, 0x54, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a,
-	0x09, 0x66, 0x6f, 0x6f, 0x64, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05,
+	0x05, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x65, 0x54,
-	0x52, 0x09, 0x66, 0x6f, 0x6f, 0x64, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x63,
+	0x69, 0x6d, 0x65, 0x22, 0x61, 0x0a, 0x09, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x43, 0x6f, 0x6f, 0x6b,
-	0x6f, 0x6f, 0x6b, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x63,
+	0x12, 0x1a, 0x0a, 0x08, 0x66, 0x6f, 0x6f, 0x64, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01,
-	0x6f, 0x6f, 0x6b, 0x54, 0x69, 0x6d, 0x65, 0x22, 0xc7, 0x02, 0x0a, 0x09, 0x44, 0x42, 0x47, 0x6f,
+	0x28, 0x05, 0x52, 0x08, 0x66, 0x6f, 0x6f, 0x64, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1c, 0x0a, 0x09,
-	0x75, 0x72, 0x6d, 0x65, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x66, 0x6f, 0x6f, 0x64, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52,
-	0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01,
+	0x09, 0x66, 0x6f, 0x6f, 0x64, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x6f,
-	0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x2a, 0x0a, 0x0b, 0x63, 0x6f, 0x6f, 0x6b, 0x69,
+	0x6f, 0x6b, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x63, 0x6f,
-	0x6e, 0x67, 0x46, 0x6f, 0x6f, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x43,
+	0x6f, 0x6b, 0x54, 0x69, 0x6d, 0x65, 0x22, 0xeb, 0x02, 0x0a, 0x09, 0x44, 0x42, 0x47, 0x6f, 0x75,
-	0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x0b, 0x63, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x46,
+	0x72, 0x6d, 0x65, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
-	0x6f, 0x6f, 0x64, 0x12, 0x1e, 0x0a, 0x05, 0x66, 0x6f, 0x6f, 0x64, 0x73, 0x18, 0x04, 0x20, 0x03,
+	0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x28, 0x0b, 0x32, 0x08, 0x2e, 0x43, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x05, 0x66, 0x6f,
+	0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x2a, 0x0a, 0x0b, 0x63, 0x6f, 0x6f, 0x6b, 0x69, 0x6e,
-	0x6f, 0x64, 0x73, 0x12, 0x21, 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x05, 0x20, 0x03,
+	0x67, 0x46, 0x6f, 0x6f, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x43, 0x6f,
-	0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52,
+	0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x0b, 0x63, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x46, 0x6f,
-	0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x12, 0x31, 0x0a, 0x07, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x6c,
+	0x6f, 0x64, 0x12, 0x20, 0x0a, 0x05, 0x66, 0x6f, 0x6f, 0x64, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28,
-	0x76, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x44, 0x42, 0x47, 0x6f, 0x75, 0x72,
+	0x0b, 0x32, 0x0a, 0x2e, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x43, 0x6f, 0x6f, 0x6b, 0x52, 0x05, 0x66,
-	0x6d, 0x65, 0x74, 0x2e, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x6c, 0x76, 0x45, 0x6e, 0x74, 0x72, 0x79,
+	0x6f, 0x6f, 0x64, 0x73, 0x12, 0x21, 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x05, 0x20,
-	0x52, 0x07, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x6c, 0x76, 0x12, 0x24, 0x0a, 0x0d, 0x6f, 0x72, 0x64,
+	0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73,
-	0x65, 0x72, 0x63, 0x6f, 0x73, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05,
+	0x52, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x12, 0x2b, 0x0a, 0x05, 0x73, 0x6b, 0x69, 0x6c, 0x6c,
-	0x52, 0x0d, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x63, 0x6f, 0x73, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x12,
+	0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x44, 0x42, 0x47, 0x6f, 0x75, 0x72, 0x6d,
-	0x14, 0x0a, 0x05, 0x63, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05,
+	0x65, 0x74, 0x2e, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x73,
-	0x63, 0x74, 0x69, 0x6d, 0x65, 0x1a, 0x3a, 0x0a, 0x0c, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x6c, 0x76,
+	0x6b, 0x69, 0x6c, 0x6c, 0x12, 0x28, 0x0a, 0x0f, 0x70, 0x72, 0x6f, 0x64, 0x75, 0x63, 0x74, 0x69,
-	0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01,
+	0x6f, 0x6e, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0f, 0x70,
-	0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
+	0x72, 0x6f, 0x64, 0x75, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x12, 0x24,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38,
+	0x0a, 0x0d, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x43, 0x6f, 0x73, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x18,
-	0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0d, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x43, 0x6f, 0x73, 0x74,
-	0x33,
+	0x54, 0x69, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x09, 0x20,
+	0x01, 0x28, 0x03, 0x52, 0x05, 0x63, 0x74, 0x69, 0x6d, 0x65, 0x1a, 0x38, 0x0a, 0x0a, 0x53, 0x6b,
+	0x69, 0x6c, 0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x05, 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, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -235,18 +305,19 @@ func file_gourmet_gourmet_db_proto_rawDescGZIP() []byte {
 	return file_gourmet_gourmet_db_proto_rawDescData
 }
 
-var file_gourmet_gourmet_db_proto_msgTypes = make([]protoimpl.MessageInfo, 3)
+var file_gourmet_gourmet_db_proto_msgTypes = make([]protoimpl.MessageInfo, 4)
 var file_gourmet_gourmet_db_proto_goTypes = []interface{}{
 	(*Cooking)(nil),    // 0: Cooking
-	(*DBGourmet)(nil),  // 1: DBGourmet
+	(*OrderCook)(nil),  // 1: OrderCook
-	nil,                // 2: DBGourmet.SkilllvEntry
+	(*DBGourmet)(nil),  // 2: DBGourmet
-	(*UserAssets)(nil), // 3: UserAssets
+	nil,                // 3: DBGourmet.SkillEntry
+	(*UserAssets)(nil), // 4: UserAssets
 }
 var file_gourmet_gourmet_db_proto_depIdxs = []int32{
 	0, // 0: DBGourmet.cookingFood:type_name -> Cooking
-	0, // 1: DBGourmet.foods:type_name -> Cooking
+	1, // 1: DBGourmet.foods:type_name -> OrderCook
-	3, // 2: DBGourmet.items:type_name -> UserAssets
+	4, // 2: DBGourmet.items:type_name -> UserAssets
-	2, // 3: DBGourmet.skilllv:type_name -> DBGourmet.SkilllvEntry
+	3, // 3: DBGourmet.skill:type_name -> DBGourmet.SkillEntry
 	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
@@ -274,6 +345,18 @@ func file_gourmet_gourmet_db_proto_init() {
 			}
 		}
 		file_gourmet_gourmet_db_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*OrderCook); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_gourmet_gourmet_db_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*DBGourmet); i {
 			case 0:
 				return &v.state
@@ -292,7 +375,7 @@ func file_gourmet_gourmet_db_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_gourmet_gourmet_db_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   3,
+			NumMessages:   4,
 			NumExtensions: 0,
 			NumServices:   0,
 		},

pb/gourmet_msg.pb.go

@@ -113,7 +113,7 @@ type GourmetCreateOrderReq struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Order []*Cooking `protobuf:"bytes,1,rep,name=order,proto3" json:"order"` // 烹饪时间不用传 后端会重新计算
+	Order []*OrderCook `protobuf:"bytes,1,rep,name=order,proto3" json:"order"` // 烹饪时间不用传 后端会重新计算
 }
 
 func (x *GourmetCreateOrderReq) Reset() {
@@ -148,7 +148,7 @@ func (*GourmetCreateOrderReq) Descriptor() ([]byte, []int) {
 	return file_gourmet_gourmet_msg_proto_rawDescGZIP(), []int{2}
 }
 
-func (x *GourmetCreateOrderReq) GetOrder() []*Cooking {
+func (x *GourmetCreateOrderReq) GetOrder() []*OrderCook {
 	if x != nil {
 		return x.Order
 	}
@@ -288,6 +288,101 @@ func (x *GourmetGetRewardResp) GetData() *DBGourmet {
 	return nil
 }
 
+// 技能升级
+type GourmetSkillLvReq struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	SkillId int32 `protobuf:"varint,1,opt,name=skillId,proto3" json:"skillId"` // 技能id
+}
+
+func (x *GourmetSkillLvReq) Reset() {
+	*x = GourmetSkillLvReq{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_gourmet_gourmet_msg_proto_msgTypes[6]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *GourmetSkillLvReq) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*GourmetSkillLvReq) ProtoMessage() {}
+
+func (x *GourmetSkillLvReq) ProtoReflect() protoreflect.Message {
+	mi := &file_gourmet_gourmet_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 GourmetSkillLvReq.ProtoReflect.Descriptor instead.
+func (*GourmetSkillLvReq) Descriptor() ([]byte, []int) {
+	return file_gourmet_gourmet_msg_proto_rawDescGZIP(), []int{6}
+}
+
+func (x *GourmetSkillLvReq) GetSkillId() int32 {
+	if x != nil {
+		return x.SkillId
+	}
+	return 0
+}
+
+type GourmetSkillLvResp struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Data *DBGourmet `protobuf:"bytes,1,opt,name=data,proto3" json:"data"`
+}
+
+func (x *GourmetSkillLvResp) Reset() {
+	*x = GourmetSkillLvResp{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_gourmet_gourmet_msg_proto_msgTypes[7]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *GourmetSkillLvResp) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*GourmetSkillLvResp) ProtoMessage() {}
+
+func (x *GourmetSkillLvResp) ProtoReflect() protoreflect.Message {
+	mi := &file_gourmet_gourmet_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 GourmetSkillLvResp.ProtoReflect.Descriptor instead.
+func (*GourmetSkillLvResp) Descriptor() ([]byte, []int) {
+	return file_gourmet_gourmet_msg_proto_rawDescGZIP(), []int{7}
+}
+
+func (x *GourmetSkillLvResp) GetData() *DBGourmet {
+	if x != nil {
+		return x.Data
+	}
+	return nil
+}
+
 var File_gourmet_gourmet_msg_proto protoreflect.FileDescriptor
 
 var file_gourmet_gourmet_msg_proto_rawDesc = []byte{
@@ -299,20 +394,26 @@ var file_gourmet_gourmet_msg_proto_rawDesc = []byte{
 	0x75, 0x72, 0x6d, 0x65, 0x74, 0x47, 0x65, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70,
 	0x12, 0x1e, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a,
 	0x2e, 0x44, 0x42, 0x47, 0x6f, 0x75, 0x72, 0x6d, 0x65, 0x74, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61,
-	0x22, 0x37, 0x0a, 0x15, 0x47, 0x6f, 0x75, 0x72, 0x6d, 0x65, 0x74, 0x43, 0x72, 0x65, 0x61, 0x74,
+	0x22, 0x39, 0x0a, 0x15, 0x47, 0x6f, 0x75, 0x72, 0x6d, 0x65, 0x74, 0x43, 0x72, 0x65, 0x61, 0x74,
-	0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x1e, 0x0a, 0x05, 0x6f, 0x72, 0x64,
+	0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x20, 0x0a, 0x05, 0x6f, 0x72, 0x64,
-	0x65, 0x72, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x43, 0x6f, 0x6f, 0x6b, 0x69,
+	0x65, 0x72, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x4f, 0x72, 0x64, 0x65, 0x72,
-	0x6e, 0x67, 0x52, 0x05, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x22, 0x38, 0x0a, 0x16, 0x47, 0x6f, 0x75,
+	0x43, 0x6f, 0x6f, 0x6b, 0x52, 0x05, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x22, 0x38, 0x0a, 0x16, 0x47,
-	0x72, 0x6d, 0x65, 0x74, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52,
+	0x6f, 0x75, 0x72, 0x6d, 0x65, 0x74, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4f, 0x72, 0x64, 0x65,
-	0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20,
-	0x0b, 0x32, 0x0a, 0x2e, 0x44, 0x42, 0x47, 0x6f, 0x75, 0x72, 0x6d, 0x65, 0x74, 0x52, 0x04, 0x64,
+	0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x44, 0x42, 0x47, 0x6f, 0x75, 0x72, 0x6d, 0x65, 0x74, 0x52,
-	0x61, 0x74, 0x61, 0x22, 0x15, 0x0a, 0x13, 0x47, 0x6f, 0x75, 0x72, 0x6d, 0x65, 0x74, 0x47, 0x65,
+	0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x15, 0x0a, 0x13, 0x47, 0x6f, 0x75, 0x72, 0x6d, 0x65, 0x74,
-	0x74, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x22, 0x36, 0x0a, 0x14, 0x47, 0x6f,
+	0x47, 0x65, 0x74, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x22, 0x36, 0x0a, 0x14,
-	0x75, 0x72, 0x6d, 0x65, 0x74, 0x47, 0x65, 0x74, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65,
+	0x47, 0x6f, 0x75, 0x72, 0x6d, 0x65, 0x74, 0x47, 0x65, 0x74, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64,
-	0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
+	0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01,
-	0x32, 0x0a, 0x2e, 0x44, 0x42, 0x47, 0x6f, 0x75, 0x72, 0x6d, 0x65, 0x74, 0x52, 0x04, 0x64, 0x61,
+	0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x44, 0x42, 0x47, 0x6f, 0x75, 0x72, 0x6d, 0x65, 0x74, 0x52, 0x04,
-	0x74, 0x61, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
+	0x64, 0x61, 0x74, 0x61, 0x22, 0x2d, 0x0a, 0x11, 0x47, 0x6f, 0x75, 0x72, 0x6d, 0x65, 0x74, 0x53,
-	0x6f, 0x33,
+	0x6b, 0x69, 0x6c, 0x6c, 0x4c, 0x76, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x6b, 0x69,
+	0x6c, 0x6c, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x73, 0x6b, 0x69, 0x6c,
+	0x6c, 0x49, 0x64, 0x22, 0x34, 0x0a, 0x12, 0x47, 0x6f, 0x75, 0x72, 0x6d, 0x65, 0x74, 0x53, 0x6b,
+	0x69, 0x6c, 0x6c, 0x4c, 0x76, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x64, 0x61, 0x74,
+	0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x44, 0x42, 0x47, 0x6f, 0x75, 0x72,
+	0x6d, 0x65, 0x74, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70,
+	0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -327,7 +428,7 @@ func file_gourmet_gourmet_msg_proto_rawDescGZIP() []byte {
 	return file_gourmet_gourmet_msg_proto_rawDescData
 }
 
-var file_gourmet_gourmet_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 6)
+var file_gourmet_gourmet_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 8)
 var file_gourmet_gourmet_msg_proto_goTypes = []interface{}{
 	(*GourmetGetListReq)(nil),      // 0: GourmetGetListReq
 	(*GourmetGetListResp)(nil),     // 1: GourmetGetListResp
@@ -335,19 +436,22 @@ var file_gourmet_gourmet_msg_proto_goTypes = []interface{}{
 	(*GourmetCreateOrderResp)(nil), // 3: GourmetCreateOrderResp
 	(*GourmetGetRewardReq)(nil),    // 4: GourmetGetRewardReq
 	(*GourmetGetRewardResp)(nil),   // 5: GourmetGetRewardResp
-	(*DBGourmet)(nil),              // 6: DBGourmet
+	(*GourmetSkillLvReq)(nil),      // 6: GourmetSkillLvReq
-	(*Cooking)(nil),                // 7: Cooking
+	(*GourmetSkillLvResp)(nil),     // 7: GourmetSkillLvResp
+	(*DBGourmet)(nil),              // 8: DBGourmet
+	(*OrderCook)(nil),              // 9: OrderCook
 }
 var file_gourmet_gourmet_msg_proto_depIdxs = []int32{
-	6, // 0: GourmetGetListResp.data:type_name -> DBGourmet
+	8, // 0: GourmetGetListResp.data:type_name -> DBGourmet
-	7, // 1: GourmetCreateOrderReq.order:type_name -> Cooking
+	9, // 1: GourmetCreateOrderReq.order:type_name -> OrderCook
-	6, // 2: GourmetCreateOrderResp.data:type_name -> DBGourmet
+	8, // 2: GourmetCreateOrderResp.data:type_name -> DBGourmet
-	6, // 3: GourmetGetRewardResp.data:type_name -> DBGourmet
+	8, // 3: GourmetGetRewardResp.data:type_name -> DBGourmet
-	4, // [4:4] is the sub-list for method output_type
+	8, // 4: GourmetSkillLvResp.data:type_name -> DBGourmet
-	4, // [4:4] is the sub-list for method input_type
+	5, // [5:5] is the sub-list for method output_type
-	4, // [4:4] is the sub-list for extension type_name
+	5, // [5:5] is the sub-list for method input_type
-	4, // [4:4] is the sub-list for extension extendee
+	5, // [5:5] is the sub-list for extension type_name
-	0, // [0:4] is the sub-list for field type_name
+	5, // [5:5] is the sub-list for extension extendee
+	0, // [0:5] is the sub-list for field type_name
 }
 
 func init() { file_gourmet_gourmet_msg_proto_init() }
@@ -429,6 +533,30 @@ func file_gourmet_gourmet_msg_proto_init() {
 				return nil
 			}
 		}
+		file_gourmet_gourmet_msg_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*GourmetSkillLvReq); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_gourmet_gourmet_msg_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*GourmetSkillLvResp); 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{
@@ -436,7 +564,7 @@ func file_gourmet_gourmet_msg_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_gourmet_gourmet_msg_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   6,
+			NumMessages:   8,
 			NumExtensions: 0,
 			NumServices:   0,
 		},