From ce6e0bc03840b7aac9c822643de2fdbec54dbf5b Mon Sep 17 00:00:00 2001 From: LH Date: Tue, 3 Dec 2019 02:31:25 +0800 Subject: [PATCH] [RoyalGallery] Fixed the code to work. 1. GRPC OK 2. sign OK --- .../GirlsRoom/Script/DrawHeroesGrpcServer.cs | 151 ++++ .../Script/DrawHeroesGrpcServer.cs.meta | 11 + .../Grpc/Ultracombos.Marvel.DrawHeroesGrpc.cs | 128 +++ .../Ultracombos.Marvel.DrawHeroesGrpc.cs.meta | 11 + .../Grpc/UltracombosMarvelDrawHeroes.cs | 813 ++++++++++++++++++ .../Grpc/UltracombosMarvelDrawHeroes.cs.meta | 11 + .../Assets/MainGirlsRoom.unity | 22 +- .../Assets/Main-1-Intro.unity | 118 +-- .../Assets/Main-2-Coloring.unity | 4 +- .../Assets/Main-3-Signature.unity | 4 +- .../Assets/Main-5-Postcard.unity | 36 +- .../RoyalGallery/Script/ResourceClient.cs | 2 +- 12 files changed, 1179 insertions(+), 132 deletions(-) create mode 100644 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Script/DrawHeroesGrpcServer.cs create mode 100644 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Script/DrawHeroesGrpcServer.cs.meta create mode 100644 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Script/Grpc/Ultracombos.Marvel.DrawHeroesGrpc.cs create mode 100644 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Script/Grpc/Ultracombos.Marvel.DrawHeroesGrpc.cs.meta create mode 100644 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Script/Grpc/UltracombosMarvelDrawHeroes.cs create mode 100644 03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Script/Grpc/UltracombosMarvelDrawHeroes.cs.meta diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Script/DrawHeroesGrpcServer.cs b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Script/DrawHeroesGrpcServer.cs new file mode 100644 index 0000000..32fa6b6 --- /dev/null +++ b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Script/DrawHeroesGrpcServer.cs @@ -0,0 +1,151 @@ +using Grpc.Core; +using System.Collections; +using System.Collections.Generic; +using System.Threading.Tasks; +using UnityEngine; +using UnityEngine.Events; +using UnityEngine.Networking; + +namespace UltraCombos.Marvel.DrawHeroes +{ + public class DrawHeroesGrpcServer : GrpcServerBase + { + public string subnet = "192.168.234.0"; + public Texture2D texture; + + object data_mtx = new object(); + Queue data_pool; + int index = 0; + + object idx_mtx = new object(); + int maxCount = 10; + + public List m_IdList = new List(); + + [System.Serializable] + public class TextureEvent : UnityEvent { } + [Space(10)] + public TextureEvent onTextureReceived = new TextureEvent(); + + public delegate void MessageDelegate(DataRequest request); + public MessageDelegate onMessageReceived; + + private void Start() + { + Utility.Argument.TryParse("subnet", ref subnet); + + data_pool = new Queue(); + + var options = new List { new Grpc.Core.ChannelOption(ChannelOptions.MaxReceiveMessageLength, int.MaxValue) }; + var services = new ServerServiceDefinition[] { Resource.BindService(new ResourceImpl(OnMessageReceived, OnIndexRequest)) }; + StartServer(options, services); + +#if TRUE + m_IdList.Add("07"); + m_IdList.Add("10"); + m_IdList.Add("we"); +#else + /* + PaintingSprite[] _paintingSpriteList = FindObjectsOfType(); + for(int i=0;i< _paintingSpriteList.Length;i++) + { + m_IdList.Add(_paintingSpriteList[i].name.Substring(_paintingSpriteList[i].name.Length-2)); + } + */ +#endif + + DebugInformation.Instance.UpdateProperty("Local IP", $"{Utility.Network.GetLocalIPAddress(subnet)}"); + } + + private void Update() + { + DataRequest data = null; + + lock (data_mtx) + { + if (data_pool.Count > 0) + { + data = data_pool.Dequeue(); + } + } + + if (data != null) + { + string role_id = data.Id; + + if (texture == null) + { + texture = new Texture2D(512, 512, TextureFormat.ARGB32, false); + } + + if (texture.LoadImage(data.Thumbnail.ToByteArray(), false)) + { + onTextureReceived.Invoke(role_id, texture); + Log($"Texture {role_id} is loaded. ({texture.width} x {texture.height})"); + + DebugInformation.Instance.UpdateProperty("Last painting", $"{role_id} ({texture.width} x {texture.height})"); + } + else + { + Log("Texture load fail.", LogType.Error); + DebugInformation.Instance.UpdateProperty("Last painting", $"load fail"); + } + } + + DebugInformation.Instance.UpdateProperty("Resouce Server", $"{port}"); + } + + private void OnMessageReceived(DataRequest request) + { + //Log($"Request content length: {request.Content.Length}"); + lock (data_mtx) + { + data_pool.Enqueue(request); + } + } + + private string OnIndexRequest(int deviceId) + { + int res = 0; + lock (idx_mtx) + { + res = index; + index = (index + 1) % m_IdList.Count; + } + return m_IdList[index]; + } + } + + internal class ResourceImpl : Resource.ResourceBase + { + public delegate void MessageDelegate(DataRequest request); + public MessageDelegate onMessageReceived; + + public delegate string IndexDelegate(int deviceId); + public IndexDelegate onIndexRequest; + + public ResourceImpl(MessageDelegate msg_func, IndexDelegate index_func) + { + if (msg_func != null) + onMessageReceived += msg_func; + + if (index_func != null) + onIndexRequest += index_func; + } + + public override Task SendData(DataRequest request, ServerCallContext context) + { + onMessageReceived.Invoke(request); + return Task.FromResult(new DataReply { Result = $"Texture {request.Id} data is delivered with length: {request.Content.Length}." }); + } + + public override Task GetPage(Device request, ServerCallContext context) + { + + var res = onIndexRequest.Invoke(request.Id); + string serial = $"{System.DateTime.Now.ToString("HHmmss")}{res}"; + Debug.Log(res); + return Task.FromResult(new Page { Id = res, Serial = serial }); + } + } +} diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Script/DrawHeroesGrpcServer.cs.meta b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Script/DrawHeroesGrpcServer.cs.meta new file mode 100644 index 0000000..d99ced3 --- /dev/null +++ b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Script/DrawHeroesGrpcServer.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: a50087045006c1d4288d7571a516ba6c +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Script/Grpc/Ultracombos.Marvel.DrawHeroesGrpc.cs b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Script/Grpc/Ultracombos.Marvel.DrawHeroesGrpc.cs new file mode 100644 index 0000000..564c952 --- /dev/null +++ b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Script/Grpc/Ultracombos.Marvel.DrawHeroesGrpc.cs @@ -0,0 +1,128 @@ +// +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: Ultracombos.Marvel.DrawHeroes.proto +// +#pragma warning disable 0414, 1591 +#region Designer generated code + +using grpc = global::Grpc.Core; + +namespace UltraCombos.Marvel.DrawHeroes { + public static partial class Resource + { + static readonly string __ServiceName = "UltraCombos.Marvel.DrawHeroes.Resource"; + + static readonly grpc::Marshaller __Marshaller_UltraCombos_Marvel_DrawHeroes_Device = grpc::Marshallers.Create((arg) => global::Google.Protobuf.MessageExtensions.ToByteArray(arg), global::UltraCombos.Marvel.DrawHeroes.Device.Parser.ParseFrom); + static readonly grpc::Marshaller __Marshaller_UltraCombos_Marvel_DrawHeroes_Page = grpc::Marshallers.Create((arg) => global::Google.Protobuf.MessageExtensions.ToByteArray(arg), global::UltraCombos.Marvel.DrawHeroes.Page.Parser.ParseFrom); + static readonly grpc::Marshaller __Marshaller_UltraCombos_Marvel_DrawHeroes_DataRequest = grpc::Marshallers.Create((arg) => global::Google.Protobuf.MessageExtensions.ToByteArray(arg), global::UltraCombos.Marvel.DrawHeroes.DataRequest.Parser.ParseFrom); + static readonly grpc::Marshaller __Marshaller_UltraCombos_Marvel_DrawHeroes_DataReply = grpc::Marshallers.Create((arg) => global::Google.Protobuf.MessageExtensions.ToByteArray(arg), global::UltraCombos.Marvel.DrawHeroes.DataReply.Parser.ParseFrom); + + static readonly grpc::Method __Method_GetPage = new grpc::Method( + grpc::MethodType.Unary, + __ServiceName, + "GetPage", + __Marshaller_UltraCombos_Marvel_DrawHeroes_Device, + __Marshaller_UltraCombos_Marvel_DrawHeroes_Page); + + static readonly grpc::Method __Method_SendData = new grpc::Method( + grpc::MethodType.Unary, + __ServiceName, + "SendData", + __Marshaller_UltraCombos_Marvel_DrawHeroes_DataRequest, + __Marshaller_UltraCombos_Marvel_DrawHeroes_DataReply); + + /// Service descriptor + public static global::Google.Protobuf.Reflection.ServiceDescriptor Descriptor + { + get { return global::UltraCombos.Marvel.DrawHeroes.UltracombosMarvelDrawHeroesReflection.Descriptor.Services[0]; } + } + + /// Base class for server-side implementations of Resource + public abstract partial class ResourceBase + { + public virtual global::System.Threading.Tasks.Task GetPage(global::UltraCombos.Marvel.DrawHeroes.Device request, grpc::ServerCallContext context) + { + throw new grpc::RpcException(new grpc::Status(grpc::StatusCode.Unimplemented, "")); + } + + public virtual global::System.Threading.Tasks.Task SendData(global::UltraCombos.Marvel.DrawHeroes.DataRequest request, grpc::ServerCallContext context) + { + throw new grpc::RpcException(new grpc::Status(grpc::StatusCode.Unimplemented, "")); + } + + } + + /// Client for Resource + public partial class ResourceClient : grpc::ClientBase + { + /// Creates a new client for Resource + /// The channel to use to make remote calls. + public ResourceClient(grpc::Channel channel) : base(channel) + { + } + /// Creates a new client for Resource that uses a custom CallInvoker. + /// The callInvoker to use to make remote calls. + public ResourceClient(grpc::CallInvoker callInvoker) : base(callInvoker) + { + } + /// Protected parameterless constructor to allow creation of test doubles. + protected ResourceClient() : base() + { + } + /// Protected constructor to allow creation of configured clients. + /// The client configuration. + protected ResourceClient(ClientBaseConfiguration configuration) : base(configuration) + { + } + + public virtual global::UltraCombos.Marvel.DrawHeroes.Page GetPage(global::UltraCombos.Marvel.DrawHeroes.Device request, grpc::Metadata headers = null, global::System.DateTime? deadline = null, global::System.Threading.CancellationToken cancellationToken = default(global::System.Threading.CancellationToken)) + { + return GetPage(request, new grpc::CallOptions(headers, deadline, cancellationToken)); + } + public virtual global::UltraCombos.Marvel.DrawHeroes.Page GetPage(global::UltraCombos.Marvel.DrawHeroes.Device request, grpc::CallOptions options) + { + return CallInvoker.BlockingUnaryCall(__Method_GetPage, null, options, request); + } + public virtual grpc::AsyncUnaryCall GetPageAsync(global::UltraCombos.Marvel.DrawHeroes.Device request, grpc::Metadata headers = null, global::System.DateTime? deadline = null, global::System.Threading.CancellationToken cancellationToken = default(global::System.Threading.CancellationToken)) + { + return GetPageAsync(request, new grpc::CallOptions(headers, deadline, cancellationToken)); + } + public virtual grpc::AsyncUnaryCall GetPageAsync(global::UltraCombos.Marvel.DrawHeroes.Device request, grpc::CallOptions options) + { + return CallInvoker.AsyncUnaryCall(__Method_GetPage, null, options, request); + } + public virtual global::UltraCombos.Marvel.DrawHeroes.DataReply SendData(global::UltraCombos.Marvel.DrawHeroes.DataRequest request, grpc::Metadata headers = null, global::System.DateTime? deadline = null, global::System.Threading.CancellationToken cancellationToken = default(global::System.Threading.CancellationToken)) + { + return SendData(request, new grpc::CallOptions(headers, deadline, cancellationToken)); + } + public virtual global::UltraCombos.Marvel.DrawHeroes.DataReply SendData(global::UltraCombos.Marvel.DrawHeroes.DataRequest request, grpc::CallOptions options) + { + return CallInvoker.BlockingUnaryCall(__Method_SendData, null, options, request); + } + public virtual grpc::AsyncUnaryCall SendDataAsync(global::UltraCombos.Marvel.DrawHeroes.DataRequest request, grpc::Metadata headers = null, global::System.DateTime? deadline = null, global::System.Threading.CancellationToken cancellationToken = default(global::System.Threading.CancellationToken)) + { + return SendDataAsync(request, new grpc::CallOptions(headers, deadline, cancellationToken)); + } + public virtual grpc::AsyncUnaryCall SendDataAsync(global::UltraCombos.Marvel.DrawHeroes.DataRequest request, grpc::CallOptions options) + { + return CallInvoker.AsyncUnaryCall(__Method_SendData, null, options, request); + } + /// Creates a new instance of client from given ClientBaseConfiguration. + protected override ResourceClient NewInstance(ClientBaseConfiguration configuration) + { + return new ResourceClient(configuration); + } + } + + /// Creates service definition that can be registered with a server + /// An object implementing the server-side handling logic. + public static grpc::ServerServiceDefinition BindService(ResourceBase serviceImpl) + { + return grpc::ServerServiceDefinition.CreateBuilder() + .AddMethod(__Method_GetPage, serviceImpl.GetPage) + .AddMethod(__Method_SendData, serviceImpl.SendData).Build(); + } + + } +} +#endregion diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Script/Grpc/Ultracombos.Marvel.DrawHeroesGrpc.cs.meta b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Script/Grpc/Ultracombos.Marvel.DrawHeroesGrpc.cs.meta new file mode 100644 index 0000000..c7a79e9 --- /dev/null +++ b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Script/Grpc/Ultracombos.Marvel.DrawHeroesGrpc.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: b4c162a4785013143a46d39310ca0b6a +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Script/Grpc/UltracombosMarvelDrawHeroes.cs b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Script/Grpc/UltracombosMarvelDrawHeroes.cs new file mode 100644 index 0000000..59717be --- /dev/null +++ b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Script/Grpc/UltracombosMarvelDrawHeroes.cs @@ -0,0 +1,813 @@ +// +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: Ultracombos.Marvel.DrawHeroes.proto +// +#pragma warning disable 1591, 0612, 3021 +#region Designer generated code + +using pb = global::Google.Protobuf; +using pbc = global::Google.Protobuf.Collections; +using pbr = global::Google.Protobuf.Reflection; +using scg = global::System.Collections.Generic; +namespace UltraCombos.Marvel.DrawHeroes { + + /// Holder for reflection information generated from Ultracombos.Marvel.DrawHeroes.proto + public static partial class UltracombosMarvelDrawHeroesReflection { + + #region Descriptor + /// File descriptor for Ultracombos.Marvel.DrawHeroes.proto + public static pbr::FileDescriptor Descriptor { + get { return descriptor; } + } + private static pbr::FileDescriptor descriptor; + + static UltracombosMarvelDrawHeroesReflection() { + byte[] descriptorData = global::System.Convert.FromBase64String( + string.Concat( + "CiNVbHRyYWNvbWJvcy5NYXJ2ZWwuRHJhd0hlcm9lcy5wcm90bxIdVWx0cmFD", + "b21ib3MuTWFydmVsLkRyYXdIZXJvZXMiBwoFRW1wdHkiFAoGRGV2aWNlEgoK", + "AmlkGAEgASgFIiIKBFBhZ2USCgoCaWQYASABKAkSDgoGc2VyaWFsGAIgASgJ", + "ImAKC0RhdGFSZXF1ZXN0EgoKAmlkGAEgASgJEg4KBnNlcmlhbBgCIAEoCRIP", + "Cgdjb250ZW50GAMgASgMEhEKCXNpZ25hdHVyZRgEIAEoDBIRCgl0aHVtYm5h", + "aWwYBSABKAwiGwoJRGF0YVJlcGx5Eg4KBnJlc3VsdBgBIAEoCTLHAQoIUmVz", + "b3VyY2USVwoHR2V0UGFnZRIlLlVsdHJhQ29tYm9zLk1hcnZlbC5EcmF3SGVy", + "b2VzLkRldmljZRojLlVsdHJhQ29tYm9zLk1hcnZlbC5EcmF3SGVyb2VzLlBh", + "Z2UiABJiCghTZW5kRGF0YRIqLlVsdHJhQ29tYm9zLk1hcnZlbC5EcmF3SGVy", + "b2VzLkRhdGFSZXF1ZXN0GiguVWx0cmFDb21ib3MuTWFydmVsLkRyYXdIZXJv", + "ZXMuRGF0YVJlcGx5IgBiBnByb3RvMw==")); + descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, + new pbr::FileDescriptor[] { }, + new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] { + new pbr::GeneratedClrTypeInfo(typeof(global::UltraCombos.Marvel.DrawHeroes.Empty), global::UltraCombos.Marvel.DrawHeroes.Empty.Parser, null, null, null, null), + new pbr::GeneratedClrTypeInfo(typeof(global::UltraCombos.Marvel.DrawHeroes.Device), global::UltraCombos.Marvel.DrawHeroes.Device.Parser, new[]{ "Id" }, null, null, null), + new pbr::GeneratedClrTypeInfo(typeof(global::UltraCombos.Marvel.DrawHeroes.Page), global::UltraCombos.Marvel.DrawHeroes.Page.Parser, new[]{ "Id", "Serial" }, null, null, null), + new pbr::GeneratedClrTypeInfo(typeof(global::UltraCombos.Marvel.DrawHeroes.DataRequest), global::UltraCombos.Marvel.DrawHeroes.DataRequest.Parser, new[]{ "Id", "Serial", "Content", "Signature", "Thumbnail" }, null, null, null), + new pbr::GeneratedClrTypeInfo(typeof(global::UltraCombos.Marvel.DrawHeroes.DataReply), global::UltraCombos.Marvel.DrawHeroes.DataReply.Parser, new[]{ "Result" }, null, null, null) + })); + } + #endregion + + } + #region Messages + public sealed partial class Empty : pb::IMessage { + private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new Empty()); + private pb::UnknownFieldSet _unknownFields; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public static pb::MessageParser Parser { get { return _parser; } } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public static pbr::MessageDescriptor Descriptor { + get { return global::UltraCombos.Marvel.DrawHeroes.UltracombosMarvelDrawHeroesReflection.Descriptor.MessageTypes[0]; } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public Empty() { + OnConstruction(); + } + + partial void OnConstruction(); + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public Empty(Empty other) : this() { + _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public Empty Clone() { + return new Empty(this); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public override bool Equals(object other) { + return Equals(other as Empty); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public bool Equals(Empty other) { + if (ReferenceEquals(other, null)) { + return false; + } + if (ReferenceEquals(other, this)) { + return true; + } + return Equals(_unknownFields, other._unknownFields); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public override int GetHashCode() { + int hash = 1; + if (_unknownFields != null) { + hash ^= _unknownFields.GetHashCode(); + } + return hash; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public override string ToString() { + return pb::JsonFormatter.ToDiagnosticString(this); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public void WriteTo(pb::CodedOutputStream output) { + if (_unknownFields != null) { + _unknownFields.WriteTo(output); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public int CalculateSize() { + int size = 0; + if (_unknownFields != null) { + size += _unknownFields.CalculateSize(); + } + return size; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public void MergeFrom(Empty other) { + if (other == null) { + return; + } + _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public void MergeFrom(pb::CodedInputStream input) { + uint tag; + while ((tag = input.ReadTag()) != 0) { + switch(tag) { + default: + _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); + break; + } + } + } + + } + + public sealed partial class Device : pb::IMessage { + private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new Device()); + private pb::UnknownFieldSet _unknownFields; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public static pb::MessageParser Parser { get { return _parser; } } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public static pbr::MessageDescriptor Descriptor { + get { return global::UltraCombos.Marvel.DrawHeroes.UltracombosMarvelDrawHeroesReflection.Descriptor.MessageTypes[1]; } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public Device() { + OnConstruction(); + } + + partial void OnConstruction(); + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public Device(Device other) : this() { + id_ = other.id_; + _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public Device Clone() { + return new Device(this); + } + + /// Field number for the "id" field. + public const int IdFieldNumber = 1; + private int id_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public int Id { + get { return id_; } + set { + id_ = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public override bool Equals(object other) { + return Equals(other as Device); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public bool Equals(Device other) { + if (ReferenceEquals(other, null)) { + return false; + } + if (ReferenceEquals(other, this)) { + return true; + } + if (Id != other.Id) return false; + return Equals(_unknownFields, other._unknownFields); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public override int GetHashCode() { + int hash = 1; + if (Id != 0) hash ^= Id.GetHashCode(); + if (_unknownFields != null) { + hash ^= _unknownFields.GetHashCode(); + } + return hash; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public override string ToString() { + return pb::JsonFormatter.ToDiagnosticString(this); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public void WriteTo(pb::CodedOutputStream output) { + if (Id != 0) { + output.WriteRawTag(8); + output.WriteInt32(Id); + } + if (_unknownFields != null) { + _unknownFields.WriteTo(output); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public int CalculateSize() { + int size = 0; + if (Id != 0) { + size += 1 + pb::CodedOutputStream.ComputeInt32Size(Id); + } + if (_unknownFields != null) { + size += _unknownFields.CalculateSize(); + } + return size; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public void MergeFrom(Device other) { + if (other == null) { + return; + } + if (other.Id != 0) { + Id = other.Id; + } + _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public void MergeFrom(pb::CodedInputStream input) { + uint tag; + while ((tag = input.ReadTag()) != 0) { + switch(tag) { + default: + _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); + break; + case 8: { + Id = input.ReadInt32(); + break; + } + } + } + } + + } + + public sealed partial class Page : pb::IMessage { + private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new Page()); + private pb::UnknownFieldSet _unknownFields; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public static pb::MessageParser Parser { get { return _parser; } } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public static pbr::MessageDescriptor Descriptor { + get { return global::UltraCombos.Marvel.DrawHeroes.UltracombosMarvelDrawHeroesReflection.Descriptor.MessageTypes[2]; } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public Page() { + OnConstruction(); + } + + partial void OnConstruction(); + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public Page(Page other) : this() { + id_ = other.id_; + serial_ = other.serial_; + _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public Page Clone() { + return new Page(this); + } + + /// Field number for the "id" field. + public const int IdFieldNumber = 1; + private string id_ = ""; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public string Id { + get { return id_; } + set { + id_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); + } + } + + /// Field number for the "serial" field. + public const int SerialFieldNumber = 2; + private string serial_ = ""; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public string Serial { + get { return serial_; } + set { + serial_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public override bool Equals(object other) { + return Equals(other as Page); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public bool Equals(Page other) { + if (ReferenceEquals(other, null)) { + return false; + } + if (ReferenceEquals(other, this)) { + return true; + } + if (Id != other.Id) return false; + if (Serial != other.Serial) return false; + return Equals(_unknownFields, other._unknownFields); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public override int GetHashCode() { + int hash = 1; + if (Id.Length != 0) hash ^= Id.GetHashCode(); + if (Serial.Length != 0) hash ^= Serial.GetHashCode(); + if (_unknownFields != null) { + hash ^= _unknownFields.GetHashCode(); + } + return hash; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public override string ToString() { + return pb::JsonFormatter.ToDiagnosticString(this); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public void WriteTo(pb::CodedOutputStream output) { + if (Id.Length != 0) { + output.WriteRawTag(10); + output.WriteString(Id); + } + if (Serial.Length != 0) { + output.WriteRawTag(18); + output.WriteString(Serial); + } + if (_unknownFields != null) { + _unknownFields.WriteTo(output); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public int CalculateSize() { + int size = 0; + if (Id.Length != 0) { + size += 1 + pb::CodedOutputStream.ComputeStringSize(Id); + } + if (Serial.Length != 0) { + size += 1 + pb::CodedOutputStream.ComputeStringSize(Serial); + } + if (_unknownFields != null) { + size += _unknownFields.CalculateSize(); + } + return size; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public void MergeFrom(Page other) { + if (other == null) { + return; + } + if (other.Id.Length != 0) { + Id = other.Id; + } + if (other.Serial.Length != 0) { + Serial = other.Serial; + } + _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public void MergeFrom(pb::CodedInputStream input) { + uint tag; + while ((tag = input.ReadTag()) != 0) { + switch(tag) { + default: + _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); + break; + case 10: { + Id = input.ReadString(); + break; + } + case 18: { + Serial = input.ReadString(); + break; + } + } + } + } + + } + + public sealed partial class DataRequest : pb::IMessage { + private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new DataRequest()); + private pb::UnknownFieldSet _unknownFields; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public static pb::MessageParser Parser { get { return _parser; } } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public static pbr::MessageDescriptor Descriptor { + get { return global::UltraCombos.Marvel.DrawHeroes.UltracombosMarvelDrawHeroesReflection.Descriptor.MessageTypes[3]; } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public DataRequest() { + OnConstruction(); + } + + partial void OnConstruction(); + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public DataRequest(DataRequest other) : this() { + id_ = other.id_; + serial_ = other.serial_; + content_ = other.content_; + signature_ = other.signature_; + thumbnail_ = other.thumbnail_; + _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public DataRequest Clone() { + return new DataRequest(this); + } + + /// Field number for the "id" field. + public const int IdFieldNumber = 1; + private string id_ = ""; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public string Id { + get { return id_; } + set { + id_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); + } + } + + /// Field number for the "serial" field. + public const int SerialFieldNumber = 2; + private string serial_ = ""; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public string Serial { + get { return serial_; } + set { + serial_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); + } + } + + /// Field number for the "content" field. + public const int ContentFieldNumber = 3; + private pb::ByteString content_ = pb::ByteString.Empty; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public pb::ByteString Content { + get { return content_; } + set { + content_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); + } + } + + /// Field number for the "signature" field. + public const int SignatureFieldNumber = 4; + private pb::ByteString signature_ = pb::ByteString.Empty; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public pb::ByteString Signature { + get { return signature_; } + set { + signature_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); + } + } + + /// Field number for the "thumbnail" field. + public const int ThumbnailFieldNumber = 5; + private pb::ByteString thumbnail_ = pb::ByteString.Empty; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public pb::ByteString Thumbnail { + get { return thumbnail_; } + set { + thumbnail_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public override bool Equals(object other) { + return Equals(other as DataRequest); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public bool Equals(DataRequest other) { + if (ReferenceEquals(other, null)) { + return false; + } + if (ReferenceEquals(other, this)) { + return true; + } + if (Id != other.Id) return false; + if (Serial != other.Serial) return false; + if (Content != other.Content) return false; + if (Signature != other.Signature) return false; + if (Thumbnail != other.Thumbnail) return false; + return Equals(_unknownFields, other._unknownFields); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public override int GetHashCode() { + int hash = 1; + if (Id.Length != 0) hash ^= Id.GetHashCode(); + if (Serial.Length != 0) hash ^= Serial.GetHashCode(); + if (Content.Length != 0) hash ^= Content.GetHashCode(); + if (Signature.Length != 0) hash ^= Signature.GetHashCode(); + if (Thumbnail.Length != 0) hash ^= Thumbnail.GetHashCode(); + if (_unknownFields != null) { + hash ^= _unknownFields.GetHashCode(); + } + return hash; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public override string ToString() { + return pb::JsonFormatter.ToDiagnosticString(this); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public void WriteTo(pb::CodedOutputStream output) { + if (Id.Length != 0) { + output.WriteRawTag(10); + output.WriteString(Id); + } + if (Serial.Length != 0) { + output.WriteRawTag(18); + output.WriteString(Serial); + } + if (Content.Length != 0) { + output.WriteRawTag(26); + output.WriteBytes(Content); + } + if (Signature.Length != 0) { + output.WriteRawTag(34); + output.WriteBytes(Signature); + } + if (Thumbnail.Length != 0) { + output.WriteRawTag(42); + output.WriteBytes(Thumbnail); + } + if (_unknownFields != null) { + _unknownFields.WriteTo(output); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public int CalculateSize() { + int size = 0; + if (Id.Length != 0) { + size += 1 + pb::CodedOutputStream.ComputeStringSize(Id); + } + if (Serial.Length != 0) { + size += 1 + pb::CodedOutputStream.ComputeStringSize(Serial); + } + if (Content.Length != 0) { + size += 1 + pb::CodedOutputStream.ComputeBytesSize(Content); + } + if (Signature.Length != 0) { + size += 1 + pb::CodedOutputStream.ComputeBytesSize(Signature); + } + if (Thumbnail.Length != 0) { + size += 1 + pb::CodedOutputStream.ComputeBytesSize(Thumbnail); + } + if (_unknownFields != null) { + size += _unknownFields.CalculateSize(); + } + return size; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public void MergeFrom(DataRequest other) { + if (other == null) { + return; + } + if (other.Id.Length != 0) { + Id = other.Id; + } + if (other.Serial.Length != 0) { + Serial = other.Serial; + } + if (other.Content.Length != 0) { + Content = other.Content; + } + if (other.Signature.Length != 0) { + Signature = other.Signature; + } + if (other.Thumbnail.Length != 0) { + Thumbnail = other.Thumbnail; + } + _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public void MergeFrom(pb::CodedInputStream input) { + uint tag; + while ((tag = input.ReadTag()) != 0) { + switch(tag) { + default: + _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); + break; + case 10: { + Id = input.ReadString(); + break; + } + case 18: { + Serial = input.ReadString(); + break; + } + case 26: { + Content = input.ReadBytes(); + break; + } + case 34: { + Signature = input.ReadBytes(); + break; + } + case 42: { + Thumbnail = input.ReadBytes(); + break; + } + } + } + } + + } + + public sealed partial class DataReply : pb::IMessage { + private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new DataReply()); + private pb::UnknownFieldSet _unknownFields; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public static pb::MessageParser Parser { get { return _parser; } } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public static pbr::MessageDescriptor Descriptor { + get { return global::UltraCombos.Marvel.DrawHeroes.UltracombosMarvelDrawHeroesReflection.Descriptor.MessageTypes[4]; } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public DataReply() { + OnConstruction(); + } + + partial void OnConstruction(); + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public DataReply(DataReply other) : this() { + result_ = other.result_; + _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public DataReply Clone() { + return new DataReply(this); + } + + /// Field number for the "result" field. + public const int ResultFieldNumber = 1; + private string result_ = ""; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public string Result { + get { return result_; } + set { + result_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public override bool Equals(object other) { + return Equals(other as DataReply); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public bool Equals(DataReply other) { + if (ReferenceEquals(other, null)) { + return false; + } + if (ReferenceEquals(other, this)) { + return true; + } + if (Result != other.Result) return false; + return Equals(_unknownFields, other._unknownFields); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public override int GetHashCode() { + int hash = 1; + if (Result.Length != 0) hash ^= Result.GetHashCode(); + if (_unknownFields != null) { + hash ^= _unknownFields.GetHashCode(); + } + return hash; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public override string ToString() { + return pb::JsonFormatter.ToDiagnosticString(this); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public void WriteTo(pb::CodedOutputStream output) { + if (Result.Length != 0) { + output.WriteRawTag(10); + output.WriteString(Result); + } + if (_unknownFields != null) { + _unknownFields.WriteTo(output); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public int CalculateSize() { + int size = 0; + if (Result.Length != 0) { + size += 1 + pb::CodedOutputStream.ComputeStringSize(Result); + } + if (_unknownFields != null) { + size += _unknownFields.CalculateSize(); + } + return size; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public void MergeFrom(DataReply other) { + if (other == null) { + return; + } + if (other.Result.Length != 0) { + Result = other.Result; + } + _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public void MergeFrom(pb::CodedInputStream input) { + uint tag; + while ((tag = input.ReadTag()) != 0) { + switch(tag) { + default: + _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); + break; + case 10: { + Result = input.ReadString(); + break; + } + } + } + } + + } + + #endregion + +} + +#endregion Designer generated code diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Script/Grpc/UltracombosMarvelDrawHeroes.cs.meta b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Script/Grpc/UltracombosMarvelDrawHeroes.cs.meta new file mode 100644 index 0000000..f3cfbea --- /dev/null +++ b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/GirlsRoom/Script/Grpc/UltracombosMarvelDrawHeroes.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 13345b8d9365ba34b933b6b74ec53c7c +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/MainGirlsRoom.unity b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/MainGirlsRoom.unity index f5b5e87..5cfeaa2 100644 --- a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/MainGirlsRoom.unity +++ b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/MainGirlsRoom.unity @@ -1251,6 +1251,7 @@ GameObject: - component: {fileID: 977824801} - component: {fileID: 977824799} - component: {fileID: 977824802} + - component: {fileID: 977824800} m_Layer: 0 m_Name: Resource Server m_TagString: Untagged @@ -1265,7 +1266,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 977824798} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 562012399f9d5ab44bcdd9f041e30c83, type: 3} m_Name: @@ -1300,6 +1301,25 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 +--- !u!114 &977824800 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 977824798} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a50087045006c1d4288d7571a516ba6c, type: 3} + m_Name: + m_EditorClassIdentifier: + port: 50051 + subnet: 192.168.234.0 + texture: {fileID: 0} + m_IdList: [] + onTextureReceived: + m_PersistentCalls: + m_Calls: [] --- !u!4 &977824801 Transform: m_ObjectHideFlags: 0 diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Main-1-Intro.unity b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Main-1-Intro.unity index 6b96794..e327aea 100644 --- a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Main-1-Intro.unity +++ b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Main-1-Intro.unity @@ -294,8 +294,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Texture: {fileID: 2800000, guid: 8b9f5ef69e0bebb4b8db75bbea00afff, type: 3} m_UVRect: serializedVersion: 2 @@ -681,8 +679,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: b4951b01ae7e1c341bd5faea97be7189, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -815,8 +811,6 @@ MonoBehaviour: onSelected: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0, - Culture=neutral, PublicKeyToken=null --- !u!1 &715782058 GameObject: m_ObjectHideFlags: 0 @@ -865,8 +859,6 @@ MonoBehaviour: onStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UltraCombos.GrpcClientBase+StateEvent, com.ultracombos.grpc.Runtime, - Version=0.0.0.0, Culture=neutral, PublicKeyToken=null overrideHost: 127.0.0.1 onPageReceived: m_PersistentCalls: @@ -882,13 +874,9 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - m_TypeName: UltraCombos.Marvel.DrawHeroes.ResourceClient+PageEvent, Assembly-CSharp, - Version=0.0.0.0, Culture=neutral, PublicKeyToken=null onTextureSent: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0, - Culture=neutral, PublicKeyToken=null --- !u!1 &725555479 GameObject: m_ObjectHideFlags: 0 @@ -924,7 +912,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 8} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 31.3, y: 9.8} + m_AnchoredPosition: {x: 31.3, y: 15.08} m_SizeDelta: {x: 405, y: 276} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &725555481 @@ -945,11 +933,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: - m_Font: {fileID: 12800000, guid: b6f3e9c99a2aacd418c384e8a28d1877, type: 3} - m_FontSize: 72 + m_Font: {fileID: 12800000, guid: 1f940ec663706444798b9201d8ddedec, type: 3} + m_FontSize: 60 m_FontStyle: 2 m_BestFit: 0 m_MinSize: 0 @@ -960,7 +946,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: EN + m_Text: "\u7C21\u4E2D" --- !u!222 &725555482 CanvasRenderer: m_ObjectHideFlags: 0 @@ -981,7 +967,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5d4111d72b538b544860d085f76e5ad8, type: 3} m_Name: m_EditorClassIdentifier: - language: 40 + language: 10 contexts: - language: 10 text: "\u7C21\u4E2D" @@ -1046,7 +1032,7 @@ MonoBehaviour: m_UiScaleMode: 1 m_ReferencePixelsPerUnit: 100 m_ScaleFactor: 1 - m_ReferenceResolution: {x: 2732, y: 2048} + m_ReferenceResolution: {x: 2048, y: 2732} m_ScreenMatchMode: 0 m_MatchWidthOrHeight: 1 m_PhysicalUnit: 3 @@ -1137,7 +1123,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 8} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -18, y: 13.82} + m_AnchoredPosition: {x: -18, y: 6} m_SizeDelta: {x: 0, y: 14.73} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &779108442 @@ -1158,11 +1144,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: - m_Font: {fileID: 12800000, guid: 1f940ec663706444798b9201d8ddedec, type: 3} - m_FontSize: 108 + m_Font: {fileID: 12800000, guid: b6f3e9c99a2aacd418c384e8a28d1877, type: 3} + m_FontSize: 106 m_FontStyle: 2 m_BestFit: 0 m_MinSize: 1 @@ -1173,7 +1157,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u5F00\u59CB" + m_Text: START --- !u!222 &779108443 CanvasRenderer: m_ObjectHideFlags: 0 @@ -1194,7 +1178,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5d4111d72b538b544860d085f76e5ad8, type: 3} m_Name: m_EditorClassIdentifier: - language: 40 + language: 10 contexts: - language: 10 text: START @@ -1313,8 +1297,6 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null --- !u!114 &938718535 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1333,8 +1315,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: ab0eddca7031e5641b5f0b9017cd6018, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -1520,8 +1500,6 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null --- !u!114 &1036863578 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1540,8 +1518,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 @@ -1651,8 +1627,6 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null --- !u!114 &1049342136 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1671,8 +1645,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 46cbb54786964e84a8b2c112f6306d2e, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -1771,8 +1743,6 @@ MonoBehaviour: m_events: m_PersistentCalls: m_Calls: [] - m_TypeName: RenderHeads.Media.AVProVideo.MediaPlayerEvent, Assembly-CSharp, Version=0.0.0.0, - Culture=neutral, PublicKeyToken=null m_eventMask: -1 m_forceFileFormat: 0 _pauseMediaOnAppPause: 1 @@ -1879,8 +1849,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null _mediaPlayer: {fileID: 1103808277} m_UVRect: serializedVersion: 2 @@ -1956,8 +1924,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 @@ -2010,7 +1976,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 8} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -7.1999016, y: 5.98} + m_AnchoredPosition: {x: -7.19989, y: 0.74} m_SizeDelta: {x: 0, y: 14.73} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1264086242 @@ -2025,7 +1991,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5d4111d72b538b544860d085f76e5ad8, type: 3} m_Name: m_EditorClassIdentifier: - language: 40 + language: 10 contexts: - language: 10 text: START @@ -2057,11 +2023,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: - m_Font: {fileID: 12800000, guid: 1f940ec663706444798b9201d8ddedec, type: 3} - m_FontSize: 108 + m_Font: {fileID: 12800000, guid: b6f3e9c99a2aacd418c384e8a28d1877, type: 3} + m_FontSize: 106 m_FontStyle: 2 m_BestFit: 0 m_MinSize: 1 @@ -2072,7 +2036,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u5F00\u59CB" + m_Text: START --- !u!222 &1264086244 CanvasRenderer: m_ObjectHideFlags: 0 @@ -2185,8 +2149,6 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null --- !u!114 &1282467669 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2205,8 +2167,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: c033f95f7b3cf2645bea174b55dd607f, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -2335,8 +2295,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 @@ -2446,8 +2404,6 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null --- !u!114 &1550112395 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2466,8 +2422,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 @@ -2577,8 +2531,6 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null --- !u!114 &1587564879 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2597,8 +2549,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 @@ -2671,8 +2621,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 542da5fff7fd9e54b8b7e5b633c580a8, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -2782,8 +2730,6 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null --- !u!114 &1663065348 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2802,8 +2748,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: bf4422b2f834e2a41a5875f53c34eeb3, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -2885,8 +2829,6 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0, - Culture=neutral, PublicKeyToken=null --- !u!114 &1704994861 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2905,8 +2847,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 @@ -3016,8 +2956,6 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null --- !u!114 &1812602787 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3036,8 +2974,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 @@ -3198,8 +3134,6 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null --- !u!114 &1832217225 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3218,8 +3152,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 @@ -3293,13 +3225,9 @@ MonoBehaviour: onCountdown: m_PersistentCalls: m_Calls: [] - m_TypeName: UltraCombos.Marvel.DrawHeroes.SceneLoader+CountdownEvent, Assembly-CSharp, - Version=0.0.0.0, Culture=neutral, PublicKeyToken=null onLoadScene: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0, - Culture=neutral, PublicKeyToken=null --- !u!114 &2033046878 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3318,8 +3246,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 @@ -3384,7 +3310,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 8} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 42, y: 4.3} + m_AnchoredPosition: {x: 42, y: 8.7} m_SizeDelta: {x: 405, y: 276} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2138975511 @@ -3399,7 +3325,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5d4111d72b538b544860d085f76e5ad8, type: 3} m_Name: m_EditorClassIdentifier: - language: 40 + language: 10 contexts: - language: 10 text: "\u7C21\u4E2D" @@ -3431,11 +3357,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: - m_Font: {fileID: 12800000, guid: b6f3e9c99a2aacd418c384e8a28d1877, type: 3} - m_FontSize: 72 + m_Font: {fileID: 12800000, guid: 1f940ec663706444798b9201d8ddedec, type: 3} + m_FontSize: 60 m_FontStyle: 2 m_BestFit: 0 m_MinSize: 0 @@ -3446,7 +3370,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: EN + m_Text: "\u7C21\u4E2D" --- !u!222 &2138975513 CanvasRenderer: m_ObjectHideFlags: 0 diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Main-2-Coloring.unity b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Main-2-Coloring.unity index 526fd34..86868ec 100644 --- a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Main-2-Coloring.unity +++ b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Main-2-Coloring.unity @@ -13476,7 +13476,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: duration: 0 - scenePath: Assets/Main-4-Location.unity + scenePath: Assets/Main-3-Signature.unity onCountdown: m_PersistentCalls: m_Calls: @@ -13495,7 +13495,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 1241959017} - m_MethodName: SavePaintingAndSignature + m_MethodName: SavePainting m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Main-3-Signature.unity b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Main-3-Signature.unity index 2557112..8ca46ca 100644 --- a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Main-3-Signature.unity +++ b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Main-3-Signature.unity @@ -1122,7 +1122,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Texture: {fileID: 8400000, guid: 926a63ef985233242aa29857b5bbc1d2, type: 2} + m_Texture: {fileID: 8400000, guid: 4ef76f2a408f15842a4a4bea68e8a87b, type: 2} m_UVRect: serializedVersion: 2 x: 0 @@ -3155,7 +3155,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: duration: 0 - scenePath: Assets/Main-4-Location.unity + scenePath: Assets/Main-5-Postcard.unity onCountdown: m_PersistentCalls: m_Calls: diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Main-5-Postcard.unity b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Main-5-Postcard.unity index 2734b92..2b37d7a 100644 --- a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Main-5-Postcard.unity +++ b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Main-5-Postcard.unity @@ -320,8 +320,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} m_FontSize: 48 @@ -363,11 +361,13 @@ MonoBehaviour: font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} fontSize: 48 lineSpacing: 1.1 + baseline: -188 - language: 40 text: "\u8BF7\u8BB0\u4E0B\u60A8\u7684\u5217\u5370\u4EE3\u7801\u81F3\u524D\u65B9\u67DC\u53F0\u9009\u8D2D\u60A8\u7684\u4F5C\u54C1\uFF01" font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} fontSize: 60 lineSpacing: 1.1 + baseline: 0 --- !u!1 &324924812 GameObject: m_ObjectHideFlags: 0 @@ -423,8 +423,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 @@ -574,8 +572,6 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null --- !u!114 &481181423 MonoBehaviour: m_ObjectHideFlags: 0 @@ -594,8 +590,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 208a4e2e11e5597429f005436342f000, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -996,7 +990,7 @@ MonoBehaviour: m_UiScaleMode: 1 m_ReferencePixelsPerUnit: 100 m_ScaleFactor: 1 - m_ReferenceResolution: {x: 2732, y: 2048} + m_ReferenceResolution: {x: 2048, y: 2732} m_ScreenMatchMode: 0 m_MatchWidthOrHeight: 1 m_PhysicalUnit: 3 @@ -1153,8 +1147,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} m_FontSize: 82 @@ -1196,11 +1188,13 @@ MonoBehaviour: font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} fontSize: 82 lineSpacing: 1 + baseline: 0 - language: 40 text: "\u77E5\u9053\u4E86!" font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} fontSize: 82 lineSpacing: 1 + baseline: 0 --- !u!1 &1117073448 GameObject: m_ObjectHideFlags: 0 @@ -1256,8 +1250,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 371cdf1b424df4241bc5e8324b427050, type: 3} m_FontSize: 120 @@ -1337,11 +1329,13 @@ MonoBehaviour: font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} fontSize: 30 lineSpacing: 1.1 + baseline: -306 - language: 40 text: "\u5217\u5370\u4EE3\u7801" font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} fontSize: 30 lineSpacing: 1.1 + baseline: 0 --- !u!114 &1262648298 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1360,8 +1354,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} m_FontSize: 30 @@ -1439,8 +1431,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Texture: {fileID: 8400000, guid: 926a63ef985233242aa29857b5bbc1d2, type: 2} m_UVRect: serializedVersion: 2 @@ -1556,8 +1546,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: a3b08b2f3212775418737408a655e5e0, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -1630,8 +1618,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Texture: {fileID: 2800000, guid: 1d3f294d46785a4418df1173dfb7898e, type: 3} m_UVRect: serializedVersion: 2 @@ -1704,13 +1690,9 @@ MonoBehaviour: onCountdown: m_PersistentCalls: m_Calls: [] - m_TypeName: UltraCombos.Coloring.SceneManager+CountdownEvent, UltraCombos.Coloring.Runtime, - Version=0.0.0.0, Culture=neutral, PublicKeyToken=null onLoadScene: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0, - Culture=neutral, PublicKeyToken=null --- !u!114 &1855157455 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1729,8 +1711,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 @@ -1815,8 +1795,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Texture: {fileID: 2800000, guid: 487b869ae7002dc4898033ca6e391326, type: 3} m_UVRect: serializedVersion: 2 diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Script/ResourceClient.cs b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Script/ResourceClient.cs index b8832c7..0c5c30e 100644 --- a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Script/ResourceClient.cs +++ b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Script/ResourceClient.cs @@ -48,7 +48,7 @@ namespace UltraCombos.Marvel.DrawHeroes public void GetPage() { - if (State != ChannelState.Ready || is_index_got) + if (/*State != ChannelState.Ready ||*/ is_index_got) return; GetPageAsync();