From 18765f9e03033ba212a9115372431b77e5893d83 Mon Sep 17 00:00:00 2001 From: zhaocy Date: Wed, 20 Jul 2022 18:00:47 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E6=89=A9=E5=B1=95=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pb/proto/userexpand.proto | 13 +++-- pb/user_db.pb.go | 115 +++++++++++++++++++------------------- pb/userexpand.pb.go | 33 +++++++++-- 3 files changed, 93 insertions(+), 68 deletions(-) diff --git a/pb/proto/userexpand.proto b/pb/proto/userexpand.proto index 8ce3d42d3..52a5d5b76 100644 --- a/pb/proto/userexpand.proto +++ b/pb/proto/userexpand.proto @@ -1,11 +1,12 @@ syntax = "proto3"; option go_package = ".;pb"; - //用户扩展数据 message DBUserExpand { - string id = 1; //主键id - string uid = 2; //用户id - int64 lastreadnotiftime = 3; //最后阅读公告时间 - int32 chatchannel = 4; //跨服聊天频道 - } \ No newline at end of file + string id = 1; //主键id + string uid = 2; //用户id + int64 lastreadnotiftime = 3; //最后阅读公告时间 + int64 lastInitdataTime = 4; //上次初始数据时间 + uint32 initdataCount = 5; //今日初始累计次数 + int32 chatchannel = 6; //跨服聊天频道 +} diff --git a/pb/user_db.pb.go b/pb/user_db.pb.go index d0a170697..05d5af8b1 100644 --- a/pb/user_db.pb.go +++ b/pb/user_db.pb.go @@ -429,62 +429,65 @@ var File_user_user_db_proto protoreflect.FileDescriptor var file_user_user_db_proto_rawDesc = []byte{ 0x0a, 0x12, 0x75, 0x73, 0x65, 0x72, 0x2f, 0x75, 0x73, 0x65, 0x72, 0x5f, 0x64, 0x62, 0x2e, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x77, 0x0a, 0x09, 0x43, 0x61, 0x63, 0x68, 0x65, 0x55, 0x73, 0x65, - 0x72, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, - 0x75, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, - 0x64, 0x12, 0x2a, 0x0a, 0x10, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x53, 0x65, 0x72, 0x76, - 0x69, 0x63, 0x65, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x47, 0x61, 0x74, - 0x65, 0x77, 0x61, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x49, 0x64, 0x12, 0x0e, 0x0a, - 0x02, 0x69, 0x70, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x70, 0x22, 0xa6, 0x03, - 0x0a, 0x06, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 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, 0x12, 0x0a, 0x04, 0x75, 0x75, - 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x75, 0x75, 0x69, 0x64, 0x12, 0x18, - 0x0a, 0x07, 0x62, 0x69, 0x6e, 0x64, 0x75, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x07, 0x62, 0x69, 0x6e, 0x64, 0x75, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, - 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x10, 0x0a, 0x03, - 0x73, 0x69, 0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x73, 0x69, 0x64, 0x12, 0x1a, - 0x0a, 0x08, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x69, 0x70, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x08, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x69, 0x70, 0x12, 0x20, 0x0a, 0x0b, 0x6c, 0x61, - 0x73, 0x74, 0x6c, 0x6f, 0x67, 0x69, 0x6e, 0x69, 0x70, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x0b, 0x6c, 0x61, 0x73, 0x74, 0x6c, 0x6f, 0x67, 0x69, 0x6e, 0x69, 0x70, 0x12, 0x14, 0x0a, 0x05, - 0x63, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x63, 0x74, 0x69, - 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x6c, 0x6f, 0x67, 0x69, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x18, - 0x0a, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x6c, 0x6f, 0x67, 0x69, 0x6e, 0x74, 0x69, 0x6d, 0x65, - 0x12, 0x20, 0x0a, 0x0b, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x50, 0x6f, 0x69, 0x6e, 0x74, 0x18, - 0x0b, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x50, 0x6f, 0x69, - 0x6e, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x18, 0x0c, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x06, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x67, 0x6f, - 0x6c, 0x64, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x67, 0x6f, 0x6c, 0x64, 0x12, 0x10, - 0x0a, 0x03, 0x65, 0x78, 0x70, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x65, 0x78, 0x70, - 0x12, 0x18, 0x0a, 0x07, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x18, 0x0f, 0x20, 0x01, 0x28, - 0x08, 0x52, 0x07, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, - 0x18, 0x10, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x12, 0x10, 0x0a, 0x03, 0x76, 0x69, - 0x70, 0x18, 0x11, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x76, 0x69, 0x70, 0x12, 0x18, 0x0a, 0x07, - 0x64, 0x69, 0x61, 0x6d, 0x6f, 0x6e, 0x64, 0x18, 0x12, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x64, - 0x69, 0x61, 0x6d, 0x6f, 0x6e, 0x64, 0x22, 0xc7, 0x02, 0x0a, 0x0d, 0x44, 0x42, 0x55, 0x73, 0x65, - 0x72, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x75, - 0x61, 0x7a, 0x68, 0x69, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x06, 0x68, 0x75, 0x61, 0x7a, - 0x68, 0x69, 0x12, 0x1c, 0x0a, 0x09, 0x6b, 0x61, 0x6e, 0x67, 0x6a, 0x75, 0x63, 0x68, 0x69, 0x18, - 0x04, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x09, 0x6b, 0x61, 0x6e, 0x67, 0x6a, 0x75, 0x63, 0x68, 0x69, - 0x12, 0x1a, 0x0a, 0x08, 0x67, 0x61, 0x6f, 0x67, 0x75, 0x61, 0x6e, 0x67, 0x18, 0x05, 0x20, 0x01, - 0x28, 0x08, 0x52, 0x08, 0x67, 0x61, 0x6f, 0x67, 0x75, 0x61, 0x6e, 0x67, 0x12, 0x12, 0x0a, 0x04, - 0x77, 0x75, 0x6c, 0x69, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x77, 0x75, 0x6c, 0x69, - 0x12, 0x14, 0x0a, 0x05, 0x6d, 0x75, 0x73, 0x69, 0x63, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, - 0x05, 0x6d, 0x75, 0x73, 0x69, 0x63, 0x12, 0x16, 0x0a, 0x06, 0x65, 0x66, 0x66, 0x65, 0x63, 0x74, - 0x18, 0x08, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x65, 0x66, 0x66, 0x65, 0x63, 0x74, 0x12, 0x14, - 0x0a, 0x05, 0x67, 0x75, 0x61, 0x6a, 0x69, 0x18, 0x09, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x67, - 0x75, 0x61, 0x6a, 0x69, 0x12, 0x14, 0x0a, 0x05, 0x66, 0x75, 0x62, 0x65, 0x6e, 0x18, 0x0a, 0x20, - 0x01, 0x28, 0x08, 0x52, 0x05, 0x66, 0x75, 0x62, 0x65, 0x6e, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, - 0x6e, 0x73, 0x75, 0x6f, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x74, 0x61, 0x6e, 0x73, - 0x75, 0x6f, 0x12, 0x18, 0x0a, 0x07, 0x68, 0x75, 0x6f, 0x64, 0x6f, 0x6e, 0x67, 0x18, 0x0c, 0x20, - 0x01, 0x28, 0x08, 0x52, 0x07, 0x68, 0x75, 0x6f, 0x64, 0x6f, 0x6e, 0x67, 0x12, 0x1c, 0x0a, 0x09, - 0x78, 0x75, 0x61, 0x6e, 0x73, 0x68, 0x61, 0x6e, 0x67, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x08, 0x52, - 0x09, 0x78, 0x75, 0x61, 0x6e, 0x73, 0x68, 0x61, 0x6e, 0x67, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x61, - 0x69, 0x6a, 0x69, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x73, 0x61, 0x69, 0x6a, 0x69, - 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x97, 0x01, 0x0a, 0x09, 0x43, 0x61, 0x63, 0x68, 0x65, 0x55, 0x73, + 0x65, 0x72, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x03, 0x75, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, + 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, + 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x54, 0x61, 0x67, + 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x54, + 0x61, 0x67, 0x12, 0x2a, 0x0a, 0x10, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x53, 0x65, 0x72, + 0x76, 0x69, 0x63, 0x65, 0x49, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x47, 0x61, + 0x74, 0x65, 0x77, 0x61, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x49, 0x64, 0x12, 0x0e, + 0x0a, 0x02, 0x69, 0x70, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x70, 0x22, 0xa6, + 0x03, 0x0a, 0x06, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 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, 0x12, 0x0a, 0x04, 0x75, + 0x75, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x75, 0x75, 0x69, 0x64, 0x12, + 0x18, 0x0a, 0x07, 0x62, 0x69, 0x6e, 0x64, 0x75, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x07, 0x62, 0x69, 0x6e, 0x64, 0x75, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, + 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x10, 0x0a, + 0x03, 0x73, 0x69, 0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x73, 0x69, 0x64, 0x12, + 0x1a, 0x0a, 0x08, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x69, 0x70, 0x18, 0x07, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x08, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x69, 0x70, 0x12, 0x20, 0x0a, 0x0b, 0x6c, + 0x61, 0x73, 0x74, 0x6c, 0x6f, 0x67, 0x69, 0x6e, 0x69, 0x70, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x0b, 0x6c, 0x61, 0x73, 0x74, 0x6c, 0x6f, 0x67, 0x69, 0x6e, 0x69, 0x70, 0x12, 0x14, 0x0a, + 0x05, 0x63, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x63, 0x74, + 0x69, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x6c, 0x6f, 0x67, 0x69, 0x6e, 0x74, 0x69, 0x6d, 0x65, + 0x18, 0x0a, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x6c, 0x6f, 0x67, 0x69, 0x6e, 0x74, 0x69, 0x6d, + 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x50, 0x6f, 0x69, 0x6e, 0x74, + 0x18, 0x0b, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x50, 0x6f, + 0x69, 0x6e, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x18, 0x0c, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x06, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x67, + 0x6f, 0x6c, 0x64, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x67, 0x6f, 0x6c, 0x64, 0x12, + 0x10, 0x0a, 0x03, 0x65, 0x78, 0x70, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x65, 0x78, + 0x70, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x18, 0x0f, 0x20, 0x01, + 0x28, 0x08, 0x52, 0x07, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x6c, + 0x76, 0x18, 0x10, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x12, 0x10, 0x0a, 0x03, 0x76, + 0x69, 0x70, 0x18, 0x11, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x76, 0x69, 0x70, 0x12, 0x18, 0x0a, + 0x07, 0x64, 0x69, 0x61, 0x6d, 0x6f, 0x6e, 0x64, 0x18, 0x12, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, + 0x64, 0x69, 0x61, 0x6d, 0x6f, 0x6e, 0x64, 0x22, 0xc7, 0x02, 0x0a, 0x0d, 0x44, 0x42, 0x55, 0x73, + 0x65, 0x72, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x68, + 0x75, 0x61, 0x7a, 0x68, 0x69, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x06, 0x68, 0x75, 0x61, + 0x7a, 0x68, 0x69, 0x12, 0x1c, 0x0a, 0x09, 0x6b, 0x61, 0x6e, 0x67, 0x6a, 0x75, 0x63, 0x68, 0x69, + 0x18, 0x04, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x09, 0x6b, 0x61, 0x6e, 0x67, 0x6a, 0x75, 0x63, 0x68, + 0x69, 0x12, 0x1a, 0x0a, 0x08, 0x67, 0x61, 0x6f, 0x67, 0x75, 0x61, 0x6e, 0x67, 0x18, 0x05, 0x20, + 0x01, 0x28, 0x08, 0x52, 0x08, 0x67, 0x61, 0x6f, 0x67, 0x75, 0x61, 0x6e, 0x67, 0x12, 0x12, 0x0a, + 0x04, 0x77, 0x75, 0x6c, 0x69, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x77, 0x75, 0x6c, + 0x69, 0x12, 0x14, 0x0a, 0x05, 0x6d, 0x75, 0x73, 0x69, 0x63, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, + 0x52, 0x05, 0x6d, 0x75, 0x73, 0x69, 0x63, 0x12, 0x16, 0x0a, 0x06, 0x65, 0x66, 0x66, 0x65, 0x63, + 0x74, 0x18, 0x08, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x65, 0x66, 0x66, 0x65, 0x63, 0x74, 0x12, + 0x14, 0x0a, 0x05, 0x67, 0x75, 0x61, 0x6a, 0x69, 0x18, 0x09, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, + 0x67, 0x75, 0x61, 0x6a, 0x69, 0x12, 0x14, 0x0a, 0x05, 0x66, 0x75, 0x62, 0x65, 0x6e, 0x18, 0x0a, + 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x66, 0x75, 0x62, 0x65, 0x6e, 0x12, 0x16, 0x0a, 0x06, 0x74, + 0x61, 0x6e, 0x73, 0x75, 0x6f, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x74, 0x61, 0x6e, + 0x73, 0x75, 0x6f, 0x12, 0x18, 0x0a, 0x07, 0x68, 0x75, 0x6f, 0x64, 0x6f, 0x6e, 0x67, 0x18, 0x0c, + 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x68, 0x75, 0x6f, 0x64, 0x6f, 0x6e, 0x67, 0x12, 0x1c, 0x0a, + 0x09, 0x78, 0x75, 0x61, 0x6e, 0x73, 0x68, 0x61, 0x6e, 0x67, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x08, + 0x52, 0x09, 0x78, 0x75, 0x61, 0x6e, 0x73, 0x68, 0x61, 0x6e, 0x67, 0x12, 0x14, 0x0a, 0x05, 0x73, + 0x61, 0x69, 0x6a, 0x69, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x73, 0x61, 0x69, 0x6a, + 0x69, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x33, } var ( diff --git a/pb/userexpand.pb.go b/pb/userexpand.pb.go index 0ee2b6512..ebea506bc 100644 --- a/pb/userexpand.pb.go +++ b/pb/userexpand.pb.go @@ -29,7 +29,9 @@ type DBUserExpand struct { Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id"` //主键id Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid"` //用户id Lastreadnotiftime int64 `protobuf:"varint,3,opt,name=lastreadnotiftime,proto3" json:"lastreadnotiftime"` //最后阅读公告时间 - Chatchannel int32 `protobuf:"varint,4,opt,name=chatchannel,proto3" json:"chatchannel"` //跨服聊天频道 + LastInitdataTime int64 `protobuf:"varint,4,opt,name=lastInitdataTime,proto3" json:"lastInitdataTime"` //上次初始数据时间 + InitdataCount uint32 `protobuf:"varint,5,opt,name=initdataCount,proto3" json:"initdataCount"` //今日初始累计次数 + Chatchannel int32 `protobuf:"varint,6,opt,name=chatchannel,proto3" json:"chatchannel"` //跨服聊天频道 } func (x *DBUserExpand) Reset() { @@ -85,6 +87,20 @@ func (x *DBUserExpand) GetLastreadnotiftime() int64 { return 0 } +func (x *DBUserExpand) GetLastInitdataTime() int64 { + if x != nil { + return x.LastInitdataTime + } + return 0 +} + +func (x *DBUserExpand) GetInitdataCount() uint32 { + if x != nil { + return x.InitdataCount + } + return 0 +} + func (x *DBUserExpand) GetChatchannel() int32 { if x != nil { return x.Chatchannel @@ -96,16 +112,21 @@ 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, 0x80, 0x01, 0x0a, 0x0c, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x45, 0x78, 0x70, + 0x74, 0x6f, 0x22, 0xd2, 0x01, 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, 0x64, 0x6e, 0x6f, 0x74, 0x69, 0x66, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x11, 0x6c, 0x61, 0x73, 0x74, 0x72, 0x65, 0x61, 0x64, 0x6e, 0x6f, 0x74, 0x69, 0x66, 0x74, - 0x69, 0x6d, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x63, 0x68, 0x61, 0x74, 0x63, 0x68, 0x61, 0x6e, 0x6e, - 0x65, 0x6c, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x63, 0x68, 0x61, 0x74, 0x63, 0x68, - 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x69, 0x6d, 0x65, 0x12, 0x2a, 0x0a, 0x10, 0x6c, 0x61, 0x73, 0x74, 0x49, 0x6e, 0x69, 0x74, 0x64, + 0x61, 0x74, 0x61, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x10, 0x6c, + 0x61, 0x73, 0x74, 0x49, 0x6e, 0x69, 0x74, 0x64, 0x61, 0x74, 0x61, 0x54, 0x69, 0x6d, 0x65, 0x12, + 0x24, 0x0a, 0x0d, 0x69, 0x6e, 0x69, 0x74, 0x64, 0x61, 0x74, 0x61, 0x43, 0x6f, 0x75, 0x6e, 0x74, + 0x18, 0x05, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0d, 0x69, 0x6e, 0x69, 0x74, 0x64, 0x61, 0x74, 0x61, + 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x20, 0x0a, 0x0b, 0x63, 0x68, 0x61, 0x74, 0x63, 0x68, 0x61, + 0x6e, 0x6e, 0x65, 0x6c, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x63, 0x68, 0x61, 0x74, + 0x63, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, + 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( From 1c2ea3d15f2150cc0edaa0251ab31c49cc1b1171 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Wed, 20 Jul 2022 18:10:27 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=8A=BD=E5=8D=A1=E4=BF=9D=E5=BA=95?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_drawcard.json | 210 +++ bin/json/game_drawcom.json | 58 + bin/json/game_drawcost.json | 92 ++ bin/json/game_drawupdraw.json | 19 +- bin/json/game_equip.json | 216 ++- bin/json/game_equipsuit.json | 17 + bin/json/game_newhero.json | 1276 ++++++++++-------- bin/json/game_newskill.json | 51 + bin/json/game_shop.json | 5 + bin/json/game_skillafteratk.json | 73 +- bin/json/game_skillatk.json | 51 + bin/json/game_skillpassive.json | 16 + bin/json/game_ui.json | 46 +- comm/const.go | 13 + modules/equipment/api_upgrade.go | 2 +- modules/hero/api_awaken.go | 2 +- modules/hero/api_drawCard.go | 95 +- modules/hero/api_resonance.go | 2 +- modules/hero/api_resonanceReset.go | 2 +- modules/hero/api_strengthenUplv.go | 2 +- modules/hero/configure_comp.go | 65 +- modules/mail/api_getAttachment.go | 2 +- modules/modulebase.go | 40 +- modules/shop/api_buy.go | 2 +- modules/shop/api_getlist.go | 2 +- modules/task/api_receive.go | 2 +- modules/user/model_record.go | 29 + modules/user/module.go | 8 + pb/hero_msg.pb.go | 20 +- pb/proto/hero/hero_msg.proto | 2 +- pb/proto/user/user_db.proto | 2 +- pb/proto/userrecord.proto | 8 +- pb/userrecord.pb.go | 72 +- sys/configure/structs/Tables.go | 28 + sys/configure/structs/game.drawCom.go | 42 + sys/configure/structs/game.drawComData.go | 27 + sys/configure/structs/game.drawCost.go | 42 + sys/configure/structs/game.drawCostData.go | 29 + sys/configure/structs/game.drawUpdrawData.go | 59 +- sys/configure/structs/game.equipData.go | 2 + sys/configure/structs/game.equipSuitData.go | 2 + sys/configure/structs/game.newHeroData.go | 6 +- sys/configure/structs/game.shopData.go | 2 + 43 files changed, 1985 insertions(+), 756 deletions(-) create mode 100644 bin/json/game_drawcom.json create mode 100644 bin/json/game_drawcost.json create mode 100644 modules/user/model_record.go create mode 100644 sys/configure/structs/game.drawCom.go create mode 100644 sys/configure/structs/game.drawComData.go create mode 100644 sys/configure/structs/game.drawCost.go create mode 100644 sys/configure/structs/game.drawCostData.go diff --git a/bin/json/game_drawcard.json b/bin/json/game_drawcard.json index b8017bd01..75cee4ad0 100644 --- a/bin/json/game_drawcard.json +++ b/bin/json/game_drawcard.json @@ -88,5 +88,215 @@ "id": 10015, "type_id": 1, "weight": 1000 + }, + { + "key": 16, + "id": 10016, + "type_id": 1, + "weight": 1000 + }, + { + "key": 17, + "id": 10017, + "type_id": 1, + "weight": 1000 + }, + { + "key": 18, + "id": 10018, + "type_id": 1, + "weight": 1000 + }, + { + "key": 19, + "id": 10019, + "type_id": 1, + "weight": 1000 + }, + { + "key": 20, + "id": 10020, + "type_id": 1, + "weight": 1000 + }, + { + "key": 21, + "id": 10001, + "type_id": 2, + "weight": 1000 + }, + { + "key": 22, + "id": 10002, + "type_id": 2, + "weight": 1000 + }, + { + "key": 23, + "id": 10001, + "type_id": 11, + "weight": 1000 + }, + { + "key": 24, + "id": 10002, + "type_id": 11, + "weight": 1000 + }, + { + "key": 25, + "id": 10003, + "type_id": 11, + "weight": 1000 + }, + { + "key": 26, + "id": 10004, + "type_id": 11, + "weight": 1000 + }, + { + "key": 27, + "id": 10005, + "type_id": 11, + "weight": 1000 + }, + { + "key": 28, + "id": 10001, + "type_id": 12, + "weight": 1000 + }, + { + "key": 29, + "id": 10002, + "type_id": 12, + "weight": 1000 + }, + { + "key": 30, + "id": 10006, + "type_id": 21, + "weight": 1000 + }, + { + "key": 31, + "id": 10007, + "type_id": 21, + "weight": 1000 + }, + { + "key": 32, + "id": 10008, + "type_id": 21, + "weight": 1000 + }, + { + "key": 33, + "id": 10009, + "type_id": 21, + "weight": 1000 + }, + { + "key": 34, + "id": 10010, + "type_id": 21, + "weight": 1000 + }, + { + "key": 35, + "id": 10006, + "type_id": 22, + "weight": 1000 + }, + { + "key": 36, + "id": 10007, + "type_id": 22, + "weight": 1000 + }, + { + "key": 37, + "id": 100011, + "type_id": 31, + "weight": 1000 + }, + { + "key": 38, + "id": 100012, + "type_id": 31, + "weight": 1000 + }, + { + "key": 39, + "id": 100013, + "type_id": 31, + "weight": 1000 + }, + { + "key": 40, + "id": 100014, + "type_id": 31, + "weight": 1000 + }, + { + "key": 41, + "id": 100015, + "type_id": 31, + "weight": 1000 + }, + { + "key": 42, + "id": 100011, + "type_id": 32, + "weight": 1000 + }, + { + "key": 43, + "id": 100012, + "type_id": 32, + "weight": 1000 + }, + { + "key": 44, + "id": 100016, + "type_id": 41, + "weight": 1000 + }, + { + "key": 45, + "id": 100017, + "type_id": 41, + "weight": 1000 + }, + { + "key": 46, + "id": 100018, + "type_id": 41, + "weight": 1000 + }, + { + "key": 47, + "id": 100019, + "type_id": 41, + "weight": 1000 + }, + { + "key": 48, + "id": 100020, + "type_id": 41, + "weight": 1000 + }, + { + "key": 49, + "id": 100016, + "type_id": 42, + "weight": 1000 + }, + { + "key": 50, + "id": 100017, + "type_id": 42, + "weight": 1000 } ] \ No newline at end of file diff --git a/bin/json/game_drawcom.json b/bin/json/game_drawcom.json new file mode 100644 index 000000000..9eab1dd7d --- /dev/null +++ b/bin/json/game_drawcom.json @@ -0,0 +1,58 @@ +[ + { + "key": "star3_click", + "value": "2" + }, + { + "key": "star4_click", + "value": "4" + }, + { + "key": "star5_click", + "value": "6" + }, + { + "key": "ordinary_floors_star4", + "value": "20" + }, + { + "key": "ordinary_floors_star5", + "value": "100" + }, + { + "key": "camp1_floors_star4", + "value": "20" + }, + { + "key": "camp1_floors_star5", + "value": "50" + }, + { + "key": "camp2_floors_star4", + "value": "20" + }, + { + "key": "camp2_floors_star5", + "value": "50" + }, + { + "key": "camp3_floors_star4", + "value": "20" + }, + { + "key": "camp3_floors_star5", + "value": "50" + }, + { + "key": "camp4_floors_star4", + "value": "20" + }, + { + "key": "camp4_floors_star5", + "value": "50" + }, + { + "key": "progress_bar_time", + "value": "10" + } +] \ No newline at end of file diff --git a/bin/json/game_drawcost.json b/bin/json/game_drawcost.json new file mode 100644 index 000000000..6c819e033 --- /dev/null +++ b/bin/json/game_drawcost.json @@ -0,0 +1,92 @@ +[ + { + "key": 1, + "count": 1, + "cost": { + "a": "item", + "t": "10001", + "n": 1 + } + }, + { + "key": 2, + "count": 10, + "cost": { + "a": "item", + "t": "10001", + "n": 10 + } + }, + { + "key": 3, + "count": 1, + "cost": { + "a": "item", + "t": "10002", + "n": 1 + } + }, + { + "key": 4, + "count": 10, + "cost": { + "a": "item", + "t": "10002", + "n": 10 + } + }, + { + "key": 5, + "count": 1, + "cost": { + "a": "item", + "t": "10003", + "n": 1 + } + }, + { + "key": 6, + "count": 10, + "cost": { + "a": "item", + "t": "10003", + "n": 10 + } + }, + { + "key": 7, + "count": 1, + "cost": { + "a": "item", + "t": "10004", + "n": 1 + } + }, + { + "key": 8, + "count": 10, + "cost": { + "a": "item", + "t": "10004", + "n": 10 + } + }, + { + "key": 9, + "count": 1, + "cost": { + "a": "item", + "t": "10005", + "n": 1 + } + }, + { + "key": 10, + "count": 10, + "cost": { + "a": "item", + "t": "10005", + "n": 10 + } + } +] \ No newline at end of file diff --git a/bin/json/game_drawupdraw.json b/bin/json/game_drawupdraw.json index 1c3836489..feb3d0311 100644 --- a/bin/json/game_drawupdraw.json +++ b/bin/json/game_drawupdraw.json @@ -1,9 +1,20 @@ [ { "key": 1, - "time": 20220715, - "duration": 14, - "up_hero": 10001, - "up_weight": 10000 + "time_on": 934041600, + "time_off": 935251200, + "up_hero": [ + 10001, + 10002 + ], + "up_weight": [ + 5000, + 5000 + ], + "trigger_num": 50, + "Increase_weight": [ + 100, + 100 + ] } ] \ No newline at end of file diff --git a/bin/json/game_equip.json b/bin/json/game_equip.json index 1e8c174e5..37d350eac 100644 --- a/bin/json/game_equip.json +++ b/bin/json/game_equip.json @@ -16,7 +16,8 @@ 30, 20 ], - "addlibrary": 1001 + "addlibrary": 1001, + "ico": "" }, { "id": 10002, @@ -35,7 +36,8 @@ 50, 20 ], - "addlibrary": 1001 + "addlibrary": 1001, + "ico": "" }, { "id": 10003, @@ -56,7 +58,8 @@ 40, 10 ], - "addlibrary": 1001 + "addlibrary": 1001, + "ico": "" }, { "id": 10004, @@ -75,7 +78,8 @@ 40, 20 ], - "addlibrary": 1001 + "addlibrary": 1001, + "ico": "" }, { "id": 10005, @@ -96,7 +100,8 @@ 40, 10 ], - "addlibrary": 1001 + "addlibrary": 1001, + "ico": "" }, { "id": 10006, @@ -115,7 +120,8 @@ 35, 5 ], - "addlibrary": 1001 + "addlibrary": 1001, + "ico": "" }, { "id": 10011, @@ -134,7 +140,8 @@ 30, 20 ], - "addlibrary": 1001 + "addlibrary": 1001, + "ico": "" }, { "id": 10012, @@ -153,7 +160,8 @@ 50, 20 ], - "addlibrary": 1001 + "addlibrary": 1001, + "ico": "" }, { "id": 10013, @@ -174,7 +182,8 @@ 40, 10 ], - "addlibrary": 1001 + "addlibrary": 1001, + "ico": "" }, { "id": 10014, @@ -193,7 +202,8 @@ 40, 20 ], - "addlibrary": 1001 + "addlibrary": 1001, + "ico": "" }, { "id": 10015, @@ -214,7 +224,8 @@ 40, 10 ], - "addlibrary": 1001 + "addlibrary": 1001, + "ico": "" }, { "id": 10016, @@ -233,7 +244,8 @@ 35, 5 ], - "addlibrary": 1001 + "addlibrary": 1001, + "ico": "" }, { "id": 10021, @@ -252,7 +264,8 @@ 30, 20 ], - "addlibrary": 1001 + "addlibrary": 1001, + "ico": "" }, { "id": 10022, @@ -271,7 +284,8 @@ 50, 20 ], - "addlibrary": 1001 + "addlibrary": 1001, + "ico": "" }, { "id": 10023, @@ -292,7 +306,8 @@ 40, 10 ], - "addlibrary": 1001 + "addlibrary": 1001, + "ico": "" }, { "id": 10024, @@ -311,7 +326,8 @@ 40, 20 ], - "addlibrary": 1001 + "addlibrary": 1001, + "ico": "" }, { "id": 10025, @@ -332,7 +348,8 @@ 40, 10 ], - "addlibrary": 1001 + "addlibrary": 1001, + "ico": "" }, { "id": 10026, @@ -351,7 +368,8 @@ 35, 5 ], - "addlibrary": 1001 + "addlibrary": 1001, + "ico": "" }, { "id": 10031, @@ -370,7 +388,8 @@ 30, 20 ], - "addlibrary": 1001 + "addlibrary": 1001, + "ico": "" }, { "id": 10032, @@ -389,7 +408,8 @@ 50, 20 ], - "addlibrary": 1001 + "addlibrary": 1001, + "ico": "" }, { "id": 10033, @@ -410,7 +430,8 @@ 40, 10 ], - "addlibrary": 1001 + "addlibrary": 1001, + "ico": "" }, { "id": 10034, @@ -429,7 +450,8 @@ 40, 20 ], - "addlibrary": 1001 + "addlibrary": 1001, + "ico": "" }, { "id": 10035, @@ -450,7 +472,8 @@ 40, 10 ], - "addlibrary": 1001 + "addlibrary": 1001, + "ico": "" }, { "id": 10036, @@ -469,7 +492,8 @@ 35, 5 ], - "addlibrary": 1001 + "addlibrary": 1001, + "ico": "" }, { "id": 10041, @@ -488,7 +512,8 @@ 30, 20 ], - "addlibrary": 1001 + "addlibrary": 1001, + "ico": "" }, { "id": 10042, @@ -507,7 +532,8 @@ 50, 20 ], - "addlibrary": 1001 + "addlibrary": 1001, + "ico": "" }, { "id": 10043, @@ -528,7 +554,8 @@ 40, 10 ], - "addlibrary": 1001 + "addlibrary": 1001, + "ico": "" }, { "id": 10044, @@ -547,7 +574,8 @@ 40, 20 ], - "addlibrary": 1001 + "addlibrary": 1001, + "ico": "" }, { "id": 10045, @@ -568,7 +596,8 @@ 40, 10 ], - "addlibrary": 1001 + "addlibrary": 1001, + "ico": "" }, { "id": 10046, @@ -587,7 +616,8 @@ 35, 5 ], - "addlibrary": 1001 + "addlibrary": 1001, + "ico": "" }, { "id": 10051, @@ -606,7 +636,8 @@ 30, 20 ], - "addlibrary": 1001 + "addlibrary": 1001, + "ico": "" }, { "id": 10052, @@ -625,7 +656,8 @@ 50, 20 ], - "addlibrary": 1001 + "addlibrary": 1001, + "ico": "" }, { "id": 10053, @@ -646,7 +678,8 @@ 40, 10 ], - "addlibrary": 1001 + "addlibrary": 1001, + "ico": "" }, { "id": 10054, @@ -665,7 +698,8 @@ 40, 20 ], - "addlibrary": 1001 + "addlibrary": 1001, + "ico": "" }, { "id": 10055, @@ -686,7 +720,8 @@ 40, 10 ], - "addlibrary": 1001 + "addlibrary": 1001, + "ico": "" }, { "id": 10056, @@ -705,7 +740,8 @@ 35, 5 ], - "addlibrary": 1001 + "addlibrary": 1001, + "ico": "" }, { "id": 11001, @@ -724,7 +760,8 @@ 30, 20 ], - "addlibrary": 1101 + "addlibrary": 1101, + "ico": "" }, { "id": 11002, @@ -743,7 +780,8 @@ 50, 20 ], - "addlibrary": 1101 + "addlibrary": 1101, + "ico": "" }, { "id": 11003, @@ -764,7 +802,8 @@ 40, 10 ], - "addlibrary": 1101 + "addlibrary": 1101, + "ico": "" }, { "id": 11004, @@ -783,7 +822,8 @@ 40, 20 ], - "addlibrary": 1101 + "addlibrary": 1101, + "ico": "" }, { "id": 11005, @@ -804,7 +844,8 @@ 40, 10 ], - "addlibrary": 1101 + "addlibrary": 1101, + "ico": "" }, { "id": 11006, @@ -823,7 +864,8 @@ 35, 5 ], - "addlibrary": 1101 + "addlibrary": 1101, + "ico": "" }, { "id": 11011, @@ -842,7 +884,8 @@ 30, 20 ], - "addlibrary": 1101 + "addlibrary": 1101, + "ico": "" }, { "id": 11012, @@ -861,7 +904,8 @@ 50, 20 ], - "addlibrary": 1101 + "addlibrary": 1101, + "ico": "" }, { "id": 11013, @@ -882,7 +926,8 @@ 40, 10 ], - "addlibrary": 1101 + "addlibrary": 1101, + "ico": "" }, { "id": 11014, @@ -901,7 +946,8 @@ 40, 20 ], - "addlibrary": 1101 + "addlibrary": 1101, + "ico": "" }, { "id": 11015, @@ -922,7 +968,8 @@ 40, 10 ], - "addlibrary": 1101 + "addlibrary": 1101, + "ico": "" }, { "id": 11016, @@ -941,7 +988,8 @@ 35, 5 ], - "addlibrary": 1101 + "addlibrary": 1101, + "ico": "" }, { "id": 11021, @@ -960,7 +1008,8 @@ 30, 20 ], - "addlibrary": 1101 + "addlibrary": 1101, + "ico": "" }, { "id": 11022, @@ -979,7 +1028,8 @@ 50, 20 ], - "addlibrary": 1101 + "addlibrary": 1101, + "ico": "" }, { "id": 11023, @@ -1000,7 +1050,8 @@ 40, 10 ], - "addlibrary": 1101 + "addlibrary": 1101, + "ico": "" }, { "id": 11024, @@ -1019,7 +1070,8 @@ 40, 20 ], - "addlibrary": 1101 + "addlibrary": 1101, + "ico": "" }, { "id": 11025, @@ -1040,7 +1092,8 @@ 40, 10 ], - "addlibrary": 1101 + "addlibrary": 1101, + "ico": "" }, { "id": 11026, @@ -1059,7 +1112,8 @@ 35, 5 ], - "addlibrary": 1101 + "addlibrary": 1101, + "ico": "" }, { "id": 11031, @@ -1078,7 +1132,8 @@ 30, 20 ], - "addlibrary": 1101 + "addlibrary": 1101, + "ico": "" }, { "id": 11032, @@ -1097,7 +1152,8 @@ 50, 20 ], - "addlibrary": 1101 + "addlibrary": 1101, + "ico": "" }, { "id": 11033, @@ -1118,7 +1174,8 @@ 40, 10 ], - "addlibrary": 1101 + "addlibrary": 1101, + "ico": "" }, { "id": 11034, @@ -1137,7 +1194,8 @@ 40, 20 ], - "addlibrary": 1101 + "addlibrary": 1101, + "ico": "" }, { "id": 11035, @@ -1158,7 +1216,8 @@ 40, 10 ], - "addlibrary": 1101 + "addlibrary": 1101, + "ico": "" }, { "id": 11036, @@ -1177,7 +1236,8 @@ 35, 5 ], - "addlibrary": 1101 + "addlibrary": 1101, + "ico": "" }, { "id": 11041, @@ -1196,7 +1256,8 @@ 30, 20 ], - "addlibrary": 1101 + "addlibrary": 1101, + "ico": "" }, { "id": 11042, @@ -1215,7 +1276,8 @@ 50, 20 ], - "addlibrary": 1101 + "addlibrary": 1101, + "ico": "" }, { "id": 11043, @@ -1236,7 +1298,8 @@ 40, 10 ], - "addlibrary": 1101 + "addlibrary": 1101, + "ico": "" }, { "id": 11044, @@ -1255,7 +1318,8 @@ 40, 20 ], - "addlibrary": 1101 + "addlibrary": 1101, + "ico": "" }, { "id": 11045, @@ -1276,7 +1340,8 @@ 40, 10 ], - "addlibrary": 1101 + "addlibrary": 1101, + "ico": "" }, { "id": 11046, @@ -1295,7 +1360,8 @@ 35, 5 ], - "addlibrary": 1101 + "addlibrary": 1101, + "ico": "" }, { "id": 11051, @@ -1314,7 +1380,8 @@ 30, 20 ], - "addlibrary": 1101 + "addlibrary": 1101, + "ico": "" }, { "id": 11052, @@ -1333,7 +1400,8 @@ 50, 20 ], - "addlibrary": 1101 + "addlibrary": 1101, + "ico": "" }, { "id": 11053, @@ -1354,7 +1422,8 @@ 40, 10 ], - "addlibrary": 1101 + "addlibrary": 1101, + "ico": "" }, { "id": 11054, @@ -1373,7 +1442,8 @@ 40, 20 ], - "addlibrary": 1101 + "addlibrary": 1101, + "ico": "" }, { "id": 11055, @@ -1394,7 +1464,8 @@ 40, 10 ], - "addlibrary": 1101 + "addlibrary": 1101, + "ico": "" }, { "id": 11056, @@ -1413,6 +1484,7 @@ 35, 5 ], - "addlibrary": 1101 + "addlibrary": 1101, + "ico": "" } ] \ No newline at end of file diff --git a/bin/json/game_equipsuit.json b/bin/json/game_equipsuit.json index e836e9203..fde567757 100644 --- a/bin/json/game_equipsuit.json +++ b/bin/json/game_equipsuit.json @@ -3,102 +3,119 @@ "suittype": 0, "suitnum": 4, "skill": 100012000, + "skillname": "", "skillintr": "" }, { "suittype": 1, "suitnum": 4, "skill": 100012000, + "skillname": "", "skillintr": "" }, { "suittype": 2, "suitnum": 4, "skill": 100012000, + "skillname": "", "skillintr": "" }, { "suittype": 3, "suitnum": 4, "skill": 100012000, + "skillname": "", "skillintr": "" }, { "suittype": 4, "suitnum": 4, "skill": 100012000, + "skillname": "", "skillintr": "" }, { "suittype": 5, "suitnum": 4, "skill": 100012000, + "skillname": "", "skillintr": "" }, { "suittype": 6, "suitnum": 4, "skill": 100012000, + "skillname": "", "skillintr": "" }, { "suittype": 7, "suitnum": 4, "skill": 100012000, + "skillname": "", "skillintr": "" }, { "suittype": 8, "suitnum": 4, "skill": 100012000, + "skillname": "", "skillintr": "" }, { "suittype": 9, "suitnum": 4, "skill": 100012000, + "skillname": "", "skillintr": "" }, { "suittype": 100, "suitnum": 2, "skill": 100012000, + "skillname": "", "skillintr": "" }, { "suittype": 101, "suitnum": 2, "skill": 100012000, + "skillname": "", "skillintr": "" }, { "suittype": 102, "suitnum": 2, "skill": 100012000, + "skillname": "", "skillintr": "" }, { "suittype": 103, "suitnum": 2, "skill": 100012000, + "skillname": "", "skillintr": "" }, { "suittype": 104, "suitnum": 2, "skill": 100012000, + "skillname": "", "skillintr": "" }, { "suittype": 105, "suitnum": 2, "skill": 100012000, + "skillname": "", "skillintr": "" }, { "suittype": 106, "suitnum": 2, "skill": 100012000, + "skillname": "", "skillintr": "" } ] \ No newline at end of file diff --git a/bin/json/game_newhero.json b/bin/json/game_newhero.json index e555df95a..ecf20e510 100644 --- a/bin/json/game_newhero.json +++ b/bin/json/game_newhero.json @@ -3,14 +3,14 @@ "hid": 13001, "name": { "key": "hero_13001", - "text": "" + "text": "闪闪" }, "star": 3, "color": 2, "race": 1, "job": 2, "type": 1, - "prefab": "13001", + "prefab": 13001, "icon": 13001, "sound": { "key": "13001", @@ -34,20 +34,21 @@ "skill": 190011000, "skill1": 190012000, "skill2": 190013000, - "skill3": 190014000 + "skill3": 190014000, + "txt": "hero_55009" }, { "hid": 13002, "name": { "key": "hero_13002", - "text": "" + "text": "食人鱼先生" }, "star": 3, "color": 2, "race": 1, "job": 1, "type": 1, - "prefab": "13002", + "prefab": 13002, "icon": 13002, "sound": { "key": "13002", @@ -71,20 +72,21 @@ "skill": 190011000, "skill1": 190012000, "skill2": 190013000, - "skill3": 190014000 + "skill3": 190014000, + "txt": "hero_55010" }, { "hid": 13003, "name": { "key": "hero_13003", - "text": "" + "text": "啊啊" }, "star": 3, "color": 2, "race": 1, "job": 2, "type": 1, - "prefab": "13003", + "prefab": 13003, "icon": 13003, "sound": { "key": "13003", @@ -108,20 +110,21 @@ "skill": 190011000, "skill1": 190012000, "skill2": 190013000, - "skill3": 190014000 + "skill3": 190014000, + "txt": "hero_55011" }, { "hid": 13004, "name": { "key": "hero_13004", - "text": "" + "text": "法夸德勋爵" }, "star": 3, "color": 2, "race": 1, "job": 1, "type": 1, - "prefab": "13004", + "prefab": 13004, "icon": 13004, "sound": { "key": "13004", @@ -145,20 +148,21 @@ "skill": 190011000, "skill1": 190012000, "skill2": 190013000, - "skill3": 190014000 + "skill3": 190014000, + "txt": "hero_55012" }, { "hid": 13005, "name": { "key": "hero_13005", - "text": "" + "text": "大大" }, "star": 3, "color": 2, "race": 1, "job": 3, "type": 1, - "prefab": "13005", + "prefab": 13005, "icon": 13005, "sound": { "key": "13005", @@ -182,20 +186,21 @@ "skill": 190011000, "skill1": 190012000, "skill2": 190013000, - "skill3": 190014000 + "skill3": 190014000, + "txt": "hero_55013" }, { "hid": 14001, "name": { "key": "hero_14001", - "text": "" + "text": "史图依克" }, "star": 4, "color": 3, "race": 1, "job": 2, "type": 1, - "prefab": "14001", + "prefab": 14001, "icon": 14001, "sound": { "key": "14001", @@ -219,20 +224,21 @@ "skill": 190011000, "skill1": 190012000, "skill2": 190013000, - "skill3": 190014000 + "skill3": 190014000, + "txt": "hero_55014" }, { "hid": 14002, "name": { "key": "hero_14002", - "text": "" + "text": "大龙" }, "star": 4, "color": 3, "race": 1, "job": 2, "type": 1, - "prefab": "14002", + "prefab": 14002, "icon": 14002, "sound": { "key": "14002", @@ -256,20 +262,21 @@ "skill": 190011000, "skill1": 190012000, "skill2": 190013000, - "skill3": 190014000 + "skill3": 190014000, + "txt": "hero_55015" }, { "hid": 14003, "name": { "key": "hero_14003", - "text": "" + "text": "亚丝翠" }, "star": 4, "color": 3, "race": 1, "job": 4, "type": 1, - "prefab": "14003", + "prefab": 14003, "icon": 14003, "sound": { "key": "14003", @@ -293,20 +300,21 @@ "skill": 190011000, "skill1": 190012000, "skill2": 190013000, - "skill3": 190014000 + "skill3": 190014000, + "txt": "hero_55016" }, { "hid": 14004, "name": { "key": "hero_14004", - "text": "" + "text": "克莱尔·努涅斯" }, "star": 4, "color": 3, "race": 1, "job": 3, "type": 1, - "prefab": "14004", + "prefab": 14004, "icon": 14004, "sound": { "key": "14004", @@ -330,20 +338,21 @@ "skill": 190011000, "skill1": 190012000, "skill2": 190013000, - "skill3": 190014000 + "skill3": 190014000, + "txt": "hero_55017" }, { "hid": 14005, "name": { "key": "hero_14005", - "text": "" + "text": "鹤大师" }, "star": 4, "color": 3, "race": 1, "job": 1, "type": 1, - "prefab": "14005", + "prefab": 14005, "icon": 14005, "sound": { "key": "14005", @@ -367,20 +376,21 @@ "skill": 190011000, "skill1": 190012000, "skill2": 190013000, - "skill3": 190014000 + "skill3": 190014000, + "txt": "hero_55018" }, { "hid": 14006, "name": { "key": "hero_14006", - "text": "" + "text": "布兰奇" }, "star": 4, "color": 3, "race": 1, "job": 4, "type": 1, - "prefab": "14006", + "prefab": 14006, "icon": 14006, "sound": { "key": "14006", @@ -404,20 +414,21 @@ "skill": 190011000, "skill1": 190012000, "skill2": 190013000, - "skill3": 190014000 + "skill3": 190014000, + "txt": "hero_55019" }, { "hid": 14007, "name": { "key": "hero_14007", - "text": "" + "text": "格里斯特王子" }, "star": 4, "color": 3, "race": 1, "job": 2, "type": 1, - "prefab": "14007", + "prefab": 14007, "icon": 14007, "sound": { "key": "14007", @@ -441,20 +452,21 @@ "skill": 190011000, "skill1": 190012000, "skill2": 190013000, - "skill3": 190014000 + "skill3": 190014000, + "txt": "hero_55020" }, { "hid": 15001, "name": { "key": "hero_15001", - "text": "" + "text": "吉姆·莱克" }, "star": 5, "color": 4, "race": 1, "job": 1, "type": 1, - "prefab": "15001", + "prefab": 15001, "icon": 15001, "sound": { "key": "15001", @@ -478,20 +490,21 @@ "skill": 190011000, "skill1": 190012000, "skill2": 190013000, - "skill3": 190014000 + "skill3": 190014000, + "txt": "hero_55021" }, { "hid": 15002, "name": { "key": "hero_15002", - "text": "" + "text": "船长" }, "star": 5, "color": 4, "race": 1, "job": 1, "type": 1, - "prefab": "15002", + "prefab": 15002, "icon": 15002, "sound": { "key": "15002", @@ -515,20 +528,21 @@ "skill": 190011000, "skill1": 190012000, "skill2": 190013000, - "skill3": 190014000 + "skill3": 190014000, + "txt": "hero_55022" }, { "hid": 15003, "name": { "key": "hero_15003", - "text": "" + "text": "希沙窦斯" }, "star": 5, "color": 4, "race": 1, "job": 1, "type": 1, - "prefab": "15003", + "prefab": 15003, "icon": 15003, "sound": { "key": "15003", @@ -552,20 +566,21 @@ "skill": 190011000, "skill1": 190012000, "skill2": 190013000, - "skill3": 190014000 + "skill3": 190014000, + "txt": "hero_55023" }, { "hid": 15004, "name": { "key": "hero_15004", - "text": "" + "text": "小欧" }, "star": 5, "color": 4, "race": 1, "job": 4, "type": 1, - "prefab": "15004", + "prefab": 15004, "icon": 15004, "sound": { "key": "15004", @@ -589,20 +604,21 @@ "skill": 190011000, "skill1": 190012000, "skill2": 190013000, - "skill3": 190014000 + "skill3": 190014000, + "txt": "hero_55024" }, { "hid": 15005, "name": { "key": "hero_15005", - "text": "" + "text": "亚力克斯" }, "star": 5, "color": 4, "race": 1, "job": 3, "type": 1, - "prefab": "15005", + "prefab": 15005, "icon": 15005, "sound": { "key": "15005", @@ -626,20 +642,21 @@ "skill": 190011000, "skill1": 190012000, "skill2": 190013000, - "skill3": 190014000 + "skill3": 190014000, + "txt": "hero_55025" }, { "hid": 23001, "name": { "key": "hero_23001", - "text": "" + "text": "斯梅克船长" }, "star": 3, "color": 2, "race": 2, "job": 3, "type": 1, - "prefab": "23001", + "prefab": 23001, "icon": 23001, "sound": { "key": "23001", @@ -660,23 +677,24 @@ "y": 0, "z": 0 }, - "skill": 0, - "skill1": 1000, - "skill2": 2000, - "skill3": 3000 + "skill": 190011000, + "skill1": 190012000, + "skill2": 190013000, + "skill3": 190014000, + "txt": "hero_55026" }, { "hid": 23002, "name": { "key": "hero_23002", - "text": "" + "text": "警卫队长" }, "star": 3, "color": 2, "race": 2, "job": 1, "type": 1, - "prefab": "23002", + "prefab": 23002, "icon": 23002, "sound": { "key": "23002", @@ -697,23 +715,24 @@ "y": 0, "z": 0 }, - "skill": 0, - "skill1": 1000, - "skill2": 2000, - "skill3": 3000 + "skill": 190011000, + "skill1": 190012000, + "skill2": 190013000, + "skill3": 190014000, + "txt": "hero_55027" }, { "hid": 23003, "name": { "key": "hero_23003", - "text": "" + "text": "泰德·邓普顿" }, "star": 3, "color": 2, "race": 2, "job": 3, "type": 1, - "prefab": "23003", + "prefab": 23003, "icon": 23003, "sound": { "key": "23003", @@ -734,23 +753,24 @@ "y": 0, "z": 0 }, - "skill": 0, - "skill1": 1000, - "skill2": 2000, - "skill3": 3000 + "skill": 190011000, + "skill1": 190012000, + "skill2": 190013000, + "skill3": 190014000, + "txt": "hero_55028" }, { "hid": 23004, "name": { "key": "hero_23004", - "text": "" + "text": "吉姆·普雷斯科特" }, "star": 3, "color": 2, "race": 2, "job": 4, "type": 1, - "prefab": "23004", + "prefab": 23004, "icon": 23004, "sound": { "key": "23004", @@ -771,23 +791,24 @@ "y": 0, "z": 0 }, - "skill": 0, - "skill1": 1000, - "skill2": 2000, - "skill3": 3000 + "skill": 190011000, + "skill1": 190012000, + "skill2": 190013000, + "skill3": 190014000, + "txt": "hero_55029" }, { "hid": 24001, "name": { "key": "hero_24001", - "text": "" + "text": "警长" }, "star": 4, "color": 3, "race": 2, "job": 1, "type": 1, - "prefab": "24001", + "prefab": 24001, "icon": 24001, "sound": { "key": "24001", @@ -808,23 +829,24 @@ "y": 0, "z": 0 }, - "skill": 0, - "skill1": 1000, - "skill2": 2000, - "skill3": 3000 + "skill": 190011000, + "skill1": 190012000, + "skill2": 190013000, + "skill3": 190014000, + "txt": "hero_55030" }, { "hid": 24002, "name": { "key": "hero_24002", - "text": "" + "text": "牙仙" }, "star": 4, "color": 3, "race": 2, "job": 1, "type": 1, - "prefab": "24002", + "prefab": 24002, "icon": 24002, "sound": { "key": "24002", @@ -845,23 +867,24 @@ "y": 0, "z": 0 }, - "skill": 0, - "skill1": 1000, - "skill2": 2000, - "skill3": 3000 + "skill": 190011000, + "skill1": 190012000, + "skill2": 190013000, + "skill3": 190014000, + "txt": "hero_55031" }, { "hid": 24003, "name": { "key": "hero_24003", - "text": "" + "text": "睡神沙人" }, "star": 4, "color": 3, "race": 2, "job": 4, "type": 1, - "prefab": "24003", + "prefab": 24003, "icon": 24003, "sound": { "key": "24003", @@ -882,23 +905,24 @@ "y": 0, "z": 0 }, - "skill": 0, - "skill1": 1000, - "skill2": 2000, - "skill3": 3000 + "skill": 190011000, + "skill1": 190012000, + "skill2": 190013000, + "skill3": 190014000, + "txt": "hero_55032" }, { "hid": 24004, "name": { "key": "hero_24004", - "text": "" + "text": "邦尼兔" }, "star": 4, "color": 3, "race": 2, "job": 1, "type": 1, - "prefab": "24004", + "prefab": 24004, "icon": 24004, "sound": { "key": "24004", @@ -919,23 +943,24 @@ "y": 0, "z": 0 }, - "skill": 0, - "skill1": 1000, - "skill2": 2000, - "skill3": 3000 + "skill": 190011000, + "skill1": 190012000, + "skill2": 190013000, + "skill3": 190014000, + "txt": "hero_55033" }, { "hid": 24005, "name": { "key": "hero_24005", - "text": "" + "text": "金猴" }, "star": 4, "color": 3, "race": 2, "job": 3, "type": 1, - "prefab": "24005", + "prefab": 24005, "icon": 24005, "sound": { "key": "24005", @@ -956,23 +981,24 @@ "y": 0, "z": 0 }, - "skill": 0, - "skill1": 1000, - "skill2": 2000, - "skill3": 3000 + "skill": 190011000, + "skill1": 190012000, + "skill2": 190013000, + "skill3": 190014000, + "txt": "hero_55034" }, { "hid": 24006, "name": { "key": "hero_24006", - "text": "" + "text": "凯尔" }, "star": 4, "color": 3, "race": 2, "job": 3, "type": 1, - "prefab": "24006", + "prefab": 24006, "icon": 24006, "sound": { "key": "24006", @@ -993,23 +1019,24 @@ "y": 0, "z": 0 }, - "skill": 0, - "skill1": 1000, - "skill2": 2000, - "skill3": 3000 + "skill": 190011000, + "skill1": 190012000, + "skill2": 190013000, + "skill3": 190014000, + "txt": "hero_55035" }, { "hid": 24007, "name": { "key": "hero_24007", - "text": "" + "text": "小钱" }, "star": 4, "color": 3, "race": 2, "job": 3, "type": 1, - "prefab": "24007", + "prefab": 24007, "icon": 24007, "sound": { "key": "24007", @@ -1030,23 +1057,24 @@ "y": 0, "z": 0 }, - "skill": 0, - "skill1": 1000, - "skill2": 2000, - "skill3": 3000 + "skill": 190011000, + "skill1": 190012000, + "skill2": 190013000, + "skill3": 190014000, + "txt": "hero_55036" }, { "hid": 24008, "name": { "key": "hero_24008", - "text": "" + "text": "暴芙那特" }, "star": 4, "color": 3, "race": 2, "job": 1, "type": 1, - "prefab": "24008", + "prefab": 24008, "icon": 24008, "sound": { "key": "24008", @@ -1067,23 +1095,24 @@ "y": 0, "z": 0 }, - "skill": 0, - "skill1": 1000, - "skill2": 2000, - "skill3": 3000 + "skill": 190011000, + "skill1": 190012000, + "skill2": 190013000, + "skill3": 190014000, + "txt": "hero_55037" }, { "hid": 24009, "name": { "key": "hero_24009", - "text": "" + "text": "云朵先生" }, "star": 4, "color": 3, "race": 2, "job": 4, "type": 1, - "prefab": "24009", + "prefab": 24009, "icon": 24009, "sound": { "key": "24009", @@ -1104,23 +1133,24 @@ "y": 0, "z": 0 }, - "skill": 0, - "skill1": 1000, - "skill2": 2000, - "skill3": 3000 + "skill": 190011000, + "skill1": 190012000, + "skill2": 190013000, + "skill3": 190014000, + "txt": "hero_55038" }, { "hid": 25001, "name": { "key": "hero_25001", - "text": "" + "text": "阿宝" }, "star": 5, "color": 4, "race": 2, "job": 2, "type": 1, - "prefab": "25001", + "prefab": 25001, "icon": 25001, "sound": { "key": "25001", @@ -1141,23 +1171,24 @@ "y": 0, "z": 0 }, - "skill": 0, - "skill1": 1000, - "skill2": 2000, - "skill3": 3000 + "skill": 190011000, + "skill1": 190012000, + "skill2": 190013000, + "skill3": 190014000, + "txt": "hero_55039" }, { "hid": 25002, "name": { "key": "hero_25002", - "text": "" + "text": "沃尔夫先生" }, "star": 5, "color": 4, "race": 2, "job": 3, "type": 1, - "prefab": "25002", + "prefab": 25002, "icon": 25002, "sound": { "key": "25002", @@ -1178,23 +1209,24 @@ "y": 0, "z": 0 }, - "skill": 0, - "skill1": 1000, - "skill2": 2000, - "skill3": 3000 + "skill": 190011000, + "skill1": 190012000, + "skill2": 190013000, + "skill3": 190014000, + "txt": "hero_55040" }, { "hid": 25003, "name": { "key": "hero_25003", - "text": "" + "text": "无牙仔" }, "star": 5, "color": 4, "race": 2, "job": 4, "type": 1, - "prefab": "25003", + "prefab": 25003, "icon": 25003, "sound": { "key": "25003", @@ -1215,23 +1247,24 @@ "y": 0, "z": 0 }, - "skill": 0, - "skill1": 1000, - "skill2": 2000, - "skill3": 3000 + "skill": 190011000, + "skill1": 190012000, + "skill2": 190013000, + "skill3": 190014000, + "txt": "hero_55041" }, { "hid": 25004, "name": { "key": "hero_25004", - "text": "" + "text": "波比" }, "star": 5, "color": 4, "race": 2, "job": 3, "type": 1, - "prefab": "25004", + "prefab": 25004, "icon": 25004, "sound": { "key": "25004", @@ -1252,23 +1285,24 @@ "y": 0, "z": 0 }, - "skill": 0, - "skill1": 1000, - "skill2": 2000, - "skill3": 3000 + "skill": 190011000, + "skill1": 190012000, + "skill2": 190013000, + "skill3": 190014000, + "txt": "hero_55042" }, { "hid": 33001, "name": { "key": "hero_33001", - "text": "" + "text": "巫嘎" }, "star": 3, "color": 2, "race": 3, "job": 3, "type": 1, - "prefab": "33001", + "prefab": 33001, "icon": 33001, "sound": { "key": "33001", @@ -1289,23 +1323,24 @@ "y": 0, "z": 0 }, - "skill": 0, - "skill1": 1000, - "skill2": 2000, - "skill3": 3000 + "skill": 190011000, + "skill1": 190012000, + "skill2": 190013000, + "skill3": 190014000, + "txt": "hero_55043" }, { "hid": 33002, "name": { "key": "hero_33002", - "text": "" + "text": "坦克" }, "star": 3, "color": 2, "race": 3, "job": 1, "type": 1, - "prefab": "33002", + "prefab": 33002, "icon": 33002, "sound": { "key": "33002", @@ -1326,23 +1361,24 @@ "y": 0, "z": 0 }, - "skill": 0, - "skill1": 1000, - "skill2": 2000, - "skill3": 3000 + "skill": 190011000, + "skill1": 190012000, + "skill2": 190013000, + "skill3": 190014000, + "txt": "hero_55044" }, { "hid": 33003, "name": { "key": "hero_33003", - "text": "" + "text": "胡德先生" }, "star": 3, "color": 2, "race": 3, "job": 1, "type": 1, - "prefab": "33003", + "prefab": 33003, "icon": 33003, "sound": { "key": "33003", @@ -1363,23 +1399,24 @@ "y": 0, "z": 0 }, - "skill": 0, - "skill1": 1000, - "skill2": 2000, - "skill3": 3000 + "skill": 190011000, + "skill1": 190012000, + "skill2": 190013000, + "skill3": 190014000, + "txt": "hero_55045" }, { "hid": 33004, "name": { "key": "hero_33004", - "text": "" + "text": "普鲁格兰杰" }, "star": 3, "color": 2, "race": 3, "job": 1, "type": 1, - "prefab": "33004", + "prefab": 33004, "icon": 33004, "sound": { "key": "33004", @@ -1400,23 +1437,24 @@ "y": 0, "z": 0 }, - "skill": 0, - "skill1": 1000, - "skill2": 2000, - "skill3": 3000 + "skill": 190011000, + "skill1": 190012000, + "skill2": 190013000, + "skill3": 190014000, + "txt": "hero_55046" }, { "hid": 33005, "name": { "key": "hero_33005", - "text": "" + "text": "鼻涕粗" }, "star": 3, "color": 2, "race": 3, "job": 1, "type": 1, - "prefab": "33005", + "prefab": 33005, "icon": 33005, "sound": { "key": "33005", @@ -1437,23 +1475,24 @@ "y": 0, "z": 0 }, - "skill": 0, - "skill1": 1000, - "skill2": 2000, - "skill3": 3000 + "skill": 190011000, + "skill1": 190012000, + "skill2": 190013000, + "skill3": 190014000, + "txt": "hero_55047" }, { "hid": 33006, "name": { "key": "hero_33006", - "text": "" + "text": "珍妮丝·邓普顿" }, "star": 3, "color": 2, "race": 3, "job": 3, "type": 1, - "prefab": "33006", + "prefab": 33006, "icon": 33006, "sound": { "key": "33006", @@ -1474,23 +1513,24 @@ "y": 0, "z": 0 }, - "skill": 0, - "skill1": 1000, - "skill2": 2000, - "skill3": 3000 + "skill": 190011000, + "skill1": 190012000, + "skill2": 190013000, + "skill3": 190014000, + "txt": "hero_55048" }, { "hid": 34001, "name": { "key": "hero_34001", - "text": "" + "text": "贫嘴驴" }, "star": 4, "color": 3, "race": 3, "job": 1, "type": 1, - "prefab": "34001", + "prefab": 34001, "icon": 34001, "sound": { "key": "34001", @@ -1511,23 +1551,24 @@ "y": 0, "z": 0 }, - "skill": 0, - "skill1": 1000, - "skill2": 2000, - "skill3": 3000 + "skill": 190011000, + "skill1": 190012000, + "skill2": 190013000, + "skill3": 190014000, + "txt": "hero_55049" }, { "hid": 34002, "name": { "key": "hero_34002", - "text": "" + "text": "蒂姆·邓普顿" }, "star": 4, "color": 3, "race": 3, "job": 3, "type": 1, - "prefab": "34002", + "prefab": 34002, "icon": 34002, "sound": { "key": "34002", @@ -1548,23 +1589,24 @@ "y": 0, "z": 0 }, - "skill": 0, - "skill1": 1000, - "skill2": 2000, - "skill3": 3000 + "skill": 190011000, + "skill1": 190012000, + "skill2": 190013000, + "skill3": 190014000, + "txt": "hero_55050" }, { "hid": 34003, "name": { "key": "hero_34003", - "text": "" + "text": "圣诞老人" }, "star": 4, "color": 3, "race": 3, "job": 1, "type": 1, - "prefab": "34003", + "prefab": 34003, "icon": 34003, "sound": { "key": "34003", @@ -1585,23 +1627,24 @@ "y": 0, "z": 0 }, - "skill": 0, - "skill1": 1000, - "skill2": 2000, - "skill3": 3000 + "skill": 190011000, + "skill1": 190012000, + "skill2": 190013000, + "skill3": 190014000, + "txt": "hero_55051" }, { "hid": 34004, "name": { "key": "hero_34004", - "text": "" + "text": "瓜哥" }, "star": 4, "color": 3, "race": 3, "job": 3, "type": 1, - "prefab": "34004", + "prefab": 34004, "icon": 34004, "sound": { "key": "34004", @@ -1622,23 +1665,24 @@ "y": 0, "z": 0 }, - "skill": 0, - "skill1": 1000, - "skill2": 2000, - "skill3": 3000 + "skill": 190011000, + "skill1": 190012000, + "skill2": 190013000, + "skill3": 190014000, + "txt": "hero_55052" }, { "hid": 34005, "name": { "key": "hero_34005", - "text": "" + "text": "沃尔特·史翠克勒" }, "star": 4, "color": 3, "race": 3, "job": 4, "type": 1, - "prefab": "34005", + "prefab": 34005, "icon": 34005, "sound": { "key": "34005", @@ -1659,23 +1703,24 @@ "y": 0, "z": 0 }, - "skill": 0, - "skill1": 1000, - "skill2": 2000, - "skill3": 3000 + "skill": 190011000, + "skill1": 190012000, + "skill2": 190013000, + "skill3": 190014000, + "txt": "hero_55053" }, { "hid": 34006, "name": { "key": "hero_34006", - "text": "" + "text": "冰霜杰克" }, "star": 4, "color": 3, "race": 3, "job": 4, "type": 1, - "prefab": "34006", + "prefab": 34006, "icon": 34006, "sound": { "key": "34006", @@ -1696,23 +1741,24 @@ "y": 0, "z": 0 }, - "skill": 0, - "skill1": 1000, - "skill2": 2000, - "skill3": 3000 + "skill": 190011000, + "skill1": 190012000, + "skill2": 190013000, + "skill3": 190014000, + "txt": "hero_55054" }, { "hid": 34007, "name": { "key": "hero_34007", - "text": "" + "text": "菲奥娜" }, "star": 4, "color": 3, "race": 3, "job": 1, "type": 1, - "prefab": "34007", + "prefab": 34007, "icon": 34007, "sound": { "key": "34007", @@ -1733,23 +1779,24 @@ "y": 0, "z": 0 }, - "skill": 0, - "skill1": 1000, - "skill2": 2000, - "skill3": 3000 + "skill": 190011000, + "skill1": 190012000, + "skill2": 190013000, + "skill3": 190014000, + "txt": "hero_55055" }, { "hid": 34008, "name": { "key": "hero_34008", - "text": "" + "text": "悍夫那特" }, "star": 4, "color": 3, "race": 3, "job": 4, "type": 1, - "prefab": "34008", + "prefab": 34008, "icon": 34008, "sound": { "key": "34008", @@ -1770,23 +1817,24 @@ "y": 0, "z": 0 }, - "skill": 0, - "skill1": 1000, - "skill2": 2000, - "skill3": 3000 + "skill": 190011000, + "skill1": 190012000, + "skill2": 190013000, + "skill3": 190014000, + "txt": "hero_55056" }, { "hid": 35001, "name": { "key": "hero_35001", - "text": "" + "text": "师父" }, "star": 5, "color": 4, "race": 3, "job": 1, "type": 1, - "prefab": "35001", + "prefab": 35001, "icon": 35001, "sound": { "key": "35001", @@ -1807,23 +1855,24 @@ "y": 0, "z": 0 }, - "skill": 0, - "skill1": 1000, - "skill2": 2000, - "skill3": 3000 + "skill": 190011000, + "skill1": 190012000, + "skill2": 190013000, + "skill3": 190014000, + "txt": "hero_55057" }, { "hid": 35002, "name": { "key": "hero_35002", - "text": "" + "text": "希卡普" }, "star": 5, "color": 4, "race": 3, "job": 4, "type": 1, - "prefab": "35002", + "prefab": 35002, "icon": 35002, "sound": { "key": "35002", @@ -1844,23 +1893,24 @@ "y": 0, "z": 0 }, - "skill": 0, - "skill1": 1000, - "skill2": 2000, - "skill3": 3000 + "skill": 190011000, + "skill1": 190012000, + "skill2": 190013000, + "skill3": 190014000, + "txt": "hero_55058" }, { "hid": 35003, "name": { "key": "hero_35003", - "text": "" + "text": "漆黑" }, "star": 5, "color": 4, "race": 3, "job": 1, "type": 1, - "prefab": "35003", + "prefab": 35003, "icon": 35003, "sound": { "key": "35003", @@ -1881,23 +1931,24 @@ "y": 0, "z": 0 }, - "skill": 0, - "skill1": 1000, - "skill2": 2000, - "skill3": 3000 + "skill": 190011000, + "skill1": 190012000, + "skill2": 190013000, + "skill3": 190014000, + "txt": "hero_55059" }, { "hid": 35004, "name": { "key": "hero_35004", - "text": "" + "text": "黛安·福克斯顿" }, "star": 5, "color": 4, "race": 3, "job": 1, "type": 1, - "prefab": "35004", + "prefab": 35004, "icon": 35004, "sound": { "key": "35004", @@ -1918,23 +1969,24 @@ "y": 0, "z": 0 }, - "skill": 0, - "skill1": 1000, - "skill2": 2000, - "skill3": 3000 + "skill": 190011000, + "skill1": 190012000, + "skill2": 190013000, + "skill3": 190014000, + "txt": "hero_55060" }, { "hid": 35005, "name": { "key": "hero_35005", - "text": "" + "text": "幸运·普雷斯科特" }, "star": 5, "color": 4, "race": 3, "job": 3, "type": 1, - "prefab": "35005", + "prefab": 35005, "icon": 35005, "sound": { "key": "35005", @@ -1955,23 +2007,24 @@ "y": 0, "z": 0 }, - "skill": 0, - "skill1": 1000, - "skill2": 2000, - "skill3": 3000 + "skill": 190011000, + "skill1": 190012000, + "skill2": 190013000, + "skill3": 190014000, + "txt": "hero_55061" }, { "hid": 35006, "name": { "key": "hero_35006", - "text": "" + "text": "平先生" }, "star": 5, "color": 4, "race": 3, "job": 3, "type": 1, - "prefab": "35006", + "prefab": 35006, "icon": 35006, "sound": { "key": "35006", @@ -1992,23 +2045,24 @@ "y": 0, "z": 0 }, - "skill": 0, - "skill1": 1000, - "skill2": 2000, - "skill3": 3000 + "skill": 190011000, + "skill1": 190012000, + "skill2": 190013000, + "skill3": 190014000, + "txt": "hero_55062" }, { "hid": 43001, "name": { "key": "hero_43001", - "text": "" + "text": "阿比盖尔·斯通" }, "star": 3, "color": 2, "race": 4, "job": 3, "type": 1, - "prefab": "43001", + "prefab": 43001, "icon": 43001, "sound": { "key": "43001", @@ -2029,23 +2083,24 @@ "y": 0, "z": 0 }, - "skill": 0, - "skill1": 1000, - "skill2": 2000, - "skill3": 3000 + "skill": 190011000, + "skill1": 190012000, + "skill2": 190013000, + "skill3": 190014000, + "txt": "hero_55063" }, { "hid": 43002, "name": { "key": "hero_43002", - "text": "" + "text": "果酱教授" }, "star": 3, "color": 2, "race": 4, "job": 4, "type": 1, - "prefab": "43002", + "prefab": 43002, "icon": 43002, "sound": { "key": "43002", @@ -2066,23 +2121,24 @@ "y": 0, "z": 0 }, - "skill": 0, - "skill1": 1000, - "skill2": 2000, - "skill3": 3000 + "skill": 190011000, + "skill1": 190012000, + "skill2": 190013000, + "skill3": 190014000, + "txt": "hero_55064" }, { "hid": 43003, "name": { "key": "hero_43003", - "text": "" + "text": "史蒂夫·帕丘克" }, "star": 3, "color": 2, "race": 4, "job": 3, "type": 1, - "prefab": "43003", + "prefab": 43003, "icon": 43003, "sound": { "key": "43003", @@ -2103,23 +2159,24 @@ "y": 0, "z": 0 }, - "skill": 0, - "skill1": 1000, - "skill2": 2000, - "skill3": 3000 + "skill": 190011000, + "skill1": 190012000, + "skill2": 190013000, + "skill3": 190014000, + "txt": "hero_55065" }, { "hid": 43004, "name": { "key": "hero_43004", - "text": "" + "text": "姜饼人" }, "star": 3, "color": 2, "race": 4, "job": 1, "type": 1, - "prefab": "43004", + "prefab": 43004, "icon": 43004, "sound": { "key": "43004", @@ -2140,23 +2197,24 @@ "y": 0, "z": 0 }, - "skill": 0, - "skill1": 1000, - "skill2": 2000, - "skill3": 3000 + "skill": 190011000, + "skill1": 190012000, + "skill2": 190013000, + "skill3": 190014000, + "txt": "hero_55066" }, { "hid": 43005, "name": { "key": "hero_43005", - "text": "" + "text": "瓦希尔指挥官" }, "star": 3, "color": 2, "race": 4, "job": 1, "type": 1, - "prefab": "43005", + "prefab": 43005, "icon": 43005, "sound": { "key": "43005", @@ -2177,23 +2235,24 @@ "y": 0, "z": 0 }, - "skill": 0, - "skill1": 1000, - "skill2": 2000, - "skill3": 3000 + "skill": 190011000, + "skill1": 190012000, + "skill2": 190013000, + "skill3": 190014000, + "txt": "hero_55067" }, { "hid": 43006, "name": { "key": "hero_43006", - "text": "" + "text": "布里奇特" }, "star": 3, "color": 2, "race": 4, "job": 3, "type": 1, - "prefab": "43006", + "prefab": 43006, "icon": 43006, "sound": { "key": "43006", @@ -2214,23 +2273,24 @@ "y": 0, "z": 0 }, - "skill": 0, - "skill1": 1000, - "skill2": 2000, - "skill3": 3000 + "skill": 190011000, + "skill1": 190012000, + "skill2": 190013000, + "skill3": 190014000, + "txt": "hero_55068" }, { "hid": 43007, "name": { "key": "hero_43007", - "text": "" + "text": "戈伯" }, "star": 3, "color": 2, "race": 4, "job": 1, "type": 1, - "prefab": "43007", + "prefab": 43007, "icon": 43007, "sound": { "key": "43007", @@ -2251,23 +2311,24 @@ "y": 0, "z": 0 }, - "skill": 0, - "skill1": 1000, - "skill2": 2000, - "skill3": 3000 + "skill": 190011000, + "skill1": 190012000, + "skill2": 190013000, + "skill3": 190014000, + "txt": "hero_55069" }, { "hid": 44001, "name": { "key": "hero_44001", - "text": "" + "text": "美肚鲨" }, "star": 4, "color": 3, "race": 4, "job": 3, "type": 1, - "prefab": "44001", + "prefab": 44001, "icon": 44001, "sound": { "key": "44001", @@ -2288,23 +2349,24 @@ "y": 0, "z": 0 }, - "skill": 0, - "skill1": 1000, - "skill2": 2000, - "skill3": 3000 + "skill": 190011000, + "skill1": 190012000, + "skill2": 190013000, + "skill3": 190014000, + "txt": "hero_55070" }, { "hid": 44002, "name": { "key": "hero_44002", - "text": "" + "text": "蛇先生" }, "star": 4, "color": 3, "race": 4, "job": 3, "type": 1, - "prefab": "44002", + "prefab": 44002, "icon": 44002, "sound": { "key": "44002", @@ -2325,23 +2387,24 @@ "y": 0, "z": 0 }, - "skill": 0, - "skill1": 1000, - "skill2": 2000, - "skill3": 3000 + "skill": 190011000, + "skill1": 190012000, + "skill2": 190013000, + "skill3": 190014000, + "txt": "hero_55071" }, { "hid": 44003, "name": { "key": "hero_44003", - "text": "" + "text": "匹诺曹" }, "star": 4, "color": 3, "race": 4, "job": 1, "type": 1, - "prefab": "44003", + "prefab": 44003, "icon": 44003, "sound": { "key": "44003", @@ -2362,23 +2425,24 @@ "y": 0, "z": 0 }, - "skill": 0, - "skill1": 1000, - "skill2": 2000, - "skill3": 3000 + "skill": 190011000, + "skill1": 190012000, + "skill2": 190013000, + "skill3": 190014000, + "txt": "hero_55072" }, { "hid": 44004, "name": { "key": "hero_44004", - "text": "" + "text": "艾札塔伦" }, "star": 4, "color": 3, "race": 4, "job": 3, "type": 1, - "prefab": "44004", + "prefab": 44004, "icon": 44004, "sound": { "key": "44004", @@ -2399,23 +2463,24 @@ "y": 0, "z": 0 }, - "skill": 0, - "skill1": 1000, - "skill2": 2000, - "skill3": 3000 + "skill": 190011000, + "skill1": 190012000, + "skill2": 190013000, + "skill3": 190014000, + "txt": "hero_55073" }, { "hid": 44005, "name": { "key": "hero_44005", - "text": "" + "text": "小伊" }, "star": 4, "color": 3, "race": 4, "job": 3, "type": 1, - "prefab": "44005", + "prefab": 44005, "icon": 44005, "sound": { "key": "44005", @@ -2436,23 +2501,24 @@ "y": 0, "z": 0 }, - "skill": 0, - "skill1": 1000, - "skill2": 2000, - "skill3": 3000 + "skill": 190011000, + "skill1": 190012000, + "skill2": 190013000, + "skill3": 190014000, + "txt": "hero_55074" }, { "hid": 44006, "name": { "key": "hero_44006", - "text": "" + "text": "悍娇虎" }, "star": 4, "color": 3, "race": 4, "job": 1, "type": 1, - "prefab": "44006", + "prefab": 44006, "icon": 44006, "sound": { "key": "44006", @@ -2473,23 +2539,24 @@ "y": 0, "z": 0 }, - "skill": 0, - "skill1": 1000, - "skill2": 2000, - "skill3": 3000 + "skill": 190011000, + "skill1": 190012000, + "skill2": 190013000, + "skill3": 190014000, + "txt": "hero_55075" }, { "hid": 45001, "name": { "key": "hero_45001", - "text": "" + "text": "乌龟大师" }, "star": 5, "color": 4, "race": 4, "job": 1, "type": 1, - "prefab": "45001", + "prefab": 45001, "icon": 45001, "sound": { "key": "45001", @@ -2510,23 +2577,24 @@ "y": 0, "z": 0 }, - "skill": 0, - "skill1": 1000, - "skill2": 2000, - "skill3": 3000 + "skill": 190011000, + "skill1": 190012000, + "skill2": 190013000, + "skill3": 190014000, + "txt": "hero_55076" }, { "hid": 45002, "name": { "key": "hero_45002", - "text": "" + "text": "梅林" }, "star": 5, "color": 4, "race": 4, "job": 3, "type": 1, - "prefab": "45002", + "prefab": 45002, "icon": 45002, "sound": { "key": "45002", @@ -2547,23 +2615,24 @@ "y": 0, "z": 0 }, - "skill": 0, - "skill1": 1000, - "skill2": 2000, - "skill3": 3000 + "skill": 190011000, + "skill1": 190012000, + "skill2": 190013000, + "skill3": 190014000, + "txt": "hero_55077" }, { "hid": 45003, "name": { "key": "hero_45003", - "text": "" + "text": "盖" }, "star": 5, "color": 4, "race": 4, "job": 3, "type": 1, - "prefab": "45003", + "prefab": 45003, "icon": 45003, "sound": { "key": "45003", @@ -2584,23 +2653,24 @@ "y": 0, "z": 0 }, - "skill": 0, - "skill1": 1000, - "skill2": 2000, - "skill3": 3000 + "skill": 190011000, + "skill1": 190012000, + "skill2": 190013000, + "skill3": 190014000, + "txt": "hero_55078" }, { "hid": 45004, "name": { "key": "hero_45004", - "text": "" + "text": "穿靴子的猫" }, "star": 5, "color": 4, "race": 4, "job": 1, "type": 1, - "prefab": "45004", + "prefab": 45004, "icon": 45004, "sound": { "key": "45004", @@ -2621,23 +2691,24 @@ "y": 0, "z": 0 }, - "skill": 0, - "skill1": 1000, - "skill2": 2000, - "skill3": 3000 + "skill": 190011000, + "skill1": 190012000, + "skill2": 190013000, + "skill3": 190014000, + "txt": "hero_55079" }, { "hid": 43901, "name": { "key": "hero_43901", - "text": "" + "text": "升星精灵" }, "star": 3, "color": 2, "race": 4, "job": 5, "type": 2, - "prefab": "43901", + "prefab": 43901, "icon": 43901, "sound": { "key": "43901", @@ -2658,23 +2729,24 @@ "y": 0, "z": 0 }, - "skill": 0, - "skill1": 1000, - "skill2": 2000, - "skill3": 3000 + "skill": 190011000, + "skill1": 190012000, + "skill2": 190013000, + "skill3": 190014000, + "txt": "hero_55080" }, { "hid": 42911, "name": { "key": "hero_42911", - "text": "" + "text": "初级经验精灵" }, "star": 2, "color": 1, "race": 4, "job": 5, "type": 3, - "prefab": "42911", + "prefab": 42911, "icon": 42911, "sound": { "key": "42911", @@ -2695,23 +2767,24 @@ "y": 0, "z": 0 }, - "skill": 0, - "skill1": 100044911, - "skill2": 100044911, - "skill3": 0 + "skill": 190011000, + "skill1": 190012000, + "skill2": 190013000, + "skill3": 190014000, + "txt": "hero_55081" }, { "hid": 43911, "name": { "key": "hero_43911", - "text": "" + "text": "中级经验精灵" }, "star": 3, "color": 2, "race": 4, "job": 5, "type": 3, - "prefab": "43911", + "prefab": 43911, "icon": 43911, "sound": { "key": "43911", @@ -2732,23 +2805,24 @@ "y": 0, "z": 0 }, - "skill": 0, - "skill1": 100044912, - "skill2": 100044911, - "skill3": 0 + "skill": 190011000, + "skill1": 190012000, + "skill2": 190013000, + "skill3": 190014000, + "txt": "hero_55082" }, { "hid": 44911, "name": { "key": "hero_44911", - "text": "" + "text": "高级经验精灵" }, "star": 4, "color": 3, "race": 4, "job": 5, "type": 3, - "prefab": "44911", + "prefab": 44911, "icon": 44911, "sound": { "key": "44911", @@ -2769,23 +2843,24 @@ "y": 0, "z": 0 }, - "skill": 0, - "skill1": 100044913, - "skill2": 100044911, - "skill3": 0 + "skill": 190011000, + "skill1": 190012000, + "skill2": 190013000, + "skill3": 190014000, + "txt": "hero_55083" }, { "hid": 43921, "name": { "key": "hero_43921", - "text": "" + "text": "技能精灵·稀有" }, "star": 3, "color": 2, "race": 4, "job": 5, "type": 4, - "prefab": "43921", + "prefab": 43921, "icon": 43921, "sound": { "key": "43921", @@ -2806,23 +2881,24 @@ "y": 0, "z": 0 }, - "skill": 0, - "skill1": 100044921, - "skill2": 100044911, - "skill3": 0 + "skill": 190011000, + "skill1": 190012000, + "skill2": 190013000, + "skill3": 190014000, + "txt": "hero_55084" }, { "hid": 44921, "name": { "key": "hero_44921", - "text": "" + "text": "技能精灵·史诗" }, "star": 4, "color": 3, "race": 4, "job": 5, "type": 4, - "prefab": "44921", + "prefab": 44921, "icon": 44921, "sound": { "key": "44921", @@ -2843,23 +2919,24 @@ "y": 0, "z": 0 }, - "skill": 0, - "skill1": 100044922, - "skill2": 100044911, - "skill3": 0 + "skill": 190011000, + "skill1": 190012000, + "skill2": 190013000, + "skill3": 190014000, + "txt": "hero_55085" }, { "hid": 45921, "name": { "key": "hero_45921", - "text": "" + "text": "技能精灵·传说" }, "star": 5, "color": 4, "race": 4, "job": 5, "type": 4, - "prefab": "45921", + "prefab": 45921, "icon": 45921, "sound": { "key": "45921", @@ -2880,23 +2957,24 @@ "y": 0, "z": 0 }, - "skill": 0, - "skill1": 100044923, - "skill2": 100044911, - "skill3": 0 + "skill": 190011000, + "skill1": 190012000, + "skill2": 190013000, + "skill3": 190014000, + "txt": "hero_55086" }, { "hid": 51001, "name": { "key": "hero_51001", - "text": "" + "text": "啵啵星人（新增）" }, "star": 1, "color": 0, "race": 4, "job": 3, "type": 5, - "prefab": "51001", + "prefab": 51001, "icon": 51001, "sound": { "key": "51001", @@ -2917,23 +2995,24 @@ "y": 0, "z": 0 }, - "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0 + "skill": 190011000, + "skill1": 190012000, + "skill2": 190013000, + "skill3": 190014000, + "txt": "hero_55087" }, { "hid": 51002, "name": { "key": "hero_51002", - "text": "" + "text": "埃雷特手下1号（新增）" }, "star": 1, "color": 0, "race": 4, "job": 3, "type": 5, - "prefab": "51002", + "prefab": 51002, "icon": 51002, "sound": { "key": "51002", @@ -2954,23 +3033,24 @@ "y": 0, "z": 0 }, - "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0 + "skill": 190011000, + "skill1": 190012000, + "skill2": 190013000, + "skill3": 190014000, + "txt": "hero_55088" }, { "hid": 51003, "name": { "key": "hero_51003", - "text": "" + "text": "埃雷特手下2号（新增）" }, "star": 1, "color": 0, "race": 4, "job": 3, "type": 5, - "prefab": "51003", + "prefab": 51003, "icon": 51003, "sound": { "key": "51003", @@ -2991,23 +3071,24 @@ "y": 0, "z": 0 }, - "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0 + "skill": 190011000, + "skill1": 190012000, + "skill2": 190013000, + "skill3": 190014000, + "txt": "hero_55089" }, { "hid": 51004, "name": { "key": "hero_51004", - "text": "" + "text": "豺狼小怪（新增）" }, "star": 1, "color": 0, "race": 4, "job": 3, "type": 5, - "prefab": "51004", + "prefab": 51004, "icon": 51004, "sound": { "key": "51004", @@ -3028,23 +3109,24 @@ "y": 0, "z": 0 }, - "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0 + "skill": 190011000, + "skill1": 190012000, + "skill2": 190013000, + "skill3": 190014000, + "txt": "hero_55090" }, { "hid": 51005, "name": { "key": "hero_51005", - "text": "" + "text": "犀牛守卫（新增）" }, "star": 1, "color": 0, "race": 4, "job": 1, "type": 5, - "prefab": "51005", + "prefab": 51005, "icon": 51005, "sound": { "key": "51005", @@ -3065,23 +3147,24 @@ "y": 0, "z": 0 }, - "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0 + "skill": 190011000, + "skill1": 190012000, + "skill2": 190013000, + "skill3": 190014000, + "txt": "hero_55091" }, { "hid": 51006, "name": { "key": "hero_51006", - "text": "" + "text": "香塔尔 杜布瓦队长手下1号（新增）" }, "star": 1, "color": 0, "race": 4, "job": 3, "type": 5, - "prefab": "51006", + "prefab": 51006, "icon": 51006, "sound": { "key": "51006", @@ -3102,23 +3185,24 @@ "y": 0, "z": 0 }, - "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0 + "skill": 190011000, + "skill1": 190012000, + "skill2": 190013000, + "skill3": 190014000, + "txt": "hero_55092" }, { "hid": 51007, "name": { "key": "hero_51007", - "text": "" + "text": "香塔尔 杜布瓦队长手下2号（新增）" }, "star": 1, "color": 0, "race": 4, "job": 3, "type": 5, - "prefab": "51007", + "prefab": 51007, "icon": 51007, "sound": { "key": "51007", @@ -3139,23 +3223,24 @@ "y": 0, "z": 0 }, - "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0 + "skill": 190011000, + "skill1": 190012000, + "skill2": 190013000, + "skill3": 190014000, + "txt": "hero_55093" }, { "hid": 51008, "name": { "key": "hero_51008", - "text": "" + "text": "香塔尔 杜布瓦队长手下3号（新增）" }, "star": 1, "color": 0, "race": 4, "job": 1, "type": 5, - "prefab": "51008", + "prefab": 51008, "icon": 51008, "sound": { "key": "51008", @@ -3176,23 +3261,24 @@ "y": 0, "z": 0 }, - "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0 + "skill": 190011000, + "skill1": 190012000, + "skill2": 190013000, + "skill3": 190014000, + "txt": "hero_55094" }, { "hid": 51009, "name": { "key": "hero_51009", - "text": "" + "text": "香塔尔 杜布瓦队长手下4号（新增）" }, "star": 1, "color": 0, "race": 4, "job": 1, "type": 5, - "prefab": "51009", + "prefab": 51009, "icon": 51009, "sound": { "key": "51009", @@ -3213,23 +3299,24 @@ "y": 0, "z": 0 }, - "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0 + "skill": 190011000, + "skill1": 190012000, + "skill2": 190013000, + "skill3": 190014000, + "txt": "hero_55095" }, { "hid": 51010, "name": { "key": "hero_51010", - "text": "" + "text": "警卫1号（新增）" }, "star": 1, "color": 0, "race": 4, "job": 1, "type": 5, - "prefab": "51010", + "prefab": 51010, "icon": 51010, "sound": { "key": "51010", @@ -3250,23 +3337,24 @@ "y": 0, "z": 0 }, - "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0 + "skill": 190011000, + "skill1": 190012000, + "skill2": 190013000, + "skill3": 190014000, + "txt": "hero_55096" }, { "hid": 51011, "name": { "key": "hero_51011", - "text": "" + "text": "警卫2号（新增）" }, "star": 1, "color": 0, "race": 4, "job": 3, "type": 5, - "prefab": "51011", + "prefab": 51011, "icon": 51011, "sound": { "key": "51011", @@ -3287,23 +3375,24 @@ "y": 0, "z": 0 }, - "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0 + "skill": 190011000, + "skill1": 190012000, + "skill2": 190013000, + "skill3": 190014000, + "txt": "hero_55097" }, { "hid": 51012, "name": { "key": "hero_51012", - "text": "" + "text": "小猴子（新增）" }, "star": 1, "color": 0, "race": 4, "job": 3, "type": 5, - "prefab": "51012", + "prefab": 51012, "icon": 51012, "sound": { "key": "51012", @@ -3324,23 +3413,24 @@ "y": 0, "z": 0 }, - "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0 + "skill": 190011000, + "skill1": 190012000, + "skill2": 190013000, + "skill3": 190014000, + "txt": "hero_55098" }, { "hid": 51013, "name": { "key": "hero_51013", - "text": "" + "text": "巨怪啰啰（新增）" }, "star": 1, "color": 0, "race": 4, "job": 1, "type": 5, - "prefab": "51013", + "prefab": 51013, "icon": 51013, "sound": { "key": "51013", @@ -3361,23 +3451,24 @@ "y": 0, "z": 0 }, - "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0 + "skill": 190011000, + "skill1": 190012000, + "skill2": 190013000, + "skill3": 190014000, + "txt": "hero_55099" }, { "hid": 51014, "name": { "key": "hero_51014", - "text": "" + "text": "博啃族宫廷守卫（新增）" }, "star": 1, "color": 0, "race": 4, "job": 1, "type": 5, - "prefab": "51014", + "prefab": 51014, "icon": 51014, "sound": { "key": "51014", @@ -3398,23 +3489,24 @@ "y": 0, "z": 0 }, - "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0 + "skill": 190011000, + "skill1": 190012000, + "skill2": 190013000, + "skill3": 190014000, + "txt": "hero_55100" }, { "hid": 53001, "name": { "key": "hero_53001", - "text": "" + "text": "埃雷特（新增）" }, "star": 3, "color": 2, "race": 4, "job": 3, "type": 5, - "prefab": "53001", + "prefab": 53001, "icon": 53001, "sound": { "key": "53001", @@ -3435,23 +3527,24 @@ "y": 0, "z": 0 }, - "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0 + "skill": 190011000, + "skill1": 190012000, + "skill2": 190013000, + "skill3": 190014000, + "txt": "hero_55101" }, { "hid": 53002, "name": { "key": "hero_53002", - "text": "" + "text": "豺狼头领（新增）" }, "star": 3, "color": 2, "race": 4, "job": 1, "type": 5, - "prefab": "53002", + "prefab": 53002, "icon": 53002, "sound": { "key": "53002", @@ -3472,23 +3565,24 @@ "y": 0, "z": 0 }, - "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0 + "skill": 190011000, + "skill1": 190012000, + "skill2": 190013000, + "skill3": 190014000, + "txt": "hero_55102" }, { "hid": 53003, "name": { "key": "hero_53003", - "text": "" + "text": "豪猪大师（翡翠僵尸）（新增）" }, "star": 3, "color": 2, "race": 4, "job": 1, "type": 5, - "prefab": "53003", + "prefab": 53003, "icon": 53003, "sound": { "key": "53003", @@ -3509,23 +3603,24 @@ "y": 0, "z": 0 }, - "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0 + "skill": 190011000, + "skill1": 190012000, + "skill2": 190013000, + "skill3": 190014000, + "txt": "hero_55103" }, { "hid": 53004, "name": { "key": "hero_53004", - "text": "" + "text": "双獾大师（翡翠僵尸）（新增）" }, "star": 3, "color": 2, "race": 4, "job": 1, "type": 5, - "prefab": "53004", + "prefab": 53004, "icon": 53004, "sound": { "key": "53004", @@ -3546,23 +3641,24 @@ "y": 0, "z": 0 }, - "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0 + "skill": 190011000, + "skill1": 190012000, + "skill2": 190013000, + "skill3": 190014000, + "txt": "hero_55104" }, { "hid": 53005, "name": { "key": "hero_53005", - "text": "" + "text": "小猴子首领（新增）" }, "star": 3, "color": 2, "race": 4, "job": 1, "type": 5, - "prefab": "53005", + "prefab": 53005, "icon": 53005, "sound": { "key": "53005", @@ -3583,23 +3679,24 @@ "y": 0, "z": 0 }, - "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0 + "skill": 190011000, + "skill1": 190012000, + "skill2": 190013000, + "skill3": 190014000, + "txt": "hero_55105" }, { "hid": 53006, "name": { "key": "hero_53006", - "text": "" + "text": "巨怪首领（新增）" }, "star": 3, "color": 2, "race": 4, "job": 3, "type": 5, - "prefab": "53006", + "prefab": 53006, "icon": 53006, "sound": { "key": "53006", @@ -3620,23 +3717,24 @@ "y": 0, "z": 0 }, - "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0 + "skill": 190011000, + "skill1": 190012000, + "skill2": 190013000, + "skill3": 190014000, + "txt": "hero_55106" }, { "hid": 55001, "name": { "key": "hero_55001", - "text": "" + "text": "香塔尔 杜布瓦队长" }, "star": 5, "color": 4, "race": 4, "job": 2, "type": 5, - "prefab": "55001", + "prefab": 55001, "icon": 55001, "sound": { "key": "55001", @@ -3657,23 +3755,24 @@ "y": 0, "z": 0 }, - "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0 + "skill": 190011000, + "skill1": 190012000, + "skill2": 190013000, + "skill3": 190014000, + "txt": "hero_55107" }, { "hid": 55002, "name": { "key": "hero_55002", - "text": "" + "text": "亨得利克斯（新增）" }, "star": 5, "color": 4, "race": 4, "job": 2, "type": 5, - "prefab": "55002", + "prefab": 55002, "icon": 55002, "sound": { "key": "55002", @@ -3694,23 +3793,24 @@ "y": 0, "z": 0 }, - "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0 + "skill": 190011000, + "skill1": 190012000, + "skill2": 190013000, + "skill3": 190014000, + "txt": "hero_55108" }, { "hid": 55003, "name": { "key": "hero_55003", - "text": "" + "text": "巨型猩猩怪兽（新增）" }, "star": 5, "color": 4, "race": 4, "job": 2, "type": 5, - "prefab": "55003", + "prefab": 55003, "icon": 55003, "sound": { "key": "55003", @@ -3731,23 +3831,24 @@ "y": 0, "z": 0 }, - "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0 + "skill": 190011000, + "skill1": 190012000, + "skill2": 190013000, + "skill3": 190014000, + "txt": "hero_55109" }, { "hid": 55004, "name": { "key": "hero_55004", - "text": "" + "text": "白龙王" }, "star": 5, "color": 4, "race": 4, "job": 2, "type": 5, - "prefab": "55004", + "prefab": 55004, "icon": 55004, "sound": { "key": "55004", @@ -3768,23 +3869,24 @@ "y": 0, "z": 0 }, - "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0 + "skill": 190011000, + "skill1": 190012000, + "skill2": 190013000, + "skill3": 190014000, + "txt": "hero_55110" }, { "hid": 55005, "name": { "key": "hero_55005", - "text": "" + "text": "大厨（新增）" }, "star": 5, "color": 4, "race": 4, "job": 2, "type": 5, - "prefab": "55005", + "prefab": 55005, "icon": 55005, "sound": { "key": "55005", @@ -3805,23 +3907,24 @@ "y": 0, "z": 0 }, - "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0 + "skill": 190011000, + "skill1": 190012000, + "skill2": 190013000, + "skill3": 190014000, + "txt": "hero_55111" }, { "hid": 55006, "name": { "key": "hero_55006", - "text": "" + "text": "德雷格（新增）" }, "star": 5, "color": 4, "race": 4, "job": 2, "type": 5, - "prefab": "55006", + "prefab": 55006, "icon": 55006, "sound": { "key": "55006", @@ -3842,23 +3945,24 @@ "y": 0, "z": 0 }, - "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0 + "skill": 190011000, + "skill1": 190012000, + "skill2": 190013000, + "skill3": 190014000, + "txt": "hero_55112" }, { "hid": 55007, "name": { "key": "hero_55007", - "text": "" + "text": "莫甘娜巨怪" }, "star": 5, "color": 4, "race": 4, "job": 2, "type": 5, - "prefab": "55007", + "prefab": 55007, "icon": 55007, "sound": { "key": "55007", @@ -3879,23 +3983,24 @@ "y": 0, "z": 0 }, - "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0 + "skill": 190011000, + "skill1": 190012000, + "skill2": 190013000, + "skill3": 190014000, + "txt": "hero_55113" }, { "hid": 55008, "name": { "key": "hero_55008", - "text": "" + "text": "莫甘娜二阶" }, "star": 5, "color": 4, "race": 4, "job": 2, "type": 5, - "prefab": "55008", + "prefab": 55008, "icon": 55008, "sound": { "key": "55008", @@ -3916,9 +4021,10 @@ "y": 0, "z": 0 }, - "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0 + "skill": 190011000, + "skill1": 190012000, + "skill2": 190013000, + "skill3": 190014000, + "txt": "hero_55114" } ] \ No newline at end of file diff --git a/bin/json/game_newskill.json b/bin/json/game_newskill.json index 83b678992..5a8529487 100644 --- a/bin/json/game_newskill.json +++ b/bin/json/game_newskill.json @@ -4724,5 +4724,56 @@ "Desc": [ "对目标造成攻击力40%的伤害" ] + }, + { + "Id": 190087000, + "Name": "梦之贪婪", + "ico": "jn_icon_001", + "Type": 2, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 0, + "ChildSkill": [ + { + "Id": [ + 290087001 + ] + }, + { + "Id": [ + 290087001 + ] + }, + { + "Id": [ + 290087001 + ] + }, + { + "Id": [ + 290087001 + ] + }, + { + "Id": [ + 290087001 + ] + }, + { + "Id": [ + 290087001 + ] + } + ], + "Desc": [ + "攻击时，如果自身血量大于50%，对敌方全体造成80%攻击力伤害" + ] } ] \ No newline at end of file diff --git a/bin/json/game_shop.json b/bin/json/game_shop.json index 68a471f85..8ddefda4a 100644 --- a/bin/json/game_shop.json +++ b/bin/json/game_shop.json @@ -3,6 +3,7 @@ "shopid": 1, "tab": 1, "shopname": "金币商店", + "upper_shop": "", "needshow": [ { "a": "attr", @@ -35,6 +36,7 @@ "shopid": 2, "tab": 2, "shopname": "钻石商店", + "upper_shop": "", "needshow": [ { "a": "attr", @@ -59,6 +61,7 @@ "shopid": 3, "tab": 3, "shopname": "PVP商店", + "upper_shop": "玩法商店", "needshow": [ { "a": "attr", @@ -83,6 +86,7 @@ "shopid": 4, "tab": 4, "shopname": "PVE商店", + "upper_shop": "玩法商店", "needshow": [ { "a": "attr", @@ -107,6 +111,7 @@ "shopid": 5, "tab": 5, "shopname": "联盟商店", + "upper_shop": "玩法商店", "needshow": [ { "a": "attr", diff --git a/bin/json/game_skillafteratk.json b/bin/json/game_skillafteratk.json index a9628498f..50c9e49d9 100644 --- a/bin/json/game_skillafteratk.json +++ b/bin/json/game_skillafteratk.json @@ -84,7 +84,9 @@ "Desc": "随机对敌方3个目标造成80%攻击力伤害，优先选择防御力小于自身的目标", "From": 2, "Limit": 3, - "Where": [], + "Where": [ + "Type=MyProJudge" + ], "Order": [ "Type=Sort,SortType=0,Key=Total_Def,SortMet=0", "Type=Rnd,SortType=ProJudge,RelyType=0,Key=Total_Def,Op=0", @@ -230,7 +232,7 @@ "EmitPR": 1000, "Type": "AddBuff", "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390001001,Round=2,Type=ProBuff,BufPro1=Buff_Per_Atk,BufQuaType1=1,BufParNum1=1,BufVal1=400", - "AddEffect": true, + "AddEffect": false, "FollowSK": [], "SucFollowSK": [], "FailFollowSK": [], @@ -272,7 +274,7 @@ "EmitPR": 1000, "Type": "AddBuff", "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390001002,Round=2,Type=ProBuff,BufPro1=Buff_Per_Def,BufQuaType1=1,BufParNum1=1,BufVal1=600", - "AddEffect": true, + "AddEffect": false, "FollowSK": [], "SucFollowSK": [], "FailFollowSK": [], @@ -314,7 +316,7 @@ "EmitPR": 1000, "Type": "AddBuff", "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390001003,Round=2,Type=ProBuff,BufPro1=Buff_Per_Agi,BufQuaType1=1,BufParNum1=1,BufVal1=300", - "AddEffect": true, + "AddEffect": false, "FollowSK": [], "SucFollowSK": [], "FailFollowSK": [], @@ -356,7 +358,7 @@ "EmitPR": 1000, "Type": "AddBuff", "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390001004,Round=2,Type=ProBuff,BufPro1=Add_Cri,BufQuaType1=1,BufParNum1=1,BufVal1=300", - "AddEffect": true, + "AddEffect": false, "FollowSK": [], "SucFollowSK": [], "FailFollowSK": [], @@ -461,7 +463,7 @@ "EmitPR": 1000, "Type": "AddBuff", "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390001005,Round=2,Type=ProBuff,BufPro1=Add_SufCri,BufQuaType1=1,BufParNum1=1,BufVal1=300", - "AddEffect": true, + "AddEffect": false, "FollowSK": [], "SucFollowSK": [], "FailFollowSK": [], @@ -524,7 +526,7 @@ "EmitPR": 1000, "Type": "AddBuff", "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390006001,Round=2,Type=TagBuff", - "AddEffect": true, + "AddEffect": false, "FollowSK": [], "SucFollowSK": [], "FailFollowSK": [], @@ -545,7 +547,7 @@ "EmitPR": 1000, "Type": "AddBuff", "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390005002,Round=2,Type=TagBuff", - "AddEffect": true, + "AddEffect": false, "FollowSK": [], "SucFollowSK": [], "FailFollowSK": [], @@ -566,7 +568,7 @@ "EmitPR": 1000, "Type": "AddBuff", "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=490001001,Round=2,Type=CallSkillPas,PasPr=1000,PasReVal=1", - "AddEffect": true, + "AddEffect": false, "FollowSK": [], "SucFollowSK": [], "FailFollowSK": [], @@ -587,7 +589,7 @@ "EmitPR": 1000, "Type": "AddBuff", "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390003001,Round=2,Type=TagBuff", - "AddEffect": true, + "AddEffect": false, "FollowSK": [], "SucFollowSK": [], "FailFollowSK": [], @@ -1167,7 +1169,7 @@ "EmitPR": 1000, "Type": "RobPro", "Argu": "DoVal=1,Pr=1000,RobTarget=0,Pro=ActValue,Num=300", - "AddEffect": true, + "AddEffect": false, "FollowSK": [], "SucFollowSK": [], "FailFollowSK": [], @@ -1238,7 +1240,7 @@ "EmitPR": 1000, "Type": "BuffAction", "Argu": "DoVal=1,Pr=1000,ActionType=1,BuffType1=1,RelyType1=1,ID1=201,ActionVal=-1,Tag=0", - "AddEffect": true, + "AddEffect": false, "FollowSK": [], "SucFollowSK": [], "FailFollowSK": [], @@ -1263,7 +1265,7 @@ "EmitPR": 1000, "Type": "BuffAction", "Argu": "DoVal=1,Pr=1000,ActionType=0,BuffType1=1,RelyType1=1,ID1=202,ActionVal=-1,Tag=1", - "AddEffect": true, + "AddEffect": false, "FollowSK": [], "SucFollowSK": [], "FailFollowSK": [], @@ -3442,5 +3444,50 @@ "NoRelyTags": [ "301" ] + }, + { + "Id": 290087001, + "Desc": "攻击时，如果自身血量大于50%，对敌方全体造成80%攻击力伤害", + "From": 3, + "Limit": 1, + "Where": [], + "Order": [ + "Type=Rnd" + ], + "EmitPR": 1000, + "Type": "AddPas", + "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=490087001,Round=-1,Type=CallSkillPas,PasPr=1000,PasCallType=0,PasDmgPar=400,PasId1=290087002", + "AddEffect": false, + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] + }, + { + "Id": 290087002, + "Desc": "对敌方全体造成80%攻击力伤害", + "From": 2, + "Limit": 5, + "Where": [], + "Order": [ + "Type=Rnd" + ], + "EmitPR": 1000, + "Type": "Dmg", + "Argu": "DoVal=1,Pr=1000,ProSou1=0,Pro1=Total_Atk,ProPar1=800", + "AddEffect": false, + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "Tags": [ + "102", + "101" + ], + "RelyTags": [], + "NoRelyTags": [] } ] \ No newline at end of file diff --git a/bin/json/game_skillatk.json b/bin/json/game_skillatk.json index 83b678992..5a8529487 100644 --- a/bin/json/game_skillatk.json +++ b/bin/json/game_skillatk.json @@ -4724,5 +4724,56 @@ "Desc": [ "对目标造成攻击力40%的伤害" ] + }, + { + "Id": 190087000, + "Name": "梦之贪婪", + "ico": "jn_icon_001", + "Type": 2, + "MaxLV": 6, + "CD": [ + 4, + 4, + 4, + 4, + 4, + 4 + ], + "Target": 0, + "ChildSkill": [ + { + "Id": [ + 290087001 + ] + }, + { + "Id": [ + 290087001 + ] + }, + { + "Id": [ + 290087001 + ] + }, + { + "Id": [ + 290087001 + ] + }, + { + "Id": [ + 290087001 + ] + }, + { + "Id": [ + 290087001 + ] + } + ], + "Desc": [ + "攻击时，如果自身血量大于50%，对敌方全体造成80%攻击力伤害" + ] } ] \ No newline at end of file diff --git a/bin/json/game_skillpassive.json b/bin/json/game_skillpassive.json index 0933541c4..7537a8211 100644 --- a/bin/json/game_skillpassive.json +++ b/bin/json/game_skillpassive.json @@ -620,5 +620,21 @@ "Tags": [], "RelyTags": [], "NoRelyTags": [] + }, + { + "Id": 490087001, + "Desc": "攻击时，如果自身血量大于50%，对敌方全体造成80%攻击力伤害", + "When": "ImpEff", + "Where": "Target=3,EffType=1,EffID=101", + "AddCon": [ + "Type=ProJudge,JudgeType=1,Key=NowHp_Per,Op=0,Val=500" + ], + "Type": "CallSkillPas", + "MaxEmitTimes": 0, + "OverlayTimes": 0, + "SameID": false, + "Tags": [], + "RelyTags": [], + "NoRelyTags": [] } ] \ No newline at end of file diff --git a/bin/json/game_ui.json b/bin/json/game_ui.json index 607f9a4d1..2fba408be 100644 --- a/bin/json/game_ui.json +++ b/bin/json/game_ui.json @@ -428,7 +428,7 @@ "blur": 0, "package": "roledetails/roledetails", "packagename": "roledetails", - "comname": "main", + "comname": "roledetails", "des": "英雄详细信息" }, { @@ -453,7 +453,7 @@ "package": "notice/notice", "packagename": "notice", "comname": "main", - "des": "背包" + "des": "公告" }, { "id": "mainbarrier", @@ -467,6 +467,18 @@ "comname": "battledetails", "des": "主线任务关卡界面" }, + { + "id": "mainworld", + "file": "MainWorldWindow", + "unloadpkg": 2, + "loadtype": 1, + "full": 1, + "blur": 0, + "package": "mainline/mainline", + "packagename": "mainline", + "comname": "main", + "des": "主线任务世界界面" + }, { "id": "rewardTips", "file": "RewardTipsWindow", @@ -482,13 +494,37 @@ { "id": "roleupgrade", "file": "RoleUpGradeWindow", - "unloadpkg": 1, + "unloadpkg": 5, "loadtype": 1, - "full": 2, - "blur": 1, + "full": 0, + "blur": 0, "package": "roledetails/roledetails", "packagename": "roledetails", "comname": "roleupgrade", "des": "英雄升级升星详情" + }, + { + "id": "manual", + "file": "HeroManualWindow", + "unloadpkg": 1, + "loadtype": 0, + "full": 1, + "blur": 0, + "package": "roledetails/roledetails", + "packagename": "roledetails", + "comname": "manual", + "des": "英雄图鉴" + }, + { + "id": "task", + "file": "TaskWindow", + "unloadpkg": 0, + "loadtype": 1, + "full": 0, + "blur": 0, + "package": "task/task", + "packagename": "task", + "comname": "main", + "des": "任务" } ] \ No newline at end of file diff --git a/comm/const.go b/comm/const.go index 9b2330155..23fd10502 100644 --- a/comm/const.go +++ b/comm/const.go @@ -109,3 +109,16 @@ const ( TASK_ACHIEVE TaskTag = 3 //成就 TASK_STRATEGY TaskTag = 4 // 攻略 ) + +const ( + Key_ordinaryStar4 string = "ordinary_floors_star4" + Key_ordinaryStar5 string = "ordinary_floors_star5" + Key_camp1Star4 string = "camp1_floors_star4" + Key_camp1Star5 string = "camp1_floors_star5" + Key_camp2Star4 string = "camp2_floors_star4" + Key_camp2Star5 string = "camp2_floors_star5" + Key_camp3Star4 string = "camp3_floors_star4" + Key_camp3Star5 string = "camp3_floors_star5" + Key_camp4Star4 string = "camp4_floors_star4" + Key_camp4Star5 string = "camp4_floors_star5" +) diff --git a/modules/equipment/api_upgrade.go b/modules/equipment/api_upgrade.go index 03a9559ea..d40b97f8e 100644 --- a/modules/equipment/api_upgrade.go +++ b/modules/equipment/api_upgrade.go @@ -71,7 +71,7 @@ func (this *apiComp) Upgrade(session comm.IUserSession, req *pb.EquipmentUpgrade } } if issucc { - if code = this.module.CheckConsumeRes(session, intensify.Need, true); code != pb.ErrorCode_Success { + if code = this.module.ConsumeRes(session, intensify.Need, true); code != pb.ErrorCode_Success { return } modifyequipments = make([]*pb.DB_Equipment, 0) diff --git a/modules/hero/api_awaken.go b/modules/hero/api_awaken.go index a3a4a0c34..141706344 100644 --- a/modules/hero/api_awaken.go +++ b/modules/hero/api_awaken.go @@ -55,7 +55,7 @@ func (this *apiComp) Awaken(session comm.IUserSession, req *pb.HeroAwakenReq) (c return } // 消耗校验 - code = this.module.CheckConsumeRes(session, awakenData.Phaseneed, true) + code = this.module.ConsumeRes(session, awakenData.Phaseneed, true) if code != pb.ErrorCode_Success { return } diff --git a/modules/hero/api_drawCard.go b/modules/hero/api_drawCard.go index 1c6572ca1..0cc2d6ac4 100644 --- a/modules/hero/api_drawCard.go +++ b/modules/hero/api_drawCard.go @@ -4,13 +4,14 @@ import ( "crypto/rand" "go_dreamfactory/comm" "go_dreamfactory/pb" + cfg "go_dreamfactory/sys/configure/structs" "math/big" "google.golang.org/protobuf/proto" ) func (this *apiComp) DrawCardCheck(session comm.IUserSession, req *pb.HeroDrawCardReq) (code pb.ErrorCode) { - if req.DrawCount != 1 && req.DrawCount != 10 { // 只能是单抽或10抽 + if req.DrawType <= 0 { // 只能是单抽或10抽 code = pb.ErrorCode_ReqParameterError } return @@ -19,12 +20,24 @@ func (this *apiComp) DrawCardCheck(session comm.IUserSession, req *pb.HeroDrawCa //抽卡 func (this *apiComp) DrawCard(session comm.IUserSession, req *pb.HeroDrawCardReq) (code pb.ErrorCode, data proto.Message) { var ( - szCards []int32 // 最终抽到的卡牌 - totalWeight int64 // 总权重 - curWeigth int64 // 临时随机获得的权重 + szCards []int32 // 最终抽到的卡牌 + totalWeight int64 // 总权重 + curWeigth int64 // 临时随机获得的权重 + drawTimes int32 // 抽卡次数 + hitStar4 int32 // 抽了多少次还没获得4星英雄 + hitStar5 int32 // 抽了多少次还没获得5星英雄 + hitStar int32 // 抽中几星 + curStar4Count int32 // 当前4星没抽到的次数 + curStar5Count int32 // 当前5星没抽到的次数 + // floor4Count int32 // 4星保底次数 + // floor5Count int32 // 5星保底次数 ) szCards = make([]int32, 0) rsp := &pb.HeroDrawCardResp{} + curStar4Count = this.GetFloorStarData(req.DrawType, session.GetUserId(), 4) + curStar5Count = this.GetFloorStarData(req.DrawType, session.GetUserId(), 5) + this.module.Debugf("当前4星抽卡没中次数:%d, 当前5星抽卡没中次数:%d", curStar4Count, curStar5Count) + // 抽卡相关 // 获取配置文件的权重信息 _conf, err := this.module.configure.GetHeroDrawConfig() @@ -32,26 +45,96 @@ func (this *apiComp) DrawCard(session comm.IUserSession, req *pb.HeroDrawCardReq code = pb.ErrorCode_ConfigNoFound return } + + _costConf, err := this.module.configure.GetDrawCostConfigByID(req.DrawType) + if err != nil { + code = pb.ErrorCode_ConfigNoFound + return + } + sz := make([]*cfg.Game_atn, 0) + sz = append(sz, _costConf.Cost) + code = this.module.CheckRes(session, sz) // 消耗校验 + if code != pb.ErrorCode_Success { + return + } + + drawTimes = _costConf.Count // 抽卡次数 for _, v := range _conf.GetDataList() { totalWeight += int64(v.Weight) // 统计所有权重 } - - for i := 0; i < int(req.DrawCount); i++ { + this.module.configure.GetDrawUpDrawConfig() + drawTimes = 1 + for i := 0; i < int(drawTimes); i++ { n, _ := rand.Int(rand.Reader, big.NewInt(totalWeight)) // [0,totalWeight) for _, v := range _conf.GetDataList() { curWeigth += int64(v.Weight) if curWeigth < n.Int64() { // 命中 szCards = append(szCards, v.Id) + // 获取当前星级 + _getCardCfg := this.module.configure.GetHero(v.Id) //获取的英雄信息 + if _getCardCfg != nil { + continue + } + if _getCardCfg.Star == 4 { // 当抽取到的英雄是4星的时候 清除 该类型的保底次数 + this.SetFloorStarData(req.DrawType, session.GetUserId(), 4) + hitStar4 = 0 + hitStar = 4 + break + } else if _getCardCfg.Star == 5 { // 当抽取到的英雄是5星的时候 清除 该类型的保底次数 + this.SetFloorStarData(req.DrawType, session.GetUserId(), 5) + hitStar5 = 0 // 清0 + hitStar = 5 + break + } + hitStar4++ + hitStar5++ + // 达到保底次数了 修改当前卡牌星级 + break } } + if hitStar != 0 { + hitStar = 0 + this.ModifyFloorStarData(req.DrawType, session.GetUserId(), hitStar) // 重置该星级保底 + } } + if hitStar4 != 0 { + this.AddFloorStarData(req.DrawType, session.GetUserId(), 4, hitStar4) // 增加4星保底次数 + } + + if hitStar5 != 0 { + this.AddFloorStarData(req.DrawType, session.GetUserId(), 5, hitStar5) // 增加5星保底次数 + } + //计算保底 if err := this.module.modelHero.createMultiHero(session.GetUserId(), szCards...); err != nil { code = pb.ErrorCode_HeroCreate return } + rsp.Heroes = szCards session.SendMsg(string(this.module.GetType()), DrawCard, rsp) return } + +// 获取当前卡牌类型保底次数 +func (this *apiComp) GetFloorStarData(drawType int32, uid string, star int32) (count int32) { + return +} + +// 清除保底信息(drawType 抽卡类型) +func (this *apiComp) SetFloorStarData(drawType int32, uid string, star int32) { + return +} + +// 当前没有抽中 增加保底次数 +func (this *apiComp) AddFloorStarData(drawType int32, uid string, star int32, count int32) { + + return +} + +// 当前有抽中 修改保底次数 +func (this *apiComp) ModifyFloorStarData(drawType int32, uid string, star int32) { + + return +} diff --git a/modules/hero/api_resonance.go b/modules/hero/api_resonance.go index 9f26ce4c0..e2f892e52 100644 --- a/modules/hero/api_resonance.go +++ b/modules/hero/api_resonance.go @@ -93,7 +93,7 @@ func (this *apiComp) Resonance(session comm.IUserSession, req *pb.HeroResonanceR return } - code = this.module.CheckConsumeRes(session, resonConfig.Need, true) + code = this.module.ConsumeRes(session, resonConfig.Need, true) if code != pb.ErrorCode_Success { return } diff --git a/modules/hero/api_resonanceReset.go b/modules/hero/api_resonanceReset.go index 18a74815d..3cd2aec31 100644 --- a/modules/hero/api_resonanceReset.go +++ b/modules/hero/api_resonanceReset.go @@ -56,7 +56,7 @@ func (this *apiComp) ResonanceReset(session comm.IUserSession, req *pb.HeroReson return } // 消耗校验 - code = this.module.CheckConsumeRes(session, _costConfig.Var, true) + code = this.module.ConsumeRes(session, _costConfig.Var, true) if code != pb.ErrorCode_Success { return } diff --git a/modules/hero/api_strengthenUplv.go b/modules/hero/api_strengthenUplv.go index ae34fb473..6d6ae7f09 100644 --- a/modules/hero/api_strengthenUplv.go +++ b/modules/hero/api_strengthenUplv.go @@ -145,7 +145,7 @@ func (this *apiComp) StrengthenUplv(session comm.IUserSession, req *pb.HeroStren N: costGold, } res = append(res, _d) - code = this.module.CheckConsumeRes(session, res, true) + code = this.module.ConsumeRes(session, res, true) if code != pb.ErrorCode_Success { return } diff --git a/modules/hero/configure_comp.go b/modules/hero/configure_comp.go index a33603bf6..49f6fa47d 100644 --- a/modules/hero/configure_comp.go +++ b/modules/hero/configure_comp.go @@ -22,6 +22,8 @@ const ( hero_awaken = "game_heroawaken.json" // 英雄觉醒 hero_drawcard = "game_drawcard.json" // 抽卡 hero_drawupdraw = "game_drawupdraw.json" // 抽卡概率调整 + hero_drawcom = "game_drawcom.json" // 抽卡保底 + hero_drawcost = "game_drawcost.json" // 抽卡消耗 ) ///配置管理组件 @@ -47,6 +49,8 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp hero_awaken: cfg.NewGame_heroAwaken, hero_drawcard: cfg.NewGame_drawCard, hero_drawupdraw: cfg.NewGame_drawUpdraw, + hero_drawcom: cfg.NewGame_drawCom, + hero_drawcost: cfg.NewGame_drawCost, }) return @@ -350,12 +354,13 @@ func (this *configureComp) GetHeroAwakenConfig() (configure *cfg.Game_heroAwaken return } +// 抽卡配置表 func (this *configureComp) GetHeroDrawConfig() (configure *cfg.Game_drawCard, err error) { var ( v interface{} ok bool ) - if v, err = this.GetConfigure(hero_stargrow); err == nil { + if v, err = this.GetConfigure(hero_drawcard); err == nil { if configure, ok = v.(*cfg.Game_drawCard); !ok { err = fmt.Errorf("%T no is *cfg.Game_drawCard", v) return @@ -367,12 +372,13 @@ func (this *configureComp) GetHeroDrawConfig() (configure *cfg.Game_drawCard, er return } +// 抽卡概率提高 func (this *configureComp) GetDrawUpDrawConfig() (configure *cfg.Game_drawUpdraw, err error) { var ( v interface{} ok bool ) - if v, err = this.GetConfigure(hero_stargrow); err == nil { + if v, err = this.GetConfigure(hero_drawupdraw); err == nil { if configure, ok = v.(*cfg.Game_drawUpdraw); !ok { err = fmt.Errorf("%T no is *cfg.Game_drawUpdraw", v) return @@ -383,3 +389,58 @@ func (this *configureComp) GetDrawUpDrawConfig() (configure *cfg.Game_drawUpdraw return } + +// 抽卡保底 +func (this *configureComp) GetDrawComConfig() (configure *cfg.Game_drawCom, err error) { + var ( + v interface{} + ok bool + ) + if v, err = this.GetConfigure(hero_drawcom); err == nil { + if configure, ok = v.(*cfg.Game_drawCom); !ok { + err = fmt.Errorf("%T no is *cfg.Game_drawCom", v) + return + } + } else { + err = fmt.Errorf("%T no is *cfg.Game_drawCom", v) + } + + return +} + +// 抽卡消耗 +func (this *configureComp) GetDrawCostConfig() (configure *cfg.Game_drawCost, err error) { + var ( + v interface{} + ok bool + ) + if v, err = this.GetConfigure(hero_drawcost); err == nil { + if configure, ok = v.(*cfg.Game_drawCost); !ok { + err = fmt.Errorf("%T no is *cfg.Game_drawCost", v) + return + } + } else { + err = fmt.Errorf("%T no is *cfg.Game_drawCost", v) + } + + return +} + +func (this *configureComp) GetDrawCostConfigByID(id int32) (data *cfg.Game_drawCostData, err error) { + var ( + v interface{} + ) + if v, err = this.GetConfigure(hero_drawcost); err == nil { + if configure, ok := v.(*cfg.Game_drawCost); !ok { + err = fmt.Errorf("%T no is *cfg.Game_drawCost", v) + return + } else { + data = configure.Get(id) + } + + } else { + err = fmt.Errorf("%T no is *cfg.Game_drawCost", v) + } + + return +} diff --git a/modules/mail/api_getAttachment.go b/modules/mail/api_getAttachment.go index cd0f6414e..478796cca 100644 --- a/modules/mail/api_getAttachment.go +++ b/modules/mail/api_getAttachment.go @@ -46,7 +46,7 @@ func (this *apiComp) GetUserMailAttachment(session comm.IUserSession, req *pb.Ma } res = append(res, d) } - code = this.module.api.module.CheckConsumeRes(session, res, true) // 领取附件 + code = this.module.api.module.ConsumeRes(session, res, true) // 领取附件 if code == pb.ErrorCode_Success { // 修改状态 this.module.modelMail.Mail_UpdateMailAttachmentState(req.ObjID) diff --git a/modules/modulebase.go b/modules/modulebase.go index 7cd18edf7..6094863c1 100644 --- a/modules/modulebase.go +++ b/modules/modulebase.go @@ -137,8 +137,44 @@ func (this *ModuleBase) SendMsgToUsers(mainType, subType string, msg proto.Messa return } -//校验消耗资源 -func (this *ModuleBase) CheckConsumeRes(session comm.IUserSession, res []*cfg.Game_atn, bPush bool) (code pb.ErrorCode) { +// 只校验资源 参数 atn格式 +func (this *ModuleBase) CheckRes(session comm.IUserSession, res []*cfg.Game_atn) (code pb.ErrorCode) { + var ( + err error + resID int + amount int32 + ) + + source := &comm.ModuleCallSource{ + Module: string(this.module.GetType()), + FuncName: "CheckRes", + Describe: "检查资源是否够", + } + //校验消费资源是否充足 + for _, v := range res { + if v.A == comm.AttrType { //用户属性资源 + if amount = this.ModuleUser.QueryAttributeValue(session.GetUserId(), v.T); amount < v.N { + code = pb.ErrorCode_ResNoEnough + this.Errorf("道具不足:A:%s,T:%s,N:%d", v.A, v.T, v.N) + return + } + } else if v.A == comm.ItemType { //道具资源 + if resID, err = strconv.Atoi(v.T); err != nil { + code = pb.ErrorCode_ConfigurationException + return + } + if amount = int32(this.ModuleItems.QueryItemAmount(source, session.GetSessionId(), int32(resID))); amount < v.N { + code = pb.ErrorCode_ResNoEnough + this.Errorf("道具不足:A:%s,T:%s,N:%d", v.A, v.T, v.N) + return + } + } + } + return +} + +//消耗资源 +func (this *ModuleBase) ConsumeRes(session comm.IUserSession, res []*cfg.Game_atn, bPush bool) (code pb.ErrorCode) { var ( err error resID int diff --git a/modules/shop/api_buy.go b/modules/shop/api_buy.go index 6fd388972..1f5fee864 100644 --- a/modules/shop/api_buy.go +++ b/modules/shop/api_buy.go @@ -45,7 +45,7 @@ func (this *apiComp) Buy(session comm.IUserSession, req *pb.ShopBuyReq) (code pb } } - if code = this.module.CheckConsumeRes(session, conf.Need, true); code != pb.ErrorCode_Success { + if code = this.module.ConsumeRes(session, conf.Need, true); code != pb.ErrorCode_Success { return } if code = this.module.DispenseRes(session, conf.Iteminfo, true); code != pb.ErrorCode_Success { diff --git a/modules/shop/api_getlist.go b/modules/shop/api_getlist.go index 00fcc72f2..50610f544 100644 --- a/modules/shop/api_getlist.go +++ b/modules/shop/api_getlist.go @@ -94,7 +94,7 @@ func (this *apiComp) Getlist(session comm.IUserSession, req *pb.ShopGetListReq) } if req.IsManualRefresh && shopconf.Rtype == 1 { //可以手动刷新 - if code = this.module.CheckConsumeRes(session, shopconf.Rneed, true); code != pb.ErrorCode_Success { + if code = this.module.ConsumeRes(session, shopconf.Rneed, true); code != pb.ErrorCode_Success { return } var _items []*cfg.Game_shopitemData diff --git a/modules/task/api_receive.go b/modules/task/api_receive.go index 9c049cc5a..fd4332434 100644 --- a/modules/task/api_receive.go +++ b/modules/task/api_receive.go @@ -50,7 +50,7 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.TaskReceiveReq) } //奖励 - if code = this.moduleTask.CheckConsumeRes(session, conf.Reword, true); code != pb.ErrorCode_Success { + if code = this.moduleTask.ConsumeRes(session, conf.Reword, true); code != pb.ErrorCode_Success { return } diff --git a/modules/user/model_record.go b/modules/user/model_record.go new file mode 100644 index 000000000..19e136141 --- /dev/null +++ b/modules/user/model_record.go @@ -0,0 +1,29 @@ +package user + +import ( + "go_dreamfactory/lego/core" + "go_dreamfactory/lego/sys/log" + "go_dreamfactory/modules" + "go_dreamfactory/pb" +) + +// 记录一些扩展数据 +type ModelRecord struct { + modules.MCompModel +} + +func (this *ModelRecord) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) { + err = this.MCompModel.Init(service, module, comp, options) + this.TableName = "userrecord" + return +} + +//获取用户 +func (this *ModelRecord) getUserSession(uid string) (cuser *pb.CacheUser) { + cuser = &pb.CacheUser{} + if err := this.Get(uid, cuser); err != nil { + log.Errorf("GetUserSession err:%v", err) + return + } + return +} diff --git a/modules/user/module.go b/modules/user/module.go index 09aab48b7..64f273768 100644 --- a/modules/user/module.go +++ b/modules/user/module.go @@ -19,6 +19,7 @@ type User struct { api *apiComp modelUser *ModelUser modelSession *ModelSession + modelRecord *ModelRecord configure *modules.MCompConfigure } @@ -36,6 +37,7 @@ func (this *User) OnInstallComp() { this.ModuleBase.OnInstallComp() this.api = this.RegisterComp(new(apiComp)).(*apiComp) this.modelUser = this.RegisterComp(new(ModelUser)).(*ModelUser) + this.modelRecord = this.RegisterComp(new(ModelRecord)).(*ModelRecord) this.modelSession = this.RegisterComp(new(ModelSession)).(*ModelSession) } @@ -152,3 +154,9 @@ func (this *User) UserChangePush(session comm.IUserSession, resChange *pb.UserRe session.SendMsg(string(this.GetType()), "reschange", resChange) return } + +// 设置record +func (this *User) GetUserRecordData(uid string, typeValue int32, parmare int32) (value int32, err error) { + //pb.DBUserRecord + return +} diff --git a/pb/hero_msg.pb.go b/pb/hero_msg.pb.go index 71009eaef..7de64ecf5 100644 --- a/pb/hero_msg.pb.go +++ b/pb/hero_msg.pb.go @@ -1543,7 +1543,7 @@ type HeroDrawCardReq struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - DrawCount int32 `protobuf:"varint,1,opt,name=drawCount,proto3" json:"drawCount"` // 抽卡次数, 只能是单抽和十抽 + DrawType int32 `protobuf:"varint,1,opt,name=drawType,proto3" json:"drawType"` // 抽卡类型 见drawCardCost表 } func (x *HeroDrawCardReq) Reset() { @@ -1578,9 +1578,9 @@ func (*HeroDrawCardReq) Descriptor() ([]byte, []int) { return file_hero_hero_msg_proto_rawDescGZIP(), []int{29} } -func (x *HeroDrawCardReq) GetDrawCount() int32 { +func (x *HeroDrawCardReq) GetDrawType() int32 { if x != nil { - return x.DrawCount + return x.DrawType } return 0 } @@ -1782,13 +1782,13 @@ var file_hero_hero_msg_proto_rawDesc = []byte{ 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, - 0x2f, 0x0a, 0x0f, 0x48, 0x65, 0x72, 0x6f, 0x44, 0x72, 0x61, 0x77, 0x43, 0x61, 0x72, 0x64, 0x52, - 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x64, 0x72, 0x61, 0x77, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x64, 0x72, 0x61, 0x77, 0x43, 0x6f, 0x75, 0x6e, 0x74, - 0x22, 0x2a, 0x0a, 0x10, 0x48, 0x65, 0x72, 0x6f, 0x44, 0x72, 0x61, 0x77, 0x43, 0x61, 0x72, 0x64, - 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x65, 0x73, 0x18, 0x01, - 0x20, 0x03, 0x28, 0x05, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x65, 0x73, 0x42, 0x06, 0x5a, 0x04, - 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x2d, 0x0a, 0x0f, 0x48, 0x65, 0x72, 0x6f, 0x44, 0x72, 0x61, 0x77, 0x43, 0x61, 0x72, 0x64, 0x52, + 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x72, 0x61, 0x77, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x64, 0x72, 0x61, 0x77, 0x54, 0x79, 0x70, 0x65, 0x22, 0x2a, + 0x0a, 0x10, 0x48, 0x65, 0x72, 0x6f, 0x44, 0x72, 0x61, 0x77, 0x43, 0x61, 0x72, 0x64, 0x52, 0x65, + 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, + 0x28, 0x05, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x65, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, + 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/pb/proto/hero/hero_msg.proto b/pb/proto/hero/hero_msg.proto index 49c4e14ef..fd2c3c066 100644 --- a/pb/proto/hero/hero_msg.proto +++ b/pb/proto/hero/hero_msg.proto @@ -147,7 +147,7 @@ message HeroDelHeroPush { // 抽卡 message HeroDrawCardReq { - int32 drawCount = 1; // 抽卡次数, 只能是单抽和十抽 + int32 drawType = 1; // 抽卡类型 见drawCardCost表 } message HeroDrawCardResp { diff --git a/pb/proto/user/user_db.proto b/pb/proto/user/user_db.proto index 17fadb160..684799929 100644 --- a/pb/proto/user/user_db.proto +++ b/pb/proto/user/user_db.proto @@ -28,4 +28,4 @@ message DBUser { int32 lv = 16; //@go_tags(`bson:"lv"`) 等级 int32 vip = 17; //@go_tags(`bson:"vip"`) vip int32 diamond = 18; //@go_tags(`bson:"diamond"`) 钻石 -} \ No newline at end of file +} diff --git a/pb/proto/userrecord.proto b/pb/proto/userrecord.proto index c72f140a8..eec301b09 100644 --- a/pb/proto/userrecord.proto +++ b/pb/proto/userrecord.proto @@ -4,10 +4,10 @@ option go_package = ".;pb"; //用户扩展数据 message DBUserRecord { - string id = 1; // 主键id + string id = 1; //@go_tags(`bson:"_id"`) ID 主键id string uid = 2; // 用户id - int32 type = 3; // 数据类型 - int32 parame = 4; // 参数 - int32 value = 5; // 值 + map floors = 3; // 保底信息 + int32 triggernum = 4; // 没有触发次数 + int64 mtime = 5; // 修改时间 int64 ctime = 6; // 创建时间 } \ No newline at end of file diff --git a/pb/userrecord.pb.go b/pb/userrecord.pb.go index 3730894dd..02aa6a573 100644 --- a/pb/userrecord.pb.go +++ b/pb/userrecord.pb.go @@ -26,12 +26,12 @@ type DBUserRecord struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id"` // 主键id - Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid"` // 用户id - Type int32 `protobuf:"varint,3,opt,name=type,proto3" json:"type"` // 数据类型 - Parame int32 `protobuf:"varint,4,opt,name=parame,proto3" json:"parame"` // 参数 - Value int32 `protobuf:"varint,5,opt,name=value,proto3" json:"value"` // 值 - Ctime int64 `protobuf:"varint,6,opt,name=ctime,proto3" json:"ctime"` // 创建时间 + Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //ID 主键id + Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid"` // 用户id + Floors map[string]int32 `protobuf:"bytes,3,rep,name=floors,proto3" json:"floors" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 保底信息 + Triggernum int32 `protobuf:"varint,4,opt,name=triggernum,proto3" json:"triggernum"` // 没有触发次数 + Mtime int64 `protobuf:"varint,5,opt,name=mtime,proto3" json:"mtime"` // 修改时间 + Ctime int64 `protobuf:"varint,6,opt,name=ctime,proto3" json:"ctime"` // 创建时间 } func (x *DBUserRecord) Reset() { @@ -80,23 +80,23 @@ func (x *DBUserRecord) GetUid() string { return "" } -func (x *DBUserRecord) GetType() int32 { +func (x *DBUserRecord) GetFloors() map[string]int32 { if x != nil { - return x.Type + return x.Floors + } + return nil +} + +func (x *DBUserRecord) GetTriggernum() int32 { + if x != nil { + return x.Triggernum } return 0 } -func (x *DBUserRecord) GetParame() int32 { +func (x *DBUserRecord) GetMtime() int64 { if x != nil { - return x.Parame - } - return 0 -} - -func (x *DBUserRecord) GetValue() int32 { - if x != nil { - return x.Value + return x.Mtime } return 0 } @@ -112,16 +112,22 @@ var File_userrecord_proto protoreflect.FileDescriptor var file_userrecord_proto_rawDesc = []byte{ 0x0a, 0x10, 0x75, 0x73, 0x65, 0x72, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x2e, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x22, 0x88, 0x01, 0x0a, 0x0c, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x63, + 0x74, 0x6f, 0x22, 0xea, 0x01, 0x0a, 0x0c, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x63, 0x6f, 0x72, 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, 0x12, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, - 0x61, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, - 0x65, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x74, 0x69, 0x6d, 0x65, - 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x63, 0x74, 0x69, 0x6d, 0x65, 0x42, 0x06, 0x5a, - 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x31, 0x0a, 0x06, 0x66, 0x6c, 0x6f, 0x6f, 0x72, 0x73, 0x18, + 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, + 0x63, 0x6f, 0x72, 0x64, 0x2e, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, + 0x52, 0x06, 0x66, 0x6c, 0x6f, 0x6f, 0x72, 0x73, 0x12, 0x1e, 0x0a, 0x0a, 0x74, 0x72, 0x69, 0x67, + 0x67, 0x65, 0x72, 0x6e, 0x75, 0x6d, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x74, 0x72, + 0x69, 0x67, 0x67, 0x65, 0x72, 0x6e, 0x75, 0x6d, 0x12, 0x14, 0x0a, 0x05, 0x6d, 0x74, 0x69, 0x6d, + 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x6d, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x14, + 0x0a, 0x05, 0x63, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x63, + 0x74, 0x69, 0x6d, 0x65, 0x1a, 0x39, 0x0a, 0x0b, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x73, 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, 0x42, + 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -136,16 +142,18 @@ func file_userrecord_proto_rawDescGZIP() []byte { return file_userrecord_proto_rawDescData } -var file_userrecord_proto_msgTypes = make([]protoimpl.MessageInfo, 1) +var file_userrecord_proto_msgTypes = make([]protoimpl.MessageInfo, 2) var file_userrecord_proto_goTypes = []interface{}{ (*DBUserRecord)(nil), // 0: DBUserRecord + nil, // 1: DBUserRecord.FloorsEntry } var file_userrecord_proto_depIdxs = []int32{ - 0, // [0:0] is the sub-list for method output_type - 0, // [0:0] is the sub-list for method input_type - 0, // [0:0] is the sub-list for extension type_name - 0, // [0:0] is the sub-list for extension extendee - 0, // [0:0] is the sub-list for field type_name + 1, // 0: DBUserRecord.floors:type_name -> DBUserRecord.FloorsEntry + 1, // [1:1] is the sub-list for method output_type + 1, // [1:1] is the sub-list for method input_type + 1, // [1:1] is the sub-list for extension type_name + 1, // [1:1] is the sub-list for extension extendee + 0, // [0:1] is the sub-list for field type_name } func init() { file_userrecord_proto_init() } @@ -173,7 +181,7 @@ func file_userrecord_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_userrecord_proto_rawDesc, NumEnums: 0, - NumMessages: 1, + NumMessages: 2, NumExtensions: 0, NumServices: 0, }, diff --git a/sys/configure/structs/Tables.go b/sys/configure/structs/Tables.go index 89c065c88..eab01ae3d 100644 --- a/sys/configure/structs/Tables.go +++ b/sys/configure/structs/Tables.go @@ -53,6 +53,10 @@ type Tables struct { mainlineEasy *Game_mainlineEasy mainlineHard *Game_mainlineHard mainlinePurgatory *Game_mainlinePurgatory + drawCard *Game_drawCard + drawUpdraw *Game_drawUpdraw + drawCom *Game_drawCom + drawCost *Game_drawCost } func NewTables(loader JsonLoader) (*Tables, error) { @@ -306,5 +310,29 @@ func NewTables(loader JsonLoader) (*Tables, error) { if tables.mainlinePurgatory, err = NewGame_mainlinePurgatory(buf) ; err != nil { return nil, err } + if buf, err = loader("game_drawcard") ; err != nil { + return nil, err + } + if tables.drawCard, err = NewGame_drawCard(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_drawupdraw") ; err != nil { + return nil, err + } + if tables.drawUpdraw, err = NewGame_drawUpdraw(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_drawcom") ; err != nil { + return nil, err + } + if tables.drawCom, err = NewGame_drawCom(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_drawcost") ; err != nil { + return nil, err + } + if tables.drawCost, err = NewGame_drawCost(buf) ; err != nil { + return nil, err + } return tables, nil } diff --git a/sys/configure/structs/game.drawCom.go b/sys/configure/structs/game.drawCom.go new file mode 100644 index 000000000..5fd356b16 --- /dev/null +++ b/sys/configure/structs/game.drawCom.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 Game_drawCom struct { + _dataMap map[string]*Game_drawComData + _dataList []*Game_drawComData +} + +func NewGame_drawCom(_buf []map[string]interface{}) (*Game_drawCom, error) { + _dataList := make([]*Game_drawComData, 0, len(_buf)) + dataMap := make(map[string]*Game_drawComData) + for _, _ele_ := range _buf { + if _v, err2 := NewGame_drawComData(_ele_); err2 != nil { + return nil, err2 + } else { + _dataList = append(_dataList, _v) + dataMap[_v.Key] = _v + } + } + return &Game_drawCom{_dataList:_dataList, _dataMap:dataMap}, nil +} + +func (table *Game_drawCom) GetDataMap() map[string]*Game_drawComData { + return table._dataMap +} + +func (table *Game_drawCom) GetDataList() []*Game_drawComData { + return table._dataList +} + +func (table *Game_drawCom) Get(key string) *Game_drawComData { + return table._dataMap[key] +} + + diff --git a/sys/configure/structs/game.drawComData.go b/sys/configure/structs/game.drawComData.go new file mode 100644 index 000000000..04b26d1bb --- /dev/null +++ b/sys/configure/structs/game.drawComData.go @@ -0,0 +1,27 @@ + +//------------------------------------------------------------------------------ +// +// 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 Game_drawComData struct { + Key string + Value string +} + +func (Game_drawComData) GetTypeId() int { + return 2052037355 +} + +func NewGame_drawComData(_buf map[string]interface{}) (_v *Game_drawComData, err error) { + _v = &Game_drawComData{} + { var _ok_ bool; if _v.Key, _ok_ = _buf["key"].(string); !_ok_ { err = errors.New("key error"); return } } + { var _ok_ bool; if _v.Value, _ok_ = _buf["value"].(string); !_ok_ { err = errors.New("value error"); return } } + return +} diff --git a/sys/configure/structs/game.drawCost.go b/sys/configure/structs/game.drawCost.go new file mode 100644 index 000000000..5cc993000 --- /dev/null +++ b/sys/configure/structs/game.drawCost.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 Game_drawCost struct { + _dataMap map[int32]*Game_drawCostData + _dataList []*Game_drawCostData +} + +func NewGame_drawCost(_buf []map[string]interface{}) (*Game_drawCost, error) { + _dataList := make([]*Game_drawCostData, 0, len(_buf)) + dataMap := make(map[int32]*Game_drawCostData) + for _, _ele_ := range _buf { + if _v, err2 := NewGame_drawCostData(_ele_); err2 != nil { + return nil, err2 + } else { + _dataList = append(_dataList, _v) + dataMap[_v.Key] = _v + } + } + return &Game_drawCost{_dataList:_dataList, _dataMap:dataMap}, nil +} + +func (table *Game_drawCost) GetDataMap() map[int32]*Game_drawCostData { + return table._dataMap +} + +func (table *Game_drawCost) GetDataList() []*Game_drawCostData { + return table._dataList +} + +func (table *Game_drawCost) Get(key int32) *Game_drawCostData { + return table._dataMap[key] +} + + diff --git a/sys/configure/structs/game.drawCostData.go b/sys/configure/structs/game.drawCostData.go new file mode 100644 index 000000000..962a039ce --- /dev/null +++ b/sys/configure/structs/game.drawCostData.go @@ -0,0 +1,29 @@ + +//------------------------------------------------------------------------------ +// +// 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 Game_drawCostData struct { + Key int32 + Count int32 + Cost *Game_atn +} + +func (Game_drawCostData) GetTypeId() int { + return -596129033 +} + +func NewGame_drawCostData(_buf map[string]interface{}) (_v *Game_drawCostData, err error) { + _v = &Game_drawCostData{} + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["key"].(float64); !_ok_ { err = errors.New("key error"); return }; _v.Key = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["count"].(float64); !_ok_ { err = errors.New("count error"); return }; _v.Count = int32(_tempNum_) } + { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["cost"].(map[string]interface{}); !_ok_ { err = errors.New("cost error"); return }; if _v.Cost, err = NewGame_atn(_x_); err != nil { return } } + return +} diff --git a/sys/configure/structs/game.drawUpdrawData.go b/sys/configure/structs/game.drawUpdrawData.go index 74870f8b1..7564ca97e 100644 --- a/sys/configure/structs/game.drawUpdrawData.go +++ b/sys/configure/structs/game.drawUpdrawData.go @@ -12,10 +12,12 @@ import "errors" type Game_drawUpdrawData struct { Key int32 - Time int32 - Duration int32 - UpHero int32 - UpWeight int32 + TimeOn int32 + TimeOff int32 + UpHero []int32 + UpWeight []int32 + TriggerNum int32 + IncreaseWeight []int32 } func (Game_drawUpdrawData) GetTypeId() int { @@ -25,9 +27,50 @@ func (Game_drawUpdrawData) GetTypeId() int { func NewGame_drawUpdrawData(_buf map[string]interface{}) (_v *Game_drawUpdrawData, err error) { _v = &Game_drawUpdrawData{} { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["key"].(float64); !_ok_ { err = errors.New("key error"); return }; _v.Key = int32(_tempNum_) } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["time"].(float64); !_ok_ { err = errors.New("time error"); return }; _v.Time = int32(_tempNum_) } - { 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["up_hero"].(float64); !_ok_ { err = errors.New("up_hero error"); return }; _v.UpHero = int32(_tempNum_) } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["up_weight"].(float64); !_ok_ { err = errors.New("up_weight error"); return }; _v.UpWeight = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["time_on"].(float64); !_ok_ { err = errors.New("time_on error"); return }; _v.TimeOn = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["time_off"].(float64); !_ok_ { err = errors.New("time_off error"); return }; _v.TimeOff = int32(_tempNum_) } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["up_hero"].([]interface{}); !_ok_ { err = errors.New("up_hero error"); return } + + _v.UpHero = 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.UpHero = append(_v.UpHero, _list_v_) + } + } + + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["up_weight"].([]interface{}); !_ok_ { err = errors.New("up_weight error"); return } + + _v.UpWeight = 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.UpWeight = append(_v.UpWeight, _list_v_) + } + } + + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["trigger_num"].(float64); !_ok_ { err = errors.New("trigger_num error"); return }; _v.TriggerNum = int32(_tempNum_) } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["Increase_weight"].([]interface{}); !_ok_ { err = errors.New("Increase_weight error"); return } + + _v.IncreaseWeight = 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.IncreaseWeight = append(_v.IncreaseWeight, _list_v_) + } + } + return } diff --git a/sys/configure/structs/game.equipData.go b/sys/configure/structs/game.equipData.go index df17d74b1..97c0a4d2b 100644 --- a/sys/configure/structs/game.equipData.go +++ b/sys/configure/structs/game.equipData.go @@ -20,6 +20,7 @@ type Game_equipData struct { Addattrnum []int32 Addattrnump []int32 Addlibrary int32 + Ico string } func (Game_equipData) GetTypeId() int { @@ -63,5 +64,6 @@ func NewGame_equipData(_buf map[string]interface{}) (_v *Game_equipData, err err } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["addlibrary"].(float64); !_ok_ { err = errors.New("addlibrary error"); return }; _v.Addlibrary = int32(_tempNum_) } + { var _ok_ bool; if _v.Ico, _ok_ = _buf["ico"].(string); !_ok_ { err = errors.New("ico error"); return } } return } diff --git a/sys/configure/structs/game.equipSuitData.go b/sys/configure/structs/game.equipSuitData.go index dc1e8c638..bb5f3ad19 100644 --- a/sys/configure/structs/game.equipSuitData.go +++ b/sys/configure/structs/game.equipSuitData.go @@ -14,6 +14,7 @@ type Game_equipSuitData struct { Suittype int32 Suitnum int32 Skill int32 + Skillname string Skillintr string } @@ -26,6 +27,7 @@ func NewGame_equipSuitData(_buf map[string]interface{}) (_v *Game_equipSuitData, { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["suittype"].(float64); !_ok_ { err = errors.New("suittype error"); return }; _v.Suittype = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["suitnum"].(float64); !_ok_ { err = errors.New("suitnum error"); return }; _v.Suitnum = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["skill"].(float64); !_ok_ { err = errors.New("skill error"); return }; _v.Skill = int32(_tempNum_) } + { var _ok_ bool; if _v.Skillname, _ok_ = _buf["skillname"].(string); !_ok_ { err = errors.New("skillname error"); return } } { var _ok_ bool; if _v.Skillintr, _ok_ = _buf["skillintr"].(string); !_ok_ { err = errors.New("skillintr error"); return } } return } diff --git a/sys/configure/structs/game.newHeroData.go b/sys/configure/structs/game.newHeroData.go index 507d6cb27..0ad846c01 100644 --- a/sys/configure/structs/game.newHeroData.go +++ b/sys/configure/structs/game.newHeroData.go @@ -19,7 +19,7 @@ type Game_newHeroData struct { Race int32 Job int32 Type int32 - Prefab string + Prefab int32 Icon int32 Sound string Tujing []int32 @@ -32,6 +32,7 @@ type Game_newHeroData struct { Skill1 int32 Skill2 int32 Skill3 int32 + Txt string } func (Game_newHeroData) GetTypeId() int { @@ -47,7 +48,7 @@ func NewGame_newHeroData(_buf map[string]interface{}) (_v *Game_newHeroData, err { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["race"].(float64); !_ok_ { err = errors.New("race error"); return }; _v.Race = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["job"].(float64); !_ok_ { err = errors.New("job error"); return }; _v.Job = 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; if _v.Prefab, _ok_ = _buf["prefab"].(string); !_ok_ { err = errors.New("prefab error"); return } } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["prefab"].(float64); !_ok_ { err = errors.New("prefab error"); return }; _v.Prefab = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["icon"].(float64); !_ok_ { err = errors.New("icon error"); return }; _v.Icon = int32(_tempNum_) } {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["sound"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Sound error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Sound, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } { @@ -93,5 +94,6 @@ func NewGame_newHeroData(_buf map[string]interface{}) (_v *Game_newHeroData, err { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["skill1"].(float64); !_ok_ { err = errors.New("skill1 error"); return }; _v.Skill1 = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["skill2"].(float64); !_ok_ { err = errors.New("skill2 error"); return }; _v.Skill2 = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["skill3"].(float64); !_ok_ { err = errors.New("skill3 error"); return }; _v.Skill3 = int32(_tempNum_) } + { var _ok_ bool; if _v.Txt, _ok_ = _buf["txt"].(string); !_ok_ { err = errors.New("txt error"); return } } return } diff --git a/sys/configure/structs/game.shopData.go b/sys/configure/structs/game.shopData.go index 151a0dd43..21f0f27af 100644 --- a/sys/configure/structs/game.shopData.go +++ b/sys/configure/structs/game.shopData.go @@ -14,6 +14,7 @@ type Game_shopData struct { Shopid int32 Tab int32 Shopname string + UpperShop string Needshow []*Game_atn Rtype int32 Rtime int32 @@ -31,6 +32,7 @@ func NewGame_shopData(_buf map[string]interface{}) (_v *Game_shopData, err error { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["shopid"].(float64); !_ok_ { err = errors.New("shopid error"); return }; _v.Shopid = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["tab"].(float64); !_ok_ { err = errors.New("tab error"); return }; _v.Tab = int32(_tempNum_) } { var _ok_ bool; if _v.Shopname, _ok_ = _buf["shopname"].(string); !_ok_ { err = errors.New("shopname error"); return } } + { var _ok_ bool; if _v.UpperShop, _ok_ = _buf["upper_shop"].(string); !_ok_ { err = errors.New("upper_shop error"); return } } { var _arr_ []interface{} var _ok_ bool From fc38b7f4cadb16699fe4cb83216204b00e400928 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Wed, 20 Jul 2022 20:59:06 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=8A=BD=E5=8D=A1=E4=BF=9D=E5=BA=95?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_drawcom.json | 48 ++--------------- bin/json/game_drawcost.json | 60 ++++++++++++++++++---- comm/const.go | 13 ----- comm/imodule.go | 4 +- modules/equipment/api_equip.go | 2 +- modules/equipment/api_upgrade.go | 2 +- modules/hero/api_drawCard.go | 19 +++++-- modules/hero/configure_comp.go | 20 -------- modules/hero/model_hero.go | 2 + modules/hero/module.go | 8 ++- sys/configure/structs/game.drawComData.go | 4 +- sys/configure/structs/game.drawCostData.go | 8 +++ 12 files changed, 93 insertions(+), 97 deletions(-) diff --git a/bin/json/game_drawcom.json b/bin/json/game_drawcom.json index 9eab1dd7d..195027285 100644 --- a/bin/json/game_drawcom.json +++ b/bin/json/game_drawcom.json @@ -1,58 +1,18 @@ [ { "key": "star3_click", - "value": "2" + "value": 2 }, { "key": "star4_click", - "value": "4" + "value": 4 }, { "key": "star5_click", - "value": "6" - }, - { - "key": "ordinary_floors_star4", - "value": "20" - }, - { - "key": "ordinary_floors_star5", - "value": "100" - }, - { - "key": "camp1_floors_star4", - "value": "20" - }, - { - "key": "camp1_floors_star5", - "value": "50" - }, - { - "key": "camp2_floors_star4", - "value": "20" - }, - { - "key": "camp2_floors_star5", - "value": "50" - }, - { - "key": "camp3_floors_star4", - "value": "20" - }, - { - "key": "camp3_floors_star5", - "value": "50" - }, - { - "key": "camp4_floors_star4", - "value": "20" - }, - { - "key": "camp4_floors_star5", - "value": "50" + "value": 6 }, { "key": "progress_bar_time", - "value": "10" + "value": 10 } ] \ No newline at end of file diff --git a/bin/json/game_drawcost.json b/bin/json/game_drawcost.json index 6c819e033..6fb741b05 100644 --- a/bin/json/game_drawcost.json +++ b/bin/json/game_drawcost.json @@ -6,7 +6,11 @@ "a": "item", "t": "10001", "n": 1 - } + }, + "floor4": 50, + "floor5": 100, + "floor4cards": 2, + "floor5cards": 11 }, { "key": 2, @@ -15,7 +19,11 @@ "a": "item", "t": "10001", "n": 10 - } + }, + "floor4": 50, + "floor5": 100, + "floor4cards": 2, + "floor5cards": 11 }, { "key": 3, @@ -24,7 +32,11 @@ "a": "item", "t": "10002", "n": 1 - } + }, + "floor4": 50, + "floor5": 100, + "floor4cards": 2, + "floor5cards": 11 }, { "key": 4, @@ -33,7 +45,11 @@ "a": "item", "t": "10002", "n": 10 - } + }, + "floor4": 50, + "floor5": 100, + "floor4cards": 2, + "floor5cards": 11 }, { "key": 5, @@ -42,7 +58,11 @@ "a": "item", "t": "10003", "n": 1 - } + }, + "floor4": 50, + "floor5": 100, + "floor4cards": 2, + "floor5cards": 11 }, { "key": 6, @@ -51,7 +71,11 @@ "a": "item", "t": "10003", "n": 10 - } + }, + "floor4": 50, + "floor5": 100, + "floor4cards": 2, + "floor5cards": 11 }, { "key": 7, @@ -60,7 +84,11 @@ "a": "item", "t": "10004", "n": 1 - } + }, + "floor4": 50, + "floor5": 100, + "floor4cards": 2, + "floor5cards": 11 }, { "key": 8, @@ -69,7 +97,11 @@ "a": "item", "t": "10004", "n": 10 - } + }, + "floor4": 50, + "floor5": 100, + "floor4cards": 2, + "floor5cards": 11 }, { "key": 9, @@ -78,7 +110,11 @@ "a": "item", "t": "10005", "n": 1 - } + }, + "floor4": 50, + "floor5": 100, + "floor4cards": 2, + "floor5cards": 11 }, { "key": 10, @@ -87,6 +123,10 @@ "a": "item", "t": "10005", "n": 10 - } + }, + "floor4": 50, + "floor5": 100, + "floor4cards": 2, + "floor5cards": 11 } ] \ No newline at end of file diff --git a/comm/const.go b/comm/const.go index 6bc86bc3e..b8f3749f3 100644 --- a/comm/const.go +++ b/comm/const.go @@ -110,16 +110,3 @@ const ( TASK_ACHIEVE TaskTag = 3 //成就 TASK_STRATEGY TaskTag = 4 // 攻略 ) - -const ( - Key_ordinaryStar4 string = "ordinary_floors_star4" - Key_ordinaryStar5 string = "ordinary_floors_star5" - Key_camp1Star4 string = "camp1_floors_star4" - Key_camp1Star5 string = "camp1_floors_star5" - Key_camp2Star4 string = "camp2_floors_star4" - Key_camp2Star5 string = "camp2_floors_star5" - Key_camp3Star4 string = "camp3_floors_star4" - Key_camp3Star5 string = "camp3_floors_star5" - Key_camp4Star4 string = "camp4_floors_star4" - Key_camp4Star5 string = "camp4_floors_star5" -) diff --git a/comm/imodule.go b/comm/imodule.go index f3769da60..f1d9f5c41 100644 --- a/comm/imodule.go +++ b/comm/imodule.go @@ -43,10 +43,10 @@ type ( // heroId 英雄ID GetHero(uid, heroId string) (*pb.DBHero, pb.ErrorCode) // 佩戴装备 - UpdateEquipment(hero *pb.DBHero, equip []*pb.DB_Equipment) (code pb.ErrorCode) + UpdateEquipment(session IUserSession, hero *pb.DBHero, equip []*pb.DB_Equipment) (code pb.ErrorCode) //获取玩家英雄列表 GetHeroList(uid string) []*pb.DBHero - // + // CleanData(uid string) } diff --git a/modules/equipment/api_equip.go b/modules/equipment/api_equip.go index 492fdff2d..d77745832 100644 --- a/modules/equipment/api_equip.go +++ b/modules/equipment/api_equip.go @@ -112,7 +112,7 @@ func (this *apiComp) Equip(session comm.IUserSession, req *pb.EquipmentEquipReq) } } //更新装备数据加成 - if code = this.module.ModuleHero.UpdateEquipment(hero, equipments); code == pb.ErrorCode_Success { + if code = this.module.ModuleHero.UpdateEquipment(session, hero, equipments); code == pb.ErrorCode_Success { if err = this.module.modelEquipment.UpdateByHeroId(session.GetUserId(), updatequipment...); err != nil { log.Errorf("Equip err%v", err) code = pb.ErrorCode_SystemError diff --git a/modules/equipment/api_upgrade.go b/modules/equipment/api_upgrade.go index ae443bda5..e2852eefe 100644 --- a/modules/equipment/api_upgrade.go +++ b/modules/equipment/api_upgrade.go @@ -137,7 +137,7 @@ func (this *apiComp) Upgrade(session comm.IUserSession, req *pb.EquipmentUpgrade } } } - code = this.module.ModuleHero.UpdateEquipment(hero, equipments) + code = this.module.ModuleHero.UpdateEquipment(session, hero, equipments) } } session.SendMsg(string(this.module.GetType()), "upgrade", &pb.EquipmentUpgradeResp{IsSucc: issucc, Equipment: modifyequipments}) diff --git a/modules/hero/api_drawCard.go b/modules/hero/api_drawCard.go index 0cc2d6ac4..bf0e86e65 100644 --- a/modules/hero/api_drawCard.go +++ b/modules/hero/api_drawCard.go @@ -29,8 +29,9 @@ func (this *apiComp) DrawCard(session comm.IUserSession, req *pb.HeroDrawCardReq hitStar int32 // 抽中几星 curStar4Count int32 // 当前4星没抽到的次数 curStar5Count int32 // 当前5星没抽到的次数 - // floor4Count int32 // 4星保底次数 - // floor5Count int32 // 5星保底次数 + floor4Count int32 // 4星保底次数 + floor5Count int32 // 5星保底次数 + ) szCards = make([]int32, 0) rsp := &pb.HeroDrawCardResp{} @@ -51,6 +52,12 @@ func (this *apiComp) DrawCard(session comm.IUserSession, req *pb.HeroDrawCardReq code = pb.ErrorCode_ConfigNoFound return } + floor4Count = _costConf.Floor4 // 4星保底次数 + floor5Count = _costConf.Floor5 // 五星保底次数 + if floor4Count == 0 || floor5Count == 0 { + code = pb.ErrorCode_ConfigNoFound + return + } sz := make([]*cfg.Game_atn, 0) sz = append(sz, _costConf.Cost) code = this.module.CheckRes(session, sz) // 消耗校验 @@ -88,8 +95,14 @@ func (this *apiComp) DrawCard(session comm.IUserSession, req *pb.HeroDrawCardReq } hitStar4++ hitStar5++ - // 达到保底次数了 修改当前卡牌星级 + if hitStar4 >= floor4Count { // 达到保底次数了 修改当前卡牌星级 + break + } + if hitStar5 >= floor5Count { // 触发5星保底 + // 5星卡池找 + break + } break } } diff --git a/modules/hero/configure_comp.go b/modules/hero/configure_comp.go index 49f6fa47d..68d6b7d05 100644 --- a/modules/hero/configure_comp.go +++ b/modules/hero/configure_comp.go @@ -22,7 +22,6 @@ const ( hero_awaken = "game_heroawaken.json" // 英雄觉醒 hero_drawcard = "game_drawcard.json" // 抽卡 hero_drawupdraw = "game_drawupdraw.json" // 抽卡概率调整 - hero_drawcom = "game_drawcom.json" // 抽卡保底 hero_drawcost = "game_drawcost.json" // 抽卡消耗 ) @@ -49,7 +48,6 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp hero_awaken: cfg.NewGame_heroAwaken, hero_drawcard: cfg.NewGame_drawCard, hero_drawupdraw: cfg.NewGame_drawUpdraw, - hero_drawcom: cfg.NewGame_drawCom, hero_drawcost: cfg.NewGame_drawCost, }) @@ -390,24 +388,6 @@ func (this *configureComp) GetDrawUpDrawConfig() (configure *cfg.Game_drawUpdraw return } -// 抽卡保底 -func (this *configureComp) GetDrawComConfig() (configure *cfg.Game_drawCom, err error) { - var ( - v interface{} - ok bool - ) - if v, err = this.GetConfigure(hero_drawcom); err == nil { - if configure, ok = v.(*cfg.Game_drawCom); !ok { - err = fmt.Errorf("%T no is *cfg.Game_drawCom", v) - return - } - } else { - err = fmt.Errorf("%T no is *cfg.Game_drawCom", v) - } - - return -} - // 抽卡消耗 func (this *configureComp) GetDrawCostConfig() (configure *cfg.Game_drawCost, err error) { var ( diff --git a/modules/hero/model_hero.go b/modules/hero/model_hero.go index 9531dddc6..b54ecffeb 100644 --- a/modules/hero/model_hero.go +++ b/modules/hero/model_hero.go @@ -415,6 +415,8 @@ func (this *ModelHero) HeroStarUp(session comm.IUserSession, hero *pb.DBHero) (c "star": hero.Star + 1, "isOverlying": false, } + // 触发星级任务 + this.moduleHero.ModuleTask.SendToTask(session.GetUserId(), comm.TaskTypeGetHero, &pb.TaskParam{First: hero.Star + 1}) // 保存数据 err1 := this.modifyHeroData(session.GetUserId(), hero.Id, _heroMap) if err1 != nil { diff --git a/modules/hero/module.go b/modules/hero/module.go index 2c3912acb..64738ba1f 100644 --- a/modules/hero/module.go +++ b/modules/hero/module.go @@ -58,7 +58,7 @@ func (this *Hero) GetHero(uid, heroId string) (*pb.DBHero, pb.ErrorCode) { } //佩戴装备 -func (this *Hero) UpdateEquipment(hero *pb.DBHero, equip []*pb.DB_Equipment) (code pb.ErrorCode) { +func (this *Hero) UpdateEquipment(session comm.IUserSession, hero *pb.DBHero, equip []*pb.DB_Equipment) (code pb.ErrorCode) { if hero == nil { code = pb.ErrorCode_HeroNoExist return @@ -69,6 +69,12 @@ func (this *Hero) UpdateEquipment(hero *pb.DBHero, equip []*pb.DB_Equipment) (co return } this.modelHero.setEquipProperty(hero, equip) + + err1 := this.modelHero.PushHeroProperty(session, hero.Id) // 推送属性变化 + if err1 != nil { + code = pb.ErrorCode_Unknown + this.Errorf("PushHeroProperty err!") + } return } diff --git a/sys/configure/structs/game.drawComData.go b/sys/configure/structs/game.drawComData.go index 04b26d1bb..038eea745 100644 --- a/sys/configure/structs/game.drawComData.go +++ b/sys/configure/structs/game.drawComData.go @@ -12,7 +12,7 @@ import "errors" type Game_drawComData struct { Key string - Value string + Value int32 } func (Game_drawComData) GetTypeId() int { @@ -22,6 +22,6 @@ func (Game_drawComData) GetTypeId() int { func NewGame_drawComData(_buf map[string]interface{}) (_v *Game_drawComData, err error) { _v = &Game_drawComData{} { var _ok_ bool; if _v.Key, _ok_ = _buf["key"].(string); !_ok_ { err = errors.New("key error"); return } } - { var _ok_ bool; if _v.Value, _ok_ = _buf["value"].(string); !_ok_ { err = errors.New("value error"); return } } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["value"].(float64); !_ok_ { err = errors.New("value error"); return }; _v.Value = int32(_tempNum_) } return } diff --git a/sys/configure/structs/game.drawCostData.go b/sys/configure/structs/game.drawCostData.go index 962a039ce..6cf30b45f 100644 --- a/sys/configure/structs/game.drawCostData.go +++ b/sys/configure/structs/game.drawCostData.go @@ -14,6 +14,10 @@ type Game_drawCostData struct { Key int32 Count int32 Cost *Game_atn + Floor4 int32 + Floor5 int32 + Floor4cards int32 + Floor5cards int32 } func (Game_drawCostData) GetTypeId() int { @@ -25,5 +29,9 @@ func NewGame_drawCostData(_buf map[string]interface{}) (_v *Game_drawCostData, e { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["key"].(float64); !_ok_ { err = errors.New("key error"); return }; _v.Key = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["count"].(float64); !_ok_ { err = errors.New("count error"); return }; _v.Count = int32(_tempNum_) } { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["cost"].(map[string]interface{}); !_ok_ { err = errors.New("cost error"); return }; if _v.Cost, err = NewGame_atn(_x_); err != nil { return } } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["floor4"].(float64); !_ok_ { err = errors.New("floor4 error"); return }; _v.Floor4 = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["floor5"].(float64); !_ok_ { err = errors.New("floor5 error"); return }; _v.Floor5 = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["floor4cards"].(float64); !_ok_ { err = errors.New("floor4cards error"); return }; _v.Floor4cards = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["floor5cards"].(float64); !_ok_ { err = errors.New("floor5cards error"); return }; _v.Floor5cards = int32(_tempNum_) } return }