[03_RoyalGallery/Unity-19050-03_RoyalGallery_Navigator_PC]

Fixed to work.
master
LH 6 years ago
parent 55c01ae0fa
commit 42af4a254e
  1. 4
      03_RoyalGallery/Unity-19050-03_RoyalGallery_Navigator_PC/19050-03_RoyalGallery_Navigator_PC/Assets/GirlsRoom/Script/Printer/PrinterClient.cs
  2. 2
      03_RoyalGallery/Unity-19050-03_RoyalGallery_Navigator_PC/19050-03_RoyalGallery_Navigator_PC/Assets/GirlsRoom/Script/PrintingGenerator.cs
  3. 16
      03_RoyalGallery/Unity-19050-03_RoyalGallery_Navigator_PC/19050-03_RoyalGallery_Navigator_PC/Assets/GirlsRoom/Script/ResourceServer.cs
  4. 1569
      03_RoyalGallery/Unity-19050-03_RoyalGallery_Navigator_PC/19050-03_RoyalGallery_Navigator_PC/Assets/GirlsRoomNavigator.unity
  5. 4
      03_RoyalGallery/Unity-19050-03_RoyalGallery_Navigator_PC/19050-03_RoyalGallery_Navigator_PC/Settings.json

@ -28,8 +28,8 @@ namespace UltraCombos.Utility
public void Print(Texture2D painting) public void Print(Texture2D painting)
{ {
if (State != ChannelState.Ready) //if (State != ChannelState.Ready)
return; // return;
var content = painting.EncodeToJPG(); var content = painting.EncodeToJPG();

@ -39,7 +39,7 @@ namespace UltraCombos.Minions.GirlsRoom.Nav
setting_filename = $"{Application.dataPath}/../Settings.json"; setting_filename = $"{Application.dataPath}/../Settings.json";
var json = File.ReadAllText(setting_filename); var json = File.ReadAllText(setting_filename);
var config = JsonUtility.FromJson<Config>(json); var config = JsonUtility.FromJson<UltraCombos.Marvel.DrawHeroes.Config>(json);
luggage_path = config.luggagePath; luggage_path = config.luggagePath;
Debug.Log($"Luggage path: {luggage_path}"); Debug.Log($"Luggage path: {luggage_path}");
} }

@ -6,8 +6,9 @@ using System.Threading.Tasks;
using UnityEngine; using UnityEngine;
using UnityEngine.Events; using UnityEngine.Events;
using UnityEngine.Networking; using UnityEngine.Networking;
using UltraCombos.Minions.GirlsRoom.Nav;
namespace UltraCombos.Minions.GirlsRoom.Nav namespace UltraCombos.Marvel.DrawHeroes
{ {
class Config class Config
{ {
@ -180,7 +181,7 @@ namespace UltraCombos.Minions.GirlsRoom.Nav
return; return;
} }
var artwork = new Artwork() { serial = data.Serial, painting = painting, signature = signature }; var artwork = new Minions.GirlsRoom.Nav.Artwork() { serial = data.Serial, painting = painting, signature = signature };
var folder = Directory.CreateDirectory($"{store_dir.FullName}/{data.Serial}"); var folder = Directory.CreateDirectory($"{store_dir.FullName}/{data.Serial}");
string painting_path = $"{folder.FullName}/{painting_filename}"; string painting_path = $"{folder.FullName}/{painting_filename}";
@ -189,7 +190,7 @@ namespace UltraCombos.Minions.GirlsRoom.Nav
File.WriteAllBytes(signature_path, data.Signature.ToByteArray()); File.WriteAllBytes(signature_path, data.Signature.ToByteArray());
last_data = artwork; last_data = artwork;
luggagePrinter.PrintLuggage(artwork); //luggagePrinter.PrintLuggage(artwork);
onPaintingReceived.Invoke(artwork, painting_path, signature_path); onPaintingReceived.Invoke(artwork, painting_path, signature_path);
Log($"Painting {data.Id} is loaded. ({painting.width} x {painting.height})"); Log($"Painting {data.Id} is loaded. ({painting.width} x {painting.height})");
} }
@ -212,15 +213,18 @@ namespace UltraCombos.Minions.GirlsRoom.Nav
return Task.FromResult(new DataReply { Result = $"Texture {request.Id} data is delivered with length: {request.Content.Length}." }); return Task.FromResult(new DataReply { Result = $"Texture {request.Id} data is delivered with length: {request.Content.Length}." });
} }
/*
public override Task<Index> GetIndex(Index request, ServerCallContext context) public override Task<Index> GetIndex(Index request, ServerCallContext context)
{ {
return Task.FromResult(new Index { Id = -1, Serial = "" }); return Task.FromResult(new Index { Id = -1, Serial = "" });
} }
*/
public override Task<Page> GetPage(Device request, ServerCallContext context)
{
return Task.FromResult(new Page { Id = "", Serial = "" });
}
} }
} }

@ -1,4 +1,4 @@
{ {
"rootPath":"E:/2018_Minions/Project_2018_Minions/Unity_2018_Girl's_Room_Navigator/Assets/../../../Build_GirlsRoomNav/Painting", "rootPath":"../../../../_Deploy_PC/03_RoyalGallery/UnityBuild-19050-03_RoyalGallery_Navigator/Build/Painting",
"luggagePath":"E:/2018_Minions/Project_2018_Minions/Unity_2018_Girl's_Room_Navigator/Assets/../../../Build_GirlsRoomNav/Print" "luggagePath":"../../../../_Deploy_PC/03_RoyalGallery/UnityBuild-19050-03_RoyalGallery_Navigator/Build/Print"
} }
Loading…
Cancel
Save