diff --git a/bin/json/game_coin.json b/bin/json/game_coin.json index 73854a1f7..7acaa6992 100644 --- a/bin/json/game_coin.json +++ b/bin/json/game_coin.json @@ -63,5 +63,57 @@ "ico": "wp_icon_0002", "intr": "Currency used to purchase goods", "tipstxt": "Lack of experience" + }, + { + "key": "guildexp", + "name": "guildexp", + "color": 1, + "effects": "", + "access": 0, + "star": 1, + "race": 0, + "img": "wp_icon_10024", + "ico": "wp_icon_10024", + "intr": "Currency used to purchase goods", + "tipstxt": "Lack of guildexp" + }, + { + "key": "guildactive", + "name": "guildactive", + "color": 1, + "effects": "", + "access": 0, + "star": 1, + "race": 0, + "img": "wp_icon_0001", + "ico": "wp_icon_0001", + "intr": "Currency used to purchase goods", + "tipstxt": "Insufficient guildactive" + }, + { + "key": "guildcoin", + "name": "guildcoin", + "color": 3, + "effects": "", + "access": 0, + "star": 3, + "race": 0, + "img": "wp_icon_10017", + "ico": "wp_icon_10017", + "intr": "Currency used to purchase goods", + "tipstxt": "Insufficient guildcoin" + }, + { + "key": "starcoin", + "name": "starcoin", + "color": 3, + "effects": "", + "access": 0, + "star": 3, + "race": 0, + "img": "wp_icon_10017", + "ico": "wp_icon_10017", + "intr": "Currency used to purchase goods", + "tipstxt": "Insufficient guildcoin" } ] \ No newline at end of file diff --git a/bin/json/game_equip.json b/bin/json/game_equip.json index f6ec7c97d..3e510121c 100644 --- a/bin/json/game_equip.json +++ b/bin/json/game_equip.json @@ -2798,7 +2798,7 @@ "pos": 7, "star": 1, "color": 1, - "leadlibrary": 20001, + "leadlibrary": 20101, "addattrnum": [ 0, 1, @@ -2838,7 +2838,7 @@ "pos": 7, "star": 1, "color": 1, - "leadlibrary": 20001, + "leadlibrary": 20101, "addattrnum": [ 0, 1, @@ -2878,7 +2878,7 @@ "pos": 7, "star": 1, "color": 1, - "leadlibrary": 20001, + "leadlibrary": 20101, "addattrnum": [ 0, 1, @@ -2918,7 +2918,7 @@ "pos": 7, "star": 1, "color": 1, - "leadlibrary": 20001, + "leadlibrary": 20101, "addattrnum": [ 0, 1, @@ -2958,7 +2958,7 @@ "pos": 7, "star": 2, "color": 2, - "leadlibrary": 20002, + "leadlibrary": 20101, "addattrnum": [ 0, 1, @@ -2998,7 +2998,7 @@ "pos": 7, "star": 2, "color": 2, - "leadlibrary": 20002, + "leadlibrary": 20101, "addattrnum": [ 0, 1, @@ -3038,7 +3038,7 @@ "pos": 7, "star": 2, "color": 2, - "leadlibrary": 20002, + "leadlibrary": 20101, "addattrnum": [ 0, 1, @@ -3078,7 +3078,7 @@ "pos": 7, "star": 2, "color": 2, - "leadlibrary": 20002, + "leadlibrary": 20101, "addattrnum": [ 0, 1, @@ -3118,7 +3118,7 @@ "pos": 7, "star": 3, "color": 3, - "leadlibrary": 20003, + "leadlibrary": 20101, "addattrnum": [ 0, 1, @@ -3158,7 +3158,7 @@ "pos": 7, "star": 3, "color": 3, - "leadlibrary": 20003, + "leadlibrary": 20101, "addattrnum": [ 0, 1, @@ -3198,7 +3198,7 @@ "pos": 7, "star": 3, "color": 3, - "leadlibrary": 20003, + "leadlibrary": 20101, "addattrnum": [ 0, 1, @@ -3238,7 +3238,7 @@ "pos": 7, "star": 3, "color": 3, - "leadlibrary": 20003, + "leadlibrary": 20101, "addattrnum": [ 0, 1, @@ -3278,7 +3278,7 @@ "pos": 7, "star": 4, "color": 4, - "leadlibrary": 20004, + "leadlibrary": 20101, "addattrnum": [ 1, 2, @@ -3318,7 +3318,7 @@ "pos": 7, "star": 4, "color": 4, - "leadlibrary": 20004, + "leadlibrary": 20101, "addattrnum": [ 1, 2, @@ -3358,7 +3358,7 @@ "pos": 7, "star": 4, "color": 4, - "leadlibrary": 20004, + "leadlibrary": 20101, "addattrnum": [ 1, 2, @@ -3398,7 +3398,7 @@ "pos": 7, "star": 4, "color": 4, - "leadlibrary": 20004, + "leadlibrary": 20101, "addattrnum": [ 1, 2, @@ -3438,7 +3438,7 @@ "pos": 7, "star": 5, "color": 5, - "leadlibrary": 20005, + "leadlibrary": 20101, "addattrnum": [ 2, 3, @@ -3476,7 +3476,7 @@ "pos": 7, "star": 5, "color": 5, - "leadlibrary": 20005, + "leadlibrary": 20101, "addattrnum": [ 2, 3, @@ -3514,7 +3514,7 @@ "pos": 7, "star": 5, "color": 5, - "leadlibrary": 20005, + "leadlibrary": 20101, "addattrnum": [ 2, 3, @@ -3552,7 +3552,7 @@ "pos": 7, "star": 5, "color": 5, - "leadlibrary": 20005, + "leadlibrary": 20101, "addattrnum": [ 2, 3, @@ -3590,7 +3590,7 @@ "pos": 7, "star": 6, "color": 6, - "leadlibrary": 20006, + "leadlibrary": 20101, "addattrnum": [ 2, 3, @@ -3628,7 +3628,7 @@ "pos": 7, "star": 6, "color": 6, - "leadlibrary": 20006, + "leadlibrary": 20101, "addattrnum": [ 2, 3, @@ -3666,7 +3666,7 @@ "pos": 7, "star": 6, "color": 6, - "leadlibrary": 20006, + "leadlibrary": 20101, "addattrnum": [ 2, 3, @@ -3704,7 +3704,7 @@ "pos": 7, "star": 6, "color": 6, - "leadlibrary": 20006, + "leadlibrary": 20101, "addattrnum": [ 2, 3, @@ -3742,7 +3742,7 @@ "pos": 8, "star": 1, "color": 1, - "leadlibrary": 30001, + "leadlibrary": 30101, "addattrnum": [ 0, 1, @@ -3782,7 +3782,7 @@ "pos": 8, "star": 1, "color": 1, - "leadlibrary": 30001, + "leadlibrary": 30101, "addattrnum": [ 0, 1, @@ -3822,7 +3822,7 @@ "pos": 8, "star": 1, "color": 1, - "leadlibrary": 30001, + "leadlibrary": 30101, "addattrnum": [ 0, 1, @@ -3862,7 +3862,7 @@ "pos": 8, "star": 1, "color": 1, - "leadlibrary": 30001, + "leadlibrary": 30101, "addattrnum": [ 0, 1, @@ -3902,7 +3902,7 @@ "pos": 8, "star": 2, "color": 2, - "leadlibrary": 30002, + "leadlibrary": 30101, "addattrnum": [ 0, 1, @@ -3942,7 +3942,7 @@ "pos": 8, "star": 2, "color": 2, - "leadlibrary": 30002, + "leadlibrary": 30101, "addattrnum": [ 0, 1, @@ -3982,7 +3982,7 @@ "pos": 8, "star": 2, "color": 2, - "leadlibrary": 30002, + "leadlibrary": 30101, "addattrnum": [ 0, 1, @@ -4022,7 +4022,7 @@ "pos": 8, "star": 2, "color": 2, - "leadlibrary": 30002, + "leadlibrary": 30101, "addattrnum": [ 0, 1, @@ -4062,7 +4062,7 @@ "pos": 8, "star": 3, "color": 3, - "leadlibrary": 30003, + "leadlibrary": 30101, "addattrnum": [ 0, 1, @@ -4102,7 +4102,7 @@ "pos": 8, "star": 3, "color": 3, - "leadlibrary": 30003, + "leadlibrary": 30101, "addattrnum": [ 0, 1, @@ -4142,7 +4142,7 @@ "pos": 8, "star": 3, "color": 3, - "leadlibrary": 30003, + "leadlibrary": 30101, "addattrnum": [ 0, 1, @@ -4182,7 +4182,7 @@ "pos": 8, "star": 3, "color": 3, - "leadlibrary": 30003, + "leadlibrary": 30101, "addattrnum": [ 0, 1, @@ -4222,7 +4222,7 @@ "pos": 8, "star": 4, "color": 4, - "leadlibrary": 30004, + "leadlibrary": 30101, "addattrnum": [ 1, 2, @@ -4262,7 +4262,7 @@ "pos": 8, "star": 4, "color": 4, - "leadlibrary": 30004, + "leadlibrary": 30101, "addattrnum": [ 1, 2, @@ -4302,7 +4302,7 @@ "pos": 8, "star": 4, "color": 4, - "leadlibrary": 30004, + "leadlibrary": 30101, "addattrnum": [ 1, 2, @@ -4342,7 +4342,7 @@ "pos": 8, "star": 4, "color": 4, - "leadlibrary": 30004, + "leadlibrary": 30101, "addattrnum": [ 1, 2, @@ -4382,7 +4382,7 @@ "pos": 8, "star": 5, "color": 5, - "leadlibrary": 30005, + "leadlibrary": 30101, "addattrnum": [ 2, 3, @@ -4420,7 +4420,7 @@ "pos": 8, "star": 5, "color": 5, - "leadlibrary": 30005, + "leadlibrary": 30101, "addattrnum": [ 2, 3, @@ -4458,7 +4458,7 @@ "pos": 8, "star": 5, "color": 5, - "leadlibrary": 30005, + "leadlibrary": 30101, "addattrnum": [ 2, 3, @@ -4496,7 +4496,7 @@ "pos": 8, "star": 5, "color": 5, - "leadlibrary": 30005, + "leadlibrary": 30101, "addattrnum": [ 2, 3, @@ -4534,7 +4534,7 @@ "pos": 8, "star": 6, "color": 6, - "leadlibrary": 30006, + "leadlibrary": 30101, "addattrnum": [ 2, 3, @@ -4572,7 +4572,7 @@ "pos": 8, "star": 6, "color": 6, - "leadlibrary": 30006, + "leadlibrary": 30101, "addattrnum": [ 2, 3, @@ -4610,7 +4610,7 @@ "pos": 8, "star": 6, "color": 6, - "leadlibrary": 30006, + "leadlibrary": 30101, "addattrnum": [ 2, 3, @@ -4648,7 +4648,7 @@ "pos": 8, "star": 6, "color": 6, - "leadlibrary": 30006, + "leadlibrary": 30101, "addattrnum": [ 2, 3, diff --git a/bin/json/game_equipsuit.json b/bin/json/game_equipsuit.json index 21b4e6cc2..92b489106 100644 --- a/bin/json/game_equipsuit.json +++ b/bin/json/game_equipsuit.json @@ -252,7 +252,7 @@ "skill": 225001214, "skillname": { "key": "suit_13014", - "text": "预言套装 " + "text": "预言套装" }, "skillintr": { "key": "equip_13215", diff --git a/bin/json/game_global.json b/bin/json/game_global.json index 4aea8e432..203686731 100644 --- a/bin/json/game_global.json +++ b/bin/json/game_global.json @@ -208,6 +208,7 @@ "guild_BuildCd": 72, "ArenaTicket_max": 10, "ArenaTicket_RecoveryTime": 144, + "VikingExpedition_RecoveryTime": 144, "ArenaTicket_PurchaseRrestrictions": 10, "arena_InitiaIntegral": 1000, "arena_RecordMax": 10, @@ -221,6 +222,12 @@ 200001, 200002, 200003 - ] + ], + "horoscope_reset_cost": { + "a": "attr", + "t": "starcion", + "n": 500 + }, + "horoscope_reset_cd": 86400 } ] \ No newline at end of file diff --git a/pb/battle_msg.pb.go b/pb/battle_msg.pb.go index 4538a2cf7..b432a7658 100644 --- a/pb/battle_msg.pb.go +++ b/pb/battle_msg.pb.go @@ -467,6 +467,7 @@ type BattleReport struct { Info *BattleInfo `protobuf:"bytes,1,opt,name=info,proto3" json:"info"` Costtime int32 `protobuf:"varint,2,opt,name=Costtime,proto3" json:"Costtime"` //战斗时长 单位ms + Process []byte `protobuf:"bytes,3,opt,name=process,proto3" json:"process"` //战斗过程数据 } func (x *BattleReport) Reset() { @@ -515,6 +516,13 @@ func (x *BattleReport) GetCosttime() int32 { return 0 } +func (x *BattleReport) GetProcess() []byte { + if x != nil { + return x.Process + } + return nil +} + var File_battle_battle_msg_proto protoreflect.FileDescriptor var file_battle_battle_msg_proto_rawDesc = []byte{ @@ -574,13 +582,15 @@ var file_battle_battle_msg_proto_rawDesc = []byte{ 0x28, 0x09, 0x52, 0x0a, 0x62, 0x6c, 0x75, 0x65, 0x43, 0x6f, 0x6d, 0x70, 0x49, 0x64, 0x12, 0x2c, 0x0a, 0x09, 0x62, 0x75, 0x6c, 0x65, 0x66, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x08, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, - 0x74, 0x52, 0x09, 0x62, 0x75, 0x6c, 0x65, 0x66, 0x6c, 0x69, 0x73, 0x74, 0x22, 0x4b, 0x0a, 0x0c, + 0x74, 0x52, 0x09, 0x62, 0x75, 0x6c, 0x65, 0x66, 0x6c, 0x69, 0x73, 0x74, 0x22, 0x65, 0x0a, 0x0c, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x1a, 0x0a, 0x08, 0x43, 0x6f, 0x73, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x08, 0x43, 0x6f, 0x73, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, - 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x08, 0x43, 0x6f, 0x73, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x70, 0x72, 0x6f, + 0x63, 0x65, 0x73, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x07, 0x70, 0x72, 0x6f, 0x63, + 0x65, 0x73, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x33, } var (