From b543f6a6f7b015acfb5683504dde5df812bb1908 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Tue, 18 Apr 2023 15:56:14 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E5=A5=BD=E6=84=9F=E5=BA=A6=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- comm/imodule.go | 3 + modules/library/module.go | 8 ++ pb/library_db.pb.go | 2 +- pb/troll_db.pb.go | 271 +++++++++++++++++++++++++++++++++++--- pb/userexpand.pb.go | 50 ++++--- 5 files changed, 297 insertions(+), 37 deletions(-) diff --git a/comm/imodule.go b/comm/imodule.go index f3c4e3dc3..662fa508c 100644 --- a/comm/imodule.go +++ b/comm/imodule.go @@ -298,6 +298,9 @@ type ( QueryHeroFetter(uid string) (data []*pb.DBHeroFetter) // 查询所有的羁绊信息 AddHeroFetterData(uid string, heroConfId string) (code pb.ErrorCode) // 创建一条羁绊信息 SendRpcAddHero(uid string, heroConfId string, serverTag string) (err error) + + // 获取 某个阵营的羁绊数据 + QueryFavorabilityByRace(uid string, race int32) int32 } //月子秘境 IMoonFantasy interface { diff --git a/modules/library/module.go b/modules/library/module.go index 6bbdfc742..c6701c401 100644 --- a/modules/library/module.go +++ b/modules/library/module.go @@ -319,3 +319,11 @@ func (this *Library) TaskFinishNotify(uid string, taskId, fetterId int32) error } return nil } + +// 获取阵营的好感度 +func (this *Library) QueryFavorabilityByRace(uid string, race int32) int32 { + if rst, err := this.ModuleUser.GetUserExpand(uid); err == nil { // 统计主线进度 + return rst.Race[race] + } + return 0 +} diff --git a/pb/library_db.pb.go b/pb/library_db.pb.go index 4f526bd36..0205777d6 100644 --- a/pb/library_db.pb.go +++ b/pb/library_db.pb.go @@ -28,7 +28,7 @@ type DBLibrary struct { 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 Fid int32 `protobuf:"varint,3,opt,name=fid,proto3" json:"fid"` // 配置表id 羁绊id - Hero map[string]int32 `protobuf:"bytes,4,rep,name=hero,proto3" json:"hero" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // key: hid value: favorlv + Hero map[string]int32 `protobuf:"bytes,4,rep,name=hero,proto3" json:"hero" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // key: hid value: id Prize map[int32]int32 `protobuf:"bytes,5,rep,name=prize,proto3" json:"prize" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //是否领奖 key 好感度等级 Fetterlv int32 `protobuf:"varint,6,opt,name=fetterlv,proto3" json:"fetterlv"` // 当前羁绊等级 Storyid int32 `protobuf:"varint,7,opt,name=storyid,proto3" json:"storyid"` // 故事id 用来判断是否领奖 diff --git a/pb/troll_db.pb.go b/pb/troll_db.pb.go index 6670f630d..ce75ec07c 100644 --- a/pb/troll_db.pb.go +++ b/pb/troll_db.pb.go @@ -300,6 +300,180 @@ func (x *DBTrollRecord) GetTime() int64 { return 0 } +type DBGoods struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //ID + Period int32 `protobuf:"varint,2,opt,name=period,proto3" json:"period"` // 变动周期 + CurPeriod int32 `protobuf:"varint,3,opt,name=curPeriod,proto3" json:"curPeriod"` // 当前变动周期 + Weight int32 `protobuf:"varint,4,opt,name=weight,proto3" json:"weight"` // 周期权重 + Price int32 `protobuf:"varint,5,opt,name=price,proto3" json:"price"` // 当前价格 + Time int32 `protobuf:"varint,6,opt,name=time,proto3" json:"time"` // 刷新时间 +} + +func (x *DBGoods) Reset() { + *x = DBGoods{} + if protoimpl.UnsafeEnabled { + mi := &file_troll_troll_db_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *DBGoods) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*DBGoods) ProtoMessage() {} + +func (x *DBGoods) ProtoReflect() protoreflect.Message { + mi := &file_troll_troll_db_proto_msgTypes[2] + 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 DBGoods.ProtoReflect.Descriptor instead. +func (*DBGoods) Descriptor() ([]byte, []int) { + return file_troll_troll_db_proto_rawDescGZIP(), []int{2} +} + +func (x *DBGoods) GetId() string { + if x != nil { + return x.Id + } + return "" +} + +func (x *DBGoods) GetPeriod() int32 { + if x != nil { + return x.Period + } + return 0 +} + +func (x *DBGoods) GetCurPeriod() int32 { + if x != nil { + return x.CurPeriod + } + return 0 +} + +func (x *DBGoods) GetWeight() int32 { + if x != nil { + return x.Weight + } + return 0 +} + +func (x *DBGoods) GetPrice() int32 { + if x != nil { + return x.Price + } + return 0 +} + +func (x *DBGoods) GetTime() int32 { + if x != nil { + return x.Time + } + return 0 +} + +type DBTroll struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + 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 + UseCount int32 `protobuf:"varint,3,opt,name=useCount,proto3" json:"useCount"` // 当前背包使用的数量 + Items map[int32]int32 `protobuf:"bytes,4,rep,name=items,proto3" json:"items" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 背包数据 + Goods map[int32]*DBGoods `protobuf:"bytes,5,rep,name=goods,proto3" json:"goods" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // 货物 key 货物ID + Lv int32 `protobuf:"varint,6,opt,name=lv,proto3" json:"lv"` // 商队等级 +} + +func (x *DBTroll) Reset() { + *x = DBTroll{} + if protoimpl.UnsafeEnabled { + mi := &file_troll_troll_db_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *DBTroll) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*DBTroll) ProtoMessage() {} + +func (x *DBTroll) ProtoReflect() protoreflect.Message { + mi := &file_troll_troll_db_proto_msgTypes[3] + 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 DBTroll.ProtoReflect.Descriptor instead. +func (*DBTroll) Descriptor() ([]byte, []int) { + return file_troll_troll_db_proto_rawDescGZIP(), []int{3} +} + +func (x *DBTroll) GetId() string { + if x != nil { + return x.Id + } + return "" +} + +func (x *DBTroll) GetUid() string { + if x != nil { + return x.Uid + } + return "" +} + +func (x *DBTroll) GetUseCount() int32 { + if x != nil { + return x.UseCount + } + return 0 +} + +func (x *DBTroll) GetItems() map[int32]int32 { + if x != nil { + return x.Items + } + return nil +} + +func (x *DBTroll) GetGoods() map[int32]*DBGoods { + if x != nil { + return x.Goods + } + return nil +} + +func (x *DBTroll) GetLv() int32 { + if x != nil { + return x.Lv + } + return 0 +} + var File_troll_troll_db_proto protoreflect.FileDescriptor var file_troll_troll_db_proto_rawDesc = []byte{ @@ -370,8 +544,36 @@ var file_troll_troll_db_proto_rawDesc = []byte{ 0x0a, 0x04, 0x67, 0x6f, 0x6c, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x67, 0x6f, 0x6c, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x70, 0x6f, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x70, 0x6f, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, - 0x28, 0x03, 0x52, 0x04, 0x74, 0x69, 0x6d, 0x65, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, - 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x28, 0x03, 0x52, 0x04, 0x74, 0x69, 0x6d, 0x65, 0x22, 0x91, 0x01, 0x0a, 0x07, 0x44, 0x42, 0x47, + 0x6f, 0x6f, 0x64, 0x73, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x02, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x65, 0x72, 0x69, 0x6f, 0x64, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x70, 0x65, 0x72, 0x69, 0x6f, 0x64, 0x12, 0x1c, 0x0a, 0x09, + 0x63, 0x75, 0x72, 0x50, 0x65, 0x72, 0x69, 0x6f, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x09, 0x63, 0x75, 0x72, 0x50, 0x65, 0x72, 0x69, 0x6f, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x77, 0x65, + 0x69, 0x67, 0x68, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x77, 0x65, 0x69, 0x67, + 0x68, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x70, 0x72, 0x69, 0x63, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x05, 0x70, 0x72, 0x69, 0x63, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x69, 0x6d, 0x65, + 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x74, 0x69, 0x6d, 0x65, 0x22, 0xab, 0x02, 0x0a, + 0x07, 0x44, 0x42, 0x54, 0x72, 0x6f, 0x6c, 0x6c, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x75, 0x73, + 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x75, 0x73, + 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x29, 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, + 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x44, 0x42, 0x54, 0x72, 0x6f, 0x6c, 0x6c, 0x2e, + 0x49, 0x74, 0x65, 0x6d, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x69, 0x74, 0x65, 0x6d, + 0x73, 0x12, 0x29, 0x0a, 0x05, 0x67, 0x6f, 0x6f, 0x64, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, + 0x32, 0x13, 0x2e, 0x44, 0x42, 0x54, 0x72, 0x6f, 0x6c, 0x6c, 0x2e, 0x47, 0x6f, 0x6f, 0x64, 0x73, + 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x67, 0x6f, 0x6f, 0x64, 0x73, 0x12, 0x0e, 0x0a, 0x02, + 0x6c, 0x76, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x1a, 0x38, 0x0a, 0x0a, + 0x49, 0x74, 0x65, 0x6d, 0x73, 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, 0x1a, 0x42, 0x0a, 0x0a, 0x47, 0x6f, 0x6f, 0x64, 0x73, 0x45, + 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x1e, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x44, 0x42, 0x47, 0x6f, 0x6f, 0x64, 0x73, 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 ( @@ -386,27 +588,34 @@ func file_troll_troll_db_proto_rawDescGZIP() []byte { return file_troll_troll_db_proto_rawDescData } -var file_troll_troll_db_proto_msgTypes = make([]protoimpl.MessageInfo, 7) +var file_troll_troll_db_proto_msgTypes = make([]protoimpl.MessageInfo, 11) var file_troll_troll_db_proto_goTypes = []interface{}{ (*DBTrollTrain)(nil), // 0: DBTrollTrain (*DBTrollRecord)(nil), // 1: DBTrollRecord - nil, // 2: DBTrollTrain.ItemsEntry - nil, // 3: DBTrollTrain.PriceEntry - nil, // 4: DBTrollTrain.NpcRewardEntry - nil, // 5: DBTrollTrain.ShopEntry - nil, // 6: DBTrollTrain.SurpriseIDEntry + (*DBGoods)(nil), // 2: DBGoods + (*DBTroll)(nil), // 3: DBTroll + nil, // 4: DBTrollTrain.ItemsEntry + nil, // 5: DBTrollTrain.PriceEntry + nil, // 6: DBTrollTrain.NpcRewardEntry + nil, // 7: DBTrollTrain.ShopEntry + nil, // 8: DBTrollTrain.SurpriseIDEntry + nil, // 9: DBTroll.ItemsEntry + nil, // 10: DBTroll.GoodsEntry } var file_troll_troll_db_proto_depIdxs = []int32{ - 2, // 0: DBTrollTrain.items:type_name -> DBTrollTrain.ItemsEntry - 3, // 1: DBTrollTrain.price:type_name -> DBTrollTrain.PriceEntry - 4, // 2: DBTrollTrain.npcReward:type_name -> DBTrollTrain.NpcRewardEntry - 5, // 3: DBTrollTrain.shop:type_name -> DBTrollTrain.ShopEntry - 6, // 4: DBTrollTrain.surpriseID:type_name -> DBTrollTrain.SurpriseIDEntry - 5, // [5:5] is the sub-list for method output_type - 5, // [5:5] is the sub-list for method input_type - 5, // [5:5] is the sub-list for extension type_name - 5, // [5:5] is the sub-list for extension extendee - 0, // [0:5] is the sub-list for field type_name + 4, // 0: DBTrollTrain.items:type_name -> DBTrollTrain.ItemsEntry + 5, // 1: DBTrollTrain.price:type_name -> DBTrollTrain.PriceEntry + 6, // 2: DBTrollTrain.npcReward:type_name -> DBTrollTrain.NpcRewardEntry + 7, // 3: DBTrollTrain.shop:type_name -> DBTrollTrain.ShopEntry + 8, // 4: DBTrollTrain.surpriseID:type_name -> DBTrollTrain.SurpriseIDEntry + 9, // 5: DBTroll.items:type_name -> DBTroll.ItemsEntry + 10, // 6: DBTroll.goods:type_name -> DBTroll.GoodsEntry + 2, // 7: DBTroll.GoodsEntry.value:type_name -> DBGoods + 8, // [8:8] is the sub-list for method output_type + 8, // [8:8] is the sub-list for method input_type + 8, // [8:8] is the sub-list for extension type_name + 8, // [8:8] is the sub-list for extension extendee + 0, // [0:8] is the sub-list for field type_name } func init() { file_troll_troll_db_proto_init() } @@ -439,6 +648,30 @@ func file_troll_troll_db_proto_init() { return nil } } + file_troll_troll_db_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*DBGoods); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_troll_troll_db_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*DBTroll); 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{ @@ -446,7 +679,7 @@ func file_troll_troll_db_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_troll_troll_db_proto_rawDesc, NumEnums: 0, - NumMessages: 7, + NumMessages: 11, NumExtensions: 0, NumServices: 0, }, diff --git a/pb/userexpand.pb.go b/pb/userexpand.pb.go index 2f94e09a3..6633de4c0 100644 --- a/pb/userexpand.pb.go +++ b/pb/userexpand.pb.go @@ -58,6 +58,7 @@ type DBUserExpand struct { Mline map[int32]int32 `protobuf:"bytes,34,rep,name=mline,proto3" json:"mline" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3" bson:"mline"` //主线关卡最大进度 key难度val是关卡ID SuiteId []int32 `protobuf:"varint,35,rep,packed,name=suiteId,proto3" json:"suiteId" bson:"suiteId"` // 套装Id Globalbuff int32 `protobuf:"varint,36,opt,name=globalbuff,proto3" json:"globalbuff" bson:"globalbuff"` // 全局buff + Race map[int32]int32 `protobuf:"bytes,37,rep,name=race,proto3" json:"race" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // key 阵营ID 1~4 value 总好感度 } func (x *DBUserExpand) Reset() { @@ -316,11 +317,18 @@ func (x *DBUserExpand) GetGlobalbuff() int32 { return 0 } +func (x *DBUserExpand) GetRace() map[int32]int32 { + if x != nil { + return x.Race + } + return nil +} + var File_userexpand_proto protoreflect.FileDescriptor var file_userexpand_proto_rawDesc = []byte{ 0x0a, 0x10, 0x75, 0x73, 0x65, 0x72, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x2e, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x22, 0xac, 0x0a, 0x0a, 0x0c, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x45, 0x78, 0x70, + 0x74, 0x6f, 0x22, 0x92, 0x0b, 0x0a, 0x0c, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x45, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x2c, 0x0a, 0x11, 0x6c, 0x61, 0x73, 0x74, 0x72, 0x65, 0x61, @@ -395,16 +403,22 @@ var file_userexpand_proto_rawDesc = []byte{ 0x65, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x75, 0x69, 0x74, 0x65, 0x49, 0x64, 0x18, 0x23, 0x20, 0x03, 0x28, 0x05, 0x52, 0x07, 0x73, 0x75, 0x69, 0x74, 0x65, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x67, 0x6c, 0x6f, 0x62, 0x61, 0x6c, 0x62, 0x75, 0x66, 0x66, 0x18, 0x24, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x0a, 0x67, 0x6c, 0x6f, 0x62, 0x61, 0x6c, 0x62, 0x75, 0x66, 0x66, 0x1a, 0x3a, 0x0a, 0x0c, 0x45, - 0x78, 0x70, 0x69, 0x74, 0x65, 0x6d, 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, + 0x0a, 0x67, 0x6c, 0x6f, 0x62, 0x61, 0x6c, 0x62, 0x75, 0x66, 0x66, 0x12, 0x2b, 0x0a, 0x04, 0x72, + 0x61, 0x63, 0x65, 0x18, 0x25, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x44, 0x42, 0x55, 0x73, + 0x65, 0x72, 0x45, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x2e, 0x52, 0x61, 0x63, 0x65, 0x45, 0x6e, 0x74, + 0x72, 0x79, 0x52, 0x04, 0x72, 0x61, 0x63, 0x65, 0x1a, 0x3a, 0x0a, 0x0c, 0x45, 0x78, 0x70, 0x69, + 0x74, 0x65, 0x6d, 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, 0x1a, 0x38, 0x0a, 0x0a, 0x4d, 0x6c, 0x69, 0x6e, 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, 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, 0x1a, 0x37, + 0x0a, 0x09, 0x52, 0x61, 0x63, 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, 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, 0x1a, 0x38, 0x0a, 0x0a, 0x4d, 0x6c, 0x69, 0x6e, 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, 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, + 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, + 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -419,20 +433,22 @@ func file_userexpand_proto_rawDescGZIP() []byte { return file_userexpand_proto_rawDescData } -var file_userexpand_proto_msgTypes = make([]protoimpl.MessageInfo, 3) +var file_userexpand_proto_msgTypes = make([]protoimpl.MessageInfo, 4) var file_userexpand_proto_goTypes = []interface{}{ (*DBUserExpand)(nil), // 0: DBUserExpand nil, // 1: DBUserExpand.ExpitemEntry nil, // 2: DBUserExpand.MlineEntry + nil, // 3: DBUserExpand.RaceEntry } var file_userexpand_proto_depIdxs = []int32{ 1, // 0: DBUserExpand.expitem:type_name -> DBUserExpand.ExpitemEntry 2, // 1: DBUserExpand.mline:type_name -> DBUserExpand.MlineEntry - 2, // [2:2] is the sub-list for method output_type - 2, // [2:2] is the sub-list for method input_type - 2, // [2:2] is the sub-list for extension type_name - 2, // [2:2] is the sub-list for extension extendee - 0, // [0:2] is the sub-list for field type_name + 3, // 2: DBUserExpand.race:type_name -> DBUserExpand.RaceEntry + 3, // [3:3] is the sub-list for method output_type + 3, // [3:3] is the sub-list for method input_type + 3, // [3:3] is the sub-list for extension type_name + 3, // [3:3] is the sub-list for extension extendee + 0, // [0:3] is the sub-list for field type_name } func init() { file_userexpand_proto_init() } @@ -460,7 +476,7 @@ func file_userexpand_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_userexpand_proto_rawDesc, NumEnums: 0, - NumMessages: 3, + NumMessages: 4, NumExtensions: 0, NumServices: 0, }, From 3553d4c30949e430163a025f9cc62eeac517d47e Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Tue, 18 Apr 2023 16:04:28 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E5=A5=BD=E6=84=9F=E5=BA=A6=E8=A7=A3?= =?UTF-8?q?=E6=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_camplv.json | 222 + bin/json/game_favorability.json | 3754 +++++++++++++++++ bin/json/game_friends.json | 407 ++ bin/json/game_item.json | 36 +- bin/json/game_pandamasjx.json | 64 +- bin/json/game_rdtasknpc.json | 42 + bin/json/game_skillafteratk.json | 107 +- bin/json/game_skillatk.json | 4 +- bin/json/game_skillpassive.json | 31 +- bin/json/game_talent.json | 992 +++++ bin/json/game_worldall.json | 2 +- bin/json/game_worldtask.json | 680 +-- sys/configure/structs/Game.CampLv.go | 42 + sys/configure/structs/Game.CampLvData.go | 43 + sys/configure/structs/Game.Favorability.go | 42 + .../structs/Game.FavorabilityData.go | 256 ++ sys/configure/structs/Game.Friends.go | 42 + sys/configure/structs/Game.FriendsData.go | 68 + sys/configure/structs/Game.RdtaskNpcData.go | 2 + sys/configure/structs/Game.SkillEffectType.go | 9 +- sys/configure/structs/Game.Talent.go | 42 + sys/configure/structs/Game.TalentData.go | 89 + sys/configure/structs/Game.WorldTaskData.go | 6 + sys/configure/structs/Tables.go | 28 + 24 files changed, 6567 insertions(+), 443 deletions(-) create mode 100644 bin/json/game_camplv.json create mode 100644 bin/json/game_favorability.json create mode 100644 bin/json/game_friends.json create mode 100644 bin/json/game_talent.json create mode 100644 sys/configure/structs/Game.CampLv.go create mode 100644 sys/configure/structs/Game.CampLvData.go create mode 100644 sys/configure/structs/Game.Favorability.go create mode 100644 sys/configure/structs/Game.FavorabilityData.go create mode 100644 sys/configure/structs/Game.Friends.go create mode 100644 sys/configure/structs/Game.FriendsData.go create mode 100644 sys/configure/structs/Game.Talent.go create mode 100644 sys/configure/structs/Game.TalentData.go diff --git a/bin/json/game_camplv.json b/bin/json/game_camplv.json new file mode 100644 index 000000000..c9ac87be5 --- /dev/null +++ b/bin/json/game_camplv.json @@ -0,0 +1,222 @@ +[ + { + "id": 1, + "reputation_lv": 1, + "raceType": 1, + "reputation_exp": 20, + "Reward": { + "a": "attr", + "t": "zy", + "n": 1 + } + }, + { + "id": 2, + "reputation_lv": 2, + "raceType": 1, + "reputation_exp": 30, + "Reward": { + "a": "attr", + "t": "zy", + "n": 2 + } + }, + { + "id": 3, + "reputation_lv": 3, + "raceType": 1, + "reputation_exp": 40, + "Reward": { + "a": "attr", + "t": "zy", + "n": 3 + } + }, + { + "id": 4, + "reputation_lv": 4, + "raceType": 1, + "reputation_exp": 50, + "Reward": { + "a": "attr", + "t": "zy", + "n": 4 + } + }, + { + "id": 5, + "reputation_lv": 5, + "raceType": 1, + "reputation_exp": 60, + "Reward": { + "a": "attr", + "t": "zy", + "n": 5 + } + }, + { + "id": 6, + "reputation_lv": 6, + "raceType": 1, + "reputation_exp": 70, + "Reward": { + "a": "attr", + "t": "zy", + "n": 6 + } + }, + { + "id": 7, + "reputation_lv": 7, + "raceType": 1, + "reputation_exp": 80, + "Reward": { + "a": "attr", + "t": "zy", + "n": 7 + } + }, + { + "id": 8, + "reputation_lv": 1, + "raceType": 2, + "reputation_exp": 10, + "Reward": { + "a": "attr", + "t": "zy", + "n": 8 + } + }, + { + "id": 9, + "reputation_lv": 2, + "raceType": 2, + "reputation_exp": 20, + "Reward": { + "a": "attr", + "t": "zy", + "n": 9 + } + }, + { + "id": 10, + "reputation_lv": 3, + "raceType": 2, + "reputation_exp": 30, + "Reward": { + "a": "attr", + "t": "zy", + "n": 10 + } + }, + { + "id": 11, + "reputation_lv": 4, + "raceType": 2, + "reputation_exp": 40, + "Reward": { + "a": "attr", + "t": "zy", + "n": 11 + } + }, + { + "id": 12, + "reputation_lv": 5, + "raceType": 2, + "reputation_exp": 50, + "Reward": { + "a": "attr", + "t": "zy", + "n": 12 + } + }, + { + "id": 13, + "reputation_lv": 6, + "raceType": 2, + "reputation_exp": 60, + "Reward": { + "a": "attr", + "t": "zy", + "n": 13 + } + }, + { + "id": 14, + "reputation_lv": 7, + "raceType": 2, + "reputation_exp": 70, + "Reward": { + "a": "attr", + "t": "zy", + "n": 14 + } + }, + { + "id": 15, + "reputation_lv": 8, + "raceType": 2, + "reputation_exp": 80, + "Reward": { + "a": "attr", + "t": "zy", + "n": 15 + } + }, + { + "id": 16, + "reputation_lv": 9, + "raceType": 2, + "reputation_exp": 90, + "Reward": { + "a": "attr", + "t": "zy", + "n": 16 + } + }, + { + "id": 17, + "reputation_lv": 10, + "raceType": 2, + "reputation_exp": 100, + "Reward": { + "a": "attr", + "t": "zy", + "n": 17 + } + }, + { + "id": 18, + "reputation_lv": 11, + "raceType": 2, + "reputation_exp": 110, + "Reward": { + "a": "attr", + "t": "zy", + "n": 18 + } + }, + { + "id": 19, + "reputation_lv": 12, + "raceType": 2, + "reputation_exp": 120, + "Reward": { + "a": "attr", + "t": "zy", + "n": 19 + } + }, + { + "id": 20, + "reputation_lv": 20, + "raceType": 2, + "reputation_exp": 130, + "Reward": { + "a": "attr", + "t": "zy", + "n": 20 + } + } +] \ No newline at end of file diff --git a/bin/json/game_favorability.json b/bin/json/game_favorability.json new file mode 100644 index 000000000..99fee7d74 --- /dev/null +++ b/bin/json/game_favorability.json @@ -0,0 +1,3754 @@ +[ + { + "id": 1, + "hid": "14002", + "name": { + "key": "hero_14002", + "text": "大龙" + }, + "favor_lv": 0, + "favor_exp": 100, + "lv_name": { + "key": "favorability_favorability_lv_name_0", + "text": "萍水相逢" + }, + "privilege_type": 0, + "privilege_value": 0, + "return_reward": [], + "return_txt": { + "key": "", + "text": "" + }, + "likes_food": [], + "disliking_food": [], + "likes_txt": { + "key": "favorability_favorability_likes_txt_14002", + "text": "我很喜欢，谢谢！" + }, + "ordinary_txt": { + "key": "favorability_favorability_ordinary_txt_14002", + "text": "送我的？谢谢！" + }, + "disliking_txt": { + "key": "favorability_favorabilit_disliking_txt_14002", + "text": "这味道，一言难尽......" + }, + "favorlv": [ + 1, + 3, + 5 + ], + "biography_name": [ + "140021", + "140022", + "140023" + ], + "biography_txt": [ + "140021", + "140022", + "140023" + ], + "biography_reward1": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "biography_reward2": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "biography_reward3": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "plot_unlock": [ + 2, + 4, + 6, + 8 + ], + "startid": 300001, + "endid": [ + 3000015, + 3000017, + 3000018 + ], + "rightend": 3000014, + "stroyprize": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ], + "special_stroyprize": [ + { + "a": "attr", + "t": "gold", + "n": 2000 + } + ] + }, + { + "id": 2, + "hid": "14002", + "name": { + "key": "hero_14002", + "text": "大龙" + }, + "favor_lv": 1, + "favor_exp": 200, + "lv_name": { + "key": "favorability_favorability_lv_name_1", + "text": "点头之交" + }, + "privilege_type": 0, + "privilege_value": 0, + "return_reward": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "return_txt": { + "key": "favorability_favorability_return_txt", + "text": "达到好感度{0}级可领取" + }, + "likes_food": [], + "disliking_food": [], + "likes_txt": { + "key": "favorability_favorability_likes_txt_14002", + "text": "我很喜欢，谢谢！" + }, + "ordinary_txt": { + "key": "favorability_favorability_ordinary_txt_14002", + "text": "送我的？谢谢！" + }, + "disliking_txt": { + "key": "favorability_favorabilit_disliking_txt_14002", + "text": "这味道，一言难尽......" + }, + "favorlv": [ + 1, + 3, + 5 + ], + "biography_name": [ + "140021", + "140022", + "140023" + ], + "biography_txt": [ + "140021", + "140022", + "140023" + ], + "biography_reward1": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "biography_reward2": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "biography_reward3": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "plot_unlock": [ + 2, + 4, + 6, + 8 + ], + "startid": 300001, + "endid": [ + 3000015, + 3000017, + 3000018 + ], + "rightend": 3000014, + "stroyprize": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ], + "special_stroyprize": [ + { + "a": "attr", + "t": "gold", + "n": 2000 + } + ] + }, + { + "id": 3, + "hid": "14002", + "name": { + "key": "hero_14002", + "text": "大龙" + }, + "favor_lv": 2, + "favor_exp": 300, + "lv_name": { + "key": "favorability_favorability_lv_name_2", + "text": "点头之交" + }, + "privilege_type": 0, + "privilege_value": 0, + "return_reward": [], + "return_txt": { + "key": "", + "text": "" + }, + "likes_food": [], + "disliking_food": [], + "likes_txt": { + "key": "favorability_favorability_likes_txt_14002", + "text": "我很喜欢，谢谢！" + }, + "ordinary_txt": { + "key": "favorability_favorability_ordinary_txt_14002", + "text": "送我的？谢谢！" + }, + "disliking_txt": { + "key": "favorability_favorabilit_disliking_txt_14002", + "text": "这味道，一言难尽......" + }, + "favorlv": [ + 1, + 3, + 5 + ], + "biography_name": [ + "140021", + "140022", + "140023" + ], + "biography_txt": [ + "140021", + "140022", + "140023" + ], + "biography_reward1": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "biography_reward2": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "biography_reward3": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "plot_unlock": [ + 2, + 4, + 6, + 8 + ], + "startid": 300001, + "endid": [ + 3000015, + 3000017, + 3000018 + ], + "rightend": 3000014, + "stroyprize": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ], + "special_stroyprize": [ + { + "a": "attr", + "t": "gold", + "n": 2000 + } + ] + }, + { + "id": 4, + "hid": "14002", + "name": { + "key": "hero_14002", + "text": "大龙" + }, + "favor_lv": 3, + "favor_exp": 400, + "lv_name": { + "key": "favorability_favorability_lv_name_3", + "text": "点头之交" + }, + "privilege_type": 0, + "privilege_value": 0, + "return_reward": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "return_txt": { + "key": "favorability_favorability_return_txt", + "text": "达到好感度{0}级可领取" + }, + "likes_food": [], + "disliking_food": [], + "likes_txt": { + "key": "favorability_favorability_likes_txt_14002", + "text": "我很喜欢，谢谢！" + }, + "ordinary_txt": { + "key": "favorability_favorability_ordinary_txt_14002", + "text": "送我的？谢谢！" + }, + "disliking_txt": { + "key": "favorability_favorabilit_disliking_txt_14002", + "text": "这味道，一言难尽......" + }, + "favorlv": [ + 1, + 3, + 5 + ], + "biography_name": [ + "140021", + "140022", + "140023" + ], + "biography_txt": [ + "140021", + "140022", + "140023" + ], + "biography_reward1": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "biography_reward2": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "biography_reward3": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "plot_unlock": [ + 2, + 4, + 6, + 8 + ], + "startid": 300001, + "endid": [ + 3000015, + 3000017, + 3000018 + ], + "rightend": 3000014, + "stroyprize": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ], + "special_stroyprize": [ + { + "a": "attr", + "t": "gold", + "n": 2000 + } + ] + }, + { + "id": 5, + "hid": "14002", + "name": { + "key": "hero_14002", + "text": "大龙" + }, + "favor_lv": 4, + "favor_exp": 500, + "lv_name": { + "key": "favorability_favorability_lv_name_4", + "text": "点头之交" + }, + "privilege_type": 0, + "privilege_value": 0, + "return_reward": [], + "return_txt": { + "key": "", + "text": "" + }, + "likes_food": [], + "disliking_food": [], + "likes_txt": { + "key": "favorability_favorability_likes_txt_14002", + "text": "我很喜欢，谢谢！" + }, + "ordinary_txt": { + "key": "favorability_favorability_ordinary_txt_14002", + "text": "送我的？谢谢！" + }, + "disliking_txt": { + "key": "favorability_favorabilit_disliking_txt_14002", + "text": "这味道，一言难尽......" + }, + "favorlv": [ + 1, + 3, + 5 + ], + "biography_name": [ + "140021", + "140022", + "140023" + ], + "biography_txt": [ + "140021", + "140022", + "140023" + ], + "biography_reward1": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "biography_reward2": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "biography_reward3": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "plot_unlock": [ + 2, + 4, + 6, + 8 + ], + "startid": 300001, + "endid": [ + 3000015, + 3000017, + 3000018 + ], + "rightend": 3000014, + "stroyprize": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ], + "special_stroyprize": [ + { + "a": "attr", + "t": "gold", + "n": 2000 + } + ] + }, + { + "id": 6, + "hid": "14002", + "name": { + "key": "hero_14002", + "text": "大龙" + }, + "favor_lv": 5, + "favor_exp": 600, + "lv_name": { + "key": "favorability_favorability_lv_name_5", + "text": "点头之交" + }, + "privilege_type": 0, + "privilege_value": 0, + "return_reward": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "return_txt": { + "key": "favorability_favorability_return_txt", + "text": "达到好感度{0}级可领取" + }, + "likes_food": [], + "disliking_food": [], + "likes_txt": { + "key": "favorability_favorability_likes_txt_14002", + "text": "我很喜欢，谢谢！" + }, + "ordinary_txt": { + "key": "favorability_favorability_ordinary_txt_14002", + "text": "送我的？谢谢！" + }, + "disliking_txt": { + "key": "favorability_favorabilit_disliking_txt_14002", + "text": "这味道，一言难尽......" + }, + "favorlv": [ + 1, + 3, + 5 + ], + "biography_name": [ + "140021", + "140022", + "140023" + ], + "biography_txt": [ + "140021", + "140022", + "140023" + ], + "biography_reward1": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "biography_reward2": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "biography_reward3": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "plot_unlock": [ + 2, + 4, + 6, + 8 + ], + "startid": 300001, + "endid": [ + 3000015, + 3000017, + 3000018 + ], + "rightend": 3000014, + "stroyprize": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ], + "special_stroyprize": [ + { + "a": "attr", + "t": "gold", + "n": 2000 + } + ] + }, + { + "id": 7, + "hid": "14002", + "name": { + "key": "hero_14002", + "text": "大龙" + }, + "favor_lv": 6, + "favor_exp": 700, + "lv_name": { + "key": "favorability_favorability_lv_name_6", + "text": "情投意合" + }, + "privilege_type": 0, + "privilege_value": 0, + "return_reward": [], + "return_txt": { + "key": "", + "text": "" + }, + "likes_food": [], + "disliking_food": [], + "likes_txt": { + "key": "favorability_favorability_likes_txt_14002", + "text": "我很喜欢，谢谢！" + }, + "ordinary_txt": { + "key": "favorability_favorability_ordinary_txt_14002", + "text": "送我的？谢谢！" + }, + "disliking_txt": { + "key": "favorability_favorabilit_disliking_txt_14002", + "text": "这味道，一言难尽......" + }, + "favorlv": [ + 1, + 3, + 5 + ], + "biography_name": [ + "140021", + "140022", + "140023" + ], + "biography_txt": [ + "140021", + "140022", + "140023" + ], + "biography_reward1": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "biography_reward2": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "biography_reward3": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "plot_unlock": [ + 2, + 4, + 6, + 8 + ], + "startid": 300001, + "endid": [ + 3000015, + 3000017, + 3000018 + ], + "rightend": 3000014, + "stroyprize": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ], + "special_stroyprize": [ + { + "a": "attr", + "t": "gold", + "n": 2000 + } + ] + }, + { + "id": 8, + "hid": "14002", + "name": { + "key": "hero_14002", + "text": "大龙" + }, + "favor_lv": 7, + "favor_exp": 800, + "lv_name": { + "key": "favorability_favorability_lv_name_7", + "text": "情投意合" + }, + "privilege_type": 0, + "privilege_value": 0, + "return_reward": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "return_txt": { + "key": "favorability_favorability_return_txt", + "text": "达到好感度{0}级可领取" + }, + "likes_food": [], + "disliking_food": [], + "likes_txt": { + "key": "favorability_favorability_likes_txt_14002", + "text": "我很喜欢，谢谢！" + }, + "ordinary_txt": { + "key": "favorability_favorability_ordinary_txt_14002", + "text": "送我的？谢谢！" + }, + "disliking_txt": { + "key": "favorability_favorabilit_disliking_txt_14002", + "text": "这味道，一言难尽......" + }, + "favorlv": [ + 1, + 3, + 5 + ], + "biography_name": [ + "140021", + "140022", + "140023" + ], + "biography_txt": [ + "140021", + "140022", + "140023" + ], + "biography_reward1": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "biography_reward2": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "biography_reward3": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "plot_unlock": [ + 2, + 4, + 6, + 8 + ], + "startid": 300001, + "endid": [ + 3000015, + 3000017, + 3000018 + ], + "rightend": 3000014, + "stroyprize": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ], + "special_stroyprize": [ + { + "a": "attr", + "t": "gold", + "n": 2000 + } + ] + }, + { + "id": 9, + "hid": "14002", + "name": { + "key": "hero_14002", + "text": "大龙" + }, + "favor_lv": 8, + "favor_exp": 900, + "lv_name": { + "key": "favorability_favorability_lv_name_8", + "text": "情投意合" + }, + "privilege_type": 0, + "privilege_value": 0, + "return_reward": [], + "return_txt": { + "key": "", + "text": "" + }, + "likes_food": [], + "disliking_food": [], + "likes_txt": { + "key": "favorability_favorability_likes_txt_14002", + "text": "我很喜欢，谢谢！" + }, + "ordinary_txt": { + "key": "favorability_favorability_ordinary_txt_14002", + "text": "送我的？谢谢！" + }, + "disliking_txt": { + "key": "favorability_favorabilit_disliking_txt_14002", + "text": "这味道，一言难尽......" + }, + "favorlv": [ + 1, + 3, + 5 + ], + "biography_name": [ + "140021", + "140022", + "140023" + ], + "biography_txt": [ + "140021", + "140022", + "140023" + ], + "biography_reward1": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "biography_reward2": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "biography_reward3": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "plot_unlock": [ + 2, + 4, + 6, + 8 + ], + "startid": 300001, + "endid": [ + 3000015, + 3000017, + 3000018 + ], + "rightend": 3000014, + "stroyprize": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ], + "special_stroyprize": [ + { + "a": "attr", + "t": "gold", + "n": 2000 + } + ] + }, + { + "id": 10, + "hid": "14002", + "name": { + "key": "hero_14002", + "text": "大龙" + }, + "favor_lv": 9, + "favor_exp": 1000, + "lv_name": { + "key": "favorability_favorability_lv_name_9", + "text": "情投意合" + }, + "privilege_type": 0, + "privilege_value": 0, + "return_reward": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "return_txt": { + "key": "favorability_favorability_return_txt", + "text": "达到好感度{0}级可领取" + }, + "likes_food": [], + "disliking_food": [], + "likes_txt": { + "key": "favorability_favorability_likes_txt_14002", + "text": "我很喜欢，谢谢！" + }, + "ordinary_txt": { + "key": "favorability_favorability_ordinary_txt_14002", + "text": "送我的？谢谢！" + }, + "disliking_txt": { + "key": "favorability_favorabilit_disliking_txt_14002", + "text": "这味道，一言难尽......" + }, + "favorlv": [ + 1, + 3, + 5 + ], + "biography_name": [ + "140021", + "140022", + "140023" + ], + "biography_txt": [ + "140021", + "140022", + "140023" + ], + "biography_reward1": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "biography_reward2": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "biography_reward3": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "plot_unlock": [ + 2, + 4, + 6, + 8 + ], + "startid": 300001, + "endid": [ + 3000015, + 3000017, + 3000018 + ], + "rightend": 3000014, + "stroyprize": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ], + "special_stroyprize": [ + { + "a": "attr", + "t": "gold", + "n": 2000 + } + ] + }, + { + "id": 11, + "hid": "14002", + "name": { + "key": "hero_14002", + "text": "大龙" + }, + "favor_lv": 10, + "favor_exp": 0, + "lv_name": { + "key": "favorability_favorability_lv_name_10", + "text": "情投意合" + }, + "privilege_type": 0, + "privilege_value": 0, + "return_reward": [], + "return_txt": { + "key": "", + "text": "" + }, + "likes_food": [], + "disliking_food": [], + "likes_txt": { + "key": "favorability_favorability_likes_txt_14002", + "text": "我很喜欢，谢谢！" + }, + "ordinary_txt": { + "key": "favorability_favorability_ordinary_txt_14002", + "text": "送我的？谢谢！" + }, + "disliking_txt": { + "key": "favorability_favorabilit_disliking_txt_14002", + "text": "这味道，一言难尽......" + }, + "favorlv": [ + 1, + 3, + 5 + ], + "biography_name": [ + "140021", + "140022", + "140023" + ], + "biography_txt": [ + "140021", + "140022", + "140023" + ], + "biography_reward1": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "biography_reward2": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "biography_reward3": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "plot_unlock": [ + 2, + 4, + 6, + 8 + ], + "startid": 300001, + "endid": [ + 3000015, + 3000017, + 3000018 + ], + "rightend": 3000014, + "stroyprize": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ], + "special_stroyprize": [ + { + "a": "attr", + "t": "gold", + "n": 2000 + } + ] + }, + { + "id": 12, + "hid": "14005", + "name": { + "key": "hero_14005", + "text": "鹤大师" + }, + "favor_lv": 0, + "favor_exp": 100, + "lv_name": { + "key": "favorability_favorability_lv_name_0", + "text": "萍水相逢" + }, + "privilege_type": 0, + "privilege_value": 0, + "return_reward": [], + "return_txt": { + "key": "", + "text": "" + }, + "likes_food": [], + "disliking_food": [], + "likes_txt": { + "key": "favorability_favorability_likes_txt_14005", + "text": "我很喜欢，谢谢！" + }, + "ordinary_txt": { + "key": "favorability_favorability_ordinary_txt_14005", + "text": "送我的？谢谢！" + }, + "disliking_txt": { + "key": "favorability_favorabilit_disliking_txt_14005", + "text": "这味道，一言难尽......" + }, + "favorlv": [ + 1, + 2, + 3 + ], + "biography_name": [ + "140051", + "140052", + "140053" + ], + "biography_txt": [ + "140051", + "140052", + "140053" + ], + "biography_reward1": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "biography_reward2": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "biography_reward3": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "plot_unlock": [ + 2, + 4, + 6, + 8 + ], + "startid": 300001, + "endid": [ + 3000015, + 3000017, + 3000018 + ], + "rightend": 3000014, + "stroyprize": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ], + "special_stroyprize": [ + { + "a": "attr", + "t": "gold", + "n": 2000 + } + ] + }, + { + "id": 13, + "hid": "14006", + "name": { + "key": "hero_14006", + "text": "布兰奇" + }, + "favor_lv": 0, + "favor_exp": 100, + "lv_name": { + "key": "favorability_favorability_lv_name_0", + "text": "萍水相逢" + }, + "privilege_type": 0, + "privilege_value": 0, + "return_reward": [], + "return_txt": { + "key": "", + "text": "" + }, + "likes_food": [], + "disliking_food": [], + "likes_txt": { + "key": "favorability_favorability_likes_txt_14006", + "text": "我很喜欢，谢谢！" + }, + "ordinary_txt": { + "key": "favorability_favorability_ordinary_txt_14006", + "text": "送我的？谢谢！" + }, + "disliking_txt": { + "key": "favorability_favorabilit_disliking_txt_14006", + "text": "这味道，一言难尽......" + }, + "favorlv": [ + 1, + 2, + 3 + ], + "biography_name": [ + "140061", + "140062", + "140063" + ], + "biography_txt": [ + "140061", + "140062", + "140063" + ], + "biography_reward1": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "biography_reward2": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "biography_reward3": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "plot_unlock": [ + 1, + 2, + 3, + 4 + ], + "startid": 300001, + "endid": [ + 3000015, + 3000017, + 3000018 + ], + "rightend": 3000014, + "stroyprize": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ], + "special_stroyprize": [ + { + "a": "attr", + "t": "gold", + "n": 2000 + } + ] + }, + { + "id": 14, + "hid": "15004", + "name": { + "key": "hero_15004", + "text": "小欧" + }, + "favor_lv": 0, + "favor_exp": 100, + "lv_name": { + "key": "favorability_favorability_lv_name_0", + "text": "萍水相逢" + }, + "privilege_type": 0, + "privilege_value": 0, + "return_reward": [], + "return_txt": { + "key": "", + "text": "" + }, + "likes_food": [], + "disliking_food": [], + "likes_txt": { + "key": "favorability_favorability_likes_txt_15004", + "text": "我很喜欢，谢谢！" + }, + "ordinary_txt": { + "key": "favorability_favorability_ordinary_txt_15004", + "text": "送我的？谢谢！" + }, + "disliking_txt": { + "key": "favorability_favorabilit_disliking_txt_15004", + "text": "这味道，一言难尽......" + }, + "favorlv": [ + 1, + 2, + 3 + ], + "biography_name": [ + "150041", + "150042", + "150043" + ], + "biography_txt": [ + "150041", + "150042", + "150043" + ], + "biography_reward1": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "biography_reward2": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "biography_reward3": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "plot_unlock": [ + 1, + 2, + 3, + 4 + ], + "startid": 300001, + "endid": [ + 3000015, + 3000017, + 3000018 + ], + "rightend": 3000014, + "stroyprize": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ], + "special_stroyprize": [ + { + "a": "attr", + "t": "gold", + "n": 2000 + } + ] + }, + { + "id": 15, + "hid": "24002", + "name": { + "key": "hero_24002", + "text": "牙仙" + }, + "favor_lv": 0, + "favor_exp": 100, + "lv_name": { + "key": "favorability_favorability_lv_name_0", + "text": "萍水相逢" + }, + "privilege_type": 0, + "privilege_value": 0, + "return_reward": [], + "return_txt": { + "key": "", + "text": "" + }, + "likes_food": [], + "disliking_food": [], + "likes_txt": { + "key": "favorability_favorability_likes_txt_24002", + "text": "我很喜欢，谢谢！" + }, + "ordinary_txt": { + "key": "favorability_favorability_ordinary_txt_24002", + "text": "送我的？谢谢！" + }, + "disliking_txt": { + "key": "favorability_favorabilit_disliking_txt_24002", + "text": "这味道，一言难尽......" + }, + "favorlv": [ + 1, + 2, + 3 + ], + "biography_name": [ + "240021", + "240022", + "240023" + ], + "biography_txt": [ + "240021", + "240022", + "240023" + ], + "biography_reward1": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "biography_reward2": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "biography_reward3": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "plot_unlock": [ + 1, + 2, + 3, + 4 + ], + "startid": 300001, + "endid": [ + 3000015, + 3000017, + 3000018 + ], + "rightend": 3000014, + "stroyprize": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ], + "special_stroyprize": [ + { + "a": "attr", + "t": "gold", + "n": 2000 + } + ] + }, + { + "id": 16, + "hid": "24003", + "name": { + "key": "hero_24003", + "text": "睡神沙人" + }, + "favor_lv": 0, + "favor_exp": 100, + "lv_name": { + "key": "favorability_favorability_lv_name_0", + "text": "萍水相逢" + }, + "privilege_type": 0, + "privilege_value": 0, + "return_reward": [], + "return_txt": { + "key": "", + "text": "" + }, + "likes_food": [], + "disliking_food": [], + "likes_txt": { + "key": "favorability_favorability_likes_txt_24003", + "text": "我很喜欢，谢谢！" + }, + "ordinary_txt": { + "key": "favorability_favorability_ordinary_txt_24003", + "text": "送我的？谢谢！" + }, + "disliking_txt": { + "key": "favorability_favorabilit_disliking_txt_24003", + "text": "这味道，一言难尽......" + }, + "favorlv": [ + 1, + 2, + 3 + ], + "biography_name": [ + "240031", + "240032", + "240033" + ], + "biography_txt": [ + "240031", + "240032", + "240033" + ], + "biography_reward1": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "biography_reward2": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "biography_reward3": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "plot_unlock": [ + 1, + 2, + 3, + 4 + ], + "startid": 300001, + "endid": [ + 3000015, + 3000017, + 3000018 + ], + "rightend": 3000014, + "stroyprize": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ], + "special_stroyprize": [ + { + "a": "attr", + "t": "gold", + "n": 2000 + } + ] + }, + { + "id": 17, + "hid": "24004", + "name": { + "key": "hero_24004", + "text": "邦尼兔" + }, + "favor_lv": 0, + "favor_exp": 100, + "lv_name": { + "key": "favorability_favorability_lv_name_0", + "text": "萍水相逢" + }, + "privilege_type": 0, + "privilege_value": 0, + "return_reward": [], + "return_txt": { + "key": "", + "text": "" + }, + "likes_food": [], + "disliking_food": [], + "likes_txt": { + "key": "favorability_favorability_likes_txt_24004", + "text": "我很喜欢，谢谢！" + }, + "ordinary_txt": { + "key": "favorability_favorability_ordinary_txt_24004", + "text": "送我的？谢谢！" + }, + "disliking_txt": { + "key": "favorability_favorabilit_disliking_txt_24004", + "text": "这味道，一言难尽......" + }, + "favorlv": [ + 1, + 2, + 3 + ], + "biography_name": [ + "240041", + "240042", + "240043" + ], + "biography_txt": [ + "240041", + "240042", + "240043" + ], + "biography_reward1": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "biography_reward2": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "biography_reward3": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "plot_unlock": [ + 1, + 2, + 3, + 4 + ], + "startid": 300001, + "endid": [ + 3000015, + 3000017, + 3000018 + ], + "rightend": 3000014, + "stroyprize": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ], + "special_stroyprize": [ + { + "a": "attr", + "t": "gold", + "n": 2000 + } + ] + }, + { + "id": 18, + "hid": "24005", + "name": { + "key": "hero_24005", + "text": "金猴" + }, + "favor_lv": 0, + "favor_exp": 100, + "lv_name": { + "key": "favorability_favorability_lv_name_0", + "text": "萍水相逢" + }, + "privilege_type": 0, + "privilege_value": 0, + "return_reward": [], + "return_txt": { + "key": "", + "text": "" + }, + "likes_food": [], + "disliking_food": [], + "likes_txt": { + "key": "favorability_favorability_likes_txt_24005", + "text": "我很喜欢，谢谢！" + }, + "ordinary_txt": { + "key": "favorability_favorability_ordinary_txt_24005", + "text": "送我的？谢谢！" + }, + "disliking_txt": { + "key": "favorability_favorabilit_disliking_txt_24005", + "text": "这味道，一言难尽......" + }, + "favorlv": [ + 1, + 2, + 3 + ], + "biography_name": [ + "240051", + "240052", + "240053" + ], + "biography_txt": [ + "240051", + "240052", + "240053" + ], + "biography_reward1": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "biography_reward2": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "biography_reward3": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "plot_unlock": [ + 1, + 2, + 3, + 4 + ], + "startid": 300001, + "endid": [ + 3000015, + 3000017, + 3000018 + ], + "rightend": 3000014, + "stroyprize": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ], + "special_stroyprize": [ + { + "a": "attr", + "t": "gold", + "n": 2000 + } + ] + }, + { + "id": 19, + "hid": "24008", + "name": { + "key": "hero_24008", + "text": "暴芙那特" + }, + "favor_lv": 0, + "favor_exp": 100, + "lv_name": { + "key": "favorability_favorability_lv_name_0", + "text": "萍水相逢" + }, + "privilege_type": 0, + "privilege_value": 0, + "return_reward": [], + "return_txt": { + "key": "", + "text": "" + }, + "likes_food": [], + "disliking_food": [], + "likes_txt": { + "key": "favorability_favorability_likes_txt_24008", + "text": "我很喜欢，谢谢！" + }, + "ordinary_txt": { + "key": "favorability_favorability_ordinary_txt_24008", + "text": "送我的？谢谢！" + }, + "disliking_txt": { + "key": "favorability_favorabilit_disliking_txt_24008", + "text": "这味道，一言难尽......" + }, + "favorlv": [ + 1, + 2, + 3 + ], + "biography_name": [ + "240081", + "240082", + "240083" + ], + "biography_txt": [ + "240081", + "240082", + "240083" + ], + "biography_reward1": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "biography_reward2": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "biography_reward3": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "plot_unlock": [ + 1, + 2, + 3, + 4 + ], + "startid": 300001, + "endid": [ + 3000015, + 3000017, + 3000018 + ], + "rightend": 3000014, + "stroyprize": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ], + "special_stroyprize": [ + { + "a": "attr", + "t": "gold", + "n": 2000 + } + ] + }, + { + "id": 20, + "hid": "25001", + "name": { + "key": "hero_25001", + "text": "阿宝" + }, + "favor_lv": 0, + "favor_exp": 100, + "lv_name": { + "key": "favorability_favorability_lv_name_0", + "text": "萍水相逢" + }, + "privilege_type": 0, + "privilege_value": 0, + "return_reward": [], + "return_txt": { + "key": "", + "text": "" + }, + "likes_food": [], + "disliking_food": [], + "likes_txt": { + "key": "favorability_favorability_likes_txt_25001", + "text": "我很喜欢，谢谢！" + }, + "ordinary_txt": { + "key": "favorability_favorability_ordinary_txt_25001", + "text": "送我的？谢谢！" + }, + "disliking_txt": { + "key": "favorability_favorabilit_disliking_txt_25001", + "text": "这味道，一言难尽......" + }, + "favorlv": [ + 1, + 2, + 3 + ], + "biography_name": [ + "250011", + "250012", + "250013" + ], + "biography_txt": [ + "250011", + "250012", + "250013" + ], + "biography_reward1": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "biography_reward2": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "biography_reward3": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "plot_unlock": [ + 1, + 2, + 3, + 4 + ], + "startid": 300001, + "endid": [ + 3000015, + 3000017, + 3000018 + ], + "rightend": 3000014, + "stroyprize": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ], + "special_stroyprize": [ + { + "a": "attr", + "t": "gold", + "n": 2000 + } + ] + }, + { + "id": 21, + "hid": "25003", + "name": { + "key": "hero_25003", + "text": "羊仙姑" + }, + "favor_lv": 0, + "favor_exp": 100, + "lv_name": { + "key": "favorability_favorability_lv_name_0", + "text": "萍水相逢" + }, + "privilege_type": 0, + "privilege_value": 0, + "return_reward": [], + "return_txt": { + "key": "", + "text": "" + }, + "likes_food": [], + "disliking_food": [], + "likes_txt": { + "key": "favorability_favorability_likes_txt_25003", + "text": "我很喜欢，谢谢！" + }, + "ordinary_txt": { + "key": "favorability_favorability_ordinary_txt_25003", + "text": "送我的？谢谢！" + }, + "disliking_txt": { + "key": "favorability_favorabilit_disliking_txt_25003", + "text": "这味道，一言难尽......" + }, + "favorlv": [ + 1, + 2, + 3 + ], + "biography_name": [ + "250031", + "250032", + "250033" + ], + "biography_txt": [ + "250031", + "250032", + "250033" + ], + "biography_reward1": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "biography_reward2": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "biography_reward3": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "plot_unlock": [ + 1, + 2, + 3, + 4 + ], + "startid": 300001, + "endid": [ + 3000015, + 3000017, + 3000018 + ], + "rightend": 3000014, + "stroyprize": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ], + "special_stroyprize": [ + { + "a": "attr", + "t": "gold", + "n": 2000 + } + ] + }, + { + "id": 22, + "hid": "25004", + "name": { + "key": "hero_25004", + "text": "波比" + }, + "favor_lv": 0, + "favor_exp": 100, + "lv_name": { + "key": "favorability_favorability_lv_name_0", + "text": "萍水相逢" + }, + "privilege_type": 0, + "privilege_value": 0, + "return_reward": [], + "return_txt": { + "key": "", + "text": "" + }, + "likes_food": [], + "disliking_food": [], + "likes_txt": { + "key": "favorability_favorability_likes_txt_25004", + "text": "我很喜欢，谢谢！" + }, + "ordinary_txt": { + "key": "favorability_favorability_ordinary_txt_25004", + "text": "送我的？谢谢！" + }, + "disliking_txt": { + "key": "favorability_favorabilit_disliking_txt_25004", + "text": "这味道，一言难尽......" + }, + "favorlv": [ + 1, + 2, + 3 + ], + "biography_name": [ + "250041", + "250042", + "250043" + ], + "biography_txt": [ + "250041", + "250042", + "250043" + ], + "biography_reward1": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "biography_reward2": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "biography_reward3": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "plot_unlock": [ + 1, + 2, + 3, + 4 + ], + "startid": 300001, + "endid": [ + 3000015, + 3000017, + 3000018 + ], + "rightend": 3000014, + "stroyprize": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ], + "special_stroyprize": [ + { + "a": "attr", + "t": "gold", + "n": 2000 + } + ] + }, + { + "id": 23, + "hid": "34001", + "name": { + "key": "hero_34001", + "text": "贫嘴驴" + }, + "favor_lv": 0, + "favor_exp": 100, + "lv_name": { + "key": "favorability_favorability_lv_name_0", + "text": "萍水相逢" + }, + "privilege_type": 0, + "privilege_value": 0, + "return_reward": [], + "return_txt": { + "key": "", + "text": "" + }, + "likes_food": [], + "disliking_food": [], + "likes_txt": { + "key": "favorability_favorability_likes_txt_34001", + "text": "我很喜欢，谢谢！" + }, + "ordinary_txt": { + "key": "favorability_favorability_ordinary_txt_34001", + "text": "送我的？谢谢！" + }, + "disliking_txt": { + "key": "favorability_favorabilit_disliking_txt_34001", + "text": "这味道，一言难尽......" + }, + "favorlv": [ + 1, + 2, + 3 + ], + "biography_name": [ + "340011", + "340012", + "340013" + ], + "biography_txt": [ + "340011", + "340012", + "340013" + ], + "biography_reward1": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "biography_reward2": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "biography_reward3": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "plot_unlock": [ + 1, + 2, + 3, + 4 + ], + "startid": 300001, + "endid": [ + 3000015, + 3000017, + 3000018 + ], + "rightend": 3000014, + "stroyprize": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ], + "special_stroyprize": [ + { + "a": "attr", + "t": "gold", + "n": 2000 + } + ] + }, + { + "id": 24, + "hid": "34003", + "name": { + "key": "hero_34003", + "text": "圣诞老人" + }, + "favor_lv": 0, + "favor_exp": 100, + "lv_name": { + "key": "favorability_favorability_lv_name_0", + "text": "萍水相逢" + }, + "privilege_type": 0, + "privilege_value": 0, + "return_reward": [], + "return_txt": { + "key": "", + "text": "" + }, + "likes_food": [], + "disliking_food": [], + "likes_txt": { + "key": "favorability_favorability_likes_txt_34003", + "text": "我很喜欢，谢谢！" + }, + "ordinary_txt": { + "key": "favorability_favorability_ordinary_txt_34003", + "text": "送我的？谢谢！" + }, + "disliking_txt": { + "key": "favorability_favorabilit_disliking_txt_34003", + "text": "这味道，一言难尽......" + }, + "favorlv": [ + 1, + 2, + 3 + ], + "biography_name": [ + "340031", + "340032", + "340033" + ], + "biography_txt": [ + "340031", + "340032", + "340033" + ], + "biography_reward1": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "biography_reward2": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "biography_reward3": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "plot_unlock": [ + 1, + 2, + 3, + 4 + ], + "startid": 300001, + "endid": [ + 3000015, + 3000017, + 3000018 + ], + "rightend": 3000014, + "stroyprize": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ], + "special_stroyprize": [ + { + "a": "attr", + "t": "gold", + "n": 2000 + } + ] + }, + { + "id": 25, + "hid": "34004", + "name": { + "key": "hero_34004", + "text": "瓜哥" + }, + "favor_lv": 0, + "favor_exp": 100, + "lv_name": { + "key": "favorability_favorability_lv_name_0", + "text": "萍水相逢" + }, + "privilege_type": 0, + "privilege_value": 0, + "return_reward": [], + "return_txt": { + "key": "", + "text": "" + }, + "likes_food": [], + "disliking_food": [], + "likes_txt": { + "key": "favorability_favorability_likes_txt_34004", + "text": "我很喜欢，谢谢！" + }, + "ordinary_txt": { + "key": "favorability_favorability_ordinary_txt_34004", + "text": "送我的？谢谢！" + }, + "disliking_txt": { + "key": "favorability_favorabilit_disliking_txt_34004", + "text": "这味道，一言难尽......" + }, + "favorlv": [ + 1, + 2, + 3 + ], + "biography_name": [ + "340041", + "340042", + "340043" + ], + "biography_txt": [ + "340041", + "340042", + "340043" + ], + "biography_reward1": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "biography_reward2": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "biography_reward3": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "plot_unlock": [ + 1, + 2, + 3, + 4 + ], + "startid": 300001, + "endid": [ + 3000015, + 3000017, + 3000018 + ], + "rightend": 3000014, + "stroyprize": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ], + "special_stroyprize": [ + { + "a": "attr", + "t": "gold", + "n": 2000 + } + ] + }, + { + "id": 26, + "hid": "34006", + "name": { + "key": "hero_34006", + "text": "冰霜杰克" + }, + "favor_lv": 0, + "favor_exp": 100, + "lv_name": { + "key": "favorability_favorability_lv_name_0", + "text": "萍水相逢" + }, + "privilege_type": 0, + "privilege_value": 0, + "return_reward": [], + "return_txt": { + "key": "", + "text": "" + }, + "likes_food": [], + "disliking_food": [], + "likes_txt": { + "key": "favorability_favorability_likes_txt_34006", + "text": "我很喜欢，谢谢！" + }, + "ordinary_txt": { + "key": "favorability_favorability_ordinary_txt_34006", + "text": "送我的？谢谢！" + }, + "disliking_txt": { + "key": "favorability_favorabilit_disliking_txt_34006", + "text": "这味道，一言难尽......" + }, + "favorlv": [ + 1, + 2, + 3 + ], + "biography_name": [ + "340061", + "340062", + "340063" + ], + "biography_txt": [ + "340061", + "340062", + "340063" + ], + "biography_reward1": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "biography_reward2": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "biography_reward3": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "plot_unlock": [ + 1, + 2, + 3, + 4 + ], + "startid": 300001, + "endid": [ + 3000015, + 3000017, + 3000018 + ], + "rightend": 3000014, + "stroyprize": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ], + "special_stroyprize": [ + { + "a": "attr", + "t": "gold", + "n": 2000 + } + ] + }, + { + "id": 27, + "hid": "34008", + "name": { + "key": "hero_34008", + "text": "悍夫那特" + }, + "favor_lv": 0, + "favor_exp": 100, + "lv_name": { + "key": "favorability_favorability_lv_name_0", + "text": "萍水相逢" + }, + "privilege_type": 0, + "privilege_value": 0, + "return_reward": [], + "return_txt": { + "key": "", + "text": "" + }, + "likes_food": [], + "disliking_food": [], + "likes_txt": { + "key": "favorability_favorability_likes_txt_34008", + "text": "我很喜欢，谢谢！" + }, + "ordinary_txt": { + "key": "favorability_favorability_ordinary_txt_34008", + "text": "送我的？谢谢！" + }, + "disliking_txt": { + "key": "favorability_favorabilit_disliking_txt_34008", + "text": "这味道，一言难尽......" + }, + "favorlv": [ + 1, + 2, + 3 + ], + "biography_name": [ + "340081", + "340082", + "340083" + ], + "biography_txt": [ + "340081", + "340082", + "340083" + ], + "biography_reward1": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "biography_reward2": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "biography_reward3": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "plot_unlock": [ + 1, + 2, + 3, + 4 + ], + "startid": 300001, + "endid": [ + 3000015, + 3000017, + 3000018 + ], + "rightend": 3000014, + "stroyprize": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ], + "special_stroyprize": [ + { + "a": "attr", + "t": "gold", + "n": 2000 + } + ] + }, + { + "id": 28, + "hid": "35001", + "name": { + "key": "hero_35001", + "text": "师父" + }, + "favor_lv": 0, + "favor_exp": 100, + "lv_name": { + "key": "favorability_favorability_lv_name_0", + "text": "萍水相逢" + }, + "privilege_type": 0, + "privilege_value": 0, + "return_reward": [], + "return_txt": { + "key": "", + "text": "" + }, + "likes_food": [], + "disliking_food": [], + "likes_txt": { + "key": "favorability_favorability_likes_txt_35001", + "text": "我很喜欢，谢谢！" + }, + "ordinary_txt": { + "key": "favorability_favorability_ordinary_txt_35001", + "text": "送我的？谢谢！" + }, + "disliking_txt": { + "key": "favorability_favorabilit_disliking_txt_35001", + "text": "这味道，一言难尽......" + }, + "favorlv": [ + 1, + 2, + 3 + ], + "biography_name": [ + "350011", + "350012", + "350013" + ], + "biography_txt": [ + "350011", + "350012", + "350013" + ], + "biography_reward1": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "biography_reward2": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "biography_reward3": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "plot_unlock": [ + 1, + 2, + 3, + 4 + ], + "startid": 300001, + "endid": [ + 3000015, + 3000017, + 3000018 + ], + "rightend": 3000014, + "stroyprize": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ], + "special_stroyprize": [ + { + "a": "attr", + "t": "gold", + "n": 2000 + } + ] + }, + { + "id": 29, + "hid": "35002", + "name": { + "key": "hero_35002", + "text": "希卡普" + }, + "favor_lv": 0, + "favor_exp": 100, + "lv_name": { + "key": "favorability_favorability_lv_name_0", + "text": "萍水相逢" + }, + "privilege_type": 0, + "privilege_value": 0, + "return_reward": [], + "return_txt": { + "key": "", + "text": "" + }, + "likes_food": [], + "disliking_food": [], + "likes_txt": { + "key": "favorability_favorability_likes_txt_35002", + "text": "我很喜欢，谢谢！" + }, + "ordinary_txt": { + "key": "favorability_favorability_ordinary_txt_35002", + "text": "送我的？谢谢！" + }, + "disliking_txt": { + "key": "favorability_favorabilit_disliking_txt_35002", + "text": "这味道，一言难尽......" + }, + "favorlv": [ + 1, + 2, + 3 + ], + "biography_name": [ + "350021", + "350022", + "350023" + ], + "biography_txt": [ + "350021", + "350022", + "350023" + ], + "biography_reward1": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "biography_reward2": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "biography_reward3": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "plot_unlock": [ + 1, + 2, + 3, + 4 + ], + "startid": 300001, + "endid": [ + 3000015, + 3000017, + 3000018 + ], + "rightend": 3000014, + "stroyprize": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ], + "special_stroyprize": [ + { + "a": "attr", + "t": "gold", + "n": 2000 + } + ] + }, + { + "id": 30, + "hid": "35003", + "name": { + "key": "hero_35003", + "text": "漆黑" + }, + "favor_lv": 0, + "favor_exp": 100, + "lv_name": { + "key": "favorability_favorability_lv_name_0", + "text": "萍水相逢" + }, + "privilege_type": 0, + "privilege_value": 0, + "return_reward": [], + "return_txt": { + "key": "", + "text": "" + }, + "likes_food": [], + "disliking_food": [], + "likes_txt": { + "key": "favorability_favorability_likes_txt_35003", + "text": "我很喜欢，谢谢！" + }, + "ordinary_txt": { + "key": "favorability_favorability_ordinary_txt_35003", + "text": "送我的？谢谢！" + }, + "disliking_txt": { + "key": "favorability_favorabilit_disliking_txt_35003", + "text": "这味道，一言难尽......" + }, + "favorlv": [ + 1, + 2, + 3 + ], + "biography_name": [ + "350031", + "350032", + "350033" + ], + "biography_txt": [ + "350031", + "350032", + "350033" + ], + "biography_reward1": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "biography_reward2": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "biography_reward3": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "plot_unlock": [ + 1, + 2, + 3, + 4 + ], + "startid": 300001, + "endid": [ + 3000015, + 3000017, + 3000018 + ], + "rightend": 3000014, + "stroyprize": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ], + "special_stroyprize": [ + { + "a": "attr", + "t": "gold", + "n": 2000 + } + ] + }, + { + "id": 31, + "hid": "35004", + "name": { + "key": "hero_35004", + "text": "黛安·福克斯顿" + }, + "favor_lv": 0, + "favor_exp": 100, + "lv_name": { + "key": "favorability_favorability_lv_name_0", + "text": "萍水相逢" + }, + "privilege_type": 0, + "privilege_value": 0, + "return_reward": [], + "return_txt": { + "key": "", + "text": "" + }, + "likes_food": [], + "disliking_food": [], + "likes_txt": { + "key": "favorability_favorability_likes_txt_35004", + "text": "我很喜欢，谢谢！" + }, + "ordinary_txt": { + "key": "favorability_favorability_ordinary_txt_35004", + "text": "送我的？谢谢！" + }, + "disliking_txt": { + "key": "favorability_favorabilit_disliking_txt_35004", + "text": "这味道，一言难尽......" + }, + "favorlv": [ + 1, + 2, + 3 + ], + "biography_name": [ + "350041", + "350042", + "350043" + ], + "biography_txt": [ + "350041", + "350042", + "350043" + ], + "biography_reward1": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "biography_reward2": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "biography_reward3": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "plot_unlock": [ + 1, + 2, + 3, + 4 + ], + "startid": 300001, + "endid": [ + 3000015, + 3000017, + 3000018 + ], + "rightend": 3000014, + "stroyprize": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ], + "special_stroyprize": [ + { + "a": "attr", + "t": "gold", + "n": 2000 + } + ] + }, + { + "id": 32, + "hid": "35006", + "name": { + "key": "hero_35006", + "text": "平先生" + }, + "favor_lv": 0, + "favor_exp": 100, + "lv_name": { + "key": "favorability_favorability_lv_name_0", + "text": "萍水相逢" + }, + "privilege_type": 0, + "privilege_value": 0, + "return_reward": [], + "return_txt": { + "key": "", + "text": "" + }, + "likes_food": [], + "disliking_food": [], + "likes_txt": { + "key": "favorability_favorability_likes_txt_35006", + "text": "我很喜欢，谢谢！" + }, + "ordinary_txt": { + "key": "favorability_favorability_ordinary_txt_35006", + "text": "送我的？谢谢！" + }, + "disliking_txt": { + "key": "favorability_favorabilit_disliking_txt_35006", + "text": "这味道，一言难尽......" + }, + "favorlv": [ + 1, + 2, + 3 + ], + "biography_name": [ + "350061", + "350062", + "350063" + ], + "biography_txt": [ + "350061", + "350062", + "350063" + ], + "biography_reward1": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "biography_reward2": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "biography_reward3": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "plot_unlock": [ + 1, + 2, + 3, + 4 + ], + "startid": 300001, + "endid": [ + 3000015, + 3000017, + 3000018 + ], + "rightend": 3000014, + "stroyprize": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ], + "special_stroyprize": [ + { + "a": "attr", + "t": "gold", + "n": 2000 + } + ] + }, + { + "id": 33, + "hid": "43005", + "name": { + "key": "hero_43005", + "text": "瓦希尔指挥官" + }, + "favor_lv": 0, + "favor_exp": 100, + "lv_name": { + "key": "favorability_favorability_lv_name_0", + "text": "萍水相逢" + }, + "privilege_type": 0, + "privilege_value": 0, + "return_reward": [], + "return_txt": { + "key": "", + "text": "" + }, + "likes_food": [], + "disliking_food": [], + "likes_txt": { + "key": "favorability_favorability_likes_txt_43005", + "text": "我很喜欢，谢谢！" + }, + "ordinary_txt": { + "key": "favorability_favorability_ordinary_txt_43005", + "text": "送我的？谢谢！" + }, + "disliking_txt": { + "key": "favorability_favorabilit_disliking_txt_43005", + "text": "这味道，一言难尽......" + }, + "favorlv": [ + 1, + 2, + 3 + ], + "biography_name": [ + "430051", + "430052" + ], + "biography_txt": [ + "430051", + "430052" + ], + "biography_reward1": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "biography_reward2": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "biography_reward3": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "plot_unlock": [ + 1, + 2, + 3, + 4 + ], + "startid": 300001, + "endid": [ + 3000015, + 3000017, + 3000018 + ], + "rightend": 3000014, + "stroyprize": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ], + "special_stroyprize": [ + { + "a": "attr", + "t": "gold", + "n": 2000 + } + ] + }, + { + "id": 34, + "hid": "43007", + "name": { + "key": "hero_43007", + "text": "戈伯" + }, + "favor_lv": 0, + "favor_exp": 100, + "lv_name": { + "key": "favorability_favorability_lv_name_0", + "text": "萍水相逢" + }, + "privilege_type": 0, + "privilege_value": 0, + "return_reward": [], + "return_txt": { + "key": "", + "text": "" + }, + "likes_food": [], + "disliking_food": [], + "likes_txt": { + "key": "favorability_favorability_likes_txt_43007", + "text": "我很喜欢，谢谢！" + }, + "ordinary_txt": { + "key": "favorability_favorability_ordinary_txt_43007", + "text": "送我的？谢谢！" + }, + "disliking_txt": { + "key": "favorability_favorabilit_disliking_txt_43007", + "text": "这味道，一言难尽......" + }, + "favorlv": [ + 1, + 2, + 3 + ], + "biography_name": [ + "430071", + "430072", + "430073" + ], + "biography_txt": [ + "430071", + "430072", + "430073" + ], + "biography_reward1": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "biography_reward2": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "biography_reward3": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "plot_unlock": [ + 1, + 2, + 3, + 4 + ], + "startid": 300001, + "endid": [ + 3000015, + 3000017, + 3000018 + ], + "rightend": 3000014, + "stroyprize": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ], + "special_stroyprize": [ + { + "a": "attr", + "t": "gold", + "n": 2000 + } + ] + }, + { + "id": 35, + "hid": "44006", + "name": { + "key": "hero_44006", + "text": "悍娇虎" + }, + "favor_lv": 0, + "favor_exp": 100, + "lv_name": { + "key": "favorability_favorability_lv_name_0", + "text": "萍水相逢" + }, + "privilege_type": 0, + "privilege_value": 0, + "return_reward": [], + "return_txt": { + "key": "", + "text": "" + }, + "likes_food": [], + "disliking_food": [], + "likes_txt": { + "key": "favorability_favorability_likes_txt_44006", + "text": "我很喜欢，谢谢！" + }, + "ordinary_txt": { + "key": "favorability_favorability_ordinary_txt_44006", + "text": "送我的？谢谢！" + }, + "disliking_txt": { + "key": "favorability_favorabilit_disliking_txt_44006", + "text": "这味道，一言难尽......" + }, + "favorlv": [ + 1, + 2, + 3 + ], + "biography_name": [ + "440061", + "440062", + "440063" + ], + "biography_txt": [ + "440061", + "440062", + "440063" + ], + "biography_reward1": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "biography_reward2": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "biography_reward3": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "plot_unlock": [ + 1, + 2, + 3, + 4 + ], + "startid": 300001, + "endid": [ + 3000015, + 3000017, + 3000018 + ], + "rightend": 3000014, + "stroyprize": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ], + "special_stroyprize": [ + { + "a": "attr", + "t": "gold", + "n": 2000 + } + ] + }, + { + "id": 36, + "hid": "45001", + "name": { + "key": "hero_45001", + "text": "乌龟大师" + }, + "favor_lv": 0, + "favor_exp": 100, + "lv_name": { + "key": "favorability_favorability_lv_name_0", + "text": "萍水相逢" + }, + "privilege_type": 0, + "privilege_value": 0, + "return_reward": [], + "return_txt": { + "key": "", + "text": "" + }, + "likes_food": [], + "disliking_food": [], + "likes_txt": { + "key": "favorability_favorability_likes_txt_45001", + "text": "我很喜欢，谢谢！" + }, + "ordinary_txt": { + "key": "favorability_favorability_ordinary_txt_45001", + "text": "送我的？谢谢！" + }, + "disliking_txt": { + "key": "favorability_favorabilit_disliking_txt_45001", + "text": "这味道，一言难尽......" + }, + "favorlv": [ + 1, + 2, + 3 + ], + "biography_name": [ + "450011", + "450012", + "450013" + ], + "biography_txt": [ + "450011", + "450012", + "450013" + ], + "biography_reward1": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "biography_reward2": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "biography_reward3": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "plot_unlock": [ + 1, + 2, + 3, + 4 + ], + "startid": 300001, + "endid": [ + 3000015, + 3000017, + 3000018 + ], + "rightend": 3000014, + "stroyprize": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ], + "special_stroyprize": [ + { + "a": "attr", + "t": "gold", + "n": 2000 + } + ] + }, + { + "id": 37, + "hid": "53001", + "name": { + "key": "hero_53001", + "text": "埃雷特" + }, + "favor_lv": 0, + "favor_exp": 100, + "lv_name": { + "key": "favorability_favorability_lv_name_0", + "text": "萍水相逢" + }, + "privilege_type": 0, + "privilege_value": 0, + "return_reward": [], + "return_txt": { + "key": "", + "text": "" + }, + "likes_food": [], + "disliking_food": [], + "likes_txt": { + "key": "favorability_favorability_likes_txt_53001", + "text": "我很喜欢，谢谢！" + }, + "ordinary_txt": { + "key": "favorability_favorability_ordinary_txt_53001", + "text": "送我的？谢谢！" + }, + "disliking_txt": { + "key": "favorability_favorabilit_disliking_txt_53001", + "text": "这味道，一言难尽......" + }, + "favorlv": [ + 1, + 2, + 3 + ], + "biography_name": [ + "530011", + "530012", + "530013" + ], + "biography_txt": [ + "530011", + "530012", + "530013" + ], + "biography_reward1": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "biography_reward2": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "biography_reward3": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "plot_unlock": [ + 1, + 2, + 3, + 4 + ], + "startid": 300001, + "endid": [ + 3000015, + 3000017, + 3000018 + ], + "rightend": 3000014, + "stroyprize": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ], + "special_stroyprize": [ + { + "a": "attr", + "t": "gold", + "n": 2000 + } + ] + }, + { + "id": 38, + "hid": "54005", + "name": { + "key": "hero_54005", + "text": "无牙仔" + }, + "favor_lv": 0, + "favor_exp": 100, + "lv_name": { + "key": "favorability_favorability_lv_name_0", + "text": "萍水相逢" + }, + "privilege_type": 0, + "privilege_value": 0, + "return_reward": [], + "return_txt": { + "key": "", + "text": "" + }, + "likes_food": [], + "disliking_food": [], + "likes_txt": { + "key": "favorability_favorability_likes_txt_54005", + "text": "我很喜欢，谢谢！" + }, + "ordinary_txt": { + "key": "favorability_favorability_ordinary_txt_54005", + "text": "送我的？谢谢！" + }, + "disliking_txt": { + "key": "favorability_favorabilit_disliking_txt_54005", + "text": "这味道，一言难尽......" + }, + "favorlv": [ + 1, + 2, + 3 + ], + "biography_name": [ + "540051", + "540052", + "540053" + ], + "biography_txt": [ + "540051", + "540052", + "540053" + ], + "biography_reward1": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "biography_reward2": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "biography_reward3": [ + { + "a": "item", + "t": "30001", + "n": 1 + } + ], + "plot_unlock": [ + 1, + 2, + 3, + 4 + ], + "startid": 300001, + "endid": [ + 3000015, + 3000017, + 3000018 + ], + "rightend": 3000014, + "stroyprize": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ], + "special_stroyprize": [ + { + "a": "attr", + "t": "gold", + "n": 2000 + } + ] + } +] \ No newline at end of file diff --git a/bin/json/game_friends.json b/bin/json/game_friends.json new file mode 100644 index 000000000..1f3436742 --- /dev/null +++ b/bin/json/game_friends.json @@ -0,0 +1,407 @@ +[ + { + "id": 1, + "friend_id": 40001, + "type": 1, + "type_name": { + "key": "favorability_friends_type_name_1", + "text": "传承" + }, + "friend_name": { + "key": "favorability_friends_friend_name_40001", + "text": "师徒二人" + }, + "png": "jiban_img_zu02", + "friends_lv": 1, + "favorability_lv": 1, + "hid": 25001, + "attribute": [ + { + "a": "atkpro", + "n": 1 + } + ], + "attribute_txt": { + "key": "favorability_friends_friend_name_250011", + "text": "攻击力+{0}" + } + }, + { + "id": 2, + "friend_id": 40001, + "type": 1, + "type_name": { + "key": "favorability_friends_name_1", + "text": "传承" + }, + "friend_name": { + "key": "favorability_friends_friend_name_40001", + "text": "师徒二人" + }, + "png": "jiban_img_zu02", + "friends_lv": 1, + "favorability_lv": 1, + "hid": 35001, + "attribute": [ + { + "a": "atk", + "n": 10 + } + ], + "attribute_txt": { + "key": "favorability_friends_friend_name_350011", + "text": "攻击力+{0}" + } + }, + { + "id": 3, + "friend_id": 40001, + "type": 1, + "type_name": { + "key": "favorability_friends_name_1", + "text": "传承" + }, + "friend_name": { + "key": "favorability_friends_friend_name_40001", + "text": "师徒二人" + }, + "png": "jiban_img_zu02", + "friends_lv": 2, + "favorability_lv": 9, + "hid": 25001, + "attribute": [ + { + "a": "atkpro", + "n": 2 + } + ], + "attribute_txt": { + "key": "favorability_friends_friend_name_250012", + "text": "攻击力+{0}" + } + }, + { + "id": 4, + "friend_id": 40001, + "type": 1, + "type_name": { + "key": "favorability_friends_name_1", + "text": "传承" + }, + "friend_name": { + "key": "favorability_friends_friend_name_40001", + "text": "师徒二人" + }, + "png": "jiban_img_zu02", + "friends_lv": 2, + "favorability_lv": 9, + "hid": 35001, + "attribute": [ + { + "a": "atk", + "n": 20 + } + ], + "attribute_txt": { + "key": "favorability_friends_friend_name_350012", + "text": "攻击力+{0}" + } + }, + { + "id": 5, + "friend_id": 40001, + "type": 1, + "type_name": { + "key": "favorability_friends_name_1", + "text": "传承" + }, + "friend_name": { + "key": "favorability_friends_friend_name_40001", + "text": "师徒二人" + }, + "png": "jiban_img_zu02", + "friends_lv": 3, + "favorability_lv": 15, + "hid": 25001, + "attribute": [ + { + "a": "atkpro", + "n": 3 + } + ], + "attribute_txt": { + "key": "favorability_friends_friend_name_250013", + "text": "攻击力+{0}" + } + }, + { + "id": 6, + "friend_id": 40001, + "type": 1, + "type_name": { + "key": "favorability_friends_name_1", + "text": "传承" + }, + "friend_name": { + "key": "favorability_friends_friend_name_40001", + "text": "师徒二人" + }, + "png": "jiban_img_zu02", + "friends_lv": 3, + "favorability_lv": 15, + "hid": 35001, + "attribute": [ + { + "a": "atk", + "n": 30 + } + ], + "attribute_txt": { + "key": "favorability_friends_friend_name_350013", + "text": "攻击力+{0}" + } + }, + { + "id": 7, + "friend_id": 102, + "type": 2, + "type_name": { + "key": "favorability_friends_name_2", + "text": "友谊" + }, + "friend_name": { + "key": "favorability_friends_friend_name_102", + "text": "师徒三人" + }, + "png": "jiban_img_zu02", + "friends_lv": 1, + "favorability_lv": 1, + "hid": 25001, + "attribute": [ + { + "a": "atkpro", + "n": 1 + } + ], + "attribute_txt": { + "key": "favorability_friends_friend_name_250011", + "text": "攻击力+{0}" + } + }, + { + "id": 8, + "friend_id": 102, + "type": 2, + "type_name": { + "key": "favorability_friends_name_2", + "text": "友谊" + }, + "friend_name": { + "key": "favorability_friends_friend_name_102", + "text": "师徒三人" + }, + "png": "jiban_img_zu02", + "friends_lv": 1, + "favorability_lv": 1, + "hid": 35001, + "attribute": [ + { + "a": "atk", + "n": 10 + } + ], + "attribute_txt": { + "key": "favorability_friends_friend_name_350011", + "text": "攻击力+{0}" + } + }, + { + "id": 9, + "friend_id": 102, + "type": 2, + "type_name": { + "key": "favorability_friends_name_2", + "text": "友谊" + }, + "friend_name": { + "key": "favorability_friends_friend_name_102", + "text": "师徒三人" + }, + "png": "jiban_img_zu02", + "friends_lv": 1, + "favorability_lv": 1, + "hid": 15004, + "attribute": [ + { + "a": "HP", + "n": 100 + } + ], + "attribute_txt": { + "key": "favorability_friends_friend_name_150041", + "text": "生命值+{0}" + } + }, + { + "id": 10, + "friend_id": 102, + "type": 2, + "type_name": { + "key": "favorability_friends_name_2", + "text": "友谊" + }, + "friend_name": { + "key": "favorability_friends_friend_name_102", + "text": "师徒三人" + }, + "png": "jiban_img_zu02", + "friends_lv": 2, + "favorability_lv": 9, + "hid": 25001, + "attribute": [ + { + "a": "atkpro", + "n": 1 + } + ], + "attribute_txt": { + "key": "favorability_friends_friend_name_250012", + "text": "攻击力+{0}" + } + }, + { + "id": 11, + "friend_id": 102, + "type": 2, + "type_name": { + "key": "favorability_friends_name_2", + "text": "友谊" + }, + "friend_name": { + "key": "favorability_friends_friend_name_102", + "text": "师徒三人" + }, + "png": "jiban_img_zu02", + "friends_lv": 2, + "favorability_lv": 9, + "hid": 35001, + "attribute": [ + { + "a": "atk", + "n": 10 + } + ], + "attribute_txt": { + "key": "favorability_friends_friend_name_350012", + "text": "攻击力+{0}" + } + }, + { + "id": 12, + "friend_id": 102, + "type": 2, + "type_name": { + "key": "favorability_friends_name_2", + "text": "友谊" + }, + "friend_name": { + "key": "favorability_friends_friend_name_102", + "text": "师徒三人" + }, + "png": "jiban_img_zu02", + "friends_lv": 2, + "favorability_lv": 9, + "hid": 15004, + "attribute": [ + { + "a": "HP", + "n": 100 + } + ], + "attribute_txt": { + "key": "favorability_friends_friend_name_150042", + "text": "生命值+{0}" + } + }, + { + "id": 13, + "friend_id": 102, + "type": 2, + "type_name": { + "key": "favorability_friends_name_2", + "text": "友谊" + }, + "friend_name": { + "key": "favorability_friends_friend_name_102", + "text": "师徒三人" + }, + "png": "jiban_img_zu02", + "friends_lv": 3, + "favorability_lv": 15, + "hid": 25001, + "attribute": [ + { + "a": "atkpro", + "n": 1 + } + ], + "attribute_txt": { + "key": "favorability_friends_friend_name_250013", + "text": "攻击力+{0}" + } + }, + { + "id": 14, + "friend_id": 102, + "type": 2, + "type_name": { + "key": "favorability_friends_name_2", + "text": "友谊" + }, + "friend_name": { + "key": "favorability_friends_friend_name_102", + "text": "师徒三人" + }, + "png": "jiban_img_zu02", + "friends_lv": 3, + "favorability_lv": 15, + "hid": 35001, + "attribute": [ + { + "a": "atk", + "n": 10 + } + ], + "attribute_txt": { + "key": "favorability_friends_friend_name_350013", + "text": "攻击力+{0}" + } + }, + { + "id": 15, + "friend_id": 102, + "type": 2, + "type_name": { + "key": "favorability_friends_name_2", + "text": "友谊" + }, + "friend_name": { + "key": "favorability_friends_friend_name_102", + "text": "师徒三人" + }, + "png": "jiban_img_zu02", + "friends_lv": 3, + "favorability_lv": 15, + "hid": 15004, + "attribute": [ + { + "a": "HP", + "n": 100 + } + ], + "attribute_txt": { + "key": "favorability_friends_friend_name_150043", + "text": "生命值+{0}" + } + } +] \ No newline at end of file diff --git a/bin/json/game_item.json b/bin/json/game_item.json index 037777912..c509b495d 100644 --- a/bin/json/game_item.json +++ b/bin/json/game_item.json @@ -1888,9 +1888,9 @@ "box_id": 0, "synthetize_num": 0, "access": [ - 123 + 1001 ], - "use_skip": 139, + "use_skip": 1001, "upper_limit": -1, "img": "tj_icon_flower", "intr": { @@ -1918,9 +1918,9 @@ "box_id": 0, "synthetize_num": 0, "access": [ - 123 + 1001 ], - "use_skip": 139, + "use_skip": 1001, "upper_limit": -1, "img": "tj_icon_yshy", "intr": { @@ -1948,9 +1948,9 @@ "box_id": 0, "synthetize_num": 0, "access": [ - 123 + 1001 ], - "use_skip": 139, + "use_skip": 1001, "upper_limit": -1, "img": "tj_icon_ttry", "intr": { @@ -1978,9 +1978,9 @@ "box_id": 0, "synthetize_num": 0, "access": [ - 123 + 1001 ], - "use_skip": 139, + "use_skip": 1001, "upper_limit": -1, "img": "tj_icon_hmkz", "intr": { @@ -2008,9 +2008,9 @@ "box_id": 0, "synthetize_num": 0, "access": [ - 123 + 1001 ], - "use_skip": 139, + "use_skip": 1001, "upper_limit": -1, "img": "tj_icon_ljym", "intr": { @@ -2038,9 +2038,9 @@ "box_id": 0, "synthetize_num": 0, "access": [ - 123 + 1001 ], - "use_skip": 139, + "use_skip": 1001, "upper_limit": -1, "img": "tj_icon_emtm", "intr": { @@ -2068,9 +2068,9 @@ "box_id": 0, "synthetize_num": 0, "access": [ - 123 + 1001 ], - "use_skip": 139, + "use_skip": 1001, "upper_limit": -1, "img": "tj_icon_cjbs", "intr": { @@ -2098,9 +2098,9 @@ "box_id": 0, "synthetize_num": 0, "access": [ - 123 + 1001 ], - "use_skip": 139, + "use_skip": 1001, "upper_limit": -1, "img": "tj_icon_zjbs", "intr": { @@ -2128,9 +2128,9 @@ "box_id": 0, "synthetize_num": 0, "access": [ - 123 + 1001 ], - "use_skip": 139, + "use_skip": 1001, "upper_limit": -1, "img": "tj_icon_gjbs", "intr": { diff --git a/bin/json/game_pandamasjx.json b/bin/json/game_pandamasjx.json index 78eedc34a..180dcf3aa 100644 --- a/bin/json/game_pandamasjx.json +++ b/bin/json/game_pandamasjx.json @@ -17,7 +17,7 @@ "text": "作为教习，食人鱼一直秉承着严厉的教习态度，在他手下训练的英雄可以获得巨大提升" }, "description": { - "key": "wuguanshirenyu10001", + "key": "xiaoguo_6", "text": "提升每分钟的经验值获取{0}%" }, "duration": 0, @@ -45,7 +45,7 @@ "text": "闪闪" }, "description": { - "key": "wuguanshirenyu10002", + "key": "xiaoguo_7", "text": "提升每分钟的经验值获取{0}%" }, "duration": 0, @@ -73,7 +73,7 @@ "text": "蛇先生" }, "description": { - "key": "wuguanshirenyu10003", + "key": "xiaoguo_8", "text": "提升每分钟的经验值获取{0}%" }, "duration": 0, @@ -101,7 +101,7 @@ "text": "金猴" }, "description": { - "key": "wuguanshirenyu10004", + "key": "xiaoguo_9", "text": "提升每分钟的经验值获取{0}%,提升低级觉醒材料的获取数量{0}" }, "duration": 0, @@ -140,7 +140,7 @@ "text": "鹤大师" }, "description": { - "key": "wuguanshirenyu10005", + "key": "xiaoguo_10", "text": "提升可挂机的时间{0}秒" }, "duration": 1, @@ -168,7 +168,7 @@ "text": "悍娇虎" }, "description": { - "key": "wuguanshirenyu10006", + "key": "xiaoguo_11", "text": "提升可挂机的时间{0}秒" }, "duration": 1, @@ -196,7 +196,7 @@ "text": "盖" }, "description": { - "key": "wuguanshirenyu10007", + "key": "xiaoguo_12", "text": "提升可挂机的时间{0}秒" }, "duration": 1, @@ -224,7 +224,7 @@ "text": "希卡普" }, "description": { - "key": "wuguanshirenyu10008", + "key": "xiaoguo_13", "text": "提升可挂机的时间{0}秒,提升每分钟的经验值获取{0}%" }, "duration": 1, @@ -252,7 +252,7 @@ "text": "穿靴猫" }, "description": { - "key": "wuguanshirenyu10009", + "key": "xiaoguo_14", "text": "提升低级觉醒材料的获取数量{0}" }, "duration": 0, @@ -291,7 +291,7 @@ "text": "师父" }, "description": { - "key": "wuguanshirenyu10010", + "key": "xiaoguo_15", "text": "提升低级觉醒材料的获取数量{0}" }, "duration": 0, @@ -330,7 +330,7 @@ "text": "阿宝" }, "description": { - "key": "wuguanshirenyu10011", + "key": "xiaoguo_16", "text": "{0}%概率获得1个3级升星精灵" }, "duration": 0, @@ -369,7 +369,7 @@ "text": "乌龟大师" }, "description": { - "key": "wuguanshirenyu10012", + "key": "xiaoguo_17", "text": "{0}%概率获得1个3级升星精灵" }, "duration": 0, @@ -408,7 +408,7 @@ "text": "石锁，传闻是师父在训练阿宝时经常使用到的道具" }, "description": { - "key": "wuguanshirenyu20001", + "key": "xiaoguo_18", "text": "提升每分钟的经验值获取{0}%,提升低级觉醒材料的获取数量{0}" }, "duration": 0, @@ -447,7 +447,7 @@ "text": "双头空竹" }, "description": { - "key": "wuguanshirenyu20002", + "key": "xiaoguo_19", "text": "提升每分钟的经验值获取{0}%" }, "duration": 0, @@ -475,7 +475,7 @@ "text": "木爬架" }, "description": { - "key": "wuguanshirenyu20003", + "key": "xiaoguo_20", "text": "提升每分钟的经验值获取{0}%" }, "duration": 0, @@ -503,7 +503,7 @@ "text": "不倒翁" }, "description": { - "key": "wuguanshirenyu20004", + "key": "xiaoguo_21", "text": "提升每分钟的经验值获取{0}%" }, "duration": 0, @@ -531,7 +531,7 @@ "text": "棒槌" }, "description": { - "key": "wuguanshirenyu20005", + "key": "xiaoguo_22", "text": "提升可挂机的时间{0}秒" }, "duration": 1, @@ -559,7 +559,7 @@ "text": "铜铃" }, "description": { - "key": "wuguanshirenyu20006", + "key": "xiaoguo_23", "text": "提升可挂机的时间{0}秒" }, "duration": 1, @@ -587,7 +587,7 @@ "text": "尖刺吊环" }, "description": { - "key": "wuguanshirenyu20007", + "key": "xiaoguo_24", "text": "提升可挂机的时间{0}秒" }, "duration": 1, @@ -615,7 +615,7 @@ "text": "陀螺" }, "description": { - "key": "wuguanshirenyu20008", + "key": "xiaoguo_25", "text": "提升可挂机的时间{0}秒,提升每分钟的经验值获取{0}%" }, "duration": 1, @@ -643,7 +643,7 @@ "text": "大转轮" }, "description": { - "key": "wuguanshirenyu20009", + "key": "xiaoguo_26", "text": "提升低级觉醒材料的获取数量{0}" }, "duration": 0, @@ -682,7 +682,7 @@ "text": "木头牌" }, "description": { - "key": "wuguanshirenyu20010", + "key": "xiaoguo_27", "text": "提升低级觉醒材料的获取数量{0}" }, "duration": 0, @@ -721,7 +721,7 @@ "text": "双节棍" }, "description": { - "key": "wuguanshirenyu20011", + "key": "xiaoguo_28", "text": "{0}%概率获得1个3级升星精灵" }, "duration": 0, @@ -760,7 +760,7 @@ "text": "练功带" }, "description": { - "key": "wuguanshirenyu20012", + "key": "xiaoguo_29", "text": "{0}%概率获得1个3级升星精灵" }, "duration": 0, @@ -799,7 +799,7 @@ "text": "七彩花棍" }, "description": { - "key": "wuguanshirenyu20013", + "key": "xiaoguo_30", "text": "{0}%概率获得1个3级升星精灵" }, "duration": 0, @@ -838,7 +838,7 @@ "text": "流星飞镖" }, "description": { - "key": "wuguanshirenyu20014", + "key": "xiaoguo_31", "text": "提升可挂机的时间{0}秒" }, "duration": 1, @@ -866,7 +866,7 @@ "text": "冥想锣" }, "description": { - "key": "wuguanshirenyu20015", + "key": "xiaoguo_32", "text": "提升可挂机的时间{0}秒" }, "duration": 1, @@ -894,7 +894,7 @@ "text": "彩条龙" }, "description": { - "key": "wuguanshirenyu20016", + "key": "xiaoguo_33", "text": "提升可挂机的时间{0}秒,提升每分钟的经验值获取{0}%" }, "duration": 1, @@ -922,7 +922,7 @@ "text": "孔雀毛扇" }, "description": { - "key": "wuguanshirenyu20017", + "key": "xiaoguo_34", "text": "提升低级觉醒材料的获取数量{0}" }, "duration": 0, @@ -959,7 +959,7 @@ "text": "平衡木" }, "description": { - "key": "wuguanshirenyu20018", + "key": "xiaoguo_35", "text": "提升低级觉醒材料的获取数量{0}" }, "duration": 0, @@ -996,7 +996,7 @@ "text": "铁环" }, "description": { - "key": "wuguanshirenyu20019", + "key": "xiaoguo_36", "text": "{0}%概率获得1个3级升星精灵" }, "duration": 0, @@ -1033,7 +1033,7 @@ "text": "太极球" }, "description": { - "key": "wuguanshirenyu20020", + "key": "xiaoguo_37", "text": "{0}%概率获得1个3级升星精灵,提升低级觉醒材料的获取数量{0}" }, "duration": 0, diff --git a/bin/json/game_rdtasknpc.json b/bin/json/game_rdtasknpc.json index aae711a7d..c8af586aa 100644 --- a/bin/json/game_rdtasknpc.json +++ b/bin/json/game_rdtasknpc.json @@ -1,6 +1,7 @@ [ { "id": 101, + "heroid": 44005, "datas": [ "GameMain", "功能入口-招募", @@ -14,6 +15,7 @@ }, { "id": 102, + "heroid": 15005, "datas": [ "GameMain", "功能入口-主线", @@ -27,6 +29,7 @@ }, { "id": 103, + "heroid": 51001, "datas": [ "WuGuanScene", "乌龟大师", @@ -40,6 +43,7 @@ }, { "id": 104, + "heroid": 51002, "datas": [ "WuGuanScene", "木桩1", @@ -53,6 +57,7 @@ }, { "id": 10010, + "heroid": 51003, "datas": [ "GameMain", "20010_熊猫_1", @@ -66,6 +71,7 @@ }, { "id": 10011, + "heroid": 51004, "datas": [ "GameMain", "20010_骇客蛛_1", @@ -79,6 +85,7 @@ }, { "id": 10012, + "heroid": 51005, "datas": [ "GameMain", "20010_箱子_1", @@ -92,6 +99,7 @@ }, { "id": 10020, + "heroid": 51006, "datas": [ "GameMain", "20020_熊猫_2", @@ -105,6 +113,7 @@ }, { "id": 10021, + "heroid": 51007, "datas": [ "GameMain", "20020_邦尼兔_1", @@ -118,6 +127,7 @@ }, { "id": 10022, + "heroid": 54005, "datas": [ "GameMain", "20020_熊猫_2", @@ -131,6 +141,7 @@ }, { "id": 10030, + "heroid": 51010, "datas": [ "GameMain", "20020_熊猫_2", @@ -144,6 +155,7 @@ }, { "id": 10031, + "heroid": 51011, "datas": [ "GameMain", "20020_邦尼兔_1", @@ -157,6 +169,7 @@ }, { "id": 10032, + "heroid": 51012, "datas": [ "GameMain", "20020_邦尼兔_1", @@ -170,6 +183,7 @@ }, { "id": 10040, + "heroid": 51013, "datas": [ "GameMain", "20020_邦尼兔_1", @@ -183,6 +197,7 @@ }, { "id": 10041, + "heroid": 51014, "datas": [ "GameMain", "20020_熊猫_2", @@ -196,6 +211,7 @@ }, { "id": 10050, + "heroid": 54001, "datas": [ "WuGuanScene", "20050_邦尼兔_1", @@ -209,6 +225,7 @@ }, { "id": 10060, + "heroid": 53001, "datas": [ "GameMain", "20020_熊猫_2", @@ -222,6 +239,7 @@ }, { "id": 10061, + "heroid": 53002, "datas": [ "GameMain", "20010_熊猫_1", @@ -235,6 +253,7 @@ }, { "id": 10070, + "heroid": 53003, "datas": [ "SmithyScene", "打造", @@ -248,6 +267,7 @@ }, { "id": 10071, + "heroid": 54002, "datas": [ "GameMain", "功能入口-维京远征", @@ -261,6 +281,7 @@ }, { "id": 10072, + "heroid": 53005, "datas": [ "SmithyScene", "打造", @@ -274,6 +295,7 @@ }, { "id": 10080, + "heroid": 53006, "datas": [ "GameMain", "20010_骇客蛛_1", @@ -287,6 +309,7 @@ }, { "id": 10081, + "heroid": 55001, "datas": [ "GameMain", "功能入口-主线", @@ -300,6 +323,7 @@ }, { "id": 10082, + "heroid": 55002, "datas": [ "GameMain", "20080_食人鱼_1", @@ -313,6 +337,7 @@ }, { "id": 10090, + "heroid": 55003, "datas": [ "GameMain", "20020_熊猫_2", @@ -326,6 +351,7 @@ }, { "id": 10091, + "heroid": 55004, "datas": [ "GameMain", "功能入口-招募", @@ -339,6 +365,7 @@ }, { "id": 10100, + "heroid": 55005, "datas": [ "GameMain", "20020_熊猫_2", @@ -352,6 +379,7 @@ }, { "id": 10101, + "heroid": 55006, "datas": [ "GameMain", "20100_梦魇_1", @@ -365,6 +393,7 @@ }, { "id": 10102, + "heroid": 55007, "datas": [ "GameMain", "20020_邦尼兔_1", @@ -378,6 +407,7 @@ }, { "id": 10110, + "heroid": 11021, "datas": [ "GameMain", "20020_熊猫_2", @@ -391,6 +421,7 @@ }, { "id": 70010, + "heroid": 12003, "datas": [ "GameMain", "70010_盖_1", @@ -404,6 +435,7 @@ }, { "id": 70020, + "heroid": 63002, "datas": [ "GameMain", "支线40010_格里森_1", @@ -417,6 +449,7 @@ }, { "id": 70021, + "heroid": 63003, "datas": [ "SmithyScene", "打造", @@ -430,6 +463,7 @@ }, { "id": 70022, + "heroid": 63004, "datas": [ "GameMain", "功能入口-维京远征", @@ -443,6 +477,7 @@ }, { "id": 70023, + "heroid": 64003, "datas": [ "GameMain", "支线40020_格里森_2", @@ -456,6 +491,7 @@ }, { "id": 70030, + "heroid": 74002, "datas": [ "SmithyScene", "打造", @@ -469,6 +505,7 @@ }, { "id": 70031, + "heroid": 74003, "datas": [ "SmithyScene", "打造", @@ -482,6 +519,7 @@ }, { "id": 70032, + "heroid": 74004, "datas": [ "GameMain", "功能入口-维京远征", @@ -495,6 +533,7 @@ }, { "id": 70033, + "heroid": 83002, "datas": [ "SmithyScene", "打造", @@ -508,6 +547,7 @@ }, { "id": 70040, + "heroid": 83006, "datas": [ "WuGuanScene", "支线60010_瓦希尔指挥官_1", @@ -521,6 +561,7 @@ }, { "id": 70050, + "heroid": 84002, "datas": [ "GameMain", "支线70010_小伊_1", @@ -534,6 +575,7 @@ }, { "id": 70060, + "heroid": 94002, "datas": [ "GameMain", "支线80010_鼻涕粗_1", diff --git a/bin/json/game_skillafteratk.json b/bin/json/game_skillafteratk.json index 7dabc58bf..8d4c0aeb6 100644 --- a/bin/json/game_skillafteratk.json +++ b/bin/json/game_skillafteratk.json @@ -13601,9 +13601,7 @@ -1, -1 ], - "FollowSK": [ - 214001212 - ], + "FollowSK": [], "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, @@ -13650,9 +13648,7 @@ -1, -1 ], - "FollowSK": [ - 214001214 - ], + "FollowSK": [], "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, @@ -13694,10 +13690,7 @@ -1, -1 ], - "FollowSK": [ - 214001312, - 214001313 - ], + "FollowSK": [], "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, @@ -13712,6 +13705,56 @@ "From": 3, "Where": [], "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 2, + "Argu": [ + 414001312, + -1, + -1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 214001313, + "EmitPR": 1000, + "From": 3, + "Where": [], + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 8, + "Argu": [ + 1, + 390001202, + -1, + 1000 + ], + "FollowSK": [ + 214001314, + 214001315 + ], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 214001314, + "EmitPR": 1000, + "From": 3, + "Where": [], + "Order": "", "Limit": 1, "ExecuteCnt": 1, "Type": 3, @@ -13731,44 +13774,18 @@ "RevisiParams": [] }, { - "Id": 214001313, + "Id": 214001315, "EmitPR": 1000, "From": 3, "Where": [], "Order": "", "Limit": 1, "ExecuteCnt": 1, - "Type": 28, - "Argu": [ - 390001202, - 1000, - 10 - ], - "FollowSK": [ - 214001314 - ], - "SucFollowSK": [], - "FailFollowSK": [], - "MustHit": false, - "DpsRevisiType": 0, - "DpsCondition": "", - "RevisiCondition": "", - "RevisiParams": [] - }, - { - "Id": 214001314, - "EmitPR": 1000, - "From": 3, - "Where": [], - "Order": "", - "Limit": 1, - "ExecuteCnt": 1, - "Type": 8, + "Type": 33, "Argu": [ 1, - 390001202, - -1, - 1000 + 2, + 400 ], "FollowSK": [], "SucFollowSK": [], @@ -13780,7 +13797,7 @@ "RevisiParams": [] }, { - "Id": 214001315, + "Id": 214001316, "EmitPR": 1000, "From": 4, "Where": [], @@ -13797,7 +13814,7 @@ 1200 ], "FollowSK": [ - 214001316 + 214001317 ], "SucFollowSK": [], "FailFollowSK": [], @@ -13808,7 +13825,7 @@ "RevisiParams": [] }, { - "Id": 214001316, + "Id": 214001317, "EmitPR": 1000, "From": 4, "Where": [], @@ -19235,7 +19252,7 @@ "Order": "", "Limit": 1, "ExecuteCnt": 1, - "Type": 36, + "Type": 37, "Argu": [ 215002312, 215002313, @@ -23743,7 +23760,7 @@ "Order": "", "Limit": 1, "ExecuteCnt": 1, - "Type": 33, + "Type": 34, "Argu": [ 1, 1 diff --git a/bin/json/game_skillatk.json b/bin/json/game_skillatk.json index 12697d76b..86deceed7 100644 --- a/bin/json/game_skillatk.json +++ b/bin/json/game_skillatk.json @@ -8472,7 +8472,9 @@ "ChildSkill": { "Id": [ 214001311, - 214001315 + 214001312, + 214001313, + 214001316 ] }, "Desc": { diff --git a/bin/json/game_skillpassive.json b/bin/json/game_skillpassive.json index 4675915ba..c202cd671 100644 --- a/bin/json/game_skillpassive.json +++ b/bin/json/game_skillpassive.json @@ -744,15 +744,15 @@ { "Id": 414001211, "When": 16, - "FromCheck": "", + "FromCheck": "Target=2", "TargetCheck": "Target=3", "MainSkillCheck": "", "AfterSkillCheck": "", - "BuffCheck": "BuffID=390001202", + "BuffCheck": "", "AddCon": [], "PasPr": 1000, "Type": "CallSkillPas", - "MaxEmitTimes": 1, + "MaxEmitTimes": 10, "Callback": [ 214001212 ] @@ -775,10 +775,10 @@ }, { "Id": 414001311, - "When": 2, + "When": 3, "FromCheck": "Target=3,HasBuff=390001202,OverlayNum=10", - "TargetCheck": "Target=3", - "MainSkillCheck": "", + "TargetCheck": "Target=2", + "MainSkillCheck": "114001311", "AfterSkillCheck": "", "BuffCheck": "", "AddCon": [], @@ -786,8 +786,23 @@ "Type": "CallSkillPas", "MaxEmitTimes": 1, "Callback": [ - 214001315, - 214001316 + 214001313 + ] + }, + { + "Id": 414001312, + "When": 18, + "FromCheck": "Target=3", + "TargetCheck": "Target=3", + "MainSkillCheck": "", + "AfterSkillCheck": "SkillID=214001313", + "BuffCheck": "BuffID=390001202,Succ=1", + "AddCon": [], + "PasPr": 1000, + "Type": "CallSkillPas", + "MaxEmitTimes": 1, + "Callback": [ + 214001315 ] }, { diff --git a/bin/json/game_talent.json b/bin/json/game_talent.json new file mode 100644 index 000000000..6bbcaec0b --- /dev/null +++ b/bin/json/game_talent.json @@ -0,0 +1,992 @@ +[ + { + "id": 1, + "type": 1, + "node": 1001, + "pre_node": 0, + "node_lv": 1, + "pre_node_lv": 0, + "node_direction": 90, + "node_long": 20, + "node_png": "hp_png", + "node_type": 1, + "disc_png": "", + "disc_pos": 0, + "attribute": [ + { + "a": "hp", + "n": 20 + } + ], + "range": 0, + "icon_cos": [ + { + "a": "attr", + "t": "TalentPoints1", + "n": 1 + }, + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] + }, + { + "id": 2, + "type": 1, + "node": 1001, + "pre_node": 0, + "node_lv": 2, + "pre_node_lv": 0, + "node_direction": 90, + "node_long": 20, + "node_png": "hp_png", + "node_type": 1, + "disc_png": "", + "disc_pos": 0, + "attribute": [ + { + "a": "hp", + "n": 40 + } + ], + "range": 0, + "icon_cos": [ + { + "a": "attr", + "t": "TalentPoints1", + "n": 1 + }, + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] + }, + { + "id": 3, + "type": 1, + "node": 1001, + "pre_node": 0, + "node_lv": 3, + "pre_node_lv": 0, + "node_direction": 90, + "node_long": 20, + "node_png": "hp_png", + "node_type": 1, + "disc_png": "", + "disc_pos": 0, + "attribute": [ + { + "a": "hp", + "n": 60 + } + ], + "range": 0, + "icon_cos": [ + { + "a": "attr", + "t": "TalentPoints1", + "n": 1 + }, + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] + }, + { + "id": 4, + "type": 1, + "node": 1001, + "pre_node": 0, + "node_lv": 4, + "pre_node_lv": 0, + "node_direction": 90, + "node_long": 20, + "node_png": "hp_png", + "node_type": 1, + "disc_png": "", + "disc_pos": 0, + "attribute": [ + { + "a": "hp", + "n": 80 + } + ], + "range": 0, + "icon_cos": [ + { + "a": "attr", + "t": "TalentPoints1", + "n": 1 + }, + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] + }, + { + "id": 5, + "type": 1, + "node": 1001, + "pre_node": 0, + "node_lv": 5, + "pre_node_lv": 0, + "node_direction": 90, + "node_long": 20, + "node_png": "hp_png", + "node_type": 1, + "disc_png": "", + "disc_pos": 0, + "attribute": [ + { + "a": "hp", + "n": 100 + } + ], + "range": 0, + "icon_cos": [ + { + "a": "attr", + "t": "TalentPoints1", + "n": 1 + }, + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] + }, + { + "id": 6, + "type": 1, + "node": 1002, + "pre_node": 1001, + "node_lv": 1, + "pre_node_lv": 5, + "node_direction": 90, + "node_long": 20, + "node_png": "hp_png", + "node_type": 1, + "disc_png": "", + "disc_pos": 0, + "attribute": [ + { + "a": "hp", + "n": 20 + } + ], + "range": 1, + "icon_cos": [ + { + "a": "attr", + "t": "TalentPoints1", + "n": 1 + }, + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] + }, + { + "id": 7, + "type": 1, + "node": 1002, + "pre_node": 1001, + "node_lv": 2, + "pre_node_lv": 5, + "node_direction": 90, + "node_long": 20, + "node_png": "hp_png", + "node_type": 1, + "disc_png": "", + "disc_pos": 0, + "attribute": [ + { + "a": "hp", + "n": 40 + } + ], + "range": 1, + "icon_cos": [ + { + "a": "attr", + "t": "TalentPoints1", + "n": 1 + }, + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] + }, + { + "id": 8, + "type": 1, + "node": 1002, + "pre_node": 1001, + "node_lv": 3, + "pre_node_lv": 5, + "node_direction": 90, + "node_long": 20, + "node_png": "hp_png", + "node_type": 1, + "disc_png": "", + "disc_pos": 0, + "attribute": [ + { + "a": "hp", + "n": 60 + } + ], + "range": 1, + "icon_cos": [ + { + "a": "attr", + "t": "TalentPoints1", + "n": 1 + }, + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] + }, + { + "id": 9, + "type": 1, + "node": 1002, + "pre_node": 1001, + "node_lv": 4, + "pre_node_lv": 5, + "node_direction": 90, + "node_long": 20, + "node_png": "hp_png", + "node_type": 1, + "disc_png": "", + "disc_pos": 0, + "attribute": [ + { + "a": "hp", + "n": 80 + } + ], + "range": 1, + "icon_cos": [ + { + "a": "attr", + "t": "TalentPoints1", + "n": 1 + }, + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] + }, + { + "id": 10, + "type": 1, + "node": 1002, + "pre_node": 1001, + "node_lv": 5, + "pre_node_lv": 5, + "node_direction": 90, + "node_long": 20, + "node_png": "hp_png", + "node_type": 1, + "disc_png": "", + "disc_pos": 0, + "attribute": [ + { + "a": "hp", + "n": 100 + } + ], + "range": 1, + "icon_cos": [ + { + "a": "attr", + "t": "TalentPoints1", + "n": 1 + }, + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] + }, + { + "id": 11, + "type": 1, + "node": 1003, + "pre_node": 1002, + "node_lv": 1, + "pre_node_lv": 5, + "node_direction": 90, + "node_long": 20, + "node_png": "hp_png", + "node_type": 1, + "disc_png": "", + "disc_pos": 0, + "attribute": [ + { + "a": "hp", + "n": 20 + } + ], + "range": 2, + "icon_cos": [ + { + "a": "attr", + "t": "TalentPoints1", + "n": 1 + }, + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] + }, + { + "id": 12, + "type": 1, + "node": 1003, + "pre_node": 1002, + "node_lv": 2, + "pre_node_lv": 5, + "node_direction": 90, + "node_long": 20, + "node_png": "hp_png", + "node_type": 1, + "disc_png": "", + "disc_pos": 0, + "attribute": [ + { + "a": "hp", + "n": 40 + } + ], + "range": 2, + "icon_cos": [ + { + "a": "attr", + "t": "TalentPoints1", + "n": 1 + }, + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] + }, + { + "id": 13, + "type": 1, + "node": 1003, + "pre_node": 1002, + "node_lv": 3, + "pre_node_lv": 5, + "node_direction": 90, + "node_long": 20, + "node_png": "hp_png", + "node_type": 1, + "disc_png": "", + "disc_pos": 0, + "attribute": [ + { + "a": "hp", + "n": 60 + } + ], + "range": 2, + "icon_cos": [ + { + "a": "attr", + "t": "TalentPoints1", + "n": 1 + }, + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] + }, + { + "id": 14, + "type": 1, + "node": 1003, + "pre_node": 1002, + "node_lv": 4, + "pre_node_lv": 5, + "node_direction": 90, + "node_long": 20, + "node_png": "hp_png", + "node_type": 1, + "disc_png": "", + "disc_pos": 0, + "attribute": [ + { + "a": "hp", + "n": 80 + } + ], + "range": 2, + "icon_cos": [ + { + "a": "attr", + "t": "TalentPoints1", + "n": 1 + }, + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] + }, + { + "id": 15, + "type": 1, + "node": 1003, + "pre_node": 1002, + "node_lv": 5, + "pre_node_lv": 5, + "node_direction": 90, + "node_long": 20, + "node_png": "def_png", + "node_type": 1, + "disc_png": "", + "disc_pos": 0, + "attribute": [ + { + "a": "hp", + "n": 100 + } + ], + "range": 2, + "icon_cos": [ + { + "a": "attr", + "t": "TalentPoints1", + "n": 1 + }, + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] + }, + { + "id": 16, + "type": 1, + "node": 2001, + "pre_node": 1003, + "node_lv": 1, + "pre_node_lv": 5, + "node_direction": 45, + "node_long": 30, + "node_png": "def_png", + "node_type": 1, + "disc_png": "png001", + "disc_pos": 3, + "attribute": [ + { + "a": "def", + "n": 2 + } + ], + "range": 3, + "icon_cos": [ + { + "a": "attr", + "t": "TalentPoints1", + "n": 1 + }, + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] + }, + { + "id": 17, + "type": 1, + "node": 2001, + "pre_node": 1003, + "node_lv": 2, + "pre_node_lv": 5, + "node_direction": 45, + "node_long": 30, + "node_png": "def_png", + "node_type": 1, + "disc_png": "png001", + "disc_pos": 3, + "attribute": [ + { + "a": "def", + "n": 4 + } + ], + "range": 3, + "icon_cos": [ + { + "a": "attr", + "t": "TalentPoints1", + "n": 1 + }, + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] + }, + { + "id": 18, + "type": 1, + "node": 2001, + "pre_node": 1003, + "node_lv": 3, + "pre_node_lv": 5, + "node_direction": 45, + "node_long": 30, + "node_png": "def_png", + "node_type": 1, + "disc_png": "png001", + "disc_pos": 3, + "attribute": [ + { + "a": "def", + "n": 6 + } + ], + "range": 3, + "icon_cos": [ + { + "a": "attr", + "t": "TalentPoints1", + "n": 1 + }, + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] + }, + { + "id": 19, + "type": 1, + "node": 2001, + "pre_node": 1003, + "node_lv": 4, + "pre_node_lv": 5, + "node_direction": 45, + "node_long": 30, + "node_png": "def_png", + "node_type": 1, + "disc_png": "png001", + "disc_pos": 3, + "attribute": [ + { + "a": "def", + "n": 8 + } + ], + "range": 3, + "icon_cos": [ + { + "a": "attr", + "t": "TalentPoints1", + "n": 1 + }, + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] + }, + { + "id": 20, + "type": 1, + "node": 2001, + "pre_node": 1003, + "node_lv": 5, + "pre_node_lv": 5, + "node_direction": 45, + "node_long": 30, + "node_png": "def_png", + "node_type": 1, + "disc_png": "png001", + "disc_pos": 3, + "attribute": [ + { + "a": "def", + "n": 10 + } + ], + "range": 3, + "icon_cos": [ + { + "a": "attr", + "t": "TalentPoints1", + "n": 1 + }, + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] + }, + { + "id": 21, + "type": 1, + "node": 2002, + "pre_node": 2001, + "node_lv": 1, + "pre_node_lv": 5, + "node_direction": 0, + "node_long": 0, + "node_png": "def_png", + "node_type": 1, + "disc_png": "png001", + "disc_pos": 2, + "attribute": [ + { + "a": "def", + "n": 2 + } + ], + "range": 4, + "icon_cos": [ + { + "a": "attr", + "t": "TalentPoints1", + "n": 1 + }, + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] + }, + { + "id": 22, + "type": 1, + "node": 2002, + "pre_node": 2001, + "node_lv": 2, + "pre_node_lv": 5, + "node_direction": 0, + "node_long": 0, + "node_png": "def_png", + "node_type": 1, + "disc_png": "png001", + "disc_pos": 2, + "attribute": [ + { + "a": "def", + "n": 4 + } + ], + "range": 4, + "icon_cos": [ + { + "a": "attr", + "t": "TalentPoints1", + "n": 1 + }, + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] + }, + { + "id": 23, + "type": 1, + "node": 2002, + "pre_node": 2001, + "node_lv": 3, + "pre_node_lv": 5, + "node_direction": 0, + "node_long": 0, + "node_png": "def_png", + "node_type": 1, + "disc_png": "png001", + "disc_pos": 2, + "attribute": [ + { + "a": "def", + "n": 6 + } + ], + "range": 4, + "icon_cos": [ + { + "a": "attr", + "t": "TalentPoints1", + "n": 1 + }, + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] + }, + { + "id": 24, + "type": 1, + "node": 2002, + "pre_node": 2001, + "node_lv": 4, + "pre_node_lv": 5, + "node_direction": 0, + "node_long": 0, + "node_png": "def_png", + "node_type": 1, + "disc_png": "png001", + "disc_pos": 2, + "attribute": [ + { + "a": "def", + "n": 8 + } + ], + "range": 4, + "icon_cos": [ + { + "a": "attr", + "t": "TalentPoints1", + "n": 1 + }, + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] + }, + { + "id": 25, + "type": 1, + "node": 2002, + "pre_node": 2001, + "node_lv": 5, + "pre_node_lv": 5, + "node_direction": 0, + "node_long": 0, + "node_png": "def_png", + "node_type": 1, + "disc_png": "png001", + "disc_pos": 2, + "attribute": [ + { + "a": "def", + "n": 10 + } + ], + "range": 4, + "icon_cos": [ + { + "a": "attr", + "t": "TalentPoints1", + "n": 1 + }, + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] + }, + { + "id": 26, + "type": 1, + "node": 2003, + "pre_node": 2002, + "node_lv": 1, + "pre_node_lv": 5, + "node_direction": 0, + "node_long": 0, + "node_png": "defpro_png", + "node_type": 2, + "disc_png": "png001", + "disc_pos": 1, + "attribute": [ + { + "a": "defpro", + "n": 5 + } + ], + "range": 4, + "icon_cos": [ + { + "a": "attr", + "t": "TalentPoints1", + "n": 1 + }, + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] + }, + { + "id": 27, + "type": 1, + "node": 2003, + "pre_node": 2002, + "node_lv": 2, + "pre_node_lv": 5, + "node_direction": 0, + "node_long": 0, + "node_png": "defpro_png", + "node_type": 2, + "disc_png": "png001", + "disc_pos": 1, + "attribute": [ + { + "a": "defpro", + "n": 10 + } + ], + "range": 4, + "icon_cos": [ + { + "a": "attr", + "t": "TalentPoints1", + "n": 1 + }, + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] + }, + { + "id": 28, + "type": 1, + "node": 2003, + "pre_node": 2002, + "node_lv": 3, + "pre_node_lv": 5, + "node_direction": 0, + "node_long": 0, + "node_png": "defpro_png", + "node_type": 2, + "disc_png": "png001", + "disc_pos": 1, + "attribute": [ + { + "a": "defpro", + "n": 15 + } + ], + "range": 4, + "icon_cos": [ + { + "a": "attr", + "t": "TalentPoints1", + "n": 1 + }, + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] + }, + { + "id": 29, + "type": 1, + "node": 2003, + "pre_node": 2002, + "node_lv": 4, + "pre_node_lv": 5, + "node_direction": 0, + "node_long": 0, + "node_png": "defpro_png", + "node_type": 2, + "disc_png": "png001", + "disc_pos": 1, + "attribute": [ + { + "a": "defpro", + "n": 20 + } + ], + "range": 4, + "icon_cos": [ + { + "a": "attr", + "t": "TalentPoints1", + "n": 1 + }, + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] + }, + { + "id": 30, + "type": 1, + "node": 2003, + "pre_node": 2002, + "node_lv": 5, + "pre_node_lv": 5, + "node_direction": 0, + "node_long": 0, + "node_png": "defpro_png", + "node_type": 2, + "disc_png": "png001", + "disc_pos": 1, + "attribute": [ + { + "a": "defpro", + "n": 25 + } + ], + "range": 4, + "icon_cos": [ + { + "a": "attr", + "t": "TalentPoints1", + "n": 1 + }, + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] + } +] \ No newline at end of file diff --git a/bin/json/game_worldall.json b/bin/json/game_worldall.json index 03315619e..38d4107ac 100644 --- a/bin/json/game_worldall.json +++ b/bin/json/game_worldall.json @@ -168,7 +168,7 @@ ] }, { - "id": 110, + "id": 113, "name": { "key": "story_80", "text": "日常测试任务" diff --git a/bin/json/game_worldtask.json b/bin/json/game_worldtask.json index f2c6682c5..6853aa542 100644 --- a/bin/json/game_worldtask.json +++ b/bin/json/game_worldtask.json @@ -10,20 +10,32 @@ "icon": "", "task_Tname": { "key": "Mainline_Tasks", - "text": "1" + "text": "第一章:中轴城风云" }, "task_name": { "key": "Mainline_Tasks_1", - "text": "主线任务1" + "text": "初来乍到" }, "task_display": { "key": "story_80", - "text": "1" + "text": "剧情ID:601-603" + }, + "npctxt": { + "key": "story_80", + "text": "寻找熊猫" }, "npc": 10010, + "completetasktxt": { + "key": "story_80", + "text": "和骇客蛛对话" + }, "completetask": [ 20001 ], + "deliver_npctxt": { + "key": "story_80", + "text": "发光的石头(目前是假山代替)" + }, "deliver_npc": 10012, "auto_accept": 1, "reword": [ @@ -46,7 +58,7 @@ "icon": "", "task_Tname": { "key": "Mainline_Tasks", - "text": "1" + "text": "第一章:中轴城风云" }, "task_name": { "key": "Mainline_Tasks_2", @@ -54,12 +66,24 @@ }, "task_display": { "key": "story_80", - "text": "1" + "text": "剧情ID:604-606" + }, + "npctxt": { + "key": "story_80", + "text": "寻找熊猫" }, "npc": 10020, + "completetasktxt": { + "key": "story_80", + "text": "和邦尼兔对话" + }, "completetask": [ 20002 ], + "deliver_npctxt": { + "key": "story_80", + "text": "熊猫" + }, "deliver_npc": 10022, "auto_accept": 0, "reword": [ @@ -82,7 +106,7 @@ "icon": "", "task_Tname": { "key": "Mainline_Tasks", - "text": "1" + "text": "第一章:中轴城风云" }, "task_name": { "key": "Mainline_Tasks_3", @@ -90,12 +114,24 @@ }, "task_display": { "key": "story_80", - "text": "1" + "text": "剧情ID:607-609" + }, + "npctxt": { + "key": "story_80", + "text": "寻找熊猫" }, "npc": 10030, + "completetasktxt": { + "key": "story_80", + "text": "尝试挑战邦尼兔" + }, "completetask": [ 174 ], + "deliver_npctxt": { + "key": "story_80", + "text": "邦尼兔" + }, "deliver_npc": 10032, "auto_accept": 0, "reword": [ @@ -118,7 +154,7 @@ "icon": "", "task_Tname": { "key": "Mainline_Tasks", - "text": "1" + "text": "第一章:中轴城风云" }, "task_name": { "key": "Mainline_Tasks_4", @@ -126,12 +162,24 @@ }, "task_display": { "key": "story_80", - "text": "1" + "text": "剧情ID:611-612" + }, + "npctxt": { + "key": "story_80", + "text": "寻找邦尼兔" }, "npc": 10040, + "completetasktxt": { + "key": "story_80", + "text": "招募一次守护者" + }, "completetask": [ 114 ], + "deliver_npctxt": { + "key": "story_80", + "text": "熊猫" + }, "deliver_npc": 10041, "auto_accept": 0, "reword": [ @@ -154,7 +202,7 @@ "icon": "", "task_Tname": { "key": "Mainline_Tasks", - "text": "1" + "text": "第一章:中轴城风云" }, "task_name": { "key": "Mainline_Tasks_5", @@ -162,12 +210,24 @@ }, "task_display": { "key": "story_80", - "text": "1" + "text": "剧情ID:613-614" + }, + "npctxt": { + "key": "story_80", + "text": "寻找乌龟大师" }, "npc": 103, + "completetasktxt": { + "key": "story_80", + "text": "调查这些木桩" + }, "completetask": [ 203 ], + "deliver_npctxt": { + "key": "story_80", + "text": "邦尼兔" + }, "deliver_npc": 10050, "auto_accept": 0, "reword": [ @@ -190,7 +250,7 @@ "icon": "", "task_Tname": { "key": "Mainline_Tasks", - "text": "1" + "text": "第一章:中轴城风云" }, "task_name": { "key": "Mainline_Tasks_6", @@ -198,12 +258,24 @@ }, "task_display": { "key": "story_80", - "text": "1" + "text": "剧情ID:615-617" + }, + "npctxt": { + "key": "story_80", + "text": "寻找熊猫" }, "npc": 10060, + "completetasktxt": { + "key": "story_80", + "text": "通关主线章节1-5" + }, "completetask": [ 161 ], + "deliver_npctxt": { + "key": "story_80", + "text": "熊猫" + }, "deliver_npc": 10061, "auto_accept": 0, "reword": [ @@ -226,7 +298,7 @@ "icon": "", "task_Tname": { "key": "Mainline_Tasks", - "text": "1" + "text": "第一章:中轴城风云" }, "task_name": { "key": "Mainline_Tasks_7", @@ -234,12 +306,24 @@ }, "task_display": { "key": "story_80", - "text": "1" + "text": "剧情ID:631-632" + }, + "npctxt": { + "key": "story_80", + "text": "寻找戈伯" }, "npc": 10070, + "completetasktxt": { + "key": "story_80", + "text": "通关维京远征难度1" + }, "completetask": [ 304 ], + "deliver_npctxt": { + "key": "story_80", + "text": "戈伯" + }, "deliver_npc": 10072, "auto_accept": 0, "reword": [ @@ -262,7 +346,7 @@ "icon": "", "task_Tname": { "key": "Mainline_Tasks", - "text": "1" + "text": "第一章:中轴城风云" }, "task_name": { "key": "Mainline_Tasks_8", @@ -270,12 +354,24 @@ }, "task_display": { "key": "story_80", - "text": "1" + "text": "剧情ID:636-637" + }, + "npctxt": { + "key": "story_80", + "text": "寻找骇客蛛" }, "npc": 10080, + "completetasktxt": { + "key": "story_80", + "text": "通关主线1-6" + }, "completetask": [ 305 ], + "deliver_npctxt": { + "key": "story_80", + "text": "食人鱼" + }, "deliver_npc": 10082, "auto_accept": 0, "reword": [ @@ -298,7 +394,7 @@ "icon": "", "task_Tname": { "key": "Mainline_Tasks", - "text": "1" + "text": "第一章:中轴城风云" }, "task_name": { "key": "Mainline_Tasks_9", @@ -306,12 +402,24 @@ }, "task_display": { "key": "story_80", - "text": "1" + "text": "剧情ID:638" + }, + "npctxt": { + "key": "story_80", + "text": "寻找熊猫" }, "npc": 10090, + "completetasktxt": { + "key": "story_80", + "text": "进行一次10连" + }, "completetask": [ 306 ], + "deliver_npctxt": { + "key": "story_80", + "text": "任务结束" + }, "deliver_npc": 0, "auto_accept": 0, "reword": [ @@ -334,7 +442,7 @@ "icon": "", "task_Tname": { "key": "Mainline_Tasks", - "text": "1" + "text": "第一章:中轴城风云" }, "task_name": { "key": "Mainline_Tasks_10", @@ -342,12 +450,24 @@ }, "task_display": { "key": "story_80", - "text": "1" + "text": "剧情ID:640-642" + }, + "npctxt": { + "key": "story_80", + "text": "寻找熊猫" }, "npc": 10100, + "completetasktxt": { + "key": "story_80", + "text": "打败梦魇！" + }, "completetask": [ 307 ], + "deliver_npctxt": { + "key": "story_80", + "text": "邦尼兔" + }, "deliver_npc": 10102, "auto_accept": 0, "reword": [ @@ -370,7 +490,7 @@ "icon": "", "task_Tname": { "key": "Mainline_Tasks", - "text": "1" + "text": "第一章:中轴城风云" }, "task_name": { "key": "Mainline_Tasks_11", @@ -378,12 +498,24 @@ }, "task_display": { "key": "story_80", - "text": "1" + "text": "剧情ID:99999-这是最后一个任务：敬请期待" + }, + "npctxt": { + "key": "story_80", + "text": "寻找熊猫" }, "npc": 10110, + "completetasktxt": { + "key": "story_80", + "text": "敬请期待！" + }, "completetask": [ 193 ], + "deliver_npctxt": { + "key": "story_80", + "text": "熊猫" + }, "deliver_npc": 10110, "auto_accept": 0, "reword": [ @@ -406,7 +538,7 @@ "icon": "", "task_Tname": { "key": "Side_Quest", - "text": "1" + "text": "武馆内勤奋的身影是？" }, "task_name": { "key": "WuGuanSceneTask_1", @@ -416,10 +548,22 @@ "key": "story_80", "text": "1" }, + "npctxt": { + "key": "", + "text": "" + }, "npc": 70010, + "completetasktxt": { + "key": "", + "text": "" + }, "completetask": [ 0 ], + "deliver_npctxt": { + "key": "", + "text": "" + }, "deliver_npc": 0, "auto_accept": 0, "reword": [ @@ -442,7 +586,7 @@ "icon": "", "task_Tname": { "key": "Side_Quest", - "text": "1" + "text": "铁匠铺门口身影是?" }, "task_name": { "key": "SmithyScene_1", @@ -452,10 +596,22 @@ "key": "story_80", "text": "1" }, + "npctxt": { + "key": "", + "text": "" + }, "npc": 70020, + "completetasktxt": { + "key": "", + "text": "" + }, "completetask": [ 0 ], + "deliver_npctxt": { + "key": "", + "text": "" + }, "deliver_npc": 0, "auto_accept": 0, "reword": [ @@ -478,7 +634,7 @@ "icon": "", "task_Tname": { "key": "Side_Quest", - "text": "1" + "text": "戈伯的小心思" }, "task_name": { "key": "SmithyScene_1_1", @@ -488,10 +644,22 @@ "key": "story_80", "text": "1" }, + "npctxt": { + "key": "", + "text": "" + }, "npc": 70021, + "completetasktxt": { + "key": "", + "text": "" + }, "completetask": [ 308 ], + "deliver_npctxt": { + "key": "", + "text": "" + }, "deliver_npc": 70023, "auto_accept": 0, "reword": [ @@ -514,7 +682,7 @@ "icon": "", "task_Tname": { "key": "Side_Quest", - "text": "1" + "text": "戈伯的嘱托" }, "task_name": { "key": "SmithyScene_2", @@ -524,10 +692,22 @@ "key": "story_80", "text": "1" }, + "npctxt": { + "key": "", + "text": "" + }, "npc": 70030, + "completetasktxt": { + "key": "", + "text": "" + }, "completetask": [ 0 ], + "deliver_npctxt": { + "key": "", + "text": "" + }, "deliver_npc": 0, "auto_accept": 0, "reword": [ @@ -550,7 +730,7 @@ "icon": "", "task_Tname": { "key": "Side_Quest", - "text": "1" + "text": "戈伯的嘱托" }, "task_name": { "key": "SmithyScene_2_1", @@ -560,10 +740,22 @@ "key": "story_80", "text": "1" }, + "npctxt": { + "key": "", + "text": "" + }, "npc": 70031, + "completetasktxt": { + "key": "", + "text": "" + }, "completetask": [ 309 ], + "deliver_npctxt": { + "key": "", + "text": "" + }, "deliver_npc": 70033, "auto_accept": 0, "reword": [ @@ -586,7 +778,7 @@ "icon": "", "task_Tname": { "key": "Side_Quest", - "text": "1" + "text": "武馆秘闻" }, "task_name": { "key": "WuGuanSceneTask_2", @@ -596,10 +788,22 @@ "key": "story_80", "text": "1" }, + "npctxt": { + "key": "", + "text": "" + }, "npc": 70040, + "completetasktxt": { + "key": "", + "text": "" + }, "completetask": [ 0 ], + "deliver_npctxt": { + "key": "", + "text": "" + }, "deliver_npc": 0, "auto_accept": 0, "reword": [ @@ -622,7 +826,7 @@ "icon": "", "task_Tname": { "key": "Side_Quest", - "text": "1" + "text": "好像有人再看我？" }, "task_name": { "key": "WuGuanSceneTask_3", @@ -632,10 +836,22 @@ "key": "story_80", "text": "1" }, + "npctxt": { + "key": "", + "text": "" + }, "npc": 70050, + "completetasktxt": { + "key": "", + "text": "" + }, "completetask": [ 0 ], + "deliver_npctxt": { + "key": "", + "text": "" + }, "deliver_npc": 0, "auto_accept": 0, "reword": [ @@ -658,7 +874,7 @@ "icon": "", "task_Tname": { "key": "Side_Quest", - "text": "1" + "text": "戈伯的委托" }, "task_name": { "key": "SmithyScene_3", @@ -668,10 +884,22 @@ "key": "story_80", "text": "1" }, + "npctxt": { + "key": "", + "text": "" + }, "npc": 70060, + "completetasktxt": { + "key": "", + "text": "" + }, "completetask": [ 0 ], + "deliver_npctxt": { + "key": "", + "text": "" + }, "deliver_npc": 0, "auto_accept": 0, "reword": [ @@ -683,119 +911,11 @@ ], "module": [] }, - { - "key": 100010, - "lock": 1, - "lockend": 5, - "ontxe": 20010, - "id_after": 0, - "group": 110, - "des": 1, - "icon": "", - "task_Tname": { - "key": "Daily_tasks1", - "text": "1" - }, - "task_name": { - "key": "Daily_tasks1", - "text": "1" - }, - "task_display": { - "key": "Daily_tasks1", - "text": "1" - }, - "npc": 10010, - "completetask": [ - 0 - ], - "deliver_npc": 10012, - "auto_accept": 0, - "reword": [ - { - "a": "item", - "t": "110001", - "n": 999 - } - ], - "module": [] - }, - { - "key": 100020, - "lock": 1, - "lockend": 5, - "ontxe": 20010, - "id_after": 0, - "group": 111, - "des": 1, - "icon": "", - "task_Tname": { - "key": "Daily_tasks2", - "text": "1" - }, - "task_name": { - "key": "Daily_tasks2", - "text": "1" - }, - "task_display": { - "key": "Daily_tasks2", - "text": "1" - }, - "npc": 10010, - "completetask": [ - 0 - ], - "deliver_npc": 10012, - "auto_accept": 0, - "reword": [ - { - "a": "item", - "t": "110001", - "n": 999 - } - ], - "module": [] - }, - { - "key": 100030, - "lock": 1, - "lockend": 5, - "ontxe": 20010, - "id_after": 0, - "group": 112, - "des": 1, - "icon": "", - "task_Tname": { - "key": "Daily_tasks3", - "text": "1" - }, - "task_name": { - "key": "Daily_tasks3", - "text": "1" - }, - "task_display": { - "key": "Daily_tasks3", - "text": "1" - }, - "npc": 10010, - "completetask": [ - 0 - ], - "deliver_npc": 10012, - "auto_accept": 0, - "reword": [ - { - "a": "item", - "t": "110001", - "n": 999 - } - ], - "module": [] - }, { "key": 100040, - "lock": 6, + "lock": 5, "lockend": 20, - "ontxe": 20010, + "ontxe": 20030, "id_after": 0, "group": 113, "des": 1, @@ -812,10 +932,22 @@ "key": "Daily_tasks4", "text": "1" }, + "npctxt": { + "key": "", + "text": "" + }, "npc": 10010, + "completetasktxt": { + "key": "", + "text": "" + }, "completetask": [ 0 ], + "deliver_npctxt": { + "key": "", + "text": "" + }, "deliver_npc": 10012, "auto_accept": 0, "reword": [ @@ -831,7 +963,7 @@ "key": 100050, "lock": 6, "lockend": 20, - "ontxe": 20010, + "ontxe": 20050, "id_after": 0, "group": 114, "des": 1, @@ -848,10 +980,22 @@ "key": "Daily_tasks5", "text": "1" }, + "npctxt": { + "key": "", + "text": "" + }, "npc": 10010, + "completetasktxt": { + "key": "", + "text": "" + }, "completetask": [ 0 ], + "deliver_npctxt": { + "key": "", + "text": "" + }, "deliver_npc": 10012, "auto_accept": 0, "reword": [ @@ -864,66 +1008,42 @@ "module": [] }, { - "key": 100060, - "lock": 6, - "lockend": 20, - "ontxe": 20010, + "key": 100030, + "lock": 7, + "lockend": 5, + "ontxe": 20070, "id_after": 0, - "group": 115, + "group": 112, "des": 1, "icon": "", "task_Tname": { - "key": "Daily_tasks6", + "key": "Daily_tasks3", "text": "1" }, "task_name": { - "key": "Daily_tasks6", + "key": "Daily_tasks3", "text": "1" }, "task_display": { - "key": "Daily_tasks6", + "key": "Daily_tasks3", "text": "1" }, + "npctxt": { + "key": "", + "text": "" + }, "npc": 10010, + "completetasktxt": { + "key": "", + "text": "" + }, "completetask": [ 0 ], - "deliver_npc": 10012, - "auto_accept": 0, - "reword": [ - { - "a": "item", - "t": "110001", - "n": 999 - } - ], - "module": [] - }, - { - "key": 100070, - "lock": 6, - "lockend": 20, - "ontxe": 20010, - "id_after": 0, - "group": 116, - "des": 1, - "icon": "", - "task_Tname": { - "key": "Daily_tasks7", - "text": "1" + "deliver_npctxt": { + "key": "", + "text": "" }, - "task_name": { - "key": "Daily_tasks7", - "text": "1" - }, - "task_display": { - "key": "Daily_tasks7", - "text": "1" - }, - "npc": 10010, - "completetask": [ - 0 - ], "deliver_npc": 10012, "auto_accept": 0, "reword": [ @@ -937,9 +1057,9 @@ }, { "key": 500010, - "lock": 1, + "lock": 9, "lockend": 5, - "ontxe": 20010, + "ontxe": 20090, "id_after": 0, "group": 410, "des": 4, @@ -956,10 +1076,22 @@ "key": "Weekly_Tasks1", "text": "1" }, + "npctxt": { + "key": "", + "text": "" + }, "npc": 10040, + "completetasktxt": { + "key": "", + "text": "" + }, "completetask": [ 0 ], + "deliver_npctxt": { + "key": "", + "text": "" + }, "deliver_npc": 10082, "auto_accept": 0, "reword": [ @@ -973,9 +1105,9 @@ }, { "key": 500020, - "lock": 1, + "lock": 10, "lockend": 5, - "ontxe": 20010, + "ontxe": 20100, "id_after": 0, "group": 411, "des": 4, @@ -992,10 +1124,22 @@ "key": "Weekly_Tasks2", "text": "1" }, + "npctxt": { + "key": "", + "text": "" + }, "npc": 10040, + "completetasktxt": { + "key": "", + "text": "" + }, "completetask": [ 0 ], + "deliver_npctxt": { + "key": "", + "text": "" + }, "deliver_npc": 10082, "auto_accept": 0, "reword": [ @@ -1009,9 +1153,9 @@ }, { "key": 500030, - "lock": 1, + "lock": 11, "lockend": 5, - "ontxe": 20010, + "ontxe": 20110, "id_after": 0, "group": 412, "des": 4, @@ -1028,154 +1172,22 @@ "key": "Weekly_Tasks3", "text": "1" }, + "npctxt": { + "key": "", + "text": "" + }, "npc": 10040, + "completetasktxt": { + "key": "", + "text": "" + }, "completetask": [ 0 ], - "deliver_npc": 10082, - "auto_accept": 0, - "reword": [ - { - "a": "item", - "t": "110001", - "n": 888 - } - ], - "module": [] - }, - { - "key": 500040, - "lock": 6, - "lockend": 20, - "ontxe": 20010, - "id_after": 0, - "group": 413, - "des": 4, - "icon": "", - "task_Tname": { - "key": "Weekly_Tasks4", - "text": "1" + "deliver_npctxt": { + "key": "", + "text": "" }, - "task_name": { - "key": "Weekly_Tasks4", - "text": "1" - }, - "task_display": { - "key": "Weekly_Tasks4", - "text": "1" - }, - "npc": 10040, - "completetask": [ - 0 - ], - "deliver_npc": 10082, - "auto_accept": 0, - "reword": [ - { - "a": "item", - "t": "110001", - "n": 888 - } - ], - "module": [] - }, - { - "key": 500050, - "lock": 6, - "lockend": 20, - "ontxe": 20010, - "id_after": 0, - "group": 414, - "des": 4, - "icon": "", - "task_Tname": { - "key": "Weekly_Tasks5", - "text": "1" - }, - "task_name": { - "key": "Weekly_Tasks5", - "text": "1" - }, - "task_display": { - "key": "Weekly_Tasks5", - "text": "1" - }, - "npc": 10040, - "completetask": [ - 0 - ], - "deliver_npc": 10082, - "auto_accept": 0, - "reword": [ - { - "a": "item", - "t": "110001", - "n": 888 - } - ], - "module": [] - }, - { - "key": 500060, - "lock": 6, - "lockend": 20, - "ontxe": 20010, - "id_after": 0, - "group": 415, - "des": 4, - "icon": "", - "task_Tname": { - "key": "Weekly_Tasks6", - "text": "1" - }, - "task_name": { - "key": "Weekly_Tasks6", - "text": "1" - }, - "task_display": { - "key": "Weekly_Tasks6", - "text": "1" - }, - "npc": 10040, - "completetask": [ - 0 - ], - "deliver_npc": 10082, - "auto_accept": 0, - "reword": [ - { - "a": "item", - "t": "110001", - "n": 888 - } - ], - "module": [] - }, - { - "key": 500070, - "lock": 6, - "lockend": 20, - "ontxe": 20010, - "id_after": 0, - "group": 416, - "des": 4, - "icon": "", - "task_Tname": { - "key": "Weekly_Tasks7", - "text": "1" - }, - "task_name": { - "key": "Weekly_Tasks7", - "text": "1" - }, - "task_display": { - "key": "Weekly_Tasks7", - "text": "1" - }, - "npc": 10040, - "completetask": [ - 0 - ], "deliver_npc": 10082, "auto_accept": 0, "reword": [ diff --git a/sys/configure/structs/Game.CampLv.go b/sys/configure/structs/Game.CampLv.go new file mode 100644 index 000000000..e26551cce --- /dev/null +++ b/sys/configure/structs/Game.CampLv.go @@ -0,0 +1,42 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +package cfg + +type GameCampLv struct { + _dataMap map[int32]*GameCampLvData + _dataList []*GameCampLvData +} + +func NewGameCampLv(_buf []map[string]interface{}) (*GameCampLv, error) { + _dataList := make([]*GameCampLvData, 0, len(_buf)) + dataMap := make(map[int32]*GameCampLvData) + for _, _ele_ := range _buf { + if _v, err2 := DeserializeGameCampLvData(_ele_); err2 != nil { + return nil, err2 + } else { + _dataList = append(_dataList, _v) + dataMap[_v.Id] = _v + } + } + return &GameCampLv{_dataList:_dataList, _dataMap:dataMap}, nil +} + +func (table *GameCampLv) GetDataMap() map[int32]*GameCampLvData { + return table._dataMap +} + +func (table *GameCampLv) GetDataList() []*GameCampLvData { + return table._dataList +} + +func (table *GameCampLv) Get(key int32) *GameCampLvData { + return table._dataMap[key] +} + + diff --git a/sys/configure/structs/Game.CampLvData.go b/sys/configure/structs/Game.CampLvData.go new file mode 100644 index 000000000..18c0ec68c --- /dev/null +++ b/sys/configure/structs/Game.CampLvData.go @@ -0,0 +1,43 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +package cfg + +import "errors" + +type GameCampLvData struct { + Id int32 + ReputationLv int32 + RaceType int32 + ReputationExp int32 + Reward *Gameatn +} + +const TypeId_GameCampLvData = -571721295 + +func (*GameCampLvData) GetTypeId() int32 { + return -571721295 +} + +func (_v *GameCampLvData)Deserialize(_buf map[string]interface{}) (err error) { + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["reputation_lv"].(float64); !_ok_ { err = errors.New("reputation_lv error"); return }; _v.ReputationLv = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["raceType"].(float64); !_ok_ { err = errors.New("raceType error"); return }; _v.RaceType = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["reputation_exp"].(float64); !_ok_ { err = errors.New("reputation_exp error"); return }; _v.ReputationExp = int32(_tempNum_) } + { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["Reward"].(map[string]interface{}); !_ok_ { err = errors.New("Reward error"); return }; if _v.Reward, err = DeserializeGameatn(_x_); err != nil { return } } + return +} + +func DeserializeGameCampLvData(_buf map[string]interface{}) (*GameCampLvData, error) { + v := &GameCampLvData{} + if err := v.Deserialize(_buf); err == nil { + return v, nil + } else { + return nil, err + } +} diff --git a/sys/configure/structs/Game.Favorability.go b/sys/configure/structs/Game.Favorability.go new file mode 100644 index 000000000..357d84aa5 --- /dev/null +++ b/sys/configure/structs/Game.Favorability.go @@ -0,0 +1,42 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +package cfg + +type GameFavorability struct { + _dataMap map[int32]*GameFavorabilityData + _dataList []*GameFavorabilityData +} + +func NewGameFavorability(_buf []map[string]interface{}) (*GameFavorability, error) { + _dataList := make([]*GameFavorabilityData, 0, len(_buf)) + dataMap := make(map[int32]*GameFavorabilityData) + for _, _ele_ := range _buf { + if _v, err2 := DeserializeGameFavorabilityData(_ele_); err2 != nil { + return nil, err2 + } else { + _dataList = append(_dataList, _v) + dataMap[_v.Id] = _v + } + } + return &GameFavorability{_dataList:_dataList, _dataMap:dataMap}, nil +} + +func (table *GameFavorability) GetDataMap() map[int32]*GameFavorabilityData { + return table._dataMap +} + +func (table *GameFavorability) GetDataList() []*GameFavorabilityData { + return table._dataList +} + +func (table *GameFavorability) Get(key int32) *GameFavorabilityData { + return table._dataMap[key] +} + + diff --git a/sys/configure/structs/Game.FavorabilityData.go b/sys/configure/structs/Game.FavorabilityData.go new file mode 100644 index 000000000..2b5fffaae --- /dev/null +++ b/sys/configure/structs/Game.FavorabilityData.go @@ -0,0 +1,256 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +package cfg + +import "errors" + +type GameFavorabilityData struct { + Id int32 + Hid string + Name string + FavorLv int32 + FavorExp int32 + LvName string + PrivilegeType int32 + PrivilegeValue int32 + ReturnReward []*Gameatn + ReturnTxt string + LikesFood []int32 + DislikingFood []int32 + LikesTxt string + OrdinaryTxt string + DislikingTxt string + Favorlv []int32 + BiographyName []string + BiographyTxt []string + BiographyReward1 []*Gameatn + BiographyReward2 []*Gameatn + BiographyReward3 []*Gameatn + PlotUnlock []int32 + Startid int32 + Endid []int32 + Rightend int32 + Stroyprize []*Gameatn + SpecialStroyprize []*Gameatn +} + +const TypeId_GameFavorabilityData = -1618357902 + +func (*GameFavorabilityData) GetTypeId() int32 { + return -1618357902 +} + +func (_v *GameFavorabilityData)Deserialize(_buf map[string]interface{}) (err error) { + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) } + { var _ok_ bool; if _v.Hid, _ok_ = _buf["hid"].(string); !_ok_ { err = errors.New("hid 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["favor_lv"].(float64); !_ok_ { err = errors.New("favor_lv error"); return }; _v.FavorLv = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["favor_exp"].(float64); !_ok_ { err = errors.New("favor_exp error"); return }; _v.FavorExp = int32(_tempNum_) } + {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["lv_name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.LvName error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.LvName, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["privilege_type"].(float64); !_ok_ { err = errors.New("privilege_type error"); return }; _v.PrivilegeType = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["privilege_value"].(float64); !_ok_ { err = errors.New("privilege_value error"); return }; _v.PrivilegeValue = int32(_tempNum_) } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["return_reward"].([]interface{}); !_ok_ { err = errors.New("return_reward error"); return } + + _v.ReturnReward = make([]*Gameatn, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ *Gameatn + { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } } + _v.ReturnReward = append(_v.ReturnReward, _list_v_) + } + } + + {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["return_txt"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.ReturnTxt error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.ReturnTxt, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["likes_food"].([]interface{}); !_ok_ { err = errors.New("likes_food error"); return } + + _v.LikesFood = 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.LikesFood = append(_v.LikesFood, _list_v_) + } + } + + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["disliking_food"].([]interface{}); !_ok_ { err = errors.New("disliking_food error"); return } + + _v.DislikingFood = 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.DislikingFood = append(_v.DislikingFood, _list_v_) + } + } + + {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["likes_txt"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.LikesTxt error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.LikesTxt, _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["ordinary_txt"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.OrdinaryTxt error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.OrdinaryTxt, _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["disliking_txt"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.DislikingTxt error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.DislikingTxt, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["favorlv"].([]interface{}); !_ok_ { err = errors.New("favorlv error"); return } + + _v.Favorlv = 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.Favorlv = append(_v.Favorlv, _list_v_) + } + } + + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["biography_name"].([]interface{}); !_ok_ { err = errors.New("biography_name error"); return } + + _v.BiographyName = make([]string, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ string + { if _list_v_, _ok_ = _e_.(string); !_ok_ { err = errors.New("_list_v_ error"); return } } + _v.BiographyName = append(_v.BiographyName, _list_v_) + } + } + + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["biography_txt"].([]interface{}); !_ok_ { err = errors.New("biography_txt error"); return } + + _v.BiographyTxt = make([]string, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ string + { if _list_v_, _ok_ = _e_.(string); !_ok_ { err = errors.New("_list_v_ error"); return } } + _v.BiographyTxt = append(_v.BiographyTxt, _list_v_) + } + } + + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["biography_reward1"].([]interface{}); !_ok_ { err = errors.New("biography_reward1 error"); return } + + _v.BiographyReward1 = make([]*Gameatn, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ *Gameatn + { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } } + _v.BiographyReward1 = append(_v.BiographyReward1, _list_v_) + } + } + + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["biography_reward2"].([]interface{}); !_ok_ { err = errors.New("biography_reward2 error"); return } + + _v.BiographyReward2 = make([]*Gameatn, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ *Gameatn + { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } } + _v.BiographyReward2 = append(_v.BiographyReward2, _list_v_) + } + } + + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["biography_reward3"].([]interface{}); !_ok_ { err = errors.New("biography_reward3 error"); return } + + _v.BiographyReward3 = make([]*Gameatn, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ *Gameatn + { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } } + _v.BiographyReward3 = append(_v.BiographyReward3, _list_v_) + } + } + + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["plot_unlock"].([]interface{}); !_ok_ { err = errors.New("plot_unlock error"); return } + + _v.PlotUnlock = 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.PlotUnlock = append(_v.PlotUnlock, _list_v_) + } + } + + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["startid"].(float64); !_ok_ { err = errors.New("startid error"); return }; _v.Startid = int32(_tempNum_) } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["endid"].([]interface{}); !_ok_ { err = errors.New("endid error"); return } + + _v.Endid = 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.Endid = append(_v.Endid, _list_v_) + } + } + + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["rightend"].(float64); !_ok_ { err = errors.New("rightend error"); return }; _v.Rightend = int32(_tempNum_) } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["stroyprize"].([]interface{}); !_ok_ { err = errors.New("stroyprize error"); return } + + _v.Stroyprize = make([]*Gameatn, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ *Gameatn + { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } } + _v.Stroyprize = append(_v.Stroyprize, _list_v_) + } + } + + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["special_stroyprize"].([]interface{}); !_ok_ { err = errors.New("special_stroyprize error"); return } + + _v.SpecialStroyprize = make([]*Gameatn, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ *Gameatn + { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } } + _v.SpecialStroyprize = append(_v.SpecialStroyprize, _list_v_) + } + } + + return +} + +func DeserializeGameFavorabilityData(_buf map[string]interface{}) (*GameFavorabilityData, error) { + v := &GameFavorabilityData{} + if err := v.Deserialize(_buf); err == nil { + return v, nil + } else { + return nil, err + } +} diff --git a/sys/configure/structs/Game.Friends.go b/sys/configure/structs/Game.Friends.go new file mode 100644 index 000000000..13ad66466 --- /dev/null +++ b/sys/configure/structs/Game.Friends.go @@ -0,0 +1,42 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +package cfg + +type GameFriends struct { + _dataMap map[int32]*GameFriendsData + _dataList []*GameFriendsData +} + +func NewGameFriends(_buf []map[string]interface{}) (*GameFriends, error) { + _dataList := make([]*GameFriendsData, 0, len(_buf)) + dataMap := make(map[int32]*GameFriendsData) + for _, _ele_ := range _buf { + if _v, err2 := DeserializeGameFriendsData(_ele_); err2 != nil { + return nil, err2 + } else { + _dataList = append(_dataList, _v) + dataMap[_v.Id] = _v + } + } + return &GameFriends{_dataList:_dataList, _dataMap:dataMap}, nil +} + +func (table *GameFriends) GetDataMap() map[int32]*GameFriendsData { + return table._dataMap +} + +func (table *GameFriends) GetDataList() []*GameFriendsData { + return table._dataList +} + +func (table *GameFriends) Get(key int32) *GameFriendsData { + return table._dataMap[key] +} + + diff --git a/sys/configure/structs/Game.FriendsData.go b/sys/configure/structs/Game.FriendsData.go new file mode 100644 index 000000000..2bbee09aa --- /dev/null +++ b/sys/configure/structs/Game.FriendsData.go @@ -0,0 +1,68 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +package cfg + +import "errors" + +type GameFriendsData struct { + Id int32 + FriendId int32 + Type int32 + TypeName string + FriendName string + Png string + FriendsLv int32 + FavorabilityLv int32 + Hid int32 + Attribute []*Gameatr + AttributeTxt string +} + +const TypeId_GameFriendsData = -103780637 + +func (*GameFriendsData) GetTypeId() int32 { + return -103780637 +} + +func (_v *GameFriendsData)Deserialize(_buf map[string]interface{}) (err error) { + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["friend_id"].(float64); !_ok_ { err = errors.New("friend_id error"); return }; _v.FriendId = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["type"].(float64); !_ok_ { err = errors.New("type error"); return }; _v.Type = int32(_tempNum_) } + {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["type_name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.TypeName error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.TypeName, _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["friend_name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.FriendName error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.FriendName, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } + { var _ok_ bool; if _v.Png, _ok_ = _buf["png"].(string); !_ok_ { err = errors.New("png error"); return } } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["friends_lv"].(float64); !_ok_ { err = errors.New("friends_lv error"); return }; _v.FriendsLv = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["favorability_lv"].(float64); !_ok_ { err = errors.New("favorability_lv error"); return }; _v.FavorabilityLv = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["hid"].(float64); !_ok_ { err = errors.New("hid error"); return }; _v.Hid = int32(_tempNum_) } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["attribute"].([]interface{}); !_ok_ { err = errors.New("attribute error"); return } + + _v.Attribute = make([]*Gameatr, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ *Gameatr + { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatr(_x_); err != nil { return } } + _v.Attribute = append(_v.Attribute, _list_v_) + } + } + + {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["attribute_txt"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.AttributeTxt error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.AttributeTxt, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } + return +} + +func DeserializeGameFriendsData(_buf map[string]interface{}) (*GameFriendsData, error) { + v := &GameFriendsData{} + if err := v.Deserialize(_buf); err == nil { + return v, nil + } else { + return nil, err + } +} diff --git a/sys/configure/structs/Game.RdtaskNpcData.go b/sys/configure/structs/Game.RdtaskNpcData.go index b09616ae6..2bb320c01 100644 --- a/sys/configure/structs/Game.RdtaskNpcData.go +++ b/sys/configure/structs/Game.RdtaskNpcData.go @@ -12,6 +12,7 @@ import "errors" type GameRdtaskNpcData struct { Id int32 + Heroid int32 Datas []string Event []int32 Goto int32 @@ -25,6 +26,7 @@ func (*GameRdtaskNpcData) GetTypeId() int32 { func (_v *GameRdtaskNpcData)Deserialize(_buf map[string]interface{}) (err error) { { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["heroid"].(float64); !_ok_ { err = errors.New("heroid error"); return }; _v.Heroid = int32(_tempNum_) } { var _arr_ []interface{} var _ok_ bool diff --git a/sys/configure/structs/Game.SkillEffectType.go b/sys/configure/structs/Game.SkillEffectType.go index 0f8ea5030..c226992a6 100644 --- a/sys/configure/structs/Game.SkillEffectType.go +++ b/sys/configure/structs/Game.SkillEffectType.go @@ -41,8 +41,9 @@ const ( GameSkillEffectType_Rebirth = 30 GameSkillEffectType_StealBuff = 31 GameSkillEffectType_BuffDmg = 32 - GameSkillEffectType_ShiftOurAllBuff = 33 - GameSkillEffectType_DrawActValueToTeam = 34 - GameSkillEffectType_SpecialTre = 35 - GameSkillEffectType_RandChildSkill = 36 + GameSkillEffectType_BuffTre = 33 + GameSkillEffectType_ShiftOurAllBuff = 34 + GameSkillEffectType_DrawActValueToTeam = 35 + GameSkillEffectType_SpecialTre = 36 + GameSkillEffectType_RandChildSkill = 37 ) diff --git a/sys/configure/structs/Game.Talent.go b/sys/configure/structs/Game.Talent.go new file mode 100644 index 000000000..208ef5b92 --- /dev/null +++ b/sys/configure/structs/Game.Talent.go @@ -0,0 +1,42 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +package cfg + +type GameTalent struct { + _dataMap map[int32]*GameTalentData + _dataList []*GameTalentData +} + +func NewGameTalent(_buf []map[string]interface{}) (*GameTalent, error) { + _dataList := make([]*GameTalentData, 0, len(_buf)) + dataMap := make(map[int32]*GameTalentData) + for _, _ele_ := range _buf { + if _v, err2 := DeserializeGameTalentData(_ele_); err2 != nil { + return nil, err2 + } else { + _dataList = append(_dataList, _v) + dataMap[_v.Id] = _v + } + } + return &GameTalent{_dataList:_dataList, _dataMap:dataMap}, nil +} + +func (table *GameTalent) GetDataMap() map[int32]*GameTalentData { + return table._dataMap +} + +func (table *GameTalent) GetDataList() []*GameTalentData { + return table._dataList +} + +func (table *GameTalent) Get(key int32) *GameTalentData { + return table._dataMap[key] +} + + diff --git a/sys/configure/structs/Game.TalentData.go b/sys/configure/structs/Game.TalentData.go new file mode 100644 index 000000000..9c165df6a --- /dev/null +++ b/sys/configure/structs/Game.TalentData.go @@ -0,0 +1,89 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +package cfg + +import "errors" + +type GameTalentData struct { + Id int32 + Type int32 + Node int32 + PreNode int32 + NodeLv int32 + PreNodeLv int32 + NodeDirection int32 + NodeLong int32 + NodePng string + NodeType int32 + DiscPng string + DiscPos int32 + Attribute []*Gameatr + Range int32 + IconCos []*Gameatn +} + +const TypeId_GameTalentData = -1561355726 + +func (*GameTalentData) GetTypeId() int32 { + return -1561355726 +} + +func (_v *GameTalentData)Deserialize(_buf map[string]interface{}) (err error) { + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["type"].(float64); !_ok_ { err = errors.New("type error"); return }; _v.Type = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["node"].(float64); !_ok_ { err = errors.New("node error"); return }; _v.Node = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["pre_node"].(float64); !_ok_ { err = errors.New("pre_node error"); return }; _v.PreNode = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["node_lv"].(float64); !_ok_ { err = errors.New("node_lv error"); return }; _v.NodeLv = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["pre_node_lv"].(float64); !_ok_ { err = errors.New("pre_node_lv error"); return }; _v.PreNodeLv = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["node_direction"].(float64); !_ok_ { err = errors.New("node_direction error"); return }; _v.NodeDirection = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["node_long"].(float64); !_ok_ { err = errors.New("node_long error"); return }; _v.NodeLong = int32(_tempNum_) } + { var _ok_ bool; if _v.NodePng, _ok_ = _buf["node_png"].(string); !_ok_ { err = errors.New("node_png error"); return } } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["node_type"].(float64); !_ok_ { err = errors.New("node_type error"); return }; _v.NodeType = int32(_tempNum_) } + { var _ok_ bool; if _v.DiscPng, _ok_ = _buf["disc_png"].(string); !_ok_ { err = errors.New("disc_png error"); return } } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["disc_pos"].(float64); !_ok_ { err = errors.New("disc_pos error"); return }; _v.DiscPos = int32(_tempNum_) } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["attribute"].([]interface{}); !_ok_ { err = errors.New("attribute error"); return } + + _v.Attribute = make([]*Gameatr, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ *Gameatr + { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatr(_x_); err != nil { return } } + _v.Attribute = append(_v.Attribute, _list_v_) + } + } + + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["range"].(float64); !_ok_ { err = errors.New("range error"); return }; _v.Range = int32(_tempNum_) } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["icon_cos"].([]interface{}); !_ok_ { err = errors.New("icon_cos error"); return } + + _v.IconCos = make([]*Gameatn, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ *Gameatn + { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } } + _v.IconCos = append(_v.IconCos, _list_v_) + } + } + + return +} + +func DeserializeGameTalentData(_buf map[string]interface{}) (*GameTalentData, error) { + v := &GameTalentData{} + if err := v.Deserialize(_buf); err == nil { + return v, nil + } else { + return nil, err + } +} diff --git a/sys/configure/structs/Game.WorldTaskData.go b/sys/configure/structs/Game.WorldTaskData.go index e2934bcef..7919eba1b 100644 --- a/sys/configure/structs/Game.WorldTaskData.go +++ b/sys/configure/structs/Game.WorldTaskData.go @@ -22,8 +22,11 @@ type GameWorldTaskData struct { TaskTname string TaskName string TaskDisplay string + Npctxt string Npc int32 + Completetasktxt string Completetask []int32 + DeliverNpctxt string DeliverNpc int32 AutoAccept int32 Reword []*Gameatn @@ -48,7 +51,9 @@ func (_v *GameWorldTaskData)Deserialize(_buf map[string]interface{}) (err error) {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["task_Tname"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.TaskTname error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.TaskTname, _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["task_name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.TaskName error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.TaskName, _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["task_display"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.TaskDisplay error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.TaskDisplay, _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["npctxt"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Npctxt error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Npctxt, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["npc"].(float64); !_ok_ { err = errors.New("npc error"); return }; _v.Npc = int32(_tempNum_) } + {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["completetasktxt"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Completetasktxt error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Completetasktxt, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } { var _arr_ []interface{} var _ok_ bool @@ -63,6 +68,7 @@ func (_v *GameWorldTaskData)Deserialize(_buf map[string]interface{}) (err error) } } + {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["deliver_npctxt"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.DeliverNpctxt error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.DeliverNpctxt, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["deliver_npc"].(float64); !_ok_ { err = errors.New("deliver_npc error"); return }; _v.DeliverNpc = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["auto_accept"].(float64); !_ok_ { err = errors.New("auto_accept error"); return }; _v.AutoAccept = int32(_tempNum_) } { diff --git a/sys/configure/structs/Tables.go b/sys/configure/structs/Tables.go index c1754915a..5c53fea6d 100644 --- a/sys/configure/structs/Tables.go +++ b/sys/configure/structs/Tables.go @@ -185,6 +185,10 @@ type Tables struct { itinerant_lv *Gameitinerant_lv itinerant_reward *Gameitinerant_reward NewRedDot *GameNewRedDot + Talent *GameTalent + Favorability *GameFavorability + Friends *GameFriends + CampLv *GameCampLv } func NewTables(loader JsonLoader) (*Tables, error) { @@ -1236,5 +1240,29 @@ func NewTables(loader JsonLoader) (*Tables, error) { if tables.NewRedDot, err = NewGameNewRedDot(buf) ; err != nil { return nil, err } + if buf, err = loader("game_talent") ; err != nil { + return nil, err + } + if tables.Talent, err = NewGameTalent(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_favorability") ; err != nil { + return nil, err + } + if tables.Favorability, err = NewGameFavorability(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_friends") ; err != nil { + return nil, err + } + if tables.Friends, err = NewGameFriends(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_camplv") ; err != nil { + return nil, err + } + if tables.CampLv, err = NewGameCampLv(buf) ; err != nil { + return nil, err + } return tables, nil } From 681ede4d1aef0b473e5fa35d26ca06479538bc5b Mon Sep 17 00:00:00 2001 From: wh_zcy Date: Tue, 18 Apr 2023 16:11:48 +0800 Subject: [PATCH 3/8] update const --- comm/const.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/comm/const.go b/comm/const.go index 23144ceda..8e262b644 100644 --- a/comm/const.go +++ b/comm/const.go @@ -84,6 +84,7 @@ const ( ModulePandaAtlas core.M_Modules = "atlas" //熊猫图鉴 ModuleParkour core.M_Modules = "parkour" //跑酷系统 ModuleTools core.M_Modules = "tools" //工具 + ModuleReputation core.M_Modules = "reputation" //阵营声望 ) // 数据表名定义处 @@ -242,6 +243,8 @@ const ( // 美食馆 图鉴 TableGourmetAtlas = "gourmetatlas" + // 声望 + TableReputation = "reputation" ) // RPC服务接口定义处 From a77e855a2ec1650d295d644b655d6ff26d7b1505 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Tue, 18 Apr 2023 18:34:29 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E4=BC=98=E5=8C=96=20+=20=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=20=E4=B8=80=E9=94=AE=E8=B8=A2=E9=A6=86GM?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- comm/imodule.go | 3 + modules/comp_configure.go | 260 ----------------------- modules/gm/api_cmd.go | 1 + modules/gm/module.go | 12 ++ modules/practice/api_npcbattklefinish.go | 4 +- modules/practice/module.go | 16 ++ modules/user/comp_configure.go | 17 +- 7 files changed, 51 insertions(+), 262 deletions(-) diff --git a/comm/imodule.go b/comm/imodule.go index 662fa508c..3ab6a3bdd 100644 --- a/comm/imodule.go +++ b/comm/imodule.go @@ -453,6 +453,9 @@ type ( AddItems(session IUserSession, items map[string]int32, bPush bool) (code pb.ErrorCode) //pvp切磋结果通知 ChallengeResults(bid, red, bule string, winSide int32) + + // 清除玩家踢馆状态 + CleanUpNpc(uid string) } ITools interface { diff --git a/modules/comp_configure.go b/modules/comp_configure.go index adfae337b..86e0e1355 100644 --- a/modules/comp_configure.go +++ b/modules/comp_configure.go @@ -12,8 +12,6 @@ import ( ) const ( - game_global = "game_global.json" //全局配置表 - game_initial = "game_initial.json" //初始化表 game_gamecolor = "game_gamecolor.json" //颜色表 game_playerlv = "game_playerlv.json" //玩家等级 game_facemod = "game_facemod.json" //形象配置表 @@ -28,7 +26,6 @@ const ( game_equip = "game_equip.json" //装备信息表 - game_lottery = "game_lottery.json" ) ///配置管理基础组件 @@ -37,27 +34,11 @@ type MCompConfigure struct { hlock sync.RWMutex _dropMap map[int32][]*cfg.GameDropData // 掉落表 key 是DiropId _sign map[int32]*cfg.GameSignData - - _group map[int64][]int32 // key 小组ID value cid - - // 类型为1 的数据 该大组中的小组为权重掉落，必定从N个小组中随机出1个小组 - _lotteryType1 map[int32][]int32 // key 大组ID value cid - // 类型为2 的数据 有多个小组ID - _lotteryType2 map[int32][]int32 // key 大组ID value 小组ID - // 小组类型为1 - _groupType1 map[int64][]int32 //value cid - // 小组类型为2 - _groupType2 map[int64][]int32 //value cid - Btype map[int32]int32 - Stype map[int64]int32 // subtype - SNum map[int64]int32 // 小组产出数量 } //组件初始化接口 func (this *MCompConfigure) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) { err = this.ModuleCompBase.Init(service, module, comp, options) - err = this.LoadConfigure(game_global, cfg.NewGameGlobal) - err = this.LoadConfigure(game_initial, cfg.NewGameInitial) err = this.LoadConfigure(game_gamecolor, cfg.NewGameGameColor) err = this.LoadConfigure(new_hero, cfg.NewGameHero) err = this.LoadConfigure(game_playerlv, cfg.NewGamePlayerlv) @@ -67,211 +48,11 @@ func (this *MCompConfigure) Init(service core.IService, module core.IModule, com //err = this.LoadConfigure(game_sign, cfg.NewGameSign) err = this.LoadConfigure(game_item, cfg.NewGameItem) err = this.LoadConfigure(game_vip, cfg.NewGameVip) - err = this.LoadConfigure(game_lottery, cfg.NewGameLottery) this._dropMap = make(map[int32][]*cfg.GameDropData, 0) this._sign = make(map[int32]*cfg.GameSignData, 0) configure.RegisterConfigure(game_drop, cfg.NewGameDrop, this.LoadDropData) configure.RegisterConfigure(game_sign, cfg.NewGameSign, this.LoadSignData) - this._group = make(map[int64][]int32, 0) - this._lotteryType1 = make(map[int32][]int32, 0) - this._lotteryType2 = make(map[int32][]int32, 0) - this._groupType1 = make(map[int64][]int32, 0) - this._groupType2 = make(map[int64][]int32, 0) - this.Btype = make(map[int32]int32, 0) - this.Stype = make(map[int64]int32, 0) - this.SNum = make(map[int64]int32, 0) - configure.RegisterConfigure(game_lottery, cfg.NewGameLottery, this.LoadGroupData) - - return -} - -func (this *MCompConfigure) LoadGroupData() { - if v, err := this.GetConfigure(game_lottery); err == nil { - if configure, ok := v.(*cfg.GameLottery); ok { - this.hlock.Lock() - defer this.hlock.Unlock() - this._group = make(map[int64][]int32, 0) - this._lotteryType1 = make(map[int32][]int32, 0) - this._lotteryType2 = make(map[int32][]int32, 0) - this._groupType1 = make(map[int64][]int32, 0) - this._groupType2 = make(map[int64][]int32, 0) - this.Btype = make(map[int32]int32, 0) - this.Stype = make(map[int64]int32, 0) - this.SNum = make(map[int64]int32, 0) - for _, value := range configure.GetDataList() { - key := int64(value.Lotteryid)<<31 + int64(value.Groupid) - this._group[key] = append(this._group[key], value.Id) - - if _, ok := this.Btype[value.Lotteryid]; !ok { - this.Btype[value.Lotteryid] = value.Type - } - - if _, ok := this.Stype[key]; !ok { - this.Stype[key] = value.Subtype - } - if _, ok := this.SNum[key]; !ok { - this.SNum[key] = value.Groupnum - } - if this.Btype[value.Lotteryid] == 1 { - this._lotteryType1[value.Lotteryid] = append(this._lotteryType1[value.Lotteryid], value.Id) - } else if this.Btype[value.Lotteryid] == 2 { - this._lotteryType2[value.Lotteryid] = append(this._lotteryType2[value.Lotteryid], value.Id) - } - - if this.Stype[key] == 1 { // 小组ID为1 - this._groupType1[key] = append(this._groupType1[key], value.Id) - } else if this.Stype[key] == 2 { - this._groupType2[key] = append(this._groupType2[key], value.Id) - } - } - return - } - } else { - log.Errorf("get LoadGroupData conf err:%v", err) - } - return -} - -// 实际掉落逻辑 (传入 掉落组ID vip等级 玩家等级 返回获得的道具) -func (this *MCompConfigure) GetGroupDataByLottery(lotteryId int32, vipLv int32, lv int32) (items []*cfg.Gameatn) { - - if _, ok := this._lotteryType1[lotteryId]; !ok { - if _, ok := this._lotteryType2[lotteryId]; !ok { - fmt.Printf("not found config lotterId:%d", lotteryId) - return - } - } - // 优先校验大组ID 的类型 - if this.Btype[lotteryId] == 1 { // 该大组中的小组为权重掉落，必定从N个小组中随机出1个小组 - var ( - szW []int32 // 权重数组 - szID []int32 // 小组ID 数组 - groupID int32 - gourp map[int32]int32 // key 小组ID value 权重 - ) - - gourp = make(map[int32]int32, 0) - // 随机小组id - for _, v := range this._lotteryType1[lotteryId] { - if _data := this.GetLotterConfById(v); _data != nil { - if (_data.Playerlvmax == 0 || _data.Playerlvmin <= lv && lv <= _data.Playerlvmax) && (_data.VIPmax == 0 || _data.VIPmin <= vipLv && vipLv <= _data.VIPmax) { // 过滤等级等条件 - if _, ok := gourp[_data.Groupid]; !ok { - gourp[_data.Groupid] = _data.Groupwt // 小组ID 权重赋值 - szW = append(szW, _data.Groupwt) - szID = append(szID, _data.Groupid) - } - } - } - } - - groupID = szID[comm.GetRandW(szW)] // 获得小组ID - fmt.Printf("大组类型为1的,获得小组ID :%d，dropID：%d", groupID, lotteryId) - key := int64(lotteryId)<<31 + int64(groupID) - // 小组ID 类型判断 - if this.Stype[key] == 1 { // 该小组的道具为权重掉落，必定从N个道具中随机出1个道具 - for i := 0; i < int(this.SNum[key]); i++ { - szW = make([]int32, 0) - szID = make([]int32, 0) - gourp = make(map[int32]int32, 0) - for _, v := range this._groupType1[key] { - if _data := this.GetLotterConfById(v); _data != nil { // 权重赋值 - if _, ok := gourp[_data.Groupid]; !ok { - szW = append(szW, _data.Itemwt) - szID = append(szID, _data.Id) - } - } - } - index := comm.GetRandW(szW) - _data := this.GetLotterConfById(szID[index]) - fmt.Printf("获得最终的道具 :%d", _data.Id) - count := comm.GetRandNum(_data.Min, _data.Max) - // 随机获得的数量 - items = append(items, &cfg.Gameatn{ - A: _data.Itemid.A, - T: _data.Itemid.T, - N: _data.Itemid.N * count, - }) - } - return - } else if this.Stype[key] == 2 { // 该小组中的道具为概率掉落，每个道具都会随机一次是否会掉落（单位为千分比） - for _, v := range this._groupType2[key] { - if _data := this.GetLotterConfById(v); _data != nil { // 权重赋值 - fmt.Printf("大组类型1小组类型2获得道具 :%v, 该道具Cid:%d", _data.Itemid, v) - if _data.Itemwt >= comm.GetRandNum(1, 1000) { // 命中 - count := comm.GetRandNum(_data.Min, _data.Max) - items = append(items, &cfg.Gameatn{ - A: _data.Itemid.A, - T: _data.Itemid.T, - N: _data.Itemid.N * count, // 小组产出数量 - }) - } - } - } - return - } - } else if this.Btype[lotteryId] == 2 { // 该大组中的小组为概率掉落，每个小组都会随机一次是否会掉落（单位为千分比） - // 每个小组id 都随机取一次 - var szGroupID []int32 // 获得的权重数组 - gourp := make(map[int32]*cfg.GameLotteryData, 0) // key 小组ID value 权重 - for _, v := range this._lotteryType2[lotteryId] { - if _data := this.GetLotterConfById(v); _data != nil { - if (_data.Playerlvmax == 0 || _data.Playerlvmin <= lv && lv <= _data.Playerlvmax) && (_data.VIPmax == 0 || _data.VIPmin <= vipLv && vipLv <= _data.VIPmax) { // 过滤等级等条件 - if _, ok := gourp[_data.Groupid]; !ok { - gourp[_data.Groupid] = _data // 小组ID 权重赋值 - } - } - } - } - - // 类型为2 可能会同时获得多个组id - for k, v := range gourp { - fmt.Printf("大组类型为2的,获得小组ID :%d,dropID:%d", k, v.Id) - if v.Itemwt >= comm.GetRandNum(0, 1000) { // 命中 - szGroupID = append(szGroupID, k) - key := int64(lotteryId)<<31 + int64(k) - if this.Stype[key] == 1 { // 随机一组数据 - for i := 0; i < int(this.SNum[key]); i++ { - szW := make([]int32, 0) - szID := make([]int32, 0) - gourp := make(map[int32]int32, 0) - for _, v := range this._groupType1[key] { - if _data := this.GetLotterConfById(v); _data != nil { // 权重赋值 - if _, ok := gourp[_data.Groupid]; !ok { - szW = append(szW, _data.Itemwt) - szID = append(szID, _data.Id) - } - } - } - index := comm.GetRandW(szW) - _data := this.GetLotterConfById(szID[index]) - fmt.Printf("获得最终的道具 :%d", _data.Id) - count := comm.GetRandNum(_data.Min, _data.Max) - // 随机获得的数量 - items = append(items, &cfg.Gameatn{ - A: _data.Itemid.A, - T: _data.Itemid.T, - N: _data.Itemid.N * count, - }) - } - } else if this.Stype[key] == 2 { - for _, v := range this._groupType2[key] { - if _data := this.GetLotterConfById(v); _data != nil { // 权重赋值 - fmt.Printf("大组类型2小组类型2获得道具 :%v，该道具Cid:%d", _data.Itemid, v) - if _data.Itemwt >= comm.GetRandNum(1, 1000) { // 命中 - count := comm.GetRandNum(_data.Min, _data.Max) - items = append(items, &cfg.Gameatn{ - A: _data.Itemid.A, - T: _data.Itemid.T, - N: _data.Itemid.N * count, // 小组产出数量 - }) - } - } - } - } - } - } - } return } @@ -323,38 +104,6 @@ func (this *MCompConfigure) GetConfigure(name string) (v interface{}, err error) return configure.GetConfigure(name) } -//全局配置 -// func (this *MCompConfigure) GetGlobalConf() *cfg.GameGlobalData { -// var ( -// configure *cfg.GameGlobal -// ok bool -// ) -// if v, err := this.GetConfigure(game_global); err != nil { -// log.Errorf("get global conf err:%v", err) -// return nil -// } else { -// if configure, ok = v.(*cfg.GameGlobal); !ok { -// log.Errorf("%T no is *cfg.Game_global", v) -// return nil -// } -// } -// return configure.GetDataList()[0] // 返回对象信息 -// } - -func (this *MCompConfigure) GetGlobalInitConf() (configure *cfg.GameInitial, err error) { - var ( - v interface{} - ok bool - ) - if v, err = this.GetConfigure(game_initial); err == nil { - if configure, ok = v.(*cfg.GameInitial); !ok { - err = fmt.Errorf("%T no is *cfg.Game_comInitial", v) - return - } - } - return -} - // 主角等级经验配置列表 func (this *MCompConfigure) GetPlayerlvConfList() (list []*cfg.GamePlayerlvData) { if v, err := this.GetConfigure(game_playerlv); err != nil { @@ -578,12 +327,3 @@ func (this *MCompConfigure) GetAllEquipmentConfigure() (configure []*cfg.GameEqu } return } - -func (this *MCompConfigure) GetLotterConfById(id int32) (data *cfg.GameLotteryData) { - if v, err := this.GetConfigure(game_lottery); err == nil { - if configure, ok := v.(*cfg.GameLottery); ok { - return configure.Get(id) - } - } - return -} diff --git a/modules/gm/api_cmd.go b/modules/gm/api_cmd.go index e04b85013..a5056ecc0 100644 --- a/modules/gm/api_cmd.go +++ b/modules/gm/api_cmd.go @@ -37,6 +37,7 @@ import ( 21、bingo:chat,1 22、bingo:itemtype,1,1 // 获取某种类型所有道具（道具类型,数量） 23、bingo:viplv,50 +24、bingo:cleannpc */ //参数校验 func (this *apiComp) CmdCheck(session comm.IUserSession, req *pb.GMCmdReq) (code pb.ErrorCode) { diff --git a/modules/gm/module.go b/modules/gm/module.go index 28b301e72..1301d8231 100644 --- a/modules/gm/module.go +++ b/modules/gm/module.go @@ -463,6 +463,18 @@ func (this *GM) CreateCmd(session comm.IUserSession, cmd string) (code pb.ErrorC log.Field{Key: "0", Value: datas[0]}, log.Field{Key: "N", Value: int32(num)}, ) + } else if len(datas) == 1 && (datas[0] == "cleannpc") { // 充值次数 + module1, err := this.service.GetModule(comm.ModulePractice) + if err != nil { + return + } + + module1.(comm.IPractice).CleanUpNpc(session.GetUserId()) + + this.Debug("使用bingo命令:uid = %s ", + log.Field{Key: "uid", Value: session.GetUserId()}, + log.Field{Key: "0", Value: datas[0]}, + ) } } } diff --git a/modules/practice/api_npcbattklefinish.go b/modules/practice/api_npcbattklefinish.go index 3891fb8ef..831ba607b 100644 --- a/modules/practice/api_npcbattklefinish.go +++ b/modules/practice/api_npcbattklefinish.go @@ -34,7 +34,7 @@ func (this *apiComp) NPCBattkleFinish(session comm.IUserSession, req *pb.Practic } if req.Report.WinSide == 1 { - room.Npcstate = 2 + room.Npcstate = 2 //稍后 状态改成3。让客户端先处理协议 if conf, err = this.module.configure.getDispatchBattleData(room.Currnpc); err != nil { code = pb.ErrorCode_ConfigNoFound return @@ -42,8 +42,10 @@ func (this *apiComp) NPCBattkleFinish(session comm.IUserSession, req *pb.Practic if code = this.module.DispenseRes(session, conf.Award, true); code != pb.ErrorCode_Success { return } + room.Refresh = configure.Now().Unix() this.module.modelPandata.Change(session.GetUserId(), map[string]interface{}{ "npcstate": room.Npcstate, + "refresh": room.Refresh, }) } else { room.Npcstate = 1 diff --git a/modules/practice/module.go b/modules/practice/module.go index 70b8acb85..71767bd3a 100644 --- a/modules/practice/module.go +++ b/modules/practice/module.go @@ -402,3 +402,19 @@ func (this *Practice) RPC_ModulePracticeUnLockPillar(ctx context.Context, args * // } return } + +// 一键踢馆 (跨服) +func (this *Practice) CleanUpNpc(uid string) { + conn_, _ := db.Cross() // 获取跨服数据库对象 + model := db.NewDBModel(comm.TablePandata, time.Hour, conn_) + result := &pb.DBPracticeRoom{} + if err := model.Get(uid, result); err != nil && err != mgo.MongodbNil { + return + } + + result.Refresh = configure.Now().Unix() + this.modelPandata.Change(uid, map[string]interface{}{ // 同步状态即可 + "npcstate": 3, + "refresh": result.Refresh, + }) +} diff --git a/modules/user/comp_configure.go b/modules/user/comp_configure.go index ef1d45dba..9033d2ba5 100644 --- a/modules/user/comp_configure.go +++ b/modules/user/comp_configure.go @@ -15,6 +15,7 @@ const ( game_sign = "game_sign.json" gameOpencond = "game_opencond.json" game_SignExtra = "game_signextra.json" + game_initial = "game_initial.json" //初始化表 ) ///配置管理基础组件 @@ -28,7 +29,7 @@ type configureComp struct { //组件初始化接口 func (this *configureComp) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) { err = this.MCompConfigure.Init(service, module, comp, options) - + err = this.LoadConfigure(game_initial, cfg.NewGameInitial) this._sign = make(map[int32]*cfg.GameSignData, 0) configure.RegisterConfigure(game_sign, cfg.NewGameSign, this.LoadSignData) this.LoadConfigure(gameOpencond, cfg.NewGameOpencond) @@ -130,3 +131,17 @@ func (this *configureComp) GetSignExtarConf(day, group int32) *cfg.GameSignExtra } return nil } + +func (this *configureComp) GetGlobalInitConf() (configure *cfg.GameInitial, err error) { + var ( + v interface{} + ok bool + ) + if v, err = this.GetConfigure(game_initial); err == nil { + if configure, ok = v.(*cfg.GameInitial); !ok { + err = fmt.Errorf("%T no is *cfg.Game_comInitial", v) + return + } + } + return +} From c501d3c205316677154fe5ee54ff5f2254c2e076 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Tue, 18 Apr 2023 18:37:58 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E8=B8=A2=E9=A6=86=E6=88=90=E5=8A=9F?= =?UTF-8?q?=E4=B8=8D=E9=80=9A=E5=85=B3=E5=89=A7=E6=83=85=E8=8E=B7=E5=BE=97?= =?UTF-8?q?=E5=A5=96=E5=8A=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/practice/api_npcbattklefinish.go | 2 +- modules/practice/api_npcdialog.go | 47 ++++++++++++------------ 2 files changed, 24 insertions(+), 25 deletions(-) diff --git a/modules/practice/api_npcbattklefinish.go b/modules/practice/api_npcbattklefinish.go index 831ba607b..a33a4cebb 100644 --- a/modules/practice/api_npcbattklefinish.go +++ b/modules/practice/api_npcbattklefinish.go @@ -34,7 +34,7 @@ func (this *apiComp) NPCBattkleFinish(session comm.IUserSession, req *pb.Practic } if req.Report.WinSide == 1 { - room.Npcstate = 2 //稍后 状态改成3。让客户端先处理协议 + room.Npcstate = 3 if conf, err = this.module.configure.getDispatchBattleData(room.Currnpc); err != nil { code = pb.ErrorCode_ConfigNoFound return diff --git a/modules/practice/api_npcdialog.go b/modules/practice/api_npcdialog.go index bf771aaee..5a3a9835f 100644 --- a/modules/practice/api_npcdialog.go +++ b/modules/practice/api_npcdialog.go @@ -3,7 +3,6 @@ package practice import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - "go_dreamfactory/sys/configure" ) //参数校验 @@ -12,34 +11,34 @@ func (this *apiComp) NPCDialogCheck(session comm.IUserSession, req *pb.PracticeN return } -///npc 领取对白奖励 +///npc 此协议废弃 不用 func (this *apiComp) NPCDialog(session comm.IUserSession, req *pb.PracticeNPCDialogReq) (code pb.ErrorCode, data *pb.ErrorData) { - var ( - err error - room *pb.DBPracticeRoom - // conf *cfg.GameDispatch_BattleData - ) - if room, err = this.module.modelPandata.queryUserMartialhall(session.GetUserId()); err != nil { - code = pb.ErrorCode_DBError - return - } - if room.Npcstate != 2 { - code = pb.ErrorCode_ReqParameterError - return - } - // if conf, err = this.module.configure.getDispatchBattleData(room.Currnpc); err != nil { - // code = pb.ErrorCode_ConfigNoFound + // var ( + // err error + // room *pb.DBPracticeRoom + // // conf *cfg.GameDispatch_BattleData + // ) + // if room, err = this.module.modelPandata.queryUserMartialhall(session.GetUserId()); err != nil { + // code = pb.ErrorCode_DBError // return // } - // if code = this.module.DispenseRes(session, conf.StoryAward, true); code != pb.ErrorCode_Success { + // if room.Npcstate != 2 { + // code = pb.ErrorCode_ReqParameterError // return // } - room.Npcstate = 3 - room.Refresh = configure.Now().Unix() - this.module.modelPandata.Change(session.GetUserId(), map[string]interface{}{ - "npcstate": room.Npcstate, - "refresh": room.Refresh, - }) + // // if conf, err = this.module.configure.getDispatchBattleData(room.Currnpc); err != nil { + // // code = pb.ErrorCode_ConfigNoFound + // // return + // // } + // // if code = this.module.DispenseRes(session, conf.StoryAward, true); code != pb.ErrorCode_Success { + // // return + // // } + // room.Npcstate = 3 + // room.Refresh = configure.Now().Unix() + // this.module.modelPandata.Change(session.GetUserId(), map[string]interface{}{ + // "npcstate": room.Npcstate, + // "refresh": room.Refresh, + // }) session.SendMsg(string(this.module.GetType()), "npcdialog", &pb.PracticeNPCDialogResp{Issucc: true}) return } From 7da8284b730b5e4b7148605295e5a01a8ee64d8f Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Tue, 18 Apr 2023 20:07:13 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E7=8A=B6=E6=80=81=E8=BF=98=E5=8E=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/practice/api_npcbattklefinish.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/practice/api_npcbattklefinish.go b/modules/practice/api_npcbattklefinish.go index a33a4cebb..3f0678e7c 100644 --- a/modules/practice/api_npcbattklefinish.go +++ b/modules/practice/api_npcbattklefinish.go @@ -34,7 +34,7 @@ func (this *apiComp) NPCBattkleFinish(session comm.IUserSession, req *pb.Practic } if req.Report.WinSide == 1 { - room.Npcstate = 3 + room.Npcstate = 2 if conf, err = this.module.configure.getDispatchBattleData(room.Currnpc); err != nil { code = pb.ErrorCode_ConfigNoFound return From 882adadc3e8650ca32c5db95aa482566991426f3 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Tue, 18 Apr 2023 20:08:33 +0800 Subject: [PATCH 7/8] =?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_bubblegroup.json | 48 ++ bin/json/game_camplv.json | 78 +-- bin/json/game_dispatch_task.json | 148 ++--- bin/json/game_mainstage.json | 6 +- bin/json/game_monsterformat.json | 13 + bin/json/game_pagoda.json | 20 +- bin/json/game_pandamasjx.json | 192 ++++++ bin/json/game_pandamasmryl.json | 54 +- bin/json/game_rdtaskcondi.json | 104 ++- bin/json/game_rdtasknpc.json | 84 +-- bin/json/game_smithyatlas.json | 264 ++++---- bin/json/game_talent.json | 60 +- bin/json/game_worldall.json | 69 +- bin/json/game_worldtask.json | 622 ++++++++---------- sys/configure/structs/Game.PandamasJxData.go | 19 + .../structs/Game.PandamasMrylData.go | 6 + sys/configure/structs/Game.WorldTaskData.go | 2 - 17 files changed, 1046 insertions(+), 743 deletions(-) diff --git a/bin/json/game_bubblegroup.json b/bin/json/game_bubblegroup.json index c8e0084ef..c095fb63c 100644 --- a/bin/json/game_bubblegroup.json +++ b/bin/json/game_bubblegroup.json @@ -286,5 +286,53 @@ "key": "bubblegroup_24", "text": "踢馆" } + }, + { + "KeyId": 25, + "GroupID": 25001, + "Type": 1, + "TaskIDMin": 0, + "TaskIDMax": 0, + "weight": 10, + "Text_Bubble": { + "key": "bubblegroup_25", + "text": "好好训练！" + } + }, + { + "KeyId": 26, + "GroupID": 25002, + "Type": 1, + "TaskIDMin": 0, + "TaskIDMax": 0, + "weight": 10, + "Text_Bubble": { + "key": "bubblegroup_26", + "text": "力气这么弱，昨晚没吃饭吗？" + } + }, + { + "KeyId": 27, + "GroupID": 25003, + "Type": 1, + "TaskIDMin": 0, + "TaskIDMax": 0, + "weight": 10, + "Text_Bubble": { + "key": "bubblegroup_27", + "text": "准备好锻炼了吗" + } + }, + { + "KeyId": 28, + "GroupID": 25004, + "Type": 1, + "TaskIDMin": 0, + "TaskIDMax": 0, + "weight": 10, + "Text_Bubble": { + "key": "bubblegroup_28", + "text": "没错就是这样" + } } ] \ No newline at end of file diff --git a/bin/json/game_camplv.json b/bin/json/game_camplv.json index c9ac87be5..632ff25d0 100644 --- a/bin/json/game_camplv.json +++ b/bin/json/game_camplv.json @@ -6,7 +6,7 @@ "reputation_exp": 20, "Reward": { "a": "attr", - "t": "zy", + "t": "talent1", "n": 1 } }, @@ -17,8 +17,8 @@ "reputation_exp": 30, "Reward": { "a": "attr", - "t": "zy", - "n": 2 + "t": "talent1", + "n": 1 } }, { @@ -28,8 +28,8 @@ "reputation_exp": 40, "Reward": { "a": "attr", - "t": "zy", - "n": 3 + "t": "talent1", + "n": 1 } }, { @@ -39,8 +39,8 @@ "reputation_exp": 50, "Reward": { "a": "attr", - "t": "zy", - "n": 4 + "t": "talent1", + "n": 1 } }, { @@ -50,8 +50,8 @@ "reputation_exp": 60, "Reward": { "a": "attr", - "t": "zy", - "n": 5 + "t": "talent1", + "n": 1 } }, { @@ -61,8 +61,8 @@ "reputation_exp": 70, "Reward": { "a": "attr", - "t": "zy", - "n": 6 + "t": "talent1", + "n": 1 } }, { @@ -72,8 +72,8 @@ "reputation_exp": 80, "Reward": { "a": "attr", - "t": "zy", - "n": 7 + "t": "talent1", + "n": 1 } }, { @@ -83,8 +83,8 @@ "reputation_exp": 10, "Reward": { "a": "attr", - "t": "zy", - "n": 8 + "t": "talent2", + "n": 1 } }, { @@ -94,8 +94,8 @@ "reputation_exp": 20, "Reward": { "a": "attr", - "t": "zy", - "n": 9 + "t": "talent2", + "n": 1 } }, { @@ -105,8 +105,8 @@ "reputation_exp": 30, "Reward": { "a": "attr", - "t": "zy", - "n": 10 + "t": "talent2", + "n": 1 } }, { @@ -116,8 +116,8 @@ "reputation_exp": 40, "Reward": { "a": "attr", - "t": "zy", - "n": 11 + "t": "talent2", + "n": 1 } }, { @@ -127,8 +127,8 @@ "reputation_exp": 50, "Reward": { "a": "attr", - "t": "zy", - "n": 12 + "t": "talent2", + "n": 1 } }, { @@ -138,8 +138,8 @@ "reputation_exp": 60, "Reward": { "a": "attr", - "t": "zy", - "n": 13 + "t": "talent2", + "n": 1 } }, { @@ -149,8 +149,8 @@ "reputation_exp": 70, "Reward": { "a": "attr", - "t": "zy", - "n": 14 + "t": "talent2", + "n": 1 } }, { @@ -160,8 +160,8 @@ "reputation_exp": 80, "Reward": { "a": "attr", - "t": "zy", - "n": 15 + "t": "talent2", + "n": 1 } }, { @@ -171,8 +171,8 @@ "reputation_exp": 90, "Reward": { "a": "attr", - "t": "zy", - "n": 16 + "t": "talent2", + "n": 1 } }, { @@ -182,8 +182,8 @@ "reputation_exp": 100, "Reward": { "a": "attr", - "t": "zy", - "n": 17 + "t": "talent2", + "n": 1 } }, { @@ -193,8 +193,8 @@ "reputation_exp": 110, "Reward": { "a": "attr", - "t": "zy", - "n": 18 + "t": "talent2", + "n": 1 } }, { @@ -204,8 +204,8 @@ "reputation_exp": 120, "Reward": { "a": "attr", - "t": "zy", - "n": 19 + "t": "talent2", + "n": 1 } }, { @@ -215,8 +215,8 @@ "reputation_exp": 130, "Reward": { "a": "attr", - "t": "zy", - "n": 20 + "t": "talent2", + "n": 1 } } ] \ No newline at end of file diff --git a/bin/json/game_dispatch_task.json b/bin/json/game_dispatch_task.json index 9d07473b1..964d1414c 100644 --- a/bin/json/game_dispatch_task.json +++ b/bin/json/game_dispatch_task.json @@ -8,7 +8,7 @@ }, "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 170, + "tasktime": 69, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -56,7 +56,7 @@ }, "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 176, + "tasktime": 140, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -104,7 +104,7 @@ }, "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 149, + "tasktime": 62, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -152,7 +152,7 @@ }, "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 104, + "tasktime": 91, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -200,7 +200,7 @@ }, "icon": "xmwg_rw_pt5", "taskcd": 200, - "tasktime": 79, + "tasktime": 85, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -248,7 +248,7 @@ }, "icon": "xmwg_rw_pt6", "taskcd": 200, - "tasktime": 158, + "tasktime": 72, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -296,7 +296,7 @@ }, "icon": "xmwg_rw_pt7", "taskcd": 200, - "tasktime": 69, + "tasktime": 129, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -344,7 +344,7 @@ }, "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 165, + "tasktime": 176, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -392,7 +392,7 @@ }, "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 162, + "tasktime": 100, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -440,7 +440,7 @@ }, "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 78, + "tasktime": 103, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -488,7 +488,7 @@ }, "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 173, + "tasktime": 114, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -536,7 +536,7 @@ }, "icon": "xmwg_rw_pt5", "taskcd": 200, - "tasktime": 120, + "tasktime": 124, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -584,7 +584,7 @@ }, "icon": "xmwg_rw_pt6", "taskcd": 200, - "tasktime": 139, + "tasktime": 112, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -632,7 +632,7 @@ }, "icon": "xmwg_rw_pt7", "taskcd": 200, - "tasktime": 60, + "tasktime": 87, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -680,7 +680,7 @@ }, "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 167, + "tasktime": 122, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -728,7 +728,7 @@ }, "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 130, + "tasktime": 75, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -776,7 +776,7 @@ }, "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 132, + "tasktime": 74, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -824,7 +824,7 @@ }, "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 61, + "tasktime": 92, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -872,7 +872,7 @@ }, "icon": "xmwg_rw_pt5", "taskcd": 200, - "tasktime": 90, + "tasktime": 73, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -920,7 +920,7 @@ }, "icon": "xmwg_rw_pt6", "taskcd": 200, - "tasktime": 146, + "tasktime": 85, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -968,7 +968,7 @@ }, "icon": "xmwg_rw_pt7", "taskcd": 200, - "tasktime": 77, + "tasktime": 95, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -1016,7 +1016,7 @@ }, "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 90, + "tasktime": 169, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -1064,7 +1064,7 @@ }, "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 67, + "tasktime": 118, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -1112,7 +1112,7 @@ }, "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 175, + "tasktime": 151, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -1160,7 +1160,7 @@ }, "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 156, + "tasktime": 178, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -1208,7 +1208,7 @@ }, "icon": "xmwg_rw_pt5", "taskcd": 200, - "tasktime": 152, + "tasktime": 105, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -1256,7 +1256,7 @@ }, "icon": "xmwg_rw_pt6", "taskcd": 200, - "tasktime": 149, + "tasktime": 84, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -1304,7 +1304,7 @@ }, "icon": "xmwg_rw_pt7", "taskcd": 200, - "tasktime": 156, + "tasktime": 118, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -1352,7 +1352,7 @@ }, "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 91, + "tasktime": 178, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -1400,7 +1400,7 @@ }, "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 110, + "tasktime": 108, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -1448,7 +1448,7 @@ }, "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 89, + "tasktime": 62, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -1496,7 +1496,7 @@ }, "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 169, + "tasktime": 125, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -1544,7 +1544,7 @@ }, "icon": "xmwg_rw_pt5", "taskcd": 200, - "tasktime": 90, + "tasktime": 112, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -1592,7 +1592,7 @@ }, "icon": "xmwg_rw_pt6", "taskcd": 200, - "tasktime": 117, + "tasktime": 152, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -1640,7 +1640,7 @@ }, "icon": "xmwg_rw_pt7", "taskcd": 200, - "tasktime": 73, + "tasktime": 100, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -1688,7 +1688,7 @@ }, "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 179, + "tasktime": 154, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -1736,7 +1736,7 @@ }, "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 142, + "tasktime": 165, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -1784,7 +1784,7 @@ }, "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 178, + "tasktime": 98, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -1832,7 +1832,7 @@ }, "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 150, + "tasktime": 135, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -1880,7 +1880,7 @@ }, "icon": "xmwg_rw_pt5", "taskcd": 200, - "tasktime": 175, + "tasktime": 150, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -1928,7 +1928,7 @@ }, "icon": "xmwg_rw_pt6", "taskcd": 200, - "tasktime": 139, + "tasktime": 63, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -1976,7 +1976,7 @@ }, "icon": "xmwg_rw_pt7", "taskcd": 200, - "tasktime": 105, + "tasktime": 94, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -2024,7 +2024,7 @@ }, "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 125, + "tasktime": 63, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -2072,7 +2072,7 @@ }, "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 175, + "tasktime": 112, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -2120,7 +2120,7 @@ }, "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 166, + "tasktime": 176, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -2168,7 +2168,7 @@ }, "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 62, + "tasktime": 76, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -2216,7 +2216,7 @@ }, "icon": "xmwg_rw_pt5", "taskcd": 200, - "tasktime": 167, + "tasktime": 84, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -2264,7 +2264,7 @@ }, "icon": "xmwg_rw_pt6", "taskcd": 200, - "tasktime": 94, + "tasktime": 175, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -2312,7 +2312,7 @@ }, "icon": "xmwg_rw_pt7", "taskcd": 200, - "tasktime": 81, + "tasktime": 97, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -2360,7 +2360,7 @@ }, "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 104, + "tasktime": 135, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -2408,7 +2408,7 @@ }, "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 164, + "tasktime": 178, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -2456,7 +2456,7 @@ }, "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 92, + "tasktime": 95, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -2504,7 +2504,7 @@ }, "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 151, + "tasktime": 116, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -2552,7 +2552,7 @@ }, "icon": "xmwg_rw_pt5", "taskcd": 200, - "tasktime": 89, + "tasktime": 180, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -2600,7 +2600,7 @@ }, "icon": "xmwg_rw_pt6", "taskcd": 200, - "tasktime": 124, + "tasktime": 89, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -2648,7 +2648,7 @@ }, "icon": "xmwg_rw_pt7", "taskcd": 200, - "tasktime": 162, + "tasktime": 65, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -2696,7 +2696,7 @@ }, "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 92, + "tasktime": 79, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -2744,7 +2744,7 @@ }, "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 63, + "tasktime": 125, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -2792,7 +2792,7 @@ }, "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 82, + "tasktime": 85, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -2840,7 +2840,7 @@ }, "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 116, + "tasktime": 179, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -2888,7 +2888,7 @@ }, "icon": "xmwg_rw_pt5", "taskcd": 200, - "tasktime": 128, + "tasktime": 166, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -2936,7 +2936,7 @@ }, "icon": "xmwg_rw_pt6", "taskcd": 200, - "tasktime": 67, + "tasktime": 155, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -2984,7 +2984,7 @@ }, "icon": "xmwg_rw_pt7", "taskcd": 200, - "tasktime": 141, + "tasktime": 144, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -3032,7 +3032,7 @@ }, "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 81, + "tasktime": 134, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -3080,7 +3080,7 @@ }, "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 175, + "tasktime": 129, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -3128,7 +3128,7 @@ }, "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 169, + "tasktime": 103, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -3176,7 +3176,7 @@ }, "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 90, + "tasktime": 108, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -3224,7 +3224,7 @@ }, "icon": "xmwg_rw_pt5", "taskcd": 200, - "tasktime": 131, + "tasktime": 88, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -3272,7 +3272,7 @@ }, "icon": "xmwg_rw_pt6", "taskcd": 200, - "tasktime": 160, + "tasktime": 97, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -3320,7 +3320,7 @@ }, "icon": "xmwg_rw_pt7", "taskcd": 200, - "tasktime": 69, + "tasktime": 158, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -3368,7 +3368,7 @@ }, "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 102, + "tasktime": 103, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -3416,7 +3416,7 @@ }, "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 168, + "tasktime": 162, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -3464,7 +3464,7 @@ }, "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 119, + "tasktime": 94, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -3512,7 +3512,7 @@ }, "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 110, + "tasktime": 70, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" diff --git a/bin/json/game_mainstage.json b/bin/json/game_mainstage.json index b4bf4593a..0b8c643c4 100644 --- a/bin/json/game_mainstage.json +++ b/bin/json/game_mainstage.json @@ -355,7 +355,7 @@ }, "EditorStage": 0, "frontstoryid": 626, - "afterstoryid": 0, + "afterstoryid": 628, "mainlineName": { "key": "mainlineName1100105", "text": "1-5" @@ -441,8 +441,8 @@ "z": 0 }, "EditorStage": 0, - "frontstoryid": 628, - "afterstoryid": 629, + "frontstoryid": 636, + "afterstoryid": 637, "mainlineName": { "key": "mainlineName1100106", "text": "1-6" diff --git a/bin/json/game_monsterformat.json b/bin/json/game_monsterformat.json index d141145d5..45fdc3a12 100644 --- a/bin/json/game_monsterformat.json +++ b/bin/json/game_monsterformat.json @@ -89334,5 +89334,18 @@ "atkpro": 1, "defpro": 0.8, "modelsize": 1 + }, + { + "Id": 801031, + "pos": 4, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "monster": 440065, + "lv": 20, + "hppro": 0.6, + "atkpro": 1, + "defpro": 0.8, + "modelsize": 1 } ] \ No newline at end of file diff --git a/bin/json/game_pagoda.json b/bin/json/game_pagoda.json index ffc8128f5..a3c91036e 100644 --- a/bin/json/game_pagoda.json +++ b/bin/json/game_pagoda.json @@ -13,7 +13,7 @@ "BattleReadyID": 103, "monster_id": [ 501001, - 501002, + 801031, 501003 ], "reward": [ @@ -51,7 +51,7 @@ "BattleReadyID": 103, "monster_id": [ 501004, - 501005, + 801031, 501006 ], "reward": [ @@ -84,7 +84,7 @@ "BattleReadyID": 103, "monster_id": [ 501007, - 501008, + 801031, 501009 ], "reward": [ @@ -117,7 +117,7 @@ "BattleReadyID": 103, "monster_id": [ 501010, - 501011, + 801031, 501012 ], "reward": [ @@ -150,7 +150,7 @@ "BattleReadyID": 103, "monster_id": [ 501013, - 501014, + 801031, 501015 ], "reward": [ @@ -183,7 +183,7 @@ "BattleReadyID": 103, "monster_id": [ 501016, - 501017, + 801031, 501018 ], "reward": [ @@ -216,7 +216,7 @@ "BattleReadyID": 103, "monster_id": [ 501019, - 501020, + 801031, 501021 ], "reward": [ @@ -249,7 +249,7 @@ "BattleReadyID": 103, "monster_id": [ 501022, - 501023, + 801031, 501024 ], "reward": [ @@ -282,7 +282,7 @@ "BattleReadyID": 103, "monster_id": [ 501025, - 501026, + 801031, 501027 ], "reward": [ @@ -315,7 +315,7 @@ "BattleReadyID": 103, "monster_id": [ 501028, - 501029, + 801031, 501030 ], "reward": [ diff --git a/bin/json/game_pandamasjx.json b/bin/json/game_pandamasjx.json index 180dcf3aa..50bd92bd3 100644 --- a/bin/json/game_pandamasjx.json +++ b/bin/json/game_pandamasjx.json @@ -16,6 +16,12 @@ "key": "shirenyu10001", "text": "作为教习，食人鱼一直秉承着严厉的教习态度，在他手下训练的英雄可以获得巨大提升" }, + "standard_text": 25001, + "special_text": 25002, + "effective_hero_id": [ + "25001", + "24003" + ], "description": { "key": "xiaoguo_6", "text": "提升每分钟的经验值获取{0}%" @@ -44,6 +50,12 @@ "key": "shirenyu10002", "text": "闪闪" }, + "standard_text": 25001, + "special_text": 25002, + "effective_hero_id": [ + "25001", + "24003" + ], "description": { "key": "xiaoguo_7", "text": "提升每分钟的经验值获取{0}%" @@ -72,6 +84,12 @@ "key": "shirenyu10003", "text": "蛇先生" }, + "standard_text": 25001, + "special_text": 25002, + "effective_hero_id": [ + "25001", + "24003" + ], "description": { "key": "xiaoguo_8", "text": "提升每分钟的经验值获取{0}%" @@ -100,6 +118,12 @@ "key": "shirenyu10004", "text": "金猴" }, + "standard_text": 25001, + "special_text": 25002, + "effective_hero_id": [ + "25001", + "24003" + ], "description": { "key": "xiaoguo_9", "text": "提升每分钟的经验值获取{0}%,提升低级觉醒材料的获取数量{0}" @@ -139,6 +163,12 @@ "key": "shirenyu10005", "text": "鹤大师" }, + "standard_text": 25001, + "special_text": 25002, + "effective_hero_id": [ + "25001", + "24003" + ], "description": { "key": "xiaoguo_10", "text": "提升可挂机的时间{0}秒" @@ -167,6 +197,12 @@ "key": "shirenyu10006", "text": "悍娇虎" }, + "standard_text": 25001, + "special_text": 25002, + "effective_hero_id": [ + "25001", + "24003" + ], "description": { "key": "xiaoguo_11", "text": "提升可挂机的时间{0}秒" @@ -195,6 +231,12 @@ "key": "shirenyu10007", "text": "盖" }, + "standard_text": 25001, + "special_text": 25002, + "effective_hero_id": [ + "25001", + "24003" + ], "description": { "key": "xiaoguo_12", "text": "提升可挂机的时间{0}秒" @@ -223,6 +265,12 @@ "key": "shirenyu10008", "text": "希卡普" }, + "standard_text": 25001, + "special_text": 25002, + "effective_hero_id": [ + "25001", + "24003" + ], "description": { "key": "xiaoguo_13", "text": "提升可挂机的时间{0}秒,提升每分钟的经验值获取{0}%" @@ -251,6 +299,12 @@ "key": "shirenyu10009", "text": "穿靴猫" }, + "standard_text": 25001, + "special_text": 25002, + "effective_hero_id": [ + "25001", + "24003" + ], "description": { "key": "xiaoguo_14", "text": "提升低级觉醒材料的获取数量{0}" @@ -290,6 +344,12 @@ "key": "shirenyu10010", "text": "师父" }, + "standard_text": 25001, + "special_text": 25002, + "effective_hero_id": [ + "25001", + "24003" + ], "description": { "key": "xiaoguo_15", "text": "提升低级觉醒材料的获取数量{0}" @@ -329,6 +389,12 @@ "key": "shirenyu10011", "text": "阿宝" }, + "standard_text": 25001, + "special_text": 25002, + "effective_hero_id": [ + "25001", + "24003" + ], "description": { "key": "xiaoguo_16", "text": "{0}%概率获得1个3级升星精灵" @@ -368,6 +434,12 @@ "key": "shirenyu10012", "text": "乌龟大师" }, + "standard_text": 25001, + "special_text": 25002, + "effective_hero_id": [ + "25001", + "24003" + ], "description": { "key": "xiaoguo_17", "text": "{0}%概率获得1个3级升星精灵" @@ -407,6 +479,12 @@ "key": "shirenyu20001", "text": "石锁，传闻是师父在训练阿宝时经常使用到的道具" }, + "standard_text": 0, + "special_text": 0, + "effective_hero_id": [ + "25001", + "24003" + ], "description": { "key": "xiaoguo_18", "text": "提升每分钟的经验值获取{0}%,提升低级觉醒材料的获取数量{0}" @@ -446,6 +524,12 @@ "key": "shirenyu20002", "text": "双头空竹" }, + "standard_text": 0, + "special_text": 0, + "effective_hero_id": [ + "25001", + "24003" + ], "description": { "key": "xiaoguo_19", "text": "提升每分钟的经验值获取{0}%" @@ -474,6 +558,12 @@ "key": "shirenyu20003", "text": "木爬架" }, + "standard_text": 0, + "special_text": 0, + "effective_hero_id": [ + "25001", + "24003" + ], "description": { "key": "xiaoguo_20", "text": "提升每分钟的经验值获取{0}%" @@ -502,6 +592,12 @@ "key": "shirenyu20004", "text": "不倒翁" }, + "standard_text": 0, + "special_text": 0, + "effective_hero_id": [ + "25001", + "24003" + ], "description": { "key": "xiaoguo_21", "text": "提升每分钟的经验值获取{0}%" @@ -530,6 +626,12 @@ "key": "shirenyu20005", "text": "棒槌" }, + "standard_text": 0, + "special_text": 0, + "effective_hero_id": [ + "25001", + "24003" + ], "description": { "key": "xiaoguo_22", "text": "提升可挂机的时间{0}秒" @@ -558,6 +660,12 @@ "key": "shirenyu20006", "text": "铜铃" }, + "standard_text": 0, + "special_text": 0, + "effective_hero_id": [ + "25001", + "24003" + ], "description": { "key": "xiaoguo_23", "text": "提升可挂机的时间{0}秒" @@ -586,6 +694,12 @@ "key": "shirenyu20007", "text": "尖刺吊环" }, + "standard_text": 0, + "special_text": 0, + "effective_hero_id": [ + "25001", + "24003" + ], "description": { "key": "xiaoguo_24", "text": "提升可挂机的时间{0}秒" @@ -614,6 +728,12 @@ "key": "shirenyu20008", "text": "陀螺" }, + "standard_text": 0, + "special_text": 0, + "effective_hero_id": [ + "25001", + "24003" + ], "description": { "key": "xiaoguo_25", "text": "提升可挂机的时间{0}秒,提升每分钟的经验值获取{0}%" @@ -642,6 +762,12 @@ "key": "shirenyu20009", "text": "大转轮" }, + "standard_text": 0, + "special_text": 0, + "effective_hero_id": [ + "25001", + "24003" + ], "description": { "key": "xiaoguo_26", "text": "提升低级觉醒材料的获取数量{0}" @@ -681,6 +807,12 @@ "key": "shirenyu20010", "text": "木头牌" }, + "standard_text": 0, + "special_text": 0, + "effective_hero_id": [ + "25001", + "24003" + ], "description": { "key": "xiaoguo_27", "text": "提升低级觉醒材料的获取数量{0}" @@ -720,6 +852,12 @@ "key": "shirenyu20011", "text": "双节棍" }, + "standard_text": 0, + "special_text": 0, + "effective_hero_id": [ + "25001", + "24003" + ], "description": { "key": "xiaoguo_28", "text": "{0}%概率获得1个3级升星精灵" @@ -759,6 +897,12 @@ "key": "shirenyu20012", "text": "练功带" }, + "standard_text": 0, + "special_text": 0, + "effective_hero_id": [ + "25001", + "24003" + ], "description": { "key": "xiaoguo_29", "text": "{0}%概率获得1个3级升星精灵" @@ -798,6 +942,12 @@ "key": "shirenyu20013", "text": "七彩花棍" }, + "standard_text": 0, + "special_text": 0, + "effective_hero_id": [ + "25001", + "24003" + ], "description": { "key": "xiaoguo_30", "text": "{0}%概率获得1个3级升星精灵" @@ -837,6 +987,12 @@ "key": "shirenyu20014", "text": "流星飞镖" }, + "standard_text": 0, + "special_text": 0, + "effective_hero_id": [ + "25001", + "24003" + ], "description": { "key": "xiaoguo_31", "text": "提升可挂机的时间{0}秒" @@ -865,6 +1021,12 @@ "key": "shirenyu20015", "text": "冥想锣" }, + "standard_text": 0, + "special_text": 0, + "effective_hero_id": [ + "25001", + "24003" + ], "description": { "key": "xiaoguo_32", "text": "提升可挂机的时间{0}秒" @@ -893,6 +1055,12 @@ "key": "shirenyu20016", "text": "彩条龙" }, + "standard_text": 0, + "special_text": 0, + "effective_hero_id": [ + "25001", + "24003" + ], "description": { "key": "xiaoguo_33", "text": "提升可挂机的时间{0}秒,提升每分钟的经验值获取{0}%" @@ -921,6 +1089,12 @@ "key": "shirenyu20017", "text": "孔雀毛扇" }, + "standard_text": 0, + "special_text": 0, + "effective_hero_id": [ + "25001", + "24003" + ], "description": { "key": "xiaoguo_34", "text": "提升低级觉醒材料的获取数量{0}" @@ -958,6 +1132,12 @@ "key": "shirenyu20018", "text": "平衡木" }, + "standard_text": 0, + "special_text": 0, + "effective_hero_id": [ + "25001", + "24003" + ], "description": { "key": "xiaoguo_35", "text": "提升低级觉醒材料的获取数量{0}" @@ -995,6 +1175,12 @@ "key": "shirenyu20019", "text": "铁环" }, + "standard_text": 0, + "special_text": 0, + "effective_hero_id": [ + "25001", + "24003" + ], "description": { "key": "xiaoguo_36", "text": "{0}%概率获得1个3级升星精灵" @@ -1032,6 +1218,12 @@ "key": "shirenyu20020", "text": "太极球" }, + "standard_text": 0, + "special_text": 0, + "effective_hero_id": [ + "25001", + "24003" + ], "description": { "key": "xiaoguo_37", "text": "{0}%概率获得1个3级升星精灵,提升低级觉醒材料的获取数量{0}" diff --git a/bin/json/game_pandamasmryl.json b/bin/json/game_pandamasmryl.json index e94feb803..c70c9a078 100644 --- a/bin/json/game_pandamasmryl.json +++ b/bin/json/game_pandamasmryl.json @@ -8,10 +8,13 @@ "icon": "wg_js_dz001", "des": { "key": "wuguandongzuo_wg_js_dz001", - "text": "开合跳" + "text": "双脚并立,双臂自然垂在身体的两侧。向上跳,双腿打开,双手举过头顶。\n再向上跳,双脚并拢,手臂放回身体两侧，重复这个动作。这项运动锻炼身体所有的大肌肉群。" }, "ticks": 3, + "ani": "fitness_action1", "p": 200, + "before_training": 25003, + "after_training": 25004, "buff_group": 1000001 }, { @@ -23,10 +26,13 @@ "icon": "wg_js_dz001", "des": { "key": "wuguandongzuo_wg_js_dz001", - "text": "手臂环绕" + "text": "双腿与肩同宽,双臂与肩同高平伸于身体两侧。\n然后双臂进行顺时针绕环活动,之后逆时针绕环。" }, "ticks": 3, + "ani": "fitness_action2", "p": 200, + "before_training": 25003, + "after_training": 25004, "buff_group": 1000001 }, { @@ -38,10 +44,13 @@ "icon": "wg_js_dz001", "des": { "key": "wuguandongzuo_wg_js_dz001", - "text": "肩部拉伸" + "text": "一只手臂放于胸前,与地面平行，另一只手臂将它拉向胸部。\n坚持一会儿，再拉伸另一侧肩膀，重复练习。" }, "ticks": 3, + "ani": "", "p": 200, + "before_training": 25003, + "after_training": 25004, "buff_group": 1000001 }, { @@ -53,10 +62,13 @@ "icon": "wg_js_dz001", "des": { "key": "wuguandongzuo_wg_js_dz001", - "text": "波比" + "text": "双脚与肩同宽，然后下蹲并双手着地,同时双腿向后蹬直。\n快速做一个俯卧撑的动作，然后起身向上跳起。重复这套动作。" }, "ticks": 3, + "ani": "", "p": 200, + "before_training": 25003, + "after_training": 25004, "buff_group": 1000001 }, { @@ -68,10 +80,13 @@ "icon": "wg_js_dz001", "des": { "key": "wuguandongzuo_wg_js_dz001", - "text": "交错俯卧撑" + "text": "从标准的俯卧撑姿势开始，但两只手一前一后。\n双臂做一个俯卧撑的动作，然后换另一只手靠前。注意身体要保持成一条直线的状态。" }, "ticks": 3, + "ani": "", "p": 200, + "before_training": 25003, + "after_training": 25004, "buff_group": 1000001 }, { @@ -83,10 +98,13 @@ "icon": "wg_js_dz001", "des": { "key": "wuguandongzuo_wg_js_dz001", - "text": "钻石俯卧撑" + "text": "四肢着地,双手的食指和拇指分别相对,放于脸颊下方。\n身体保持呈一条直线，然后做俯卧撑动作。" }, "ticks": 3, + "ani": "", "p": 200, + "before_training": 25003, + "after_training": 25004, "buff_group": 1000001 }, { @@ -98,10 +116,13 @@ "icon": "wg_js_dz001", "des": { "key": "wuguandongzuo_wg_js_dz001", - "text": "掌上压后转身" + "text": "从标准的俯卧撑姿势开始。向下做一个俯卧撑动作,起身的同时，旋转上半身，并将右臂向上伸直。\n然后换另一条手臂重复这一动作。这个动作能够锻炼你的胸部、肩膀和手臂,同时也能锻炼腹部肌肉。" }, "ticks": 3, + "ani": "", "p": 200, + "before_training": 25003, + "after_training": 25004, "buff_group": 1000001 }, { @@ -113,10 +134,13 @@ "icon": "wg_js_dz001", "des": { "key": "wuguandongzuo_wg_js_dz001", - "text": "眼镜蛇式拉伸" + "text": "腹部向下俯卧，肘部弯曲，双手放置在肩膀下方。\n然后胸部离地,尽量伸展。保持这个姿势数秒。" }, "ticks": 3, + "ani": "", "p": 200, + "before_training": 25003, + "after_training": 25004, "buff_group": 1000001 }, { @@ -128,10 +152,13 @@ "icon": "wg_js_dz001", "des": { "key": "wuguandongzuo_wg_js_dz001", - "text": "胸部拉伸" + "text": "站在门前，腿部呈弓步姿势，两臂倚在门框上，两肘略低于肩膀,胸部慢慢向前移。\n坚持30至40秒。慢慢还原姿势,手臂自然放下，再做几圈摆臂练习。" }, "ticks": 3, + "ani": "", "p": 200, + "before_training": 25003, + "after_training": 25004, "buff_group": 1000001 }, { @@ -146,7 +173,10 @@ "text": "原地跑" }, "ticks": 3, + "ani": "", "p": 200, + "before_training": 25003, + "after_training": 25004, "buff_group": 1000001 }, { @@ -161,7 +191,10 @@ "text": "深蹲" }, "ticks": 3, + "ani": "", "p": 200, + "before_training": 25003, + "after_training": 25004, "buff_group": 1000001 }, { @@ -176,7 +209,10 @@ "text": "仰卧起坐" }, "ticks": 3, + "ani": "", "p": 200, + "before_training": 25003, + "after_training": 25004, "buff_group": 1000001 } ] \ No newline at end of file diff --git a/bin/json/game_rdtaskcondi.json b/bin/json/game_rdtaskcondi.json index 1ca51326d..2d97599b4 100644 --- a/bin/json/game_rdtaskcondi.json +++ b/bin/json/game_rdtaskcondi.json @@ -1748,7 +1748,7 @@ "type_sp": 1, "tasktxt": { "key": "308_taskcond", - "text": "通关维京远征难度1" + "text": "和戈伯聊聊，并通关维京远征难度1" }, "type": 73, "valid": 0, @@ -1764,7 +1764,7 @@ "type_sp": 1, "tasktxt": { "key": "309_taskcond", - "text": "通关维京远征难度1" + "text": "和戈伯聊聊，并通关维京远征难度1" }, "type": 73, "valid": 0, @@ -5757,7 +5757,7 @@ "data2": 602, "data3": 0, "data4": 0, - "data5": 10011 + "data5": 0 }, { "id": 20002, @@ -5773,6 +5773,102 @@ "data2": 432, "data3": 0, "data4": 0, - "data5": 10021 + "data5": 0 + }, + { + "id": 30001, + "type_sp": 1, + "tasktxt": { + "key": "30001_tasktxt", + "text": "和盖进行对话" + }, + "type": 20001, + "valid": 1, + "NPC": 70010, + "data1": 1, + "data2": 9010, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 30002, + "type_sp": 1, + "tasktxt": { + "key": "30002_tasktxt", + "text": "和格林森对话" + }, + "type": 20001, + "valid": 1, + "NPC": 70020, + "data1": 1, + "data2": 9020, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 30003, + "type_sp": 1, + "tasktxt": { + "key": "30003_tasktxt", + "text": "和戈伯对话" + }, + "type": 20001, + "valid": 1, + "NPC": 70030, + "data1": 1, + "data2": 9030, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 30004, + "type_sp": 1, + "tasktxt": { + "key": "30004_tasktxt", + "text": "和瓦希尔指挥官对话" + }, + "type": 20001, + "valid": 1, + "NPC": 70040, + "data1": 1, + "data2": 9040, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 30005, + "type_sp": 1, + "tasktxt": { + "key": "30005_tasktxt", + "text": "和小伊对话" + }, + "type": 20001, + "valid": 1, + "NPC": 70050, + "data1": 1, + "data2": 9050, + "data3": 0, + "data4": 0, + "data5": 0 + }, + { + "id": 30006, + "type_sp": 1, + "tasktxt": { + "key": "30006_tasktxt", + "text": "和鼻涕粗对话" + }, + "type": 20001, + "valid": 1, + "NPC": 70060, + "data1": 1, + "data2": 9060, + "data3": 0, + "data4": 0, + "data5": 0 } ] \ No newline at end of file diff --git a/bin/json/game_rdtasknpc.json b/bin/json/game_rdtasknpc.json index c8af586aa..e44700ed4 100644 --- a/bin/json/game_rdtasknpc.json +++ b/bin/json/game_rdtasknpc.json @@ -1,7 +1,7 @@ [ { "id": 101, - "heroid": 44005, + "heroid": 45001, "datas": [ "GameMain", "功能入口-招募", @@ -15,7 +15,7 @@ }, { "id": 102, - "heroid": 15005, + "heroid": 14003, "datas": [ "GameMain", "功能入口-主线", @@ -29,7 +29,7 @@ }, { "id": 103, - "heroid": 51001, + "heroid": 45001, "datas": [ "WuGuanScene", "乌龟大师", @@ -43,7 +43,7 @@ }, { "id": 104, - "heroid": 51002, + "heroid": 45001, "datas": [ "WuGuanScene", "木桩1", @@ -57,7 +57,7 @@ }, { "id": 10010, - "heroid": 51003, + "heroid": 25001, "datas": [ "GameMain", "20010_熊猫_1", @@ -71,7 +71,7 @@ }, { "id": 10011, - "heroid": 51004, + "heroid": 44004, "datas": [ "GameMain", "20010_骇客蛛_1", @@ -85,7 +85,7 @@ }, { "id": 10012, - "heroid": 51005, + "heroid": 25001, "datas": [ "GameMain", "20010_箱子_1", @@ -99,7 +99,7 @@ }, { "id": 10020, - "heroid": 51006, + "heroid": 25001, "datas": [ "GameMain", "20020_熊猫_2", @@ -113,7 +113,7 @@ }, { "id": 10021, - "heroid": 51007, + "heroid": 24004, "datas": [ "GameMain", "20020_邦尼兔_1", @@ -127,7 +127,7 @@ }, { "id": 10022, - "heroid": 54005, + "heroid": 25001, "datas": [ "GameMain", "20020_熊猫_2", @@ -141,7 +141,7 @@ }, { "id": 10030, - "heroid": 51010, + "heroid": 25001, "datas": [ "GameMain", "20020_熊猫_2", @@ -155,7 +155,7 @@ }, { "id": 10031, - "heroid": 51011, + "heroid": 24004, "datas": [ "GameMain", "20020_邦尼兔_1", @@ -169,7 +169,7 @@ }, { "id": 10032, - "heroid": 51012, + "heroid": 24004, "datas": [ "GameMain", "20020_邦尼兔_1", @@ -183,7 +183,7 @@ }, { "id": 10040, - "heroid": 51013, + "heroid": 24004, "datas": [ "GameMain", "20020_邦尼兔_1", @@ -197,7 +197,7 @@ }, { "id": 10041, - "heroid": 51014, + "heroid": 25001, "datas": [ "GameMain", "20020_熊猫_2", @@ -211,7 +211,7 @@ }, { "id": 10050, - "heroid": 54001, + "heroid": 24004, "datas": [ "WuGuanScene", "20050_邦尼兔_1", @@ -225,7 +225,7 @@ }, { "id": 10060, - "heroid": 53001, + "heroid": 25001, "datas": [ "GameMain", "20020_熊猫_2", @@ -239,7 +239,7 @@ }, { "id": 10061, - "heroid": 53002, + "heroid": 25001, "datas": [ "GameMain", "20010_熊猫_1", @@ -253,7 +253,7 @@ }, { "id": 10070, - "heroid": 53003, + "heroid": 43007, "datas": [ "SmithyScene", "打造", @@ -267,7 +267,7 @@ }, { "id": 10071, - "heroid": 54002, + "heroid": 14001, "datas": [ "GameMain", "功能入口-维京远征", @@ -281,7 +281,7 @@ }, { "id": 10072, - "heroid": 53005, + "heroid": 43007, "datas": [ "SmithyScene", "打造", @@ -295,7 +295,7 @@ }, { "id": 10080, - "heroid": 53006, + "heroid": 44004, "datas": [ "GameMain", "20010_骇客蛛_1", @@ -309,7 +309,7 @@ }, { "id": 10081, - "heroid": 55001, + "heroid": 14003, "datas": [ "GameMain", "功能入口-主线", @@ -323,7 +323,7 @@ }, { "id": 10082, - "heroid": 55002, + "heroid": 13002, "datas": [ "GameMain", "20080_食人鱼_1", @@ -337,7 +337,7 @@ }, { "id": 10090, - "heroid": 55003, + "heroid": 25001, "datas": [ "GameMain", "20020_熊猫_2", @@ -351,7 +351,7 @@ }, { "id": 10091, - "heroid": 55004, + "heroid": 45001, "datas": [ "GameMain", "功能入口-招募", @@ -365,7 +365,7 @@ }, { "id": 10100, - "heroid": 55005, + "heroid": 25001, "datas": [ "GameMain", "20020_熊猫_2", @@ -379,7 +379,7 @@ }, { "id": 10101, - "heroid": 55006, + "heroid": 35003, "datas": [ "GameMain", "20100_梦魇_1", @@ -393,7 +393,7 @@ }, { "id": 10102, - "heroid": 55007, + "heroid": 24004, "datas": [ "GameMain", "20020_邦尼兔_1", @@ -407,7 +407,7 @@ }, { "id": 10110, - "heroid": 11021, + "heroid": 25001, "datas": [ "GameMain", "20020_熊猫_2", @@ -421,7 +421,7 @@ }, { "id": 70010, - "heroid": 12003, + "heroid": 45003, "datas": [ "GameMain", "70010_盖_1", @@ -435,7 +435,7 @@ }, { "id": 70020, - "heroid": 63002, + "heroid": 14007, "datas": [ "GameMain", "支线40010_格里森_1", @@ -449,7 +449,7 @@ }, { "id": 70021, - "heroid": 63003, + "heroid": 43007, "datas": [ "SmithyScene", "打造", @@ -463,7 +463,7 @@ }, { "id": 70022, - "heroid": 63004, + "heroid": 14001, "datas": [ "GameMain", "功能入口-维京远征", @@ -477,7 +477,7 @@ }, { "id": 70023, - "heroid": 64003, + "heroid": 14007, "datas": [ "GameMain", "支线40020_格里森_2", @@ -491,7 +491,7 @@ }, { "id": 70030, - "heroid": 74002, + "heroid": 43007, "datas": [ "SmithyScene", "打造", @@ -505,7 +505,7 @@ }, { "id": 70031, - "heroid": 74003, + "heroid": 43007, "datas": [ "SmithyScene", "打造", @@ -519,7 +519,7 @@ }, { "id": 70032, - "heroid": 74004, + "heroid": 14001, "datas": [ "GameMain", "功能入口-维京远征", @@ -533,7 +533,7 @@ }, { "id": 70033, - "heroid": 83002, + "heroid": 43007, "datas": [ "SmithyScene", "打造", @@ -547,7 +547,7 @@ }, { "id": 70040, - "heroid": 83006, + "heroid": 43005, "datas": [ "WuGuanScene", "支线60010_瓦希尔指挥官_1", @@ -561,7 +561,7 @@ }, { "id": 70050, - "heroid": 84002, + "heroid": 44005, "datas": [ "GameMain", "支线70010_小伊_1", @@ -575,7 +575,7 @@ }, { "id": 70060, - "heroid": 94002, + "heroid": 33005, "datas": [ "GameMain", "支线80010_鼻涕粗_1", diff --git a/bin/json/game_smithyatlas.json b/bin/json/game_smithyatlas.json index e788152c2..b7e995d95 100644 --- a/bin/json/game_smithyatlas.json +++ b/bin/json/game_smithyatlas.json @@ -14,7 +14,7 @@ "atlas_score": 0, "quality": 0, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour10110", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, @@ -33,7 +33,7 @@ "atlas_score": 0, "quality": 0, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour10111", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, @@ -52,7 +52,7 @@ "atlas_score": 0, "quality": 0, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour10112", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, @@ -71,7 +71,7 @@ "atlas_score": 0, "quality": 0, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour10113", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, @@ -90,7 +90,7 @@ "atlas_score": 0, "quality": 0, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour10114", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, @@ -109,7 +109,7 @@ "atlas_score": 0, "quality": 0, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour10115", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, @@ -128,7 +128,7 @@ "atlas_score": 0, "quality": 0, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour10210", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, @@ -147,7 +147,7 @@ "atlas_score": 0, "quality": 0, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour10211", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, @@ -166,7 +166,7 @@ "atlas_score": 0, "quality": 0, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour10212", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, @@ -185,7 +185,7 @@ "atlas_score": 0, "quality": 0, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour10213", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, @@ -204,7 +204,7 @@ "atlas_score": 0, "quality": 0, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour10214", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, @@ -223,7 +223,7 @@ "atlas_score": 0, "quality": 0, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour10215", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, @@ -242,7 +242,7 @@ "atlas_score": 0, "quality": 0, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour10310", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, @@ -261,7 +261,7 @@ "atlas_score": 0, "quality": 0, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour10311", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, @@ -280,7 +280,7 @@ "atlas_score": 0, "quality": 0, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour10312", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, @@ -299,7 +299,7 @@ "atlas_score": 0, "quality": 0, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour10313", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, @@ -318,7 +318,7 @@ "atlas_score": 0, "quality": 0, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour10314", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, @@ -337,7 +337,7 @@ "atlas_score": 0, "quality": 0, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour10315", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, @@ -356,7 +356,7 @@ "atlas_score": 0, "quality": 0, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour10410", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, @@ -375,7 +375,7 @@ "atlas_score": 0, "quality": 0, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour10411", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, @@ -394,7 +394,7 @@ "atlas_score": 0, "quality": 0, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour10412", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, @@ -413,7 +413,7 @@ "atlas_score": 0, "quality": 0, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour10413", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, @@ -432,7 +432,7 @@ "atlas_score": 0, "quality": 0, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour10414", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, @@ -451,7 +451,7 @@ "atlas_score": 0, "quality": 0, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour10415", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, @@ -470,7 +470,7 @@ "atlas_score": 0, "quality": 0, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour10510", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, @@ -489,7 +489,7 @@ "atlas_score": 0, "quality": 0, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour10511", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, @@ -508,7 +508,7 @@ "atlas_score": 0, "quality": 0, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour10512", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, @@ -527,7 +527,7 @@ "atlas_score": 0, "quality": 0, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour10513", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, @@ -546,7 +546,7 @@ "atlas_score": 0, "quality": 0, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour10514", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, @@ -565,7 +565,7 @@ "atlas_score": 0, "quality": 0, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour10515", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, @@ -584,7 +584,7 @@ "atlas_score": 0, "quality": 0, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour10610", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, @@ -603,7 +603,7 @@ "atlas_score": 0, "quality": 0, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour10611", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, @@ -622,7 +622,7 @@ "atlas_score": 0, "quality": 0, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour10612", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, @@ -641,7 +641,7 @@ "atlas_score": 0, "quality": 0, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour10613", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, @@ -660,7 +660,7 @@ "atlas_score": 0, "quality": 0, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour10614", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, @@ -679,7 +679,7 @@ "atlas_score": 0, "quality": 0, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour10615", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, @@ -698,7 +698,7 @@ "atlas_score": 0, "quality": 0, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour10710", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, @@ -717,7 +717,7 @@ "atlas_score": 0, "quality": 0, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour10711", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, @@ -736,7 +736,7 @@ "atlas_score": 0, "quality": 0, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour10712", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, @@ -755,7 +755,7 @@ "atlas_score": 0, "quality": 0, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour10713", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, @@ -774,7 +774,7 @@ "atlas_score": 0, "quality": 0, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour10714", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, @@ -793,7 +793,7 @@ "atlas_score": 0, "quality": 0, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour10715", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, @@ -812,7 +812,7 @@ "atlas_score": 0, "quality": 0, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour10810", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, @@ -831,7 +831,7 @@ "atlas_score": 0, "quality": 0, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour10811", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, @@ -850,7 +850,7 @@ "atlas_score": 0, "quality": 0, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour10812", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, @@ -869,7 +869,7 @@ "atlas_score": 0, "quality": 0, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour10813", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, @@ -888,7 +888,7 @@ "atlas_score": 0, "quality": 0, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour10814", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, @@ -907,7 +907,7 @@ "atlas_score": 0, "quality": 0, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour10815", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, @@ -926,7 +926,7 @@ "atlas_score": 0, "quality": 0, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour11010", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, @@ -945,7 +945,7 @@ "atlas_score": 0, "quality": 0, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour11011", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, @@ -964,7 +964,7 @@ "atlas_score": 0, "quality": 0, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour11012", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, @@ -983,7 +983,7 @@ "atlas_score": 0, "quality": 0, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour11013", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, @@ -1002,7 +1002,7 @@ "atlas_score": 0, "quality": 0, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour11014", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, @@ -1021,7 +1021,7 @@ "atlas_score": 0, "quality": 0, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour11015", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, @@ -1040,7 +1040,7 @@ "atlas_score": 0, "quality": 0, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour11110", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, @@ -1059,7 +1059,7 @@ "atlas_score": 0, "quality": 0, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour11111", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, @@ -1078,7 +1078,7 @@ "atlas_score": 0, "quality": 0, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour11112", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, @@ -1097,7 +1097,7 @@ "atlas_score": 0, "quality": 0, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour11113", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, @@ -1116,7 +1116,7 @@ "atlas_score": 0, "quality": 0, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour11114", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, @@ -1135,7 +1135,7 @@ "atlas_score": 0, "quality": 0, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour11115", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, @@ -1154,7 +1154,7 @@ "atlas_score": 0, "quality": 0, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour11210", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, @@ -1173,7 +1173,7 @@ "atlas_score": 0, "quality": 0, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour11211", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, @@ -1192,7 +1192,7 @@ "atlas_score": 0, "quality": 0, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour11212", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, @@ -1211,7 +1211,7 @@ "atlas_score": 0, "quality": 0, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour11213", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, @@ -1230,7 +1230,7 @@ "atlas_score": 0, "quality": 0, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour11214", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, @@ -1249,7 +1249,7 @@ "atlas_score": 0, "quality": 0, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour11215", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, @@ -1268,7 +1268,7 @@ "atlas_score": 0, "quality": 0, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour11310", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, @@ -1287,7 +1287,7 @@ "atlas_score": 0, "quality": 0, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour11311", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, @@ -1306,7 +1306,7 @@ "atlas_score": 0, "quality": 0, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour11312", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, @@ -1325,7 +1325,7 @@ "atlas_score": 0, "quality": 0, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour11313", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, @@ -1344,7 +1344,7 @@ "atlas_score": 0, "quality": 0, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour11314", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, @@ -1363,7 +1363,7 @@ "atlas_score": 0, "quality": 0, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour11315", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, @@ -1382,7 +1382,7 @@ "atlas_score": 0, "quality": 0, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour11410", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, @@ -1401,7 +1401,7 @@ "atlas_score": 0, "quality": 0, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour11411", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, @@ -1420,7 +1420,7 @@ "atlas_score": 0, "quality": 0, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour11412", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, @@ -1439,7 +1439,7 @@ "atlas_score": 0, "quality": 0, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour11413", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, @@ -1458,7 +1458,7 @@ "atlas_score": 0, "quality": 0, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour11414", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, @@ -1477,7 +1477,7 @@ "atlas_score": 0, "quality": 0, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour11415", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, @@ -1496,7 +1496,7 @@ "atlas_score": 0, "quality": 0, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour11510", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, @@ -1515,7 +1515,7 @@ "atlas_score": 0, "quality": 0, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour11511", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, @@ -1534,7 +1534,7 @@ "atlas_score": 0, "quality": 0, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour11512", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, @@ -1553,7 +1553,7 @@ "atlas_score": 0, "quality": 0, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour11513", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, @@ -1572,7 +1572,7 @@ "atlas_score": 0, "quality": 0, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour11514", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, @@ -1591,7 +1591,7 @@ "atlas_score": 0, "quality": 0, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour11515", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, @@ -1610,7 +1610,7 @@ "atlas_score": 0, "quality": 0, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour11610", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, @@ -1629,7 +1629,7 @@ "atlas_score": 0, "quality": 0, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour11611", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, @@ -1648,7 +1648,7 @@ "atlas_score": 0, "quality": 0, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour11612", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, @@ -1667,7 +1667,7 @@ "atlas_score": 0, "quality": 0, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour11613", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, @@ -1686,7 +1686,7 @@ "atlas_score": 0, "quality": 0, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour11614", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, @@ -1705,7 +1705,7 @@ "atlas_score": 0, "quality": 0, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour11615", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, @@ -1724,7 +1724,7 @@ "atlas_score": 0, "quality": 0, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour11710", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, @@ -1743,7 +1743,7 @@ "atlas_score": 0, "quality": 0, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour11711", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, @@ -1762,7 +1762,7 @@ "atlas_score": 0, "quality": 0, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour11712", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, @@ -1781,7 +1781,7 @@ "atlas_score": 0, "quality": 0, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour11713", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, @@ -1800,7 +1800,7 @@ "atlas_score": 0, "quality": 0, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour11714", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, @@ -1819,7 +1819,7 @@ "atlas_score": 0, "quality": 0, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour11715", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, @@ -1838,7 +1838,7 @@ "atlas_score": 0, "quality": 0, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour11810", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, @@ -1857,7 +1857,7 @@ "atlas_score": 0, "quality": 0, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour11811", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, @@ -1876,7 +1876,7 @@ "atlas_score": 0, "quality": 0, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour11812", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, @@ -1895,7 +1895,7 @@ "atlas_score": 0, "quality": 0, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour11813", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, @@ -1914,7 +1914,7 @@ "atlas_score": 0, "quality": 0, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour11814", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, @@ -1933,7 +1933,7 @@ "atlas_score": 0, "quality": 0, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour11815", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, @@ -1952,7 +1952,7 @@ "atlas_score": 0, "quality": 0, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour11910", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, @@ -1971,7 +1971,7 @@ "atlas_score": 0, "quality": 0, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour11911", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, @@ -1990,7 +1990,7 @@ "atlas_score": 0, "quality": 0, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour11912", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, @@ -2009,7 +2009,7 @@ "atlas_score": 0, "quality": 0, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour11913", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, @@ -2028,7 +2028,7 @@ "atlas_score": 0, "quality": 0, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour11914", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, @@ -2047,83 +2047,83 @@ "atlas_score": 0, "quality": 0, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour11915", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, { - "id": "10013", + "id": "120006", "tab_id": 4, "type_id": 2, "name_text": { - "key": "newsmithy_tool_name_text10013", - "text": "四叶草" + "key": "newsmithy_tool_name_text120006", + "text": "恶魔藤蔓" }, "content_text": { - "key": "newsmithy_tool_content_text10013", - "text": "这里会有一段关于【四叶草】的故事。" + "key": "newsmithy_tool_content_text120006", + "text": "这里会有一段关于【恶魔藤蔓】的故事。" }, "atlas_score": 5, "quality": 1, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour10013", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, { - "id": "10014", + "id": "120007", "tab_id": 4, "type_id": 2, "name_text": { - "key": "newsmithy_tool_name_text10014", - "text": "冒险家勋章" + "key": "newsmithy_tool_name_text120007", + "text": "凛冬雪花" }, "content_text": { - "key": "newsmithy_tool_content_text10014", - "text": "这里会有一段关于【冒险家勋章】的故事。" + "key": "newsmithy_tool_content_text120007", + "text": "这里会有一段关于【凛冬雪花】的故事。" }, "atlas_score": 10, "quality": 2, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour10014", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, { - "id": "10015", + "id": "120008", "tab_id": 4, "type_id": 2, "name_text": { - "key": "newsmithy_tool_name_text10015", - "text": "猫猫护身符" + "key": "newsmithy_tool_name_text120008", + "text": "北极冰砖" }, "content_text": { - "key": "newsmithy_tool_content_text10015", - "text": "这里会有一段关于【猫猫护身符】的故事。" + "key": "newsmithy_tool_content_text120008", + "text": "这里会有一段关于【北极冰砖】的故事。" }, "atlas_score": 20, "quality": 3, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour10015", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } }, { - "id": "10016", + "id": "120009", "tab_id": 4, "type_id": 2, "name_text": { - "key": "newsmithy_tool_name_text10016", - "text": "人造钻石" + "key": "newsmithy_tool_name_text120009", + "text": "龙之冰晶" }, "content_text": { - "key": "newsmithy_tool_content_text10016", - "text": "这里会有一段关于【人造钻石】的故事。" + "key": "newsmithy_tool_content_text120009", + "text": "这里会有一段关于【龙之冰晶】的故事。" }, "atlas_score": 40, "quality": 4, "atlas_favour": { - "key": "newsmithy_tool_atlas_favour10016", + "key": "newsmithy_tool_atlas_favour25001", "text": "阿宝" } } diff --git a/bin/json/game_talent.json b/bin/json/game_talent.json index 6bbcaec0b..9a00b7248 100644 --- a/bin/json/game_talent.json +++ b/bin/json/game_talent.json @@ -22,7 +22,7 @@ "icon_cos": [ { "a": "attr", - "t": "TalentPoints1", + "t": "talent1", "n": 1 }, { @@ -55,7 +55,7 @@ "icon_cos": [ { "a": "attr", - "t": "TalentPoints1", + "t": "talent1", "n": 1 }, { @@ -88,7 +88,7 @@ "icon_cos": [ { "a": "attr", - "t": "TalentPoints1", + "t": "talent1", "n": 1 }, { @@ -121,7 +121,7 @@ "icon_cos": [ { "a": "attr", - "t": "TalentPoints1", + "t": "talent1", "n": 1 }, { @@ -154,7 +154,7 @@ "icon_cos": [ { "a": "attr", - "t": "TalentPoints1", + "t": "talent1", "n": 1 }, { @@ -187,7 +187,7 @@ "icon_cos": [ { "a": "attr", - "t": "TalentPoints1", + "t": "talent1", "n": 1 }, { @@ -220,7 +220,7 @@ "icon_cos": [ { "a": "attr", - "t": "TalentPoints1", + "t": "talent1", "n": 1 }, { @@ -253,7 +253,7 @@ "icon_cos": [ { "a": "attr", - "t": "TalentPoints1", + "t": "talent1", "n": 1 }, { @@ -286,7 +286,7 @@ "icon_cos": [ { "a": "attr", - "t": "TalentPoints1", + "t": "talent1", "n": 1 }, { @@ -319,7 +319,7 @@ "icon_cos": [ { "a": "attr", - "t": "TalentPoints1", + "t": "talent1", "n": 1 }, { @@ -352,7 +352,7 @@ "icon_cos": [ { "a": "attr", - "t": "TalentPoints1", + "t": "talent1", "n": 1 }, { @@ -385,7 +385,7 @@ "icon_cos": [ { "a": "attr", - "t": "TalentPoints1", + "t": "talent1", "n": 1 }, { @@ -418,7 +418,7 @@ "icon_cos": [ { "a": "attr", - "t": "TalentPoints1", + "t": "talent1", "n": 1 }, { @@ -451,7 +451,7 @@ "icon_cos": [ { "a": "attr", - "t": "TalentPoints1", + "t": "talent1", "n": 1 }, { @@ -484,7 +484,7 @@ "icon_cos": [ { "a": "attr", - "t": "TalentPoints1", + "t": "talent1", "n": 1 }, { @@ -517,7 +517,7 @@ "icon_cos": [ { "a": "attr", - "t": "TalentPoints1", + "t": "talent1", "n": 1 }, { @@ -550,7 +550,7 @@ "icon_cos": [ { "a": "attr", - "t": "TalentPoints1", + "t": "talent1", "n": 1 }, { @@ -583,7 +583,7 @@ "icon_cos": [ { "a": "attr", - "t": "TalentPoints1", + "t": "talent1", "n": 1 }, { @@ -616,7 +616,7 @@ "icon_cos": [ { "a": "attr", - "t": "TalentPoints1", + "t": "talent1", "n": 1 }, { @@ -649,7 +649,7 @@ "icon_cos": [ { "a": "attr", - "t": "TalentPoints1", + "t": "talent1", "n": 1 }, { @@ -682,7 +682,7 @@ "icon_cos": [ { "a": "attr", - "t": "TalentPoints1", + "t": "talent1", "n": 1 }, { @@ -715,7 +715,7 @@ "icon_cos": [ { "a": "attr", - "t": "TalentPoints1", + "t": "talent1", "n": 1 }, { @@ -748,7 +748,7 @@ "icon_cos": [ { "a": "attr", - "t": "TalentPoints1", + "t": "talent1", "n": 1 }, { @@ -781,7 +781,7 @@ "icon_cos": [ { "a": "attr", - "t": "TalentPoints1", + "t": "talent1", "n": 1 }, { @@ -814,7 +814,7 @@ "icon_cos": [ { "a": "attr", - "t": "TalentPoints1", + "t": "talent1", "n": 1 }, { @@ -847,7 +847,7 @@ "icon_cos": [ { "a": "attr", - "t": "TalentPoints1", + "t": "talent1", "n": 1 }, { @@ -880,7 +880,7 @@ "icon_cos": [ { "a": "attr", - "t": "TalentPoints1", + "t": "talent1", "n": 1 }, { @@ -913,7 +913,7 @@ "icon_cos": [ { "a": "attr", - "t": "TalentPoints1", + "t": "talent1", "n": 1 }, { @@ -946,7 +946,7 @@ "icon_cos": [ { "a": "attr", - "t": "TalentPoints1", + "t": "talent1", "n": 1 }, { @@ -979,7 +979,7 @@ "icon_cos": [ { "a": "attr", - "t": "TalentPoints1", + "t": "talent1", "n": 1 }, { diff --git a/bin/json/game_worldall.json b/bin/json/game_worldall.json index 38d4107ac..297268950 100644 --- a/bin/json/game_worldall.json +++ b/bin/json/game_worldall.json @@ -14,12 +14,7 @@ { "a": "item", "t": "30001", - "n": 30 - }, - { - "a": "hero", - "t": "34006", - "n": 1 + "n": 5 } ] }, @@ -38,12 +33,12 @@ { "a": "item", "t": "30001", - "n": 31 + "n": 2 }, { - "a": "hero", - "t": "34006", - "n": 2 + "a": "attr", + "t": "diamond", + "n": 100 } ] }, @@ -62,12 +57,12 @@ { "a": "item", "t": "30001", - "n": 32 + "n": 2 }, { - "a": "hero", - "t": "34006", - "n": 3 + "a": "attr", + "t": "diamond", + "n": 100 } ] }, @@ -86,12 +81,12 @@ { "a": "item", "t": "30001", - "n": 33 + "n": 2 }, { - "a": "hero", - "t": "34006", - "n": 4 + "a": "attr", + "t": "diamond", + "n": 100 } ] }, @@ -110,12 +105,12 @@ { "a": "item", "t": "30001", - "n": 34 + "n": 2 }, { - "a": "hero", - "t": "34006", - "n": 5 + "a": "attr", + "t": "diamond", + "n": 100 } ] }, @@ -134,12 +129,12 @@ { "a": "item", "t": "30001", - "n": 35 + "n": 2 }, { - "a": "hero", - "t": "34006", - "n": 6 + "a": "attr", + "t": "diamond", + "n": 100 } ] }, @@ -158,12 +153,12 @@ { "a": "item", "t": "30001", - "n": 36 + "n": 2 }, { - "a": "hero", - "t": "34006", - "n": 7 + "a": "attr", + "t": "diamond", + "n": 100 } ] }, @@ -182,12 +177,7 @@ { "a": "item", "t": "30001", - "n": 37 - }, - { - "a": "hero", - "t": "34006", - "n": 8 + "n": 1 } ] }, @@ -206,12 +196,7 @@ { "a": "item", "t": "30001", - "n": 38 - }, - { - "a": "hero", - "t": "34006", - "n": 9 + "n": 1 } ] } diff --git a/bin/json/game_worldtask.json b/bin/json/game_worldtask.json index 6853aa542..b6c0861b0 100644 --- a/bin/json/game_worldtask.json +++ b/bin/json/game_worldtask.json @@ -9,40 +9,36 @@ "des": 2, "icon": "", "task_Tname": { - "key": "Mainline_Tasks", - "text": "第一章:中轴城风云" + "key": "Mainline_Tasks1", + "text": "第一章:预言之声" }, "task_name": { - "key": "Mainline_Tasks_1", + "key": "Mainline_Tasks1_1", "text": "初来乍到" }, - "task_display": { - "key": "story_80", - "text": "剧情ID:601-603" - }, "npctxt": { - "key": "story_80", + "key": "Mainline_Tasks1_1_Receiving", "text": "寻找熊猫" }, "npc": 10010, "completetasktxt": { - "key": "story_80", - "text": "和骇客蛛对话" + "key": "Mainline_Tasks1_1_Receiving", + "text": "寻找熊猫" }, "completetask": [ 20001 ], "deliver_npctxt": { - "key": "story_80", - "text": "发光的石头(目前是假山代替)" + "key": "Mainline_Tasks1_1_Receiving", + "text": "寻找熊猫" }, "deliver_npc": 10012, "auto_accept": 1, "reword": [ { - "a": "item", - "t": "110001", - "n": 100 + "a": "attr", + "t": "glod", + "n": 5000 } ], "module": [] @@ -57,40 +53,36 @@ "des": 2, "icon": "", "task_Tname": { - "key": "Mainline_Tasks", - "text": "第一章:中轴城风云" + "key": "Mainline_Tasks1", + "text": "第一章:预言之声" }, "task_name": { - "key": "Mainline_Tasks_2", - "text": "主线任务2" - }, - "task_display": { - "key": "story_80", - "text": "剧情ID:604-606" + "key": "Mainline_Tasks1_2", + "text": "参观中轴城" }, "npctxt": { - "key": "story_80", - "text": "寻找熊猫" + "key": "Mainline_Tasks1_2_Receiving", + "text": "美好的风景总是让人流连，忍不住心向往之，倾心守护。" }, "npc": 10020, "completetasktxt": { - "key": "story_80", - "text": "和邦尼兔对话" + "key": "Mainline_Tasks1_2_Receiving", + "text": "美好的风景总是让人流连，忍不住心向往之，倾心守护。" }, "completetask": [ 20002 ], "deliver_npctxt": { - "key": "story_80", - "text": "熊猫" + "key": "Mainline_Tasks1_2_Receiving", + "text": "美好的风景总是让人流连，忍不住心向往之，倾心守护。" }, "deliver_npc": 10022, "auto_accept": 0, "reword": [ { - "a": "item", - "t": "110001", - "n": 101 + "a": "attr", + "t": "glod", + "n": 5000 } ], "module": [] @@ -105,40 +97,36 @@ "des": 2, "icon": "", "task_Tname": { - "key": "Mainline_Tasks", - "text": "第一章:中轴城风云" + "key": "Mainline_Tasks1", + "text": "第一章:预言之声" }, "task_name": { - "key": "Mainline_Tasks_3", - "text": "主线任务3" - }, - "task_display": { - "key": "story_80", - "text": "剧情ID:607-609" + "key": "Mainline_Tasks1_3", + "text": "邦尼兔的质疑" }, "npctxt": { - "key": "story_80", - "text": "寻找熊猫" + "key": "Mainline_Tasks1_3_Receiving", + "text": "相信或不相信，能做到或不能做到，守护者与你，命运的齿轮早已开始转动……" }, "npc": 10030, "completetasktxt": { - "key": "story_80", - "text": "尝试挑战邦尼兔" + "key": "Mainline_Tasks1_3_Receiving", + "text": "相信或不相信，能做到或不能做到，守护者与你，命运的齿轮早已开始转动……" }, "completetask": [ 174 ], "deliver_npctxt": { - "key": "story_80", - "text": "邦尼兔" + "key": "Mainline_Tasks1_3_Receiving", + "text": "相信或不相信，能做到或不能做到，守护者与你，命运的齿轮早已开始转动……" }, "deliver_npc": 10032, "auto_accept": 0, "reword": [ { "a": "item", - "t": "110001", - "n": 102 + "t": "30001", + "n": 1 } ], "module": [] @@ -153,40 +141,36 @@ "des": 2, "icon": "", "task_Tname": { - "key": "Mainline_Tasks", - "text": "第一章:中轴城风云" + "key": "Mainline_Tasks1", + "text": "第一章:预言之声" }, "task_name": { - "key": "Mainline_Tasks_4", - "text": "主线任务4" - }, - "task_display": { - "key": "story_80", - "text": "剧情ID:611-612" + "key": "Mainline_Tasks1_4", + "text": "可疑之人" }, "npctxt": { - "key": "story_80", - "text": "寻找邦尼兔" + "key": "Mainline_Tasks1_4_Receiving", + "text": "它究竟从何而来，又预示着怎样的命运，一切不得而知……" }, "npc": 10040, "completetasktxt": { - "key": "story_80", - "text": "招募一次守护者" + "key": "Mainline_Tasks1_4_Receiving", + "text": "它究竟从何而来，又预示着怎样的命运，一切不得而知……" }, "completetask": [ 114 ], "deliver_npctxt": { - "key": "story_80", - "text": "熊猫" + "key": "Mainline_Tasks1_4_Receiving", + "text": "它究竟从何而来，又预示着怎样的命运，一切不得而知……" }, "deliver_npc": 10041, "auto_accept": 0, "reword": [ { "a": "item", - "t": "110001", - "n": 103 + "t": "600002", + "n": 5 } ], "module": [] @@ -201,40 +185,36 @@ "des": 2, "icon": "", "task_Tname": { - "key": "Mainline_Tasks", - "text": "第一章:中轴城风云" + "key": "Mainline_Tasks1", + "text": "第一章:预言之声" }, "task_name": { - "key": "Mainline_Tasks_5", - "text": "主线任务5" - }, - "task_display": { - "key": "story_80", - "text": "剧情ID:613-614" + "key": "Mainline_Tasks1_5", + "text": "熊猫武馆" }, "npctxt": { - "key": "story_80", - "text": "寻找乌龟大师" + "key": "Mainline_Tasks1_5_Receiving", + "text": "在熊猫武馆细细搜索，或许会有意外收获。" }, "npc": 103, "completetasktxt": { - "key": "story_80", - "text": "调查这些木桩" + "key": "Mainline_Tasks1_5_Receiving", + "text": "在熊猫武馆细细搜索，或许会有意外收获。" }, "completetask": [ 203 ], "deliver_npctxt": { - "key": "story_80", - "text": "邦尼兔" + "key": "Mainline_Tasks1_5_Receiving", + "text": "在熊猫武馆细细搜索，或许会有意外收获。" }, "deliver_npc": 10050, "auto_accept": 0, "reword": [ { - "a": "item", - "t": "110001", - "n": 104 + "a": "attr", + "t": "glod", + "n": 5000 } ], "module": [] @@ -249,40 +229,36 @@ "des": 2, "icon": "", "task_Tname": { - "key": "Mainline_Tasks", - "text": "第一章:中轴城风云" + "key": "Mainline_Tasks1", + "text": "第一章:预言之声" }, "task_name": { - "key": "Mainline_Tasks_6", - "text": "主线任务6" - }, - "task_display": { - "key": "story_80", - "text": "剧情ID:615-617" + "key": "Mainline_Tasks1_6", + "text": "紧急任务" }, "npctxt": { - "key": "story_80", - "text": "寻找熊猫" + "key": "Mainline_Tasks1_6_Receiving", + "text": "被月中人选中之人，终将为守护而生。" }, "npc": 10060, "completetasktxt": { - "key": "story_80", - "text": "通关主线章节1-5" + "key": "Mainline_Tasks1_6_Receiving", + "text": "被月中人选中之人，终将为守护而生。" }, "completetask": [ 161 ], "deliver_npctxt": { - "key": "story_80", - "text": "熊猫" + "key": "Mainline_Tasks1_6_Receiving", + "text": "被月中人选中之人，终将为守护而生。" }, "deliver_npc": 10061, "auto_accept": 0, "reword": [ { - "a": "item", - "t": "110001", - "n": 105 + "a": "attr", + "t": "diamond", + "n": 100 } ], "module": [] @@ -297,40 +273,46 @@ "des": 2, "icon": "", "task_Tname": { - "key": "Mainline_Tasks", - "text": "第一章:中轴城风云" + "key": "Mainline_Tasks1", + "text": "第一章:预言之声" }, "task_name": { - "key": "Mainline_Tasks_7", - "text": "主线任务7" - }, - "task_display": { - "key": "story_80", - "text": "剧情ID:631-632" + "key": "Mainline_Tasks1_7", + "text": "出发前的叮嘱" }, "npctxt": { - "key": "story_80", - "text": "寻找戈伯" + "key": "Mainline_Tasks1_7_Receiving", + "text": "试炼的终点，是名为勇者的觉醒。" }, "npc": 10070, "completetasktxt": { - "key": "story_80", - "text": "通关维京远征难度1" + "key": "Mainline_Tasks1_7_Receiving", + "text": "试炼的终点，是名为勇者的觉醒。" }, "completetask": [ 304 ], "deliver_npctxt": { - "key": "story_80", - "text": "戈伯" + "key": "Mainline_Tasks1_7_Receiving", + "text": "试炼的终点，是名为勇者的觉醒。" }, "deliver_npc": 10072, "auto_accept": 0, "reword": [ { "a": "item", - "t": "110001", - "n": 106 + "t": "120001", + "n": 5 + }, + { + "a": "item", + "t": "120002", + "n": 5 + }, + { + "a": "item", + "t": "120003", + "n": 5 } ], "module": [] @@ -345,40 +327,36 @@ "des": 2, "icon": "", "task_Tname": { - "key": "Mainline_Tasks", - "text": "第一章:中轴城风云" + "key": "Mainline_Tasks1", + "text": "第一章:预言之声" }, "task_name": { - "key": "Mainline_Tasks_8", - "text": "主线任务8" - }, - "task_display": { - "key": "story_80", - "text": "剧情ID:636-637" + "key": "Mainline_Tasks1_8", + "text": "戈伯铁匠铺" }, "npctxt": { - "key": "story_80", - "text": "寻找骇客蛛" + "key": "Mainline_Tasks1_8_Receiving", + "text": "听说维京人热爱海上的风浪、甘醇的啤酒、勇猛的龙，还有那无与伦比的艺术品……" }, "npc": 10080, "completetasktxt": { - "key": "story_80", - "text": "通关主线1-6" + "key": "Mainline_Tasks1_8_Receiving", + "text": "听说维京人热爱海上的风浪、甘醇的啤酒、勇猛的龙，还有那无与伦比的艺术品……" }, "completetask": [ 305 ], "deliver_npctxt": { - "key": "story_80", - "text": "食人鱼" + "key": "Mainline_Tasks1_8_Receiving", + "text": "听说维京人热爱海上的风浪、甘醇的啤酒、勇猛的龙，还有那无与伦比的艺术品……" }, "deliver_npc": 10082, "auto_accept": 0, "reword": [ { "a": "item", - "t": "110001", - "n": 107 + "t": "30001", + "n": 10 } ], "module": [] @@ -393,40 +371,36 @@ "des": 2, "icon": "", "task_Tname": { - "key": "Mainline_Tasks", - "text": "第一章:中轴城风云" + "key": "Mainline_Tasks1", + "text": "第一章:预言之声" }, "task_name": { - "key": "Mainline_Tasks_9", - "text": "主线任务9" - }, - "task_display": { - "key": "story_80", - "text": "剧情ID:638" + "key": "Mainline_Tasks1_9", + "text": "召唤英雄" }, "npctxt": { - "key": "story_80", - "text": "寻找熊猫" + "key": "Mainline_Tasks1_9_Receiving", + "text": "叩响【守护之地】的门扉，迎接英雄的到来。" }, "npc": 10090, "completetasktxt": { - "key": "story_80", - "text": "进行一次10连" + "key": "Mainline_Tasks1_9_Receiving", + "text": "叩响【守护之地】的门扉，迎接英雄的到来。" }, "completetask": [ 306 ], "deliver_npctxt": { - "key": "story_80", - "text": "任务结束" + "key": "Mainline_Tasks1_9_Receiving", + "text": "叩响【守护之地】的门扉，迎接英雄的到来。" }, "deliver_npc": 0, "auto_accept": 0, "reword": [ { - "a": "item", - "t": "110001", - "n": 108 + "a": "attr", + "t": "glod", + "n": 5000 } ], "module": [] @@ -441,40 +415,36 @@ "des": 2, "icon": "", "task_Tname": { - "key": "Mainline_Tasks", - "text": "第一章:中轴城风云" + "key": "Mainline_Tasks1", + "text": "第一章:预言之声" }, "task_name": { - "key": "Mainline_Tasks_10", - "text": "主线任务10" - }, - "task_display": { - "key": "story_80", - "text": "剧情ID:640-642" + "key": "Mainline_Tasks1_10", + "text": "梦魇的诞生" }, "npctxt": { - "key": "story_80", - "text": "寻找熊猫" + "key": "Mainline_Tasks1_10_Receiving", + "text": "沉睡梦魇，向死而生，追寻恐惧的身影、弧光与暗夜轮舞……" }, "npc": 10100, "completetasktxt": { - "key": "story_80", - "text": "打败梦魇！" + "key": "Mainline_Tasks1_10_Receiving", + "text": "沉睡梦魇，向死而生，追寻恐惧的身影、弧光与暗夜轮舞……" }, "completetask": [ 307 ], "deliver_npctxt": { - "key": "story_80", - "text": "邦尼兔" + "key": "Mainline_Tasks1_10_Receiving", + "text": "沉睡梦魇，向死而生，追寻恐惧的身影、弧光与暗夜轮舞……" }, "deliver_npc": 10102, "auto_accept": 0, "reword": [ { - "a": "item", - "t": "110001", - "n": 109 + "a": "attr", + "t": "glod", + "n": 5000 } ], "module": [] @@ -489,40 +459,36 @@ "des": 2, "icon": "", "task_Tname": { - "key": "Mainline_Tasks", - "text": "第一章:中轴城风云" + "key": "Mainline_Tasks1", + "text": "第一章:预言之声" }, "task_name": { - "key": "Mainline_Tasks_11", + "key": "Mainline_Tasks1_11", "text": "敬请期待" }, - "task_display": { - "key": "story_80", - "text": "剧情ID:99999-这是最后一个任务：敬请期待" - }, "npctxt": { - "key": "story_80", - "text": "寻找熊猫" + "key": "Mainline_Tasks1_11", + "text": "敬请期待" }, "npc": 10110, "completetasktxt": { - "key": "story_80", + "key": "Mainline_Tasks1_11", "text": "敬请期待！" }, "completetask": [ 193 ], "deliver_npctxt": { - "key": "story_80", - "text": "熊猫" + "key": "Mainline_Tasks1_11", + "text": "敬请期待！" }, "deliver_npc": 10110, "auto_accept": 0, "reword": [ { - "a": "item", - "t": "110001", - "n": 110 + "a": "attr", + "t": "glod", + "n": 5000 } ], "module": [] @@ -537,40 +503,36 @@ "des": 3, "icon": "", "task_Tname": { - "key": "Side_Quest", + "key": "Side_Quest1", "text": "武馆内勤奋的身影是？" }, "task_name": { - "key": "WuGuanSceneTask_1", - "text": "1" - }, - "task_display": { - "key": "story_80", - "text": "1" + "key": "Side_Quest1_1", + "text": "盖在做什么" }, "npctxt": { - "key": "", - "text": "" + "key": "Side_Quest1_1_Receiving", + "text": "盖在哪里坐着一些看上去像是太极的姿势，我或许可以找他聊聊。" }, "npc": 70010, "completetasktxt": { - "key": "", - "text": "" + "key": "Side_Quest1_1_Receiving", + "text": "盖在哪里坐着一些看上去像是太极的姿势，我或许可以找他聊聊。" }, "completetask": [ - 0 + 30001 ], "deliver_npctxt": { - "key": "", - "text": "" + "key": "Side_Quest1_1_Receiving", + "text": "盖在哪里坐着一些看上去像是太极的姿势，我或许可以找他聊聊。" }, "deliver_npc": 0, "auto_accept": 0, "reword": [ { - "a": "item", - "t": "110001", - "n": 110 + "a": "attr", + "t": "glod", + "n": 5000 } ], "module": [] @@ -585,40 +547,36 @@ "des": 3, "icon": "", "task_Tname": { - "key": "Side_Quest", + "key": "Side_Quest2", "text": "铁匠铺门口身影是?" }, "task_name": { - "key": "SmithyScene_1", - "text": "1" - }, - "task_display": { - "key": "story_80", - "text": "1" + "key": "Side_Quest2_1", + "text": "格里森" }, "npctxt": { - "key": "", - "text": "" + "key": "Side_Quest2_1_Receiving", + "text": "那个绿色的小家伙，好像是叫格林森，看上去有些闷闷不乐，是发生了什么事情吗？" }, "npc": 70020, "completetasktxt": { - "key": "", - "text": "" + "key": "Side_Quest2_1_Receiving", + "text": "那个绿色的小家伙，好像是叫格林森，看上去有些闷闷不乐，是发生了什么事情吗？" }, "completetask": [ - 0 + 30002 ], "deliver_npctxt": { - "key": "", - "text": "" + "key": "Side_Quest2_1_Receiving", + "text": "那个绿色的小家伙，好像是叫格林森，看上去有些闷闷不乐，是发生了什么事情吗？" }, "deliver_npc": 0, "auto_accept": 0, "reword": [ { - "a": "item", - "t": "110001", - "n": 111 + "a": "attr", + "t": "glod", + "n": 5000 } ], "module": [] @@ -633,40 +591,36 @@ "des": 3, "icon": "", "task_Tname": { - "key": "Side_Quest", - "text": "戈伯的小心思" + "key": "Side_Quest2", + "text": "铁匠铺门口身影是?" }, "task_name": { - "key": "SmithyScene_1_1", - "text": "1" - }, - "task_display": { - "key": "story_80", - "text": "1" + "key": "Side_Quest2_2", + "text": "戈伯的唠叨" }, "npctxt": { - "key": "", - "text": "" + "key": "Side_Quest2_2_Receiving", + "text": "戈伯在他的铁匠铺里干活，但我现在需要去找他聊聊。" }, "npc": 70021, "completetasktxt": { - "key": "", - "text": "" + "key": "Side_Quest2_2_Receiving", + "text": "戈伯在他的铁匠铺里干活，但我现在需要去找他聊聊。" }, "completetask": [ 308 ], "deliver_npctxt": { - "key": "", - "text": "" + "key": "Side_Quest2_2_Receiving", + "text": "戈伯在他的铁匠铺里干活，但我现在需要去找他聊聊。" }, "deliver_npc": 70023, "auto_accept": 0, "reword": [ { - "a": "item", - "t": "110001", - "n": 112 + "a": "attr", + "t": "glod", + "n": 5000 } ], "module": [] @@ -681,40 +635,36 @@ "des": 3, "icon": "", "task_Tname": { - "key": "Side_Quest", + "key": "Side_Quest3", "text": "戈伯的嘱托" }, "task_name": { - "key": "SmithyScene_2", - "text": "1" - }, - "task_display": { - "key": "story_80", - "text": "1" + "key": "Side_Quest3_1", + "text": "戈伯在等你" }, "npctxt": { - "key": "", - "text": "" + "key": "Side_Quest3_1_Receiving", + "text": "戈伯有事情找我，我或许该去看看。" }, "npc": 70030, "completetasktxt": { - "key": "", - "text": "" + "key": "Side_Quest3_1_Receiving", + "text": "戈伯有事情找我，我或许该去看看。" }, "completetask": [ - 0 + 30003 ], "deliver_npctxt": { - "key": "", - "text": "" + "key": "Side_Quest3_1_Receiving", + "text": "戈伯有事情找我，我或许该去看看。" }, "deliver_npc": 0, "auto_accept": 0, "reword": [ { - "a": "item", - "t": "110001", - "n": 113 + "a": "attr", + "t": "glod", + "n": 5000 } ], "module": [] @@ -729,40 +679,36 @@ "des": 3, "icon": "", "task_Tname": { - "key": "Side_Quest", + "key": "Side_Quest3", "text": "戈伯的嘱托" }, "task_name": { - "key": "SmithyScene_2_1", - "text": "1" - }, - "task_display": { - "key": "story_80", - "text": "1" + "key": "Side_Quest3_2", + "text": "戈伯的思考" }, "npctxt": { - "key": "", - "text": "" + "key": "Side_Quest3_2_Receiving", + "text": "去找戈伯聊聊，然后再看具体需要做些什么。" }, "npc": 70031, "completetasktxt": { - "key": "", - "text": "" + "key": "Side_Quest3_2_Receiving", + "text": "任务完成了，是时候去找戈伯聊聊了。" }, "completetask": [ 309 ], "deliver_npctxt": { - "key": "", - "text": "" + "key": "Side_Quest3_2_Receiving", + "text": "任务完成了，是时候去找戈伯聊聊了。" }, "deliver_npc": 70033, "auto_accept": 0, "reword": [ { - "a": "item", - "t": "110001", - "n": 114 + "a": "attr", + "t": "glod", + "n": 5000 } ], "module": [] @@ -777,40 +723,36 @@ "des": 3, "icon": "", "task_Tname": { - "key": "Side_Quest", + "key": "Side_Quest4", "text": "武馆秘闻" }, "task_name": { - "key": "WuGuanSceneTask_2", - "text": "1" - }, - "task_display": { - "key": "story_80", - "text": "1" + "key": "Side_Quest4_1", + "text": "瓦希尔指挥官" }, "npctxt": { - "key": "", - "text": "" + "key": "Side_Quest4_1_Receiving", + "text": "瓦希尔指挥官在哪里做些什么，我或或许可以去看看" }, "npc": 70040, "completetasktxt": { - "key": "", - "text": "" + "key": "Side_Quest4_1_Receiving", + "text": "瓦希尔指挥官在哪里做些什么，我或或许可以去看看" }, "completetask": [ - 0 + 30004 ], "deliver_npctxt": { - "key": "", - "text": "" + "key": "Side_Quest4_1_Receiving", + "text": "瓦希尔指挥官在哪里做些什么，我或或许可以去看看" }, "deliver_npc": 0, "auto_accept": 0, "reword": [ { - "a": "item", - "t": "110001", - "n": 115 + "a": "attr", + "t": "glod", + "n": 5000 } ], "module": [] @@ -825,40 +767,36 @@ "des": 3, "icon": "", "task_Tname": { - "key": "Side_Quest", + "key": "Side_Quest5", "text": "好像有人再看我？" }, "task_name": { - "key": "WuGuanSceneTask_3", - "text": "1" - }, - "task_display": { - "key": "story_80", - "text": "1" + "key": "Side_Quest5_1", + "text": "小伊" }, "npctxt": { - "key": "", - "text": "" + "key": "Side_Quest5_1_Receiving", + "text": "那不是小伊吗，她是在.....练武吗？" }, "npc": 70050, "completetasktxt": { - "key": "", - "text": "" + "key": "Side_Quest5_1_Receiving", + "text": "那不是小伊吗，她是在.....练武吗？" }, "completetask": [ - 0 + 30005 ], "deliver_npctxt": { - "key": "", - "text": "" + "key": "Side_Quest5_1_Receiving", + "text": "那不是小伊吗，她是在.....练武吗？" }, "deliver_npc": 0, "auto_accept": 0, "reword": [ { - "a": "item", - "t": "110001", - "n": 116 + "a": "attr", + "t": "glod", + "n": 5000 } ], "module": [] @@ -873,40 +811,36 @@ "des": 3, "icon": "", "task_Tname": { - "key": "Side_Quest", + "key": "Side_Quest6", "text": "戈伯的委托" }, "task_name": { - "key": "SmithyScene_3", - "text": "1" - }, - "task_display": { - "key": "story_80", - "text": "1" + "key": "Side_Quest6_1", + "text": "鼻涕粗" }, "npctxt": { - "key": "", - "text": "" + "key": "Side_Quest6_1_Receiving", + "text": "鼻涕粗为什么会一个人在这里，是遇到了什么事情吗？" }, "npc": 70060, "completetasktxt": { - "key": "", - "text": "" + "key": "Side_Quest6_1_Receiving", + "text": "鼻涕粗为什么会一个人在这里，是遇到了什么事情吗？" }, "completetask": [ - 0 + 30006 ], "deliver_npctxt": { - "key": "", - "text": "" + "key": "Side_Quest6_1_Receiving", + "text": "鼻涕粗为什么会一个人在这里，是遇到了什么事情吗？" }, "deliver_npc": 0, "auto_accept": 0, "reword": [ { - "a": "item", - "t": "110001", - "n": 117 + "a": "attr", + "t": "glod", + "n": 5000 } ], "module": [] @@ -928,10 +862,6 @@ "key": "Daily_tasks4", "text": "1" }, - "task_display": { - "key": "Daily_tasks4", - "text": "1" - }, "npctxt": { "key": "", "text": "" @@ -952,9 +882,9 @@ "auto_accept": 0, "reword": [ { - "a": "item", - "t": "110001", - "n": 999 + "a": "attr", + "t": "glod", + "n": 5000 } ], "module": [] @@ -976,10 +906,6 @@ "key": "Daily_tasks5", "text": "1" }, - "task_display": { - "key": "Daily_tasks5", - "text": "1" - }, "npctxt": { "key": "", "text": "" @@ -1000,9 +926,9 @@ "auto_accept": 0, "reword": [ { - "a": "item", - "t": "110001", - "n": 999 + "a": "attr", + "t": "glod", + "n": 5000 } ], "module": [] @@ -1024,10 +950,6 @@ "key": "Daily_tasks3", "text": "1" }, - "task_display": { - "key": "Daily_tasks3", - "text": "1" - }, "npctxt": { "key": "", "text": "" @@ -1048,9 +970,9 @@ "auto_accept": 0, "reword": [ { - "a": "item", - "t": "110001", - "n": 999 + "a": "attr", + "t": "glod", + "n": 5000 } ], "module": [] @@ -1072,10 +994,6 @@ "key": "Weekly_Tasks1", "text": "1" }, - "task_display": { - "key": "Weekly_Tasks1", - "text": "1" - }, "npctxt": { "key": "", "text": "" @@ -1096,9 +1014,9 @@ "auto_accept": 0, "reword": [ { - "a": "item", - "t": "110001", - "n": 888 + "a": "attr", + "t": "glod", + "n": 5000 } ], "module": [] @@ -1120,10 +1038,6 @@ "key": "Weekly_Tasks2", "text": "1" }, - "task_display": { - "key": "Weekly_Tasks2", - "text": "1" - }, "npctxt": { "key": "", "text": "" @@ -1144,9 +1058,9 @@ "auto_accept": 0, "reword": [ { - "a": "item", - "t": "110001", - "n": 888 + "a": "attr", + "t": "glod", + "n": 5001 } ], "module": [] @@ -1168,10 +1082,6 @@ "key": "Weekly_Tasks3", "text": "1" }, - "task_display": { - "key": "Weekly_Tasks3", - "text": "1" - }, "npctxt": { "key": "", "text": "" @@ -1192,9 +1102,9 @@ "auto_accept": 0, "reword": [ { - "a": "item", - "t": "110001", - "n": 888 + "a": "attr", + "t": "glod", + "n": 5000 } ], "module": [] diff --git a/sys/configure/structs/Game.PandamasJxData.go b/sys/configure/structs/Game.PandamasJxData.go index c0e2d5bd9..a177ca5d8 100644 --- a/sys/configure/structs/Game.PandamasJxData.go +++ b/sys/configure/structs/Game.PandamasJxData.go @@ -21,6 +21,9 @@ type GamePandamasJxData struct { Heroid string Img string Intr string + StandardText int32 + SpecialText int32 + EffectiveHeroId []string Description string Duration int32 Exp int32 @@ -47,6 +50,22 @@ func (_v *GamePandamasJxData)Deserialize(_buf map[string]interface{}) (err error { var _ok_ bool; if _v.Heroid, _ok_ = _buf["heroid"].(string); !_ok_ { err = errors.New("heroid error"); return } } { var _ok_ bool; if _v.Img, _ok_ = _buf["img"].(string); !_ok_ { err = errors.New("img error"); return } } {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["intr"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Intr error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Intr, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["standard_text"].(float64); !_ok_ { err = errors.New("standard_text error"); return }; _v.StandardText = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["special_text"].(float64); !_ok_ { err = errors.New("special_text error"); return }; _v.SpecialText = int32(_tempNum_) } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["effective_hero_id"].([]interface{}); !_ok_ { err = errors.New("effective_hero_id error"); return } + + _v.EffectiveHeroId = make([]string, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ string + { if _list_v_, _ok_ = _e_.(string); !_ok_ { err = errors.New("_list_v_ error"); return } } + _v.EffectiveHeroId = append(_v.EffectiveHeroId, _list_v_) + } + } + {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["description"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Description error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Description, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["duration"].(float64); !_ok_ { err = errors.New("duration error"); return }; _v.Duration = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["exp"].(float64); !_ok_ { err = errors.New("exp error"); return }; _v.Exp = int32(_tempNum_) } diff --git a/sys/configure/structs/Game.PandamasMrylData.go b/sys/configure/structs/Game.PandamasMrylData.go index b4b009e00..a4110b676 100644 --- a/sys/configure/structs/Game.PandamasMrylData.go +++ b/sys/configure/structs/Game.PandamasMrylData.go @@ -16,7 +16,10 @@ type GamePandamasMrylData struct { Icon string Des string Ticks int32 + Ani string P int32 + BeforeTraining int32 + AfterTraining int32 BuffGroup int32 } @@ -32,7 +35,10 @@ func (_v *GamePandamasMrylData)Deserialize(_buf map[string]interface{}) (err err { var _ok_ bool; if _v.Icon, _ok_ = _buf["icon"].(string); !_ok_ { err = errors.New("icon error"); return } } {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["des"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Des error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Des, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["ticks"].(float64); !_ok_ { err = errors.New("ticks error"); return }; _v.Ticks = int32(_tempNum_) } + { var _ok_ bool; if _v.Ani, _ok_ = _buf["ani"].(string); !_ok_ { err = errors.New("ani error"); return } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["p"].(float64); !_ok_ { err = errors.New("p error"); return }; _v.P = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["before_training"].(float64); !_ok_ { err = errors.New("before_training error"); return }; _v.BeforeTraining = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["after_training"].(float64); !_ok_ { err = errors.New("after_training error"); return }; _v.AfterTraining = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buff_group"].(float64); !_ok_ { err = errors.New("buff_group error"); return }; _v.BuffGroup = int32(_tempNum_) } return } diff --git a/sys/configure/structs/Game.WorldTaskData.go b/sys/configure/structs/Game.WorldTaskData.go index 7919eba1b..eae1b26c9 100644 --- a/sys/configure/structs/Game.WorldTaskData.go +++ b/sys/configure/structs/Game.WorldTaskData.go @@ -21,7 +21,6 @@ type GameWorldTaskData struct { Icon string TaskTname string TaskName string - TaskDisplay string Npctxt string Npc int32 Completetasktxt string @@ -50,7 +49,6 @@ func (_v *GameWorldTaskData)Deserialize(_buf map[string]interface{}) (err error) { var _ok_ bool; if _v.Icon, _ok_ = _buf["icon"].(string); !_ok_ { err = errors.New("icon error"); return } } {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["task_Tname"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.TaskTname error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.TaskTname, _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["task_name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.TaskName error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.TaskName, _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["task_display"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.TaskDisplay error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.TaskDisplay, _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["npctxt"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Npctxt error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Npctxt, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["npc"].(float64); !_ok_ { err = errors.New("npc error"); return }; _v.Npc = int32(_tempNum_) } {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["completetasktxt"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Completetasktxt error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Completetasktxt, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } From 99affaf831d0e3a58d46aa1482c41caa259e3de7 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Tue, 18 Apr 2023 20:10:57 +0800 Subject: [PATCH 8/8] =?UTF-8?q?npc=E8=B8=A2=E9=A6=86=20=E9=A2=86=E5=A5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/practice/api_npcdialog.go | 45 ++++++++++++++++--------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/modules/practice/api_npcdialog.go b/modules/practice/api_npcdialog.go index 5a3a9835f..fc5ed60e6 100644 --- a/modules/practice/api_npcdialog.go +++ b/modules/practice/api_npcdialog.go @@ -3,6 +3,7 @@ package practice import ( "go_dreamfactory/comm" "go_dreamfactory/pb" + "go_dreamfactory/sys/configure" ) //参数校验 @@ -13,32 +14,32 @@ func (this *apiComp) NPCDialogCheck(session comm.IUserSession, req *pb.PracticeN ///npc 此协议废弃 不用 func (this *apiComp) NPCDialog(session comm.IUserSession, req *pb.PracticeNPCDialogReq) (code pb.ErrorCode, data *pb.ErrorData) { - // var ( - // err error - // room *pb.DBPracticeRoom - // // conf *cfg.GameDispatch_BattleData - // ) - // if room, err = this.module.modelPandata.queryUserMartialhall(session.GetUserId()); err != nil { - // code = pb.ErrorCode_DBError + var ( + err error + room *pb.DBPracticeRoom + // conf *cfg.GameDispatch_BattleData + ) + if room, err = this.module.modelPandata.queryUserMartialhall(session.GetUserId()); err != nil { + code = pb.ErrorCode_DBError + return + } + if room.Npcstate != 2 { + code = pb.ErrorCode_ReqParameterError + return + } + // if conf, err = this.module.configure.getDispatchBattleData(room.Currnpc); err != nil { + // code = pb.ErrorCode_ConfigNoFound // return // } - // if room.Npcstate != 2 { - // code = pb.ErrorCode_ReqParameterError + // if code = this.module.DispenseRes(session, conf.StoryAward, true); code != pb.ErrorCode_Success { // return // } - // // if conf, err = this.module.configure.getDispatchBattleData(room.Currnpc); err != nil { - // // code = pb.ErrorCode_ConfigNoFound - // // return - // // } - // // if code = this.module.DispenseRes(session, conf.StoryAward, true); code != pb.ErrorCode_Success { - // // return - // // } - // room.Npcstate = 3 - // room.Refresh = configure.Now().Unix() - // this.module.modelPandata.Change(session.GetUserId(), map[string]interface{}{ - // "npcstate": room.Npcstate, - // "refresh": room.Refresh, - // }) + room.Npcstate = 3 + room.Refresh = configure.Now().Unix() + this.module.modelPandata.Change(session.GetUserId(), map[string]interface{}{ + "npcstate": room.Npcstate, + "refresh": room.Refresh, + }) session.SendMsg(string(this.module.GetType()), "npcdialog", &pb.PracticeNPCDialogResp{Issucc: true}) return }