From 699a08f9bb6b247457c2cf56f3d5b9704ef30155 Mon Sep 17 00:00:00 2001 From: sk <123456@qq.com> Date: Thu, 25 Jul 2024 14:24:54 +0800 Subject: [PATCH] update DB_Skin --- data/DB_PropExchange.dat | Bin 384 -> 384 bytes data/DB_Skin.dat | 16 +++--- data/DB_Skin.json | 24 ++------ data/DB_Task.dat | Bin 5299 -> 5299 bytes protocol/server/pbdata.pb.go | 108 ++++++++++++++++------------------- protocol/server/pbdata.proto | 2 +- public | 2 +- xlsx/DB_Skin.xlsx | Bin 11838 -> 11815 bytes 8 files changed, 66 insertions(+), 86 deletions(-) diff --git a/data/DB_PropExchange.dat b/data/DB_PropExchange.dat index 571f27da6a2d42b34082b01b42c78118972a2461..8dead4cf762ffb3ba73ec5b24aee0f869cc021eb 100644 GIT binary patch literal 384 zcmd-w<6snElw#w!+{O&1uR!UmQ2H8_z7C?5I5-yevI!h$vE|a^U;?YZ0hPZArEfv$ z+i2>;IUwf4)WggNn+vobW)D_#(A}rR33f-r+D9y0u^cR5hoBpX;t-$#Fpt43f;j|c X;T@>M!2zMf&anvS(J#zg477y+WwJaq literal 384 zcmd-w<6snElw#w!(#8y?uR`f-Q2IKQz6_$3I5-yevI!h$vE|a^U;?YZ4VAwErEfy% zTWIRTIZ(}qnG05jWIxPabn{^LK-|Fzc1Oe7M=V^i94ugmfF+O&f_VgH5X=CW1uzGo XI2fq^4%p%B9E*S+{ld(}KwAg^W2!tg diff --git a/data/DB_Skin.dat b/data/DB_Skin.dat index bb067c8..9f74014 100644 --- a/data/DB_Skin.dat +++ b/data/DB_Skin.dat @@ -1,11 +1,11 @@ 6á§juese" icon_300001* 活力-黄2mg_01J0R0Z0 -oâ§juese" icon_300002* 财神é€ç¦2mg_068Bà§J ç¦æ°”东æ¥RSkillIcon-30002Z排ä½èµ›ç§¯åˆ†æå‡ -|ã§juese" icon_300003* -活力-粉2mg_028Bã§J 活力满满RSkillIcon-30003Z$VIPèµ›æ¯æ—¥å…费报å次数æå‡ -vä§juese" icon_300004* -活力-é’2mg_038Bä§J 金å¸æ»¡æ»¡RSkillIcon-30004Zæ¯æ—¥ç¤¼åŒ…金å¸å¥–励æå‡ -xå§juese" icon_300005* 摇滚å°å­2mg_048Bå§J 金å¸åŠ æˆRSkillIcon-30005Zæ¯æ—¥ä»»åŠ¡é‡‘å¸å¥–åŠ±åŠ æˆ -?æ§juese" icon_300006* 潜水员2mg_058Bæ§J0R0Z0 -{ç§juese" icon_300007* 冲浪å¥å°†2mg_078Bç§J 好è¿åŠ æˆRSkillIcon-30007Z!æ¯æ¬¡é’»çŸ³æŠ½å¥–幸è¿å€¼æå‡ \ No newline at end of file +qâ§juese" icon_300002* 财神é€ç¦2mg_068B300000,1J ç¦æ°”东æ¥RSkillIcon-30002Z排ä½èµ›ç§¯åˆ†æå‡ +ã§juese" icon_300003* +活力-粉2mg_028B 300003,20J 活力满满RSkillIcon-30003Z$VIPèµ›æ¯æ—¥å…费报å次数æå‡ +yä§juese" icon_300004* +活力-é’2mg_038B 300004,20J 金å¸æ»¡æ»¡RSkillIcon-30004Zæ¯æ—¥ç¤¼åŒ…金å¸å¥–励æå‡ +{å§juese" icon_300005* 摇滚å°å­2mg_048B 300005,20J 金å¸åŠ æˆRSkillIcon-30005Zæ¯æ—¥ä»»åŠ¡é‡‘å¸å¥–åŠ±åŠ æˆ +Bæ§juese" icon_300006* 潜水员2mg_058B 300006,20J0R0Z0 +~ç§juese" icon_300007* 冲浪å¥å°†2mg_078B 300007,20J 好è¿åŠ æˆRSkillIcon-30007Z!æ¯æ¬¡é’»çŸ³æŠ½å¥–幸è¿å€¼æå‡ \ No newline at end of file diff --git a/data/DB_Skin.json b/data/DB_Skin.json index 33d4665..62236d2 100644 --- a/data/DB_Skin.json +++ b/data/DB_Skin.json @@ -19,9 +19,7 @@ "SkinName": "财神é€ç¦", "SkinType": "mg_06", "UnlockType": 1, - "UnlockItem": { - "300000": 1 - }, + "UnlockItem": "300000,1", "SkinSkillName": "ç¦æ°”东æ¥", "SkinSkillIcon": "SkillIcon-30002", "SkinSkillDes": "排ä½èµ›ç§¯åˆ†æå‡" @@ -34,9 +32,7 @@ "SkinName": "活力-粉", "SkinType": "mg_02", "UnlockType": 2, - "UnlockItem": { - "300003": 20 - }, + "UnlockItem": "300003,20", "SkinSkillName": "活力满满", "SkinSkillIcon": "SkillIcon-30003", "SkinSkillDes": "VIPèµ›æ¯æ—¥å…费报å次数æå‡" @@ -49,9 +45,7 @@ "SkinName": "活力-é’", "SkinType": "mg_03", "UnlockType": 2, - "UnlockItem": { - "300004": 20 - }, + "UnlockItem": "300004,20", "SkinSkillName": "金å¸æ»¡æ»¡", "SkinSkillIcon": "SkillIcon-30004", "SkinSkillDes": "æ¯æ—¥ç¤¼åŒ…金å¸å¥–励æå‡" @@ -64,9 +58,7 @@ "SkinName": "摇滚å°å­", "SkinType": "mg_04", "UnlockType": 2, - "UnlockItem": { - "300005": 20 - }, + "UnlockItem": "300005,20", "SkinSkillName": "金å¸åŠ æˆ", "SkinSkillIcon": "SkillIcon-30005", "SkinSkillDes": "æ¯æ—¥ä»»åŠ¡é‡‘å¸å¥–励加æˆ" @@ -79,9 +71,7 @@ "SkinName": "潜水员", "SkinType": "mg_05", "UnlockType": 2, - "UnlockItem": { - "300006": 20 - }, + "UnlockItem": "300006,20", "SkinSkillName": "0", "SkinSkillIcon": "0", "SkinSkillDes": "0" @@ -94,9 +84,7 @@ "SkinName": "冲浪å¥å°†", "SkinType": "mg_07", "UnlockType": 2, - "UnlockItem": { - "300007": 20 - }, + "UnlockItem": "300007,20", "SkinSkillName": "好è¿åŠ æˆ", "SkinSkillIcon": "SkillIcon-30007", "SkinSkillDes": "æ¯æ¬¡é’»çŸ³æŠ½å¥–幸è¿å€¼æå‡" diff --git a/data/DB_Task.dat b/data/DB_Task.dat index 604c1afe89bc88a396bec4fc155560fa4e43c700..ea218b81156ca70ea5011e0799979b3805a0ad06 100644 GIT binary patch delta 238 zcmdn2xmk09p&$px!d^Ck1&8Fk*f^E|S*#PCOksk(Y*0awjUB2?lS?=RC+}l21kxgt znVAbf^yYSEu!I03)8xIZ7J_UXi-2Y@c|lA)&|p zKh*pO%Y}gEgETO2=H_f=#1x*qkZT{*OcAJ=4V_h!3%D&N7c+}Y-oxEAc>>VrARdd! Wi`Ydr&*M492vyF7B<32Wl$dwwPSPAu@RnchlqvTq2W$cq}Gg;S$+AkLMU8 M&|1OGrF?d509J=f-2eap diff --git a/protocol/server/pbdata.pb.go b/protocol/server/pbdata.pb.go index 8506909..04d92e4 100644 --- a/protocol/server/pbdata.pb.go +++ b/protocol/server/pbdata.pb.go @@ -9362,18 +9362,18 @@ type DB_Skin struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Id int32 `protobuf:"varint,1,opt,name=Id,proto3" json:"Id,omitempty"` - SkinClass int32 `protobuf:"varint,2,opt,name=SkinClass,proto3" json:"SkinClass,omitempty"` - Model string `protobuf:"bytes,3,opt,name=Model,proto3" json:"Model,omitempty"` - SkinPic string `protobuf:"bytes,4,opt,name=SkinPic,proto3" json:"SkinPic,omitempty"` - SkinName string `protobuf:"bytes,5,opt,name=SkinName,proto3" json:"SkinName,omitempty"` - SkinType string `protobuf:"bytes,6,opt,name=SkinType,proto3" json:"SkinType,omitempty"` - UnlockType int32 `protobuf:"varint,7,opt,name=UnlockType,proto3" json:"UnlockType,omitempty"` - UnlockItem map[int64]int64 `protobuf:"bytes,8,rep,name=UnlockItem,proto3" json:"UnlockItem,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` - SkinSkillName string `protobuf:"bytes,9,opt,name=SkinSkillName,proto3" json:"SkinSkillName,omitempty"` - SkinSkillIcon string `protobuf:"bytes,10,opt,name=SkinSkillIcon,proto3" json:"SkinSkillIcon,omitempty"` - SkinSkillDes string `protobuf:"bytes,11,opt,name=SkinSkillDes,proto3" json:"SkinSkillDes,omitempty"` - SkinSkillType int32 `protobuf:"varint,12,opt,name=SkinSkillType,proto3" json:"SkinSkillType,omitempty"` + Id int32 `protobuf:"varint,1,opt,name=Id,proto3" json:"Id,omitempty"` + SkinClass int32 `protobuf:"varint,2,opt,name=SkinClass,proto3" json:"SkinClass,omitempty"` + Model string `protobuf:"bytes,3,opt,name=Model,proto3" json:"Model,omitempty"` + SkinPic string `protobuf:"bytes,4,opt,name=SkinPic,proto3" json:"SkinPic,omitempty"` + SkinName string `protobuf:"bytes,5,opt,name=SkinName,proto3" json:"SkinName,omitempty"` + SkinType string `protobuf:"bytes,6,opt,name=SkinType,proto3" json:"SkinType,omitempty"` + UnlockType int32 `protobuf:"varint,7,opt,name=UnlockType,proto3" json:"UnlockType,omitempty"` + UnlockItem string `protobuf:"bytes,8,opt,name=UnlockItem,proto3" json:"UnlockItem,omitempty"` + SkinSkillName string `protobuf:"bytes,9,opt,name=SkinSkillName,proto3" json:"SkinSkillName,omitempty"` + SkinSkillIcon string `protobuf:"bytes,10,opt,name=SkinSkillIcon,proto3" json:"SkinSkillIcon,omitempty"` + SkinSkillDes string `protobuf:"bytes,11,opt,name=SkinSkillDes,proto3" json:"SkinSkillDes,omitempty"` + SkinSkillType int32 `protobuf:"varint,12,opt,name=SkinSkillType,proto3" json:"SkinSkillType,omitempty"` } func (x *DB_Skin) Reset() { @@ -9457,11 +9457,11 @@ func (x *DB_Skin) GetUnlockType() int32 { return 0 } -func (x *DB_Skin) GetUnlockItem() map[int64]int64 { +func (x *DB_Skin) GetUnlockItem() string { if x != nil { return x.UnlockItem } - return nil + return "" } func (x *DB_Skin) GetSkinSkillName() string { @@ -11913,7 +11913,7 @@ var file_pbdata_proto_rawDesc = []byte{ 0x72, 0x72, 0x61, 0x79, 0x12, 0x2c, 0x0a, 0x03, 0x41, 0x72, 0x72, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x44, 0x42, 0x5f, 0x53, 0x65, 0x6e, 0x73, 0x69, 0x74, 0x69, 0x76, 0x65, 0x5f, 0x57, 0x6f, 0x72, 0x64, 0x73, 0x52, 0x03, 0x41, - 0x72, 0x72, 0x22, 0xd5, 0x03, 0x0a, 0x07, 0x44, 0x42, 0x5f, 0x53, 0x6b, 0x69, 0x6e, 0x12, 0x0e, + 0x72, 0x72, 0x22, 0xf5, 0x02, 0x0a, 0x07, 0x44, 0x42, 0x5f, 0x53, 0x6b, 0x69, 0x6e, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x49, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x53, 0x6b, 0x69, 0x6e, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x53, 0x6b, 0x69, 0x6e, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x12, 0x14, 0x0a, 0x05, @@ -11925,24 +11925,18 @@ var file_pbdata_proto_rawDesc = []byte{ 0x54, 0x79, 0x70, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x53, 0x6b, 0x69, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x55, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x55, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, - 0x54, 0x79, 0x70, 0x65, 0x12, 0x3f, 0x0a, 0x0a, 0x55, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x49, 0x74, - 0x65, 0x6d, 0x18, 0x08, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x65, - 0x72, 0x2e, 0x44, 0x42, 0x5f, 0x53, 0x6b, 0x69, 0x6e, 0x2e, 0x55, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, - 0x49, 0x74, 0x65, 0x6d, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0a, 0x55, 0x6e, 0x6c, 0x6f, 0x63, - 0x6b, 0x49, 0x74, 0x65, 0x6d, 0x12, 0x24, 0x0a, 0x0d, 0x53, 0x6b, 0x69, 0x6e, 0x53, 0x6b, 0x69, - 0x6c, 0x6c, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x53, 0x6b, - 0x69, 0x6e, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x24, 0x0a, 0x0d, 0x53, - 0x6b, 0x69, 0x6e, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x63, 0x6f, 0x6e, 0x18, 0x0a, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x0d, 0x53, 0x6b, 0x69, 0x6e, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x63, 0x6f, - 0x6e, 0x12, 0x22, 0x0a, 0x0c, 0x53, 0x6b, 0x69, 0x6e, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x44, 0x65, - 0x73, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x53, 0x6b, 0x69, 0x6e, 0x53, 0x6b, 0x69, - 0x6c, 0x6c, 0x44, 0x65, 0x73, 0x12, 0x24, 0x0a, 0x0d, 0x53, 0x6b, 0x69, 0x6e, 0x53, 0x6b, 0x69, - 0x6c, 0x6c, 0x54, 0x79, 0x70, 0x65, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0d, 0x53, 0x6b, - 0x69, 0x6e, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x54, 0x79, 0x70, 0x65, 0x1a, 0x3d, 0x0a, 0x0f, 0x55, - 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x49, 0x74, 0x65, 0x6d, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, - 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03, 0x6b, 0x65, 0x79, - 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, - 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x31, 0x0a, 0x0c, 0x44, 0x42, + 0x54, 0x79, 0x70, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x55, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x49, 0x74, + 0x65, 0x6d, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x55, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, + 0x49, 0x74, 0x65, 0x6d, 0x12, 0x24, 0x0a, 0x0d, 0x53, 0x6b, 0x69, 0x6e, 0x53, 0x6b, 0x69, 0x6c, + 0x6c, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x53, 0x6b, 0x69, + 0x6e, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x24, 0x0a, 0x0d, 0x53, 0x6b, + 0x69, 0x6e, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x63, 0x6f, 0x6e, 0x18, 0x0a, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x0d, 0x53, 0x6b, 0x69, 0x6e, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x63, 0x6f, 0x6e, + 0x12, 0x22, 0x0a, 0x0c, 0x53, 0x6b, 0x69, 0x6e, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x44, 0x65, 0x73, + 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x53, 0x6b, 0x69, 0x6e, 0x53, 0x6b, 0x69, 0x6c, + 0x6c, 0x44, 0x65, 0x73, 0x12, 0x24, 0x0a, 0x0d, 0x53, 0x6b, 0x69, 0x6e, 0x53, 0x6b, 0x69, 0x6c, + 0x6c, 0x54, 0x79, 0x70, 0x65, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0d, 0x53, 0x6b, 0x69, + 0x6e, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x54, 0x79, 0x70, 0x65, 0x22, 0x31, 0x0a, 0x0c, 0x44, 0x42, 0x5f, 0x53, 0x6b, 0x69, 0x6e, 0x41, 0x72, 0x72, 0x61, 0x79, 0x12, 0x21, 0x0a, 0x03, 0x41, 0x72, 0x72, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x44, 0x42, 0x5f, 0x53, 0x6b, 0x69, 0x6e, 0x52, 0x03, 0x41, 0x72, 0x72, 0x22, 0xd7, 0x02, @@ -12140,7 +12134,7 @@ func file_pbdata_proto_rawDescGZIP() []byte { return file_pbdata_proto_rawDescData } -var file_pbdata_proto_msgTypes = make([]protoimpl.MessageInfo, 151) +var file_pbdata_proto_msgTypes = make([]protoimpl.MessageInfo, 150) var file_pbdata_proto_goTypes = []interface{}{ (*DB_ActSign)(nil), // 0: server.DB_ActSign (*DB_ActSignArray)(nil), // 1: server.DB_ActSignArray @@ -12288,11 +12282,10 @@ var file_pbdata_proto_goTypes = []interface{}{ nil, // 143: server.DB_PetSkill.ItemConsumEntry nil, // 144: server.DB_PropExchange.CostEntry nil, // 145: server.DB_PropExchange.GainEntry - nil, // 146: server.DB_Skin.UnlockItemEntry - nil, // 147: server.DB_SkinLevel.UpItemEntry - nil, // 148: server.DB_Task.AwardEntry - nil, // 149: server.DB_VIP.Privilege7Entry - nil, // 150: server.DB_VIP.AwardEntry + nil, // 146: server.DB_SkinLevel.UpItemEntry + nil, // 147: server.DB_Task.AwardEntry + nil, // 148: server.DB_VIP.Privilege7Entry + nil, // 149: server.DB_VIP.AwardEntry } var file_pbdata_proto_depIdxs = []int32{ 0, // 0: server.DB_ActSignArray.Arr:type_name -> server.DB_ActSign @@ -12364,24 +12357,23 @@ var file_pbdata_proto_depIdxs = []int32{ 116, // 66: server.DB_RankLevelArray.Arr:type_name -> server.DB_RankLevel 118, // 67: server.DB_RankRewardArray.Arr:type_name -> server.DB_RankReward 120, // 68: server.DB_Sensitive_WordsArray.Arr:type_name -> server.DB_Sensitive_Words - 146, // 69: server.DB_Skin.UnlockItem:type_name -> server.DB_Skin.UnlockItemEntry - 122, // 70: server.DB_SkinArray.Arr:type_name -> server.DB_Skin - 147, // 71: server.DB_SkinLevel.UpItem:type_name -> server.DB_SkinLevel.UpItemEntry - 124, // 72: server.DB_SkinLevelArray.Arr:type_name -> server.DB_SkinLevel - 126, // 73: server.DB_SlotRateWeightArray.Arr:type_name -> server.DB_SlotRateWeight - 128, // 74: server.DB_SystemChanceArray.Arr:type_name -> server.DB_SystemChance - 148, // 75: server.DB_Task.Award:type_name -> server.DB_Task.AwardEntry - 130, // 76: server.DB_TaskArray.Arr:type_name -> server.DB_Task - 132, // 77: server.DB_ThirdPlatformGameMappingArray.Arr:type_name -> server.DB_ThirdPlatformGameMapping - 134, // 78: server.DB_TipsArray.Arr:type_name -> server.DB_Tips - 149, // 79: server.DB_VIP.Privilege7:type_name -> server.DB_VIP.Privilege7Entry - 150, // 80: server.DB_VIP.Award:type_name -> server.DB_VIP.AwardEntry - 136, // 81: server.DB_VIPArray.Arr:type_name -> server.DB_VIP - 82, // [82:82] is the sub-list for method output_type - 82, // [82:82] is the sub-list for method input_type - 82, // [82:82] is the sub-list for extension type_name - 82, // [82:82] is the sub-list for extension extendee - 0, // [0:82] is the sub-list for field type_name + 122, // 69: server.DB_SkinArray.Arr:type_name -> server.DB_Skin + 146, // 70: server.DB_SkinLevel.UpItem:type_name -> server.DB_SkinLevel.UpItemEntry + 124, // 71: server.DB_SkinLevelArray.Arr:type_name -> server.DB_SkinLevel + 126, // 72: server.DB_SlotRateWeightArray.Arr:type_name -> server.DB_SlotRateWeight + 128, // 73: server.DB_SystemChanceArray.Arr:type_name -> server.DB_SystemChance + 147, // 74: server.DB_Task.Award:type_name -> server.DB_Task.AwardEntry + 130, // 75: server.DB_TaskArray.Arr:type_name -> server.DB_Task + 132, // 76: server.DB_ThirdPlatformGameMappingArray.Arr:type_name -> server.DB_ThirdPlatformGameMapping + 134, // 77: server.DB_TipsArray.Arr:type_name -> server.DB_Tips + 148, // 78: server.DB_VIP.Privilege7:type_name -> server.DB_VIP.Privilege7Entry + 149, // 79: server.DB_VIP.Award:type_name -> server.DB_VIP.AwardEntry + 136, // 80: server.DB_VIPArray.Arr:type_name -> server.DB_VIP + 81, // [81:81] is the sub-list for method output_type + 81, // [81:81] is the sub-list for method input_type + 81, // [81:81] is the sub-list for extension type_name + 81, // [81:81] is the sub-list for extension extendee + 0, // [0:81] is the sub-list for field type_name } func init() { file_pbdata_proto_init() } @@ -14053,7 +14045,7 @@ func file_pbdata_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_pbdata_proto_rawDesc, NumEnums: 0, - NumMessages: 151, + NumMessages: 150, NumExtensions: 0, NumServices: 0, }, diff --git a/protocol/server/pbdata.proto b/protocol/server/pbdata.proto index 252bed3..4abca06 100644 --- a/protocol/server/pbdata.proto +++ b/protocol/server/pbdata.proto @@ -1531,7 +1531,7 @@ message DB_Skin { int32 UnlockType = 7; - map UnlockItem = 8; + string UnlockItem = 8; string SkinSkillName = 9; diff --git a/public b/public index c7b319a..1c1ffc2 160000 --- a/public +++ b/public @@ -1 +1 @@ -Subproject commit c7b319a4d738012ad02b129c3176c8f8eb77c44f +Subproject commit 1c1ffc27d12db8a5c3e6a141bf910a80a99e3a13 diff --git a/xlsx/DB_Skin.xlsx b/xlsx/DB_Skin.xlsx index 5f8da3c64478b9371c9eab6f5feaf99dd6129faf..88b716875ee4f5a1e5613652f0b78ebb0d6aa3bf 100644 GIT binary patch delta 3648 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 delta 3678 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 P%Z{VJ$WHl5@~{41%8H$`