From 73ab7486cfe54fa7a72a23db7107841cc146139a Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Wed, 30 Nov 2022 13:57:15 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=B4=AD=E4=B9=B0=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E5=B7=B2=E8=B4=AD=E4=B9=B0=E6=AC=A1=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/hero/api_buy.go | 6 +++++- modules/library/api_activationfetter.go | 2 +- pb/hero_msg.pb.go | 25 ++++++++++++++++++++++--- 3 files changed, 28 insertions(+), 5 deletions(-) diff --git a/modules/hero/api_buy.go b/modules/hero/api_buy.go index d2454fc9a..df951e7cc 100644 --- a/modules/hero/api_buy.go +++ b/modules/hero/api_buy.go @@ -118,6 +118,10 @@ func (this *apiComp) Buy(session comm.IUserSession, req *pb.HeroBuyReq) (code pb this.module.ModuleRtask.SendToRtask(session, comm.Rtype67, v.N, utils.ToInt32(v.T)) } } - session.SendMsg(string(this.module.GetType()), "buy", &pb.HeroBuyResp{IsSucc: true}) + session.SendMsg(string(this.module.GetType()), "buy", &pb.HeroBuyResp{ + IsSucc: true, + Onebuy: record.Onebuy + req.BuyCount, + Tenbuy: record.Tenbuy + req.BuyCount, + }) return } diff --git a/modules/library/api_activationfetter.go b/modules/library/api_activationfetter.go index 8eb217f3e..6dadef94b 100644 --- a/modules/library/api_activationfetter.go +++ b/modules/library/api_activationfetter.go @@ -37,7 +37,7 @@ func (this *apiComp) ActivationFetter(session comm.IUserSession, req *pb.Library mapData["activation"] = fetter.Activation // 激活的时候算一下 当前羁绊等级 list := this.module.modelFetter.getHeroFetterList(session.GetUserId()) - conf := this.configure.GetLibraryFetter(fetter.Fid, 1) + conf := this.module.configure.GetLibraryFetter(fetter.Fid, 1) var minLv int32 for _, v1 := range conf.Hid { for _, v := range list { diff --git a/pb/hero_msg.pb.go b/pb/hero_msg.pb.go index 94a001121..5eb2759dd 100644 --- a/pb/hero_msg.pb.go +++ b/pb/hero_msg.pb.go @@ -2181,7 +2181,9 @@ type HeroBuyResp struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - IsSucc bool `protobuf:"varint,1,opt,name=IsSucc,proto3" json:"IsSucc"` + IsSucc bool `protobuf:"varint,1,opt,name=IsSucc,proto3" json:"IsSucc"` + Onebuy int32 `protobuf:"varint,3,opt,name=onebuy,proto3" json:"onebuy"` // 单次购买次数 + Tenbuy int32 `protobuf:"varint,4,opt,name=tenbuy,proto3" json:"tenbuy"` // 十连购买次数 } func (x *HeroBuyResp) Reset() { @@ -2223,6 +2225,20 @@ func (x *HeroBuyResp) GetIsSucc() bool { return false } +func (x *HeroBuyResp) GetOnebuy() int32 { + if x != nil { + return x.Onebuy + } + return 0 +} + +func (x *HeroBuyResp) GetTenbuy() int32 { + if x != nil { + return x.Tenbuy + } + return 0 +} + var File_hero_hero_msg_proto protoreflect.FileDescriptor var file_hero_hero_msg_proto_rawDesc = []byte{ @@ -2417,9 +2433,12 @@ var file_hero_hero_msg_proto_rawDesc = []byte{ 0x0a, 0x07, 0x62, 0x75, 0x79, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x62, 0x75, 0x79, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x75, 0x79, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x62, 0x75, 0x79, 0x43, - 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x25, 0x0a, 0x0b, 0x48, 0x65, 0x72, 0x6f, 0x42, 0x75, 0x79, 0x52, + 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x55, 0x0a, 0x0b, 0x48, 0x65, 0x72, 0x6f, 0x42, 0x75, 0x79, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x49, 0x73, 0x53, 0x75, 0x63, 0x63, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x08, 0x52, 0x06, 0x49, 0x73, 0x53, 0x75, 0x63, 0x63, 0x42, 0x06, 0x5a, 0x04, 0x2e, + 0x01, 0x28, 0x08, 0x52, 0x06, 0x49, 0x73, 0x53, 0x75, 0x63, 0x63, 0x12, 0x16, 0x0a, 0x06, 0x6f, + 0x6e, 0x65, 0x62, 0x75, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x6f, 0x6e, 0x65, + 0x62, 0x75, 0x79, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x65, 0x6e, 0x62, 0x75, 0x79, 0x18, 0x04, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x65, 0x6e, 0x62, 0x75, 0x79, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } From 368f85f71205207925e3f5048fd6e5d666e897e3 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Wed, 30 Nov 2022 15:34:22 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_gourmet.json | 974 +++++++++++++++++----- sys/configure/structs/game.GourmetData.go | 25 +- 2 files changed, 760 insertions(+), 239 deletions(-) diff --git a/bin/json/game_gourmet.json b/bin/json/game_gourmet.json index c14af617d..9f17a005d 100644 --- a/bin/json/game_gourmet.json +++ b/bin/json/game_gourmet.json @@ -5,7 +5,10 @@ "skill_type": 1, "initial": 1, "level": 1, - "colour_level_affix": 10101, + "colour_level_affix": { + "key": "gourmet_lv1", + "text": "马马虎虎" + }, "name": { "key": "gourmet_name1", "text": "魔法厨艺" @@ -32,11 +35,18 @@ "n": 1 } ], - "item_colour_affix": [ - 10002, - 10001, - 10001 - ], + "item_colour_affix1": { + "key": "gourmet_affix2", + "text": "极低" + }, + "item_colour_affix2": { + "key": "gourmet_affix1", + "text": "无" + }, + "item_colour_affix3": { + "key": "gourmet_affix1", + "text": "无" + }, "delicious_consume": [ { "a": "item", @@ -64,7 +74,10 @@ "skill_type": 1, "initial": 0, "level": 2, - "colour_level_affix": 10102, + "colour_level_affix": { + "key": "gourmet_lv2", + "text": "可圈可点" + }, "name": { "key": "gourmet_name1", "text": "魔法厨艺" @@ -91,11 +104,18 @@ "n": 1 } ], - "item_colour_affix": [ - 10002, - 10002, - 10001 - ], + "item_colour_affix1": { + "key": "gourmet_affix2", + "text": "极低" + }, + "item_colour_affix2": { + "key": "gourmet_affix2", + "text": "极低" + }, + "item_colour_affix3": { + "key": "gourmet_affix1", + "text": "无" + }, "delicious_consume": [ { "a": "item", @@ -123,7 +143,10 @@ "skill_type": 1, "initial": 0, "level": 3, - "colour_level_affix": 10103, + "colour_level_affix": { + "key": "gourmet_lv3", + "text": "孰能生巧" + }, "name": { "key": "gourmet_name1", "text": "魔法厨艺" @@ -150,11 +173,18 @@ "n": 1 } ], - "item_colour_affix": [ - 10002, - 10002, - 10002 - ], + "item_colour_affix1": { + "key": "gourmet_affix2", + "text": "极低" + }, + "item_colour_affix2": { + "key": "gourmet_affix2", + "text": "极低" + }, + "item_colour_affix3": { + "key": "gourmet_affix2", + "text": "极低" + }, "delicious_consume": [ { "a": "item", @@ -182,7 +212,10 @@ "skill_type": 1, "initial": 0, "level": 4, - "colour_level_affix": 10104, + "colour_level_affix": { + "key": "gourmet_lv4", + "text": "驾轻就熟" + }, "name": { "key": "gourmet_name1", "text": "魔法厨艺" @@ -209,11 +242,18 @@ "n": 1 } ], - "item_colour_affix": [ - 10003, - 10002, - 10002 - ], + "item_colour_affix1": { + "key": "gourmet_affix3", + "text": "中等" + }, + "item_colour_affix2": { + "key": "gourmet_affix2", + "text": "极低" + }, + "item_colour_affix3": { + "key": "gourmet_affix2", + "text": "极低" + }, "delicious_consume": [ { "a": "item", @@ -241,7 +281,10 @@ "skill_type": 1, "initial": 0, "level": 5, - "colour_level_affix": 10105, + "colour_level_affix": { + "key": "gourmet_lv5", + "text": "得心应手" + }, "name": { "key": "gourmet_name1", "text": "魔法厨艺" @@ -268,11 +311,18 @@ "n": 1 } ], - "item_colour_affix": [ - 10003, - 10003, - 10002 - ], + "item_colour_affix1": { + "key": "gourmet_affix3", + "text": "中等" + }, + "item_colour_affix2": { + "key": "gourmet_affix3", + "text": "中等" + }, + "item_colour_affix3": { + "key": "gourmet_affix2", + "text": "极低" + }, "delicious_consume": [ { "a": "item", @@ -300,7 +350,10 @@ "skill_type": 1, "initial": 0, "level": 6, - "colour_level_affix": 10106, + "colour_level_affix": { + "key": "gourmet_lv6", + "text": "游刃有余" + }, "name": { "key": "gourmet_name1", "text": "魔法厨艺" @@ -327,11 +380,18 @@ "n": 1 } ], - "item_colour_affix": [ - 10003, - 10003, - 10003 - ], + "item_colour_affix1": { + "key": "gourmet_affix3", + "text": "中等" + }, + "item_colour_affix2": { + "key": "gourmet_affix3", + "text": "中等" + }, + "item_colour_affix3": { + "key": "gourmet_affix3", + "text": "中等" + }, "delicious_consume": [ { "a": "item", @@ -359,7 +419,10 @@ "skill_type": 1, "initial": 0, "level": 7, - "colour_level_affix": 10107, + "colour_level_affix": { + "key": "gourmet_lv7", + "text": "匠心独运" + }, "name": { "key": "gourmet_name1", "text": "魔法厨艺" @@ -386,11 +449,18 @@ "n": 1 } ], - "item_colour_affix": [ - 10004, - 10003, - 10003 - ], + "item_colour_affix1": { + "key": "gourmet_affix4", + "text": "较高" + }, + "item_colour_affix2": { + "key": "gourmet_affix3", + "text": "中等" + }, + "item_colour_affix3": { + "key": "gourmet_affix3", + "text": "中等" + }, "delicious_consume": [ { "a": "item", @@ -418,7 +488,10 @@ "skill_type": 1, "initial": 0, "level": 8, - "colour_level_affix": 10108, + "colour_level_affix": { + "key": "gourmet_lv8", + "text": "神乎其技" + }, "name": { "key": "gourmet_name1", "text": "魔法厨艺" @@ -445,11 +518,18 @@ "n": 1 } ], - "item_colour_affix": [ - 10004, - 10004, - 10003 - ], + "item_colour_affix1": { + "key": "gourmet_affix4", + "text": "较高" + }, + "item_colour_affix2": { + "key": "gourmet_affix4", + "text": "较高" + }, + "item_colour_affix3": { + "key": "gourmet_affix3", + "text": "中等" + }, "delicious_consume": [ { "a": "item", @@ -477,7 +557,10 @@ "skill_type": 1, "initial": 1, "level": 1, - "colour_level_affix": 10101, + "colour_level_affix": { + "key": "gourmet_lv1", + "text": "马马虎虎" + }, "name": { "key": "gourmet_name2", "text": "功夫厨艺" @@ -504,11 +587,18 @@ "n": 1 } ], - "item_colour_affix": [ - 10002, - 10001, - 10001 - ], + "item_colour_affix1": { + "key": "gourmet_affix2", + "text": "极低" + }, + "item_colour_affix2": { + "key": "gourmet_affix1", + "text": "无" + }, + "item_colour_affix3": { + "key": "gourmet_affix1", + "text": "无" + }, "delicious_consume": [ { "a": "item", @@ -536,7 +626,10 @@ "skill_type": 1, "initial": 0, "level": 2, - "colour_level_affix": 10102, + "colour_level_affix": { + "key": "gourmet_lv2", + "text": "可圈可点" + }, "name": { "key": "gourmet_name2", "text": "功夫厨艺" @@ -563,11 +656,18 @@ "n": 1 } ], - "item_colour_affix": [ - 10002, - 10002, - 10001 - ], + "item_colour_affix1": { + "key": "gourmet_affix2", + "text": "极低" + }, + "item_colour_affix2": { + "key": "gourmet_affix2", + "text": "极低" + }, + "item_colour_affix3": { + "key": "gourmet_affix1", + "text": "无" + }, "delicious_consume": [ { "a": "item", @@ -595,7 +695,10 @@ "skill_type": 1, "initial": 0, "level": 3, - "colour_level_affix": 10103, + "colour_level_affix": { + "key": "gourmet_lv3", + "text": "孰能生巧" + }, "name": { "key": "gourmet_name2", "text": "功夫厨艺" @@ -622,11 +725,18 @@ "n": 1 } ], - "item_colour_affix": [ - 10002, - 10002, - 10002 - ], + "item_colour_affix1": { + "key": "gourmet_affix2", + "text": "极低" + }, + "item_colour_affix2": { + "key": "gourmet_affix2", + "text": "极低" + }, + "item_colour_affix3": { + "key": "gourmet_affix2", + "text": "极低" + }, "delicious_consume": [ { "a": "item", @@ -654,7 +764,10 @@ "skill_type": 1, "initial": 0, "level": 4, - "colour_level_affix": 10104, + "colour_level_affix": { + "key": "gourmet_lv4", + "text": "驾轻就熟" + }, "name": { "key": "gourmet_name2", "text": "功夫厨艺" @@ -681,11 +794,18 @@ "n": 1 } ], - "item_colour_affix": [ - 10003, - 10002, - 10002 - ], + "item_colour_affix1": { + "key": "gourmet_affix3", + "text": "中等" + }, + "item_colour_affix2": { + "key": "gourmet_affix2", + "text": "极低" + }, + "item_colour_affix3": { + "key": "gourmet_affix2", + "text": "极低" + }, "delicious_consume": [ { "a": "item", @@ -713,7 +833,10 @@ "skill_type": 1, "initial": 0, "level": 5, - "colour_level_affix": 10105, + "colour_level_affix": { + "key": "gourmet_lv5", + "text": "得心应手" + }, "name": { "key": "gourmet_name2", "text": "功夫厨艺" @@ -740,11 +863,18 @@ "n": 1 } ], - "item_colour_affix": [ - 10003, - 10003, - 10002 - ], + "item_colour_affix1": { + "key": "gourmet_affix3", + "text": "中等" + }, + "item_colour_affix2": { + "key": "gourmet_affix3", + "text": "中等" + }, + "item_colour_affix3": { + "key": "gourmet_affix2", + "text": "极低" + }, "delicious_consume": [ { "a": "item", @@ -772,7 +902,10 @@ "skill_type": 1, "initial": 0, "level": 6, - "colour_level_affix": 10106, + "colour_level_affix": { + "key": "gourmet_lv6", + "text": "游刃有余" + }, "name": { "key": "gourmet_name2", "text": "功夫厨艺" @@ -799,11 +932,18 @@ "n": 1 } ], - "item_colour_affix": [ - 10003, - 10003, - 10003 - ], + "item_colour_affix1": { + "key": "gourmet_affix3", + "text": "中等" + }, + "item_colour_affix2": { + "key": "gourmet_affix3", + "text": "中等" + }, + "item_colour_affix3": { + "key": "gourmet_affix3", + "text": "中等" + }, "delicious_consume": [ { "a": "item", @@ -831,7 +971,10 @@ "skill_type": 1, "initial": 0, "level": 7, - "colour_level_affix": 10107, + "colour_level_affix": { + "key": "gourmet_lv7", + "text": "匠心独运" + }, "name": { "key": "gourmet_name2", "text": "功夫厨艺" @@ -858,11 +1001,18 @@ "n": 1 } ], - "item_colour_affix": [ - 10004, - 10003, - 10003 - ], + "item_colour_affix1": { + "key": "gourmet_affix4", + "text": "较高" + }, + "item_colour_affix2": { + "key": "gourmet_affix3", + "text": "中等" + }, + "item_colour_affix3": { + "key": "gourmet_affix3", + "text": "中等" + }, "delicious_consume": [ { "a": "item", @@ -890,7 +1040,10 @@ "skill_type": 1, "initial": 0, "level": 8, - "colour_level_affix": 10108, + "colour_level_affix": { + "key": "gourmet_lv8", + "text": "神乎其技" + }, "name": { "key": "gourmet_name2", "text": "功夫厨艺" @@ -917,11 +1070,18 @@ "n": 1 } ], - "item_colour_affix": [ - 10004, - 10004, - 10003 - ], + "item_colour_affix1": { + "key": "gourmet_affix4", + "text": "较高" + }, + "item_colour_affix2": { + "key": "gourmet_affix4", + "text": "较高" + }, + "item_colour_affix3": { + "key": "gourmet_affix3", + "text": "中等" + }, "delicious_consume": [ { "a": "item", @@ -949,7 +1109,10 @@ "skill_type": 1, "initial": 1, "level": 1, - "colour_level_affix": 10101, + "colour_level_affix": { + "key": "gourmet_lv1", + "text": "马马虎虎" + }, "name": { "key": "gourmet_name3", "text": "科技厨艺" @@ -976,11 +1139,18 @@ "n": 1 } ], - "item_colour_affix": [ - 10002, - 10001, - 10001 - ], + "item_colour_affix1": { + "key": "gourmet_affix2", + "text": "极低" + }, + "item_colour_affix2": { + "key": "gourmet_affix1", + "text": "无" + }, + "item_colour_affix3": { + "key": "gourmet_affix1", + "text": "无" + }, "delicious_consume": [ { "a": "item", @@ -1008,7 +1178,10 @@ "skill_type": 1, "initial": 0, "level": 2, - "colour_level_affix": 10102, + "colour_level_affix": { + "key": "gourmet_lv2", + "text": "可圈可点" + }, "name": { "key": "gourmet_name3", "text": "科技厨艺" @@ -1035,11 +1208,18 @@ "n": 1 } ], - "item_colour_affix": [ - 10002, - 10002, - 10001 - ], + "item_colour_affix1": { + "key": "gourmet_affix2", + "text": "极低" + }, + "item_colour_affix2": { + "key": "gourmet_affix2", + "text": "极低" + }, + "item_colour_affix3": { + "key": "gourmet_affix1", + "text": "无" + }, "delicious_consume": [ { "a": "item", @@ -1067,7 +1247,10 @@ "skill_type": 1, "initial": 0, "level": 3, - "colour_level_affix": 10103, + "colour_level_affix": { + "key": "gourmet_lv3", + "text": "孰能生巧" + }, "name": { "key": "gourmet_name3", "text": "科技厨艺" @@ -1094,11 +1277,18 @@ "n": 1 } ], - "item_colour_affix": [ - 10002, - 10002, - 10002 - ], + "item_colour_affix1": { + "key": "gourmet_affix2", + "text": "极低" + }, + "item_colour_affix2": { + "key": "gourmet_affix2", + "text": "极低" + }, + "item_colour_affix3": { + "key": "gourmet_affix2", + "text": "极低" + }, "delicious_consume": [ { "a": "item", @@ -1126,7 +1316,10 @@ "skill_type": 1, "initial": 0, "level": 4, - "colour_level_affix": 10104, + "colour_level_affix": { + "key": "gourmet_lv4", + "text": "驾轻就熟" + }, "name": { "key": "gourmet_name3", "text": "科技厨艺" @@ -1153,11 +1346,18 @@ "n": 1 } ], - "item_colour_affix": [ - 10003, - 10002, - 10002 - ], + "item_colour_affix1": { + "key": "gourmet_affix3", + "text": "中等" + }, + "item_colour_affix2": { + "key": "gourmet_affix2", + "text": "极低" + }, + "item_colour_affix3": { + "key": "gourmet_affix2", + "text": "极低" + }, "delicious_consume": [ { "a": "item", @@ -1185,7 +1385,10 @@ "skill_type": 1, "initial": 0, "level": 5, - "colour_level_affix": 10105, + "colour_level_affix": { + "key": "gourmet_lv5", + "text": "得心应手" + }, "name": { "key": "gourmet_name3", "text": "科技厨艺" @@ -1212,11 +1415,18 @@ "n": 1 } ], - "item_colour_affix": [ - 10003, - 10003, - 10002 - ], + "item_colour_affix1": { + "key": "gourmet_affix3", + "text": "中等" + }, + "item_colour_affix2": { + "key": "gourmet_affix3", + "text": "中等" + }, + "item_colour_affix3": { + "key": "gourmet_affix2", + "text": "极低" + }, "delicious_consume": [ { "a": "item", @@ -1244,7 +1454,10 @@ "skill_type": 1, "initial": 0, "level": 6, - "colour_level_affix": 10106, + "colour_level_affix": { + "key": "gourmet_lv6", + "text": "游刃有余" + }, "name": { "key": "gourmet_name3", "text": "科技厨艺" @@ -1271,11 +1484,18 @@ "n": 1 } ], - "item_colour_affix": [ - 10003, - 10003, - 10003 - ], + "item_colour_affix1": { + "key": "gourmet_affix3", + "text": "中等" + }, + "item_colour_affix2": { + "key": "gourmet_affix3", + "text": "中等" + }, + "item_colour_affix3": { + "key": "gourmet_affix3", + "text": "中等" + }, "delicious_consume": [ { "a": "item", @@ -1303,7 +1523,10 @@ "skill_type": 1, "initial": 0, "level": 7, - "colour_level_affix": 10107, + "colour_level_affix": { + "key": "gourmet_lv7", + "text": "匠心独运" + }, "name": { "key": "gourmet_name3", "text": "科技厨艺" @@ -1330,11 +1553,18 @@ "n": 1 } ], - "item_colour_affix": [ - 10004, - 10003, - 10003 - ], + "item_colour_affix1": { + "key": "gourmet_affix4", + "text": "较高" + }, + "item_colour_affix2": { + "key": "gourmet_affix3", + "text": "中等" + }, + "item_colour_affix3": { + "key": "gourmet_affix3", + "text": "中等" + }, "delicious_consume": [ { "a": "item", @@ -1362,7 +1592,10 @@ "skill_type": 1, "initial": 0, "level": 8, - "colour_level_affix": 10108, + "colour_level_affix": { + "key": "gourmet_lv8", + "text": "神乎其技" + }, "name": { "key": "gourmet_name3", "text": "科技厨艺" @@ -1389,11 +1622,18 @@ "n": 1 } ], - "item_colour_affix": [ - 10004, - 10004, - 10003 - ], + "item_colour_affix1": { + "key": "gourmet_affix4", + "text": "较高" + }, + "item_colour_affix2": { + "key": "gourmet_affix4", + "text": "较高" + }, + "item_colour_affix3": { + "key": "gourmet_affix3", + "text": "中等" + }, "delicious_consume": [ { "a": "item", @@ -1421,7 +1661,10 @@ "skill_type": 1, "initial": 1, "level": 1, - "colour_level_affix": 10101, + "colour_level_affix": { + "key": "gourmet_lv1", + "text": "马马虎虎" + }, "name": { "key": "gourmet_name4", "text": "月能厨艺" @@ -1448,11 +1691,18 @@ "n": 1 } ], - "item_colour_affix": [ - 10002, - 10001, - 10001 - ], + "item_colour_affix1": { + "key": "gourmet_affix2", + "text": "极低" + }, + "item_colour_affix2": { + "key": "gourmet_affix1", + "text": "无" + }, + "item_colour_affix3": { + "key": "gourmet_affix1", + "text": "无" + }, "delicious_consume": [ { "a": "item", @@ -1480,7 +1730,10 @@ "skill_type": 1, "initial": 0, "level": 2, - "colour_level_affix": 10102, + "colour_level_affix": { + "key": "gourmet_lv2", + "text": "可圈可点" + }, "name": { "key": "gourmet_name4", "text": "月能厨艺" @@ -1507,11 +1760,18 @@ "n": 1 } ], - "item_colour_affix": [ - 10002, - 10002, - 10001 - ], + "item_colour_affix1": { + "key": "gourmet_affix2", + "text": "极低" + }, + "item_colour_affix2": { + "key": "gourmet_affix2", + "text": "极低" + }, + "item_colour_affix3": { + "key": "gourmet_affix1", + "text": "无" + }, "delicious_consume": [ { "a": "item", @@ -1539,7 +1799,10 @@ "skill_type": 1, "initial": 0, "level": 3, - "colour_level_affix": 10103, + "colour_level_affix": { + "key": "gourmet_lv3", + "text": "孰能生巧" + }, "name": { "key": "gourmet_name4", "text": "月能厨艺" @@ -1566,11 +1829,18 @@ "n": 1 } ], - "item_colour_affix": [ - 10002, - 10002, - 10002 - ], + "item_colour_affix1": { + "key": "gourmet_affix2", + "text": "极低" + }, + "item_colour_affix2": { + "key": "gourmet_affix2", + "text": "极低" + }, + "item_colour_affix3": { + "key": "gourmet_affix2", + "text": "极低" + }, "delicious_consume": [ { "a": "item", @@ -1598,7 +1868,10 @@ "skill_type": 1, "initial": 0, "level": 4, - "colour_level_affix": 10104, + "colour_level_affix": { + "key": "gourmet_lv4", + "text": "驾轻就熟" + }, "name": { "key": "gourmet_name4", "text": "月能厨艺" @@ -1625,11 +1898,18 @@ "n": 1 } ], - "item_colour_affix": [ - 10003, - 10002, - 10002 - ], + "item_colour_affix1": { + "key": "gourmet_affix3", + "text": "中等" + }, + "item_colour_affix2": { + "key": "gourmet_affix2", + "text": "极低" + }, + "item_colour_affix3": { + "key": "gourmet_affix2", + "text": "极低" + }, "delicious_consume": [ { "a": "item", @@ -1657,7 +1937,10 @@ "skill_type": 1, "initial": 0, "level": 5, - "colour_level_affix": 10105, + "colour_level_affix": { + "key": "gourmet_lv5", + "text": "得心应手" + }, "name": { "key": "gourmet_name4", "text": "月能厨艺" @@ -1684,11 +1967,18 @@ "n": 1 } ], - "item_colour_affix": [ - 10003, - 10003, - 10002 - ], + "item_colour_affix1": { + "key": "gourmet_affix3", + "text": "中等" + }, + "item_colour_affix2": { + "key": "gourmet_affix3", + "text": "中等" + }, + "item_colour_affix3": { + "key": "gourmet_affix2", + "text": "极低" + }, "delicious_consume": [ { "a": "item", @@ -1716,7 +2006,10 @@ "skill_type": 1, "initial": 0, "level": 6, - "colour_level_affix": 10106, + "colour_level_affix": { + "key": "gourmet_lv6", + "text": "游刃有余" + }, "name": { "key": "gourmet_name4", "text": "月能厨艺" @@ -1743,11 +2036,18 @@ "n": 1 } ], - "item_colour_affix": [ - 10003, - 10003, - 10003 - ], + "item_colour_affix1": { + "key": "gourmet_affix3", + "text": "中等" + }, + "item_colour_affix2": { + "key": "gourmet_affix3", + "text": "中等" + }, + "item_colour_affix3": { + "key": "gourmet_affix3", + "text": "中等" + }, "delicious_consume": [ { "a": "item", @@ -1775,7 +2075,10 @@ "skill_type": 1, "initial": 0, "level": 7, - "colour_level_affix": 10107, + "colour_level_affix": { + "key": "gourmet_lv7", + "text": "匠心独运" + }, "name": { "key": "gourmet_name4", "text": "月能厨艺" @@ -1802,11 +2105,18 @@ "n": 1 } ], - "item_colour_affix": [ - 10004, - 10003, - 10003 - ], + "item_colour_affix1": { + "key": "gourmet_affix4", + "text": "较高" + }, + "item_colour_affix2": { + "key": "gourmet_affix3", + "text": "中等" + }, + "item_colour_affix3": { + "key": "gourmet_affix3", + "text": "中等" + }, "delicious_consume": [ { "a": "item", @@ -1834,7 +2144,10 @@ "skill_type": 1, "initial": 0, "level": 8, - "colour_level_affix": 10108, + "colour_level_affix": { + "key": "gourmet_lv8", + "text": "神乎其技" + }, "name": { "key": "gourmet_name4", "text": "月能厨艺" @@ -1861,11 +2174,18 @@ "n": 1 } ], - "item_colour_affix": [ - 10004, - 10004, - 10003 - ], + "item_colour_affix1": { + "key": "gourmet_affix4", + "text": "较高" + }, + "item_colour_affix2": { + "key": "gourmet_affix4", + "text": "较高" + }, + "item_colour_affix3": { + "key": "gourmet_affix3", + "text": "中等" + }, "delicious_consume": [ { "a": "item", @@ -1893,7 +2213,10 @@ "skill_type": 2, "initial": 1, "level": 1, - "colour_level_affix": 10201, + "colour_level_affix": { + "key": "gourmet_cook1", + "text": "1级" + }, "name": { "key": "gourmet_name5", "text": "高效制作" @@ -1904,7 +2227,18 @@ "delicious_icon": "", "skill_icon": "", "item": [], - "item_colour_affix": [], + "item_colour_affix1": { + "key": "", + "text": "" + }, + "item_colour_affix2": { + "key": "", + "text": "" + }, + "item_colour_affix3": { + "key": "", + "text": "" + }, "delicious_consume": [], "skill_consume": [ { @@ -1926,7 +2260,10 @@ "skill_type": 2, "initial": 0, "level": 2, - "colour_level_affix": 10202, + "colour_level_affix": { + "key": "gourmet_cook2", + "text": "2级" + }, "name": { "key": "gourmet_name5", "text": "高效制作" @@ -1937,7 +2274,18 @@ "delicious_icon": "", "skill_icon": "", "item": [], - "item_colour_affix": [], + "item_colour_affix1": { + "key": "", + "text": "" + }, + "item_colour_affix2": { + "key": "", + "text": "" + }, + "item_colour_affix3": { + "key": "", + "text": "" + }, "delicious_consume": [], "skill_consume": [ { @@ -1959,7 +2307,10 @@ "skill_type": 2, "initial": 0, "level": 3, - "colour_level_affix": 10203, + "colour_level_affix": { + "key": "gourmet_cook3", + "text": "3级" + }, "name": { "key": "gourmet_name5", "text": "高效制作" @@ -1970,7 +2321,18 @@ "delicious_icon": "", "skill_icon": "", "item": [], - "item_colour_affix": [], + "item_colour_affix1": { + "key": "", + "text": "" + }, + "item_colour_affix2": { + "key": "", + "text": "" + }, + "item_colour_affix3": { + "key": "", + "text": "" + }, "delicious_consume": [], "skill_consume": [ { @@ -1992,7 +2354,10 @@ "skill_type": 2, "initial": 0, "level": 4, - "colour_level_affix": 10204, + "colour_level_affix": { + "key": "gourmet_cook4", + "text": "4级" + }, "name": { "key": "gourmet_name5", "text": "高效制作" @@ -2003,7 +2368,18 @@ "delicious_icon": "", "skill_icon": "", "item": [], - "item_colour_affix": [], + "item_colour_affix1": { + "key": "", + "text": "" + }, + "item_colour_affix2": { + "key": "", + "text": "" + }, + "item_colour_affix3": { + "key": "", + "text": "" + }, "delicious_consume": [], "skill_consume": [ { @@ -2025,7 +2401,10 @@ "skill_type": 2, "initial": 0, "level": 5, - "colour_level_affix": 10205, + "colour_level_affix": { + "key": "gourmet_cook5", + "text": "5级" + }, "name": { "key": "gourmet_name5", "text": "高效制作" @@ -2036,7 +2415,18 @@ "delicious_icon": "", "skill_icon": "", "item": [], - "item_colour_affix": [], + "item_colour_affix1": { + "key": "", + "text": "" + }, + "item_colour_affix2": { + "key": "", + "text": "" + }, + "item_colour_affix3": { + "key": "", + "text": "" + }, "delicious_consume": [], "skill_consume": [ { @@ -2058,7 +2448,10 @@ "skill_type": 2, "initial": 0, "level": 6, - "colour_level_affix": 10206, + "colour_level_affix": { + "key": "gourmet_cook6", + "text": "6级" + }, "name": { "key": "gourmet_name5", "text": "高效制作" @@ -2069,7 +2462,18 @@ "delicious_icon": "", "skill_icon": "", "item": [], - "item_colour_affix": [], + "item_colour_affix1": { + "key": "", + "text": "" + }, + "item_colour_affix2": { + "key": "", + "text": "" + }, + "item_colour_affix3": { + "key": "", + "text": "" + }, "delicious_consume": [], "skill_consume": [ { @@ -2091,7 +2495,10 @@ "skill_type": 2, "initial": 0, "level": 7, - "colour_level_affix": 10207, + "colour_level_affix": { + "key": "gourmet_cook7", + "text": "7级" + }, "name": { "key": "gourmet_name5", "text": "高效制作" @@ -2102,7 +2509,18 @@ "delicious_icon": "", "skill_icon": "", "item": [], - "item_colour_affix": [], + "item_colour_affix1": { + "key": "", + "text": "" + }, + "item_colour_affix2": { + "key": "", + "text": "" + }, + "item_colour_affix3": { + "key": "", + "text": "" + }, "delicious_consume": [], "skill_consume": [ { @@ -2124,7 +2542,10 @@ "skill_type": 2, "initial": 0, "level": 8, - "colour_level_affix": 10208, + "colour_level_affix": { + "key": "gourmet_cook8", + "text": "8级" + }, "name": { "key": "gourmet_name5", "text": "高效制作" @@ -2135,7 +2556,18 @@ "delicious_icon": "", "skill_icon": "", "item": [], - "item_colour_affix": [], + "item_colour_affix1": { + "key": "", + "text": "" + }, + "item_colour_affix2": { + "key": "", + "text": "" + }, + "item_colour_affix3": { + "key": "", + "text": "" + }, "delicious_consume": [], "skill_consume": [ { @@ -2157,7 +2589,10 @@ "skill_type": 2, "initial": 0, "level": 9, - "colour_level_affix": 10209, + "colour_level_affix": { + "key": "gourmet_cook9", + "text": "9级" + }, "name": { "key": "gourmet_name5", "text": "高效制作" @@ -2168,7 +2603,18 @@ "delicious_icon": "", "skill_icon": "", "item": [], - "item_colour_affix": [], + "item_colour_affix1": { + "key": "", + "text": "" + }, + "item_colour_affix2": { + "key": "", + "text": "" + }, + "item_colour_affix3": { + "key": "", + "text": "" + }, "delicious_consume": [], "skill_consume": [ { @@ -2190,7 +2636,10 @@ "skill_type": 2, "initial": 0, "level": 10, - "colour_level_affix": 10210, + "colour_level_affix": { + "key": "gourmet_cook10", + "text": "10级" + }, "name": { "key": "gourmet_name5", "text": "高效制作" @@ -2201,7 +2650,18 @@ "delicious_icon": "", "skill_icon": "", "item": [], - "item_colour_affix": [], + "item_colour_affix1": { + "key": "", + "text": "" + }, + "item_colour_affix2": { + "key": "", + "text": "" + }, + "item_colour_affix3": { + "key": "", + "text": "" + }, "delicious_consume": [], "skill_consume": [ { @@ -2223,7 +2683,10 @@ "skill_type": 2, "initial": 0, "level": 11, - "colour_level_affix": 10211, + "colour_level_affix": { + "key": "gourmet_cook11", + "text": "11级" + }, "name": { "key": "gourmet_name5", "text": "高效制作" @@ -2234,7 +2697,18 @@ "delicious_icon": "", "skill_icon": "", "item": [], - "item_colour_affix": [], + "item_colour_affix1": { + "key": "", + "text": "" + }, + "item_colour_affix2": { + "key": "", + "text": "" + }, + "item_colour_affix3": { + "key": "", + "text": "" + }, "delicious_consume": [], "skill_consume": [ { @@ -2256,7 +2730,10 @@ "skill_type": 2, "initial": 0, "level": 12, - "colour_level_affix": 10212, + "colour_level_affix": { + "key": "gourmet_cook12", + "text": "12级" + }, "name": { "key": "gourmet_name5", "text": "高效制作" @@ -2267,7 +2744,18 @@ "delicious_icon": "", "skill_icon": "", "item": [], - "item_colour_affix": [], + "item_colour_affix1": { + "key": "", + "text": "" + }, + "item_colour_affix2": { + "key": "", + "text": "" + }, + "item_colour_affix3": { + "key": "", + "text": "" + }, "delicious_consume": [], "skill_consume": [ { @@ -2289,7 +2777,10 @@ "skill_type": 2, "initial": 0, "level": 13, - "colour_level_affix": 10213, + "colour_level_affix": { + "key": "gourmet_cook13", + "text": "13级" + }, "name": { "key": "gourmet_name5", "text": "高效制作" @@ -2300,7 +2791,18 @@ "delicious_icon": "", "skill_icon": "", "item": [], - "item_colour_affix": [], + "item_colour_affix1": { + "key": "", + "text": "" + }, + "item_colour_affix2": { + "key": "", + "text": "" + }, + "item_colour_affix3": { + "key": "", + "text": "" + }, "delicious_consume": [], "skill_consume": [ { @@ -2322,7 +2824,10 @@ "skill_type": 2, "initial": 0, "level": 14, - "colour_level_affix": 10214, + "colour_level_affix": { + "key": "gourmet_cook14", + "text": "14级" + }, "name": { "key": "gourmet_name5", "text": "高效制作" @@ -2333,7 +2838,18 @@ "delicious_icon": "", "skill_icon": "", "item": [], - "item_colour_affix": [], + "item_colour_affix1": { + "key": "", + "text": "" + }, + "item_colour_affix2": { + "key": "", + "text": "" + }, + "item_colour_affix3": { + "key": "", + "text": "" + }, "delicious_consume": [], "skill_consume": [ { @@ -2355,7 +2871,10 @@ "skill_type": 2, "initial": 0, "level": 15, - "colour_level_affix": 10215, + "colour_level_affix": { + "key": "gourmet_cook15", + "text": "15级" + }, "name": { "key": "gourmet_name5", "text": "高效制作" @@ -2366,7 +2885,18 @@ "delicious_icon": "", "skill_icon": "", "item": [], - "item_colour_affix": [], + "item_colour_affix1": { + "key": "", + "text": "" + }, + "item_colour_affix2": { + "key": "", + "text": "" + }, + "item_colour_affix3": { + "key": "", + "text": "" + }, "delicious_consume": [], "skill_consume": [ { diff --git a/sys/configure/structs/game.GourmetData.go b/sys/configure/structs/game.GourmetData.go index 3e6ea5cdf..e85ac159b 100644 --- a/sys/configure/structs/game.GourmetData.go +++ b/sys/configure/structs/game.GourmetData.go @@ -16,7 +16,7 @@ type GameGourmetData struct { SkillType int32 Initial int32 Level int32 - ColourLevelAffix int32 + ColourLevelAffix string Name string Needtime int32 Display int32 @@ -24,7 +24,9 @@ type GameGourmetData struct { DeliciousIcon string SkillIcon string Item []*Gameatn - ItemColourAffix []int32 + ItemColourAffix1 string + ItemColourAffix2 string + ItemColourAffix3 string DeliciousConsume []*Gameatn SkillConsume []*Gameatn Using int32 @@ -44,7 +46,7 @@ func (_v *GameGourmetData)Deserialize(_buf map[string]interface{}) (err error) { { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["skill_type"].(float64); !_ok_ { err = errors.New("skill_type error"); return }; _v.SkillType = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["initial"].(float64); !_ok_ { err = errors.New("initial error"); return }; _v.Initial = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["level"].(float64); !_ok_ { err = errors.New("level error"); return }; _v.Level = int32(_tempNum_) } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["colour_level_affix"].(float64); !_ok_ { err = errors.New("colour_level_affix error"); return }; _v.ColourLevelAffix = int32(_tempNum_) } + {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["colour_level_affix"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.ColourLevelAffix error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.ColourLevelAffix, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Name error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Name, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["needtime"].(float64); !_ok_ { err = errors.New("needtime error"); return }; _v.Needtime = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["display"].(float64); !_ok_ { err = errors.New("display error"); return }; _v.Display = int32(_tempNum_) } @@ -65,20 +67,9 @@ func (_v *GameGourmetData)Deserialize(_buf map[string]interface{}) (err error) { } } - { - var _arr_ []interface{} - var _ok_ bool - if _arr_, _ok_ = _buf["item_colour_affix"].([]interface{}); !_ok_ { err = errors.New("item_colour_affix error"); return } - - _v.ItemColourAffix = make([]int32, 0, len(_arr_)) - - for _, _e_ := range _arr_ { - var _list_v_ int32 - { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) } - _v.ItemColourAffix = append(_v.ItemColourAffix, _list_v_) - } - } - + {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["item_colour_affix1"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.ItemColourAffix1 error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.ItemColourAffix1, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } + {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["item_colour_affix2"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.ItemColourAffix2 error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.ItemColourAffix2, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } + {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["item_colour_affix3"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.ItemColourAffix3 error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.ItemColourAffix3, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } { var _arr_ []interface{} var _ok_ bool