diff --git a/protobuf/game.proto b/protobuf/game.proto index cd33a0e..d588ec5 100644 --- a/protobuf/game.proto +++ b/protobuf/game.proto @@ -20,6 +20,7 @@ message CardKind { message Image { bytes face = 1; bytes back = 2; + string kind = 3; } message CardIndex { diff --git a/server/src/server/game.rs b/server/src/server/game.rs index 2d36c7a..42c9197 100644 --- a/server/src/server/game.rs +++ b/server/src/server/game.rs @@ -129,6 +129,7 @@ pub(super) async fn get_card_image( Data::ReturnCardImage(Image { face: face_buf, back: back_buf, + kind: card_kind.kind, }), ) .await?; diff --git a/server/src/server/protos/game.rs b/server/src/server/protos/game.rs index 669ceca..318a143 100644 --- a/server/src/server/protos/game.rs +++ b/server/src/server/protos/game.rs @@ -17,6 +17,8 @@ pub struct Image { pub face: ::prost::alloc::vec::Vec, #[prost(bytes="vec", tag="2")] pub back: ::prost::alloc::vec::Vec, + #[prost(string, tag="3")] + pub kind: ::prost::alloc::string::String, } #[derive(Clone, PartialEq, ::prost::Message)] pub struct CardIndex { diff --git a/unity/Assets/Scripts/grpc/Game.cs b/unity/Assets/Scripts/grpc/Game.cs index 31298fd..123a540 100644 --- a/unity/Assets/Scripts/grpc/Game.cs +++ b/unity/Assets/Scripts/grpc/Game.cs @@ -25,29 +25,29 @@ namespace Game { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( "CgpnYW1lLnByb3RvEgRnYW1lGhtnb29nbGUvcHJvdG9idWYvZW1wdHkucHJv", - "dG8aDGNvbW1vbi5wcm90byIYCghDYXJkS2luZBIMCgRraW5kGAEgASgJIiMK", - "BUltYWdlEgwKBGZhY2UYASABKAwSDAoEYmFjaxgCIAEoDCJ0CglDYXJkSW5k", - "ZXgSDwoFaW5kZXgYASABKA1IABIlCgN0b3AYAiABKAsyFi5nb29nbGUucHJv", - "dG9idWYuRW1wdHlIABIoCgZib3R0b20YAyABKAsyFi5nb29nbGUucHJvdG9i", - "dWYuRW1wdHlIAEIFCgNwb3MiTQoIUGlsZUtpbmQSDwoFb3duZWQYASABKA1I", - "ABIoCgZjb21tb24YAiABKAsyFi5nb29nbGUucHJvdG9idWYuRW1wdHlIAEIG", - "CgRraW5kImAKBkNhcmRJZBIgCghwaWxlS2luZBgBIAEoCzIOLmdhbWUuUGls", - "ZUtpbmQSEAoIcGlsZU5hbWUYAiABKAkSIgoJY2FyZEluZGV4GAMgASgLMg8u", - "Z2FtZS5DYXJkSW5kZXgi/QIKCkdhbWVTdGF0dXMSKwoLY29tbW9uUGlsZXMY", - "ASABKAsyFi5nYW1lLkdhbWVTdGF0dXMuUGlsZXMSKwoLcGxheWVyUGlsZXMY", - "AiADKAsyFi5nYW1lLkdhbWVTdGF0dXMuUGlsZXMSGwoFbmFtZXMYAyADKAsy", - "DC5jb21tb24uTmFtZRITCgtjdXJyZW50VHVybhgEIAEoDRo1CgRDYXJkEhwK", - "BGtpbmQYASABKAsyDi5nYW1lLkNhcmRLaW5kEg8KB3Zpc2libGUYAiABKAga", - "LAoEUGlsZRIkCgVjYXJkcxgBIAMoCzIVLmdhbWUuR2FtZVN0YXR1cy5DYXJk", - "Gn4KBVBpbGVzEjAKBXBpbGVzGAEgAygLMiEuZ2FtZS5HYW1lU3RhdHVzLlBp", - "bGVzLlBpbGVzRW50cnkaQwoKUGlsZXNFbnRyeRILCgNrZXkYASABKAkSJAoF", - "dmFsdWUYAiABKAsyFS5nYW1lLkdhbWVTdGF0dXMuUGlsZToCOAFiBnByb3Rv", - "Mw==")); + "dG8aDGNvbW1vbi5wcm90byIYCghDYXJkS2luZBIMCgRraW5kGAEgASgJIjEK", + "BUltYWdlEgwKBGZhY2UYASABKAwSDAoEYmFjaxgCIAEoDBIMCgRraW5kGAMg", + "ASgJInQKCUNhcmRJbmRleBIPCgVpbmRleBgBIAEoDUgAEiUKA3RvcBgCIAEo", + "CzIWLmdvb2dsZS5wcm90b2J1Zi5FbXB0eUgAEigKBmJvdHRvbRgDIAEoCzIW", + "Lmdvb2dsZS5wcm90b2J1Zi5FbXB0eUgAQgUKA3BvcyJNCghQaWxlS2luZBIP", + "CgVvd25lZBgBIAEoDUgAEigKBmNvbW1vbhgCIAEoCzIWLmdvb2dsZS5wcm90", + "b2J1Zi5FbXB0eUgAQgYKBGtpbmQiYAoGQ2FyZElkEiAKCHBpbGVLaW5kGAEg", + "ASgLMg4uZ2FtZS5QaWxlS2luZBIQCghwaWxlTmFtZRgCIAEoCRIiCgljYXJk", + "SW5kZXgYAyABKAsyDy5nYW1lLkNhcmRJbmRleCL9AgoKR2FtZVN0YXR1cxIr", + "Cgtjb21tb25QaWxlcxgBIAEoCzIWLmdhbWUuR2FtZVN0YXR1cy5QaWxlcxIr", + "CgtwbGF5ZXJQaWxlcxgCIAMoCzIWLmdhbWUuR2FtZVN0YXR1cy5QaWxlcxIb", + "CgVuYW1lcxgDIAMoCzIMLmNvbW1vbi5OYW1lEhMKC2N1cnJlbnRUdXJuGAQg", + "ASgNGjUKBENhcmQSHAoEa2luZBgBIAEoCzIOLmdhbWUuQ2FyZEtpbmQSDwoH", + "dmlzaWJsZRgCIAEoCBosCgRQaWxlEiQKBWNhcmRzGAEgAygLMhUuZ2FtZS5H", + "YW1lU3RhdHVzLkNhcmQafgoFUGlsZXMSMAoFcGlsZXMYASADKAsyIS5nYW1l", + "LkdhbWVTdGF0dXMuUGlsZXMuUGlsZXNFbnRyeRpDCgpQaWxlc0VudHJ5EgsK", + "A2tleRgBIAEoCRIkCgV2YWx1ZRgCIAEoCzIVLmdhbWUuR2FtZVN0YXR1cy5Q", + "aWxlOgI4AWIGcHJvdG8z")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { global::Google.Protobuf.WellKnownTypes.EmptyReflection.Descriptor, global::Common.CommonReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::Game.CardKind), global::Game.CardKind.Parser, new[]{ "Kind" }, null, null, null, null), - new pbr::GeneratedClrTypeInfo(typeof(global::Game.Image), global::Game.Image.Parser, new[]{ "Face", "Back" }, null, null, null, null), + new pbr::GeneratedClrTypeInfo(typeof(global::Game.Image), global::Game.Image.Parser, new[]{ "Face", "Back", "Kind" }, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::Game.CardIndex), global::Game.CardIndex.Parser, new[]{ "Index", "Top", "Bottom" }, new[]{ "Pos" }, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::Game.PileKind), global::Game.PileKind.Parser, new[]{ "Owned", "Common" }, new[]{ "Kind" }, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::Game.CardId), global::Game.CardId.Parser, new[]{ "PileKind", "PileName", "CardIndex" }, null, null, null, null), @@ -263,6 +263,7 @@ namespace Game { public Image(Image other) : this() { face_ = other.face_; back_ = other.back_; + kind_ = other.kind_; _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); } @@ -293,6 +294,17 @@ namespace Game { } } + /// Field number for the "kind" field. + public const int KindFieldNumber = 3; + private string kind_ = ""; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public string Kind { + get { return kind_; } + set { + kind_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public override bool Equals(object other) { return Equals(other as Image); @@ -308,6 +320,7 @@ namespace Game { } if (Face != other.Face) return false; if (Back != other.Back) return false; + if (Kind != other.Kind) return false; return Equals(_unknownFields, other._unknownFields); } @@ -316,6 +329,7 @@ namespace Game { int hash = 1; if (Face.Length != 0) hash ^= Face.GetHashCode(); if (Back.Length != 0) hash ^= Back.GetHashCode(); + if (Kind.Length != 0) hash ^= Kind.GetHashCode(); if (_unknownFields != null) { hash ^= _unknownFields.GetHashCode(); } @@ -340,6 +354,10 @@ namespace Game { output.WriteRawTag(18); output.WriteBytes(Back); } + if (Kind.Length != 0) { + output.WriteRawTag(26); + output.WriteString(Kind); + } if (_unknownFields != null) { _unknownFields.WriteTo(output); } @@ -357,6 +375,10 @@ namespace Game { output.WriteRawTag(18); output.WriteBytes(Back); } + if (Kind.Length != 0) { + output.WriteRawTag(26); + output.WriteString(Kind); + } if (_unknownFields != null) { _unknownFields.WriteTo(ref output); } @@ -372,6 +394,9 @@ namespace Game { if (Back.Length != 0) { size += 1 + pb::CodedOutputStream.ComputeBytesSize(Back); } + if (Kind.Length != 0) { + size += 1 + pb::CodedOutputStream.ComputeStringSize(Kind); + } if (_unknownFields != null) { size += _unknownFields.CalculateSize(); } @@ -389,6 +414,9 @@ namespace Game { if (other.Back.Length != 0) { Back = other.Back; } + if (other.Kind.Length != 0) { + Kind = other.Kind; + } _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); } @@ -411,6 +439,10 @@ namespace Game { Back = input.ReadBytes(); break; } + case 26: { + Kind = input.ReadString(); + break; + } } } #endif @@ -433,6 +465,10 @@ namespace Game { Back = input.ReadBytes(); break; } + case 26: { + Kind = input.ReadString(); + break; + } } } }