Merge branch 'master' of http://nas.ultracombos.com:3400/19050-Frozen2/Develop-19050-Frozen2

03_RoyalGallery/Unity-19050-03_RoyalGallery_Navigator_PC/19050-03_RoyalGallery_Navigator_PC/Assets/GirlsRoom/Script/Printer/PrinterClient.cs

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

03_RoyalGallery/Unity-19050-03_RoyalGallery_Navigator_PC/19050-03_RoyalGallery_Navigator_PC/Assets/GirlsRoom/Script/PrintingGenerator.cs

@@ -39,7 +39,7 @@ namespace UltraCombos.Minions.GirlsRoom.Nav
 
             setting_filename = $"{Application.dataPath}/../Settings.json";
             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;
             Debug.Log($"Luggage path: {luggage_path}");
         }

03_RoyalGallery/Unity-19050-03_RoyalGallery_Navigator_PC/19050-03_RoyalGallery_Navigator_PC/Assets/GirlsRoom/Script/ResourceServer.cs

@@ -6,8 +6,9 @@ using System.Threading.Tasks;
 using UnityEngine;
 using UnityEngine.Events;
 using UnityEngine.Networking;
+using UltraCombos.Minions.GirlsRoom.Nav;
 
-namespace UltraCombos.Minions.GirlsRoom.Nav
+namespace UltraCombos.Marvel.DrawHeroes
 {
     class Config
     {
@@ -180,7 +181,7 @@ namespace UltraCombos.Minions.GirlsRoom.Nav
                 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}");
             string painting_path = $"{folder.FullName}/{painting_filename}";
@@ -189,7 +190,7 @@ namespace UltraCombos.Minions.GirlsRoom.Nav
             File.WriteAllBytes(signature_path, data.Signature.ToByteArray());
 
             last_data = artwork;
-            luggagePrinter.PrintLuggage(artwork);
+            //luggagePrinter.PrintLuggage(artwork);
             onPaintingReceived.Invoke(artwork, painting_path, signature_path);
             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}." });
         }
 
+        /*
         public override Task<Index> GetIndex(Index request, ServerCallContext context)
         {
             return Task.FromResult(new Index { Id = -1, Serial = "" });
         }
+        */
 
-        
+        public override Task<Page> GetPage(Device request, ServerCallContext context)
+        {
+            return Task.FromResult(new Page { Id = "", Serial = "" });
+        }
     }
-
-    
 }
 
 

03_RoyalGallery/Unity-19050-03_RoyalGallery_Navigator_PC/19050-03_RoyalGallery_Navigator_PC/Settings.json

@@ -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"
 }

03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait.unity

@@ -251,6 +251,114 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 2ef5caefbf76037459e39687e6d1c546, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!1 &275645426
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 275645427}
+  - component: {fileID: 275645430}
+  - component: {fileID: 275645429}
+  - component: {fileID: 275645428}
+  m_Layer: 0
+  m_Name: Role-02
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &275645427
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 275645426}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -42.3, y: 101.4, z: 10}
+  m_LocalScale: {x: 1.8223056, y: 8.144659, z: 1}
+  m_Children: []
+  m_Father: {fileID: 2135091040}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!212 &275645428
+SpriteRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 275645426}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 0
+  m_SelectedEditorRenderState: 0
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 3
+  m_Sprite: {fileID: 21300000, guid: c8c0a3c8b6324e543a43d25624902654, type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0
+  m_DrawMode: 0
+  m_Size: {x: 10.24, y: 10.24}
+  m_AdaptiveModeThreshold: 0.5
+  m_SpriteTileMode: 0
+  m_WasSpriteAssigned: 1
+  m_MaskInteraction: 0
+  m_SpriteSortPoint: 0
+--- !u!114 &275645429
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 275645426}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d2220dc78794eaa4b939e412e9f9b902, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  texture: {fileID: 0}
+--- !u!114 &275645430
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 275645426}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 21f70a2ec67c77142bb8578ced0ffec9, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 07
+  mode: 0
 --- !u!1 &283667689
 GameObject:
   m_ObjectHideFlags: 0
@@ -271,7 +379,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &283667690
 RectTransform:
   m_ObjectHideFlags: 0
@@ -306,7 +414,7 @@ MonoBehaviour:
   target: 0
   materials: []
   attributeName: 
-  targetObject: {fileID: 0}
+  targetObject: {fileID: 283667689}
 --- !u!114 &283667692
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -484,6 +592,114 @@ MeshFilter:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 417831287}
   m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!1 &492259777
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 492259778}
+  - component: {fileID: 492259781}
+  - component: {fileID: 492259780}
+  - component: {fileID: 492259779}
+  m_Layer: 0
+  m_Name: Role-01
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &492259778
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 492259777}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 43.41, y: 72.15, z: 10}
+  m_LocalScale: {x: 6.436748, y: 14.571055, z: 1}
+  m_Children: []
+  m_Father: {fileID: 2135091040}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!212 &492259779
+SpriteRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 492259777}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 0
+  m_SelectedEditorRenderState: 0
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 3
+  m_Sprite: {fileID: 21300000, guid: 95e96287a4bd17446854a585699d3905, type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0
+  m_DrawMode: 0
+  m_Size: {x: 10.24, y: 10.24}
+  m_AdaptiveModeThreshold: 0.5
+  m_SpriteTileMode: 0
+  m_WasSpriteAssigned: 1
+  m_MaskInteraction: 0
+  m_SpriteSortPoint: 0
+--- !u!114 &492259780
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 492259777}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d2220dc78794eaa4b939e412e9f9b902, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  texture: {fileID: 0}
+--- !u!114 &492259781
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 492259777}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 21f70a2ec67c77142bb8578ced0ffec9, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: we
+  mode: 0
 --- !u!1 &542808023
 GameObject:
   m_ObjectHideFlags: 0
@@ -891,12 +1107,12 @@ RectTransform:
   - {fileID: 542808024}
   - {fileID: 1833696213}
   m_Father: {fileID: 961139955}
-  m_RootOrder: 0
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 4192, y: 1200}
+  m_SizeDelta: {x: 1080, y: 1920}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1001 &822012542
 PrefabInstance:
@@ -909,6 +1125,10 @@ PrefabInstance:
       propertyPath: m_Name
       value: Painting Manager
       objectReference: {fileID: 0}
+    - target: {fileID: 1820076180253818, guid: 12ab0e5b5933e1f409de3b7ff462a95f, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 4566515945476120, guid: 12ab0e5b5933e1f409de3b7ff462a95f, type: 3}
       propertyPath: m_LocalPosition.x
       value: 0
@@ -939,13 +1159,27 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4566515945476120, guid: 12ab0e5b5933e1f409de3b7ff462a95f, type: 3}
       propertyPath: m_RootOrder
-      value: 1
+      value: 2
       objectReference: {fileID: 0}
     - target: {fileID: 114930378025822482, guid: 12ab0e5b5933e1f409de3b7ff462a95f,
         type: 3}
       propertyPath: onPaintingUpdated.m_PersistentCalls.m_Calls.Array.data[0].m_Target
       value: 
       objectReference: {fileID: 1547140294}
+    - target: {fileID: 1307646538150898, guid: 12ab0e5b5933e1f409de3b7ff462a95f, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 114928219075774338, guid: 12ab0e5b5933e1f409de3b7ff462a95f,
+        type: 3}
+      propertyPath: m_Enabled
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 95228011701967148, guid: 12ab0e5b5933e1f409de3b7ff462a95f,
+        type: 3}
+      propertyPath: m_Enabled
+      value: 0
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 12ab0e5b5933e1f409de3b7ff462a95f, type: 3}
 --- !u!1 &823225324
@@ -1080,6 +1314,8 @@ GameObject:
   - component: {fileID: 841726155}
   - component: {fileID: 841726154}
   - component: {fileID: 841726153}
+  - component: {fileID: 841726156}
+  - component: {fileID: 841726157}
   m_Layer: 0
   m_Name: Main Camera
   m_TagString: MainCamera
@@ -1121,7 +1357,7 @@ Camera:
   far clip plane: 1000
   field of view: 60
   orthographic: 1
-  orthographic size: 100
+  orthographic size: 160
   m_Depth: -1
   m_CullingMask:
     serializedVersion: 2
@@ -1151,6 +1387,90 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &841726156
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 841726152}
+  m_Enabled: 0
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 91a9cabf19a634d2fac557d213b89a59, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  inputTexture: {fileID: 0}
+  renderToTexture: 0
+  outputTexture: {fileID: 0}
+  outputMipmap: 0
+  EffectFade: 0
+  PanFade: 0
+  SrcBright: 0.94
+  SrcContrast: 1.4
+  SrcColor: 1.28
+  SrcBlur: 0
+  BrushDetail: 1
+  BrushFill: 0.651
+  NumStrokes: 111945
+  LayerScale: 0.722
+  Canvas: 0.209
+  FlickerFreq: 0
+  FlickerStrength: 0
+  LightAng: 110
+  LightOffs: 37
+  PaintDiff: 0.605
+  PaintSpec: 0.33
+  PaintShiny: 0
+  ColorSpread: 0.46
+  ScreenFOV: 30.9
+  StrokeAng: 186
+  StrokeBend: 0.1
+  StrokeDir: 0.168
+  StrokeContour: 1
+  MultiStroke: 6.28
+  strokeSeed: 51044
+  Vignette: 0
+  CanvasBg: 0
+  CanvasTint: {r: 1, g: 1, b: 1, a: 1}
+  flipY: 0
+  geomFlipY: 1
+--- !u!114 &841726157
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 841726152}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 79621082da8ba124eba3da9eba119a06, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  inputTexture: {fileID: 0}
+  renderToTexture: 0
+  outputTexture: {fileID: 0}
+  outputMipmap: 0
+  fade: 0
+  panFade: 0
+  brightness: 1.27
+  contrast: 1
+  color: 1
+  shaderMethod: 1
+  outlines: 1.2
+  hatches: 1.24
+  outlineError: 1.55
+  flicker: 0
+  flickerFreq: 7
+  fixedHatchDir: 0.649
+  hatchScale: 1.5
+  hatchLength: 161
+  mipLevel: 0.39
+  vignetting: 0
+  contentVignetting: 0
+  paperTint: {r: 1, g: 1, b: 1, a: 1}
+  paperRoughness: 1
+  paperTex: {fileID: 0}
+  flipY: 0
 --- !u!1 &961139953
 GameObject:
   m_ObjectHideFlags: 0
@@ -1161,9 +1481,8 @@ GameObject:
   m_Component:
   - component: {fileID: 961139955}
   - component: {fileID: 961139954}
-  - component: {fileID: 961139956}
   m_Layer: 0
-  m_Name: Wall Camera
+  m_Name: Portrait Camera
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -1195,7 +1514,7 @@ Camera:
   far clip plane: 1000
   field of view: 60
   orthographic: 1
-  orthographic size: 100
+  orthographic size: 160
   m_Depth: 0
   m_CullingMask:
     serializedVersion: 2
@@ -1222,24 +1541,13 @@ Transform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
+  - {fileID: 2135091040}
   - {fileID: 819030248}
   - {fileID: 274290747}
   - {fileID: 1547140293}
   m_Father: {fileID: 0}
   m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &961139956
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 961139953}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 45099d624c1e6c14e9514f4e5ea1ed9c, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!1 &977824798
 GameObject:
   m_ObjectHideFlags: 0
@@ -1319,7 +1627,18 @@ MonoBehaviour:
   m_IdList: []
   onTextureReceived:
     m_PersistentCalls:
-      m_Calls: []
+      m_Calls:
+      - m_Target: {fileID: 2135091041}
+        m_MethodName: UpdateTexture
+        m_Mode: 0
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
 --- !u!4 &977824801
 Transform:
   m_ObjectHideFlags: 0
@@ -1712,6 +2031,114 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1368559033}
   m_CullTransparentMesh: 0
+--- !u!1 &1424239746
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1424239747}
+  - component: {fileID: 1424239750}
+  - component: {fileID: 1424239749}
+  - component: {fileID: 1424239748}
+  m_Layer: 0
+  m_Name: Role-03
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1424239747
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1424239746}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 3, y: -82.6, z: 10}
+  m_LocalScale: {x: 12.46615, y: 12.508653, z: 1}
+  m_Children: []
+  m_Father: {fileID: 2135091040}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!212 &1424239748
+SpriteRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1424239746}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 0
+  m_SelectedEditorRenderState: 0
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 3
+  m_Sprite: {fileID: 21300000, guid: 95e96287a4bd17446854a585699d3905, type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0
+  m_DrawMode: 0
+  m_Size: {x: 10.24, y: 10.24}
+  m_AdaptiveModeThreshold: 0.5
+  m_SpriteTileMode: 0
+  m_WasSpriteAssigned: 1
+  m_MaskInteraction: 0
+  m_SpriteSortPoint: 0
+--- !u!114 &1424239749
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1424239746}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d2220dc78794eaa4b939e412e9f9b902, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  texture: {fileID: 0}
+--- !u!114 &1424239750
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1424239746}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 21f70a2ec67c77142bb8578ced0ffec9, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10
+  mode: 0
 --- !u!1 &1519278660
 GameObject:
   m_ObjectHideFlags: 0
@@ -1731,7 +2158,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &1519278661
 RectTransform:
   m_ObjectHideFlags: 0
@@ -1766,7 +2193,7 @@ MonoBehaviour:
   target: 0
   materials: []
   attributeName: 
-  targetObject: {fileID: 0}
+  targetObject: {fileID: 1519278660}
 --- !u!114 &1519278663
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1848,7 +2275,7 @@ Transform:
   m_Children:
   - {fileID: 417831288}
   m_Father: {fileID: 961139955}
-  m_RootOrder: 2
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &1547140294
 MonoBehaviour:
@@ -2535,7 +2962,7 @@ MonoBehaviour:
   width: 1748
   height: 500
   fps: 60
-  mode: 3
+  mode: 1
   cursor: 1
 --- !u!4 &1672874512
 Transform:
@@ -3121,7 +3548,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &1833696213
 RectTransform:
   m_ObjectHideFlags: 0
@@ -3604,3 +4031,55 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &2135091039
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2135091040}
+  - component: {fileID: 2135091041}
+  m_Layer: 0
+  m_Name: Portrait Manager
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &2135091040
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2135091039}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 492259778}
+  - {fileID: 275645427}
+  - {fileID: 1424239747}
+  m_Father: {fileID: 961139955}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &2135091041
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2135091039}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d8813dde4fb2c304bbcde08119f57d54, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  show_cur: 
+  mode: 0
+  id: 
+  onPaintingUpdated:
+    m_PersistentCalls:
+      m_Calls: []

03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/DrawHeroesGrpcServer.cs

@@ -41,9 +41,11 @@ namespace UltraCombos.Marvel.DrawHeroes
             StartServer(options, services);
 
 #if TRUE
-            m_IdList.Add("07");
+            Frozen.Portrait[] list = FindObjectsOfType<Frozen.Portrait>();
-            m_IdList.Add("10");
+            for (int i = 0; i < list.Length; i++)
-            m_IdList.Add("we");
+            {
+                m_IdList.Add(list[i].id);
+            }
 #else
             /*
             PaintingSprite[] _paintingSpriteList = FindObjectsOfType<PaintingSprite>();
@@ -54,7 +56,7 @@ namespace UltraCombos.Marvel.DrawHeroes
             */
 #endif
 
-            DebugInformation.Instance.UpdateProperty("Local IP", $"{Utility.Network.GetLocalIPAddress(subnet)}");
+            //DebugInformation.Instance.UpdateProperty("Local IP", $"{Utility.Network.GetLocalIPAddress(subnet)}");
         }
 
         private void Update()
@@ -75,11 +77,12 @@ namespace UltraCombos.Marvel.DrawHeroes
 
                 if (texture == null)
                 {
-                    texture = new Texture2D(512, 512, TextureFormat.ARGB32, false);
+                    texture = new Texture2D(2048, 2048, TextureFormat.ARGB32, false);
                 }
 
                 if (texture.LoadImage(data.Thumbnail.ToByteArray(), false))
                 {
+                    onMessageReceived.Invoke(data);
                     onTextureReceived.Invoke(role_id, texture);
                     Log($"Texture {role_id} is loaded. ({texture.width} x {texture.height})");
 
@@ -143,8 +146,14 @@ namespace UltraCombos.Marvel.DrawHeroes
         {
         
             var res = onIndexRequest.Invoke(request.Id);
-            string serial = $"{System.DateTime.Now.ToString("HHmmss")}{res}";
+
-            Debug.Log(res);
+            string dev_id   = request.Id.ToString().PadLeft(2, '0');
+            string date     = System.DateTime.Now.ToString("HHmmss");
+            string res_id   = res.PadLeft(3, '0');
+
+            string serial = $"{date}{dev_id}{res_id}";
+
+            Debug.Log($"GetPage: rid={res}, sid={serial}");
             return Task.FromResult(new Page { Id = res, Serial = serial });
         }
     }

03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/Portrait.cs

@@ -0,0 +1,130 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.EventSystems;
+using UnityEngine.UI;
+
+namespace UltraCombos.Frozen
+{
+    public class Portrait : MonoBehaviour
+    {
+        public string id;
+        const float duration = 150.0f;
+        float stamp = 0.0f;
+
+        RendererPropertyOverride prop;
+        Texture2D tex;
+
+        Texture blank_texture;
+
+        Animator animator = null;
+        float speed = 0.0f;
+
+        public bool isVisible
+        {
+            set
+            {
+                prop.isVisible = value;
+            }
+
+            get
+            {
+                return prop.isVisible;
+            }
+        }
+
+        [SerializeField, Header("Debug")]
+        bool mode = false;
+
+#if UNITY_IPHONE
+        private void Awake()
+        {
+            animator = GetComponent<Animator>();
+            if (animator)
+            {
+                Destroy(animator);
+                animator = null;
+            }
+            var skin = GetComponent<UnityEngine.Experimental.U2D.Animation.SpriteSkin>();
+            if (skin != null)
+            {
+                Destroy(skin);
+            }
+        }
+#endif
+
+        private void Start()
+        {
+            prop = GetComponent<RendererPropertyOverride>();
+            blank_texture = GetComponent<SpriteRenderer>().sprite.texture;
+            
+            animator = GetComponent<Animator>();
+            if (animator)
+            {
+                animator.speed = 0.0f;
+            }
+        }
+
+        private void Update()
+        {
+            if (Time.time - stamp > duration && speed > 0.0f)
+            {
+                speed = 0.0f;
+                prop.texture = blank_texture;
+            }
+
+            if (mode)
+            {
+                mode = false;
+                OnTrigger();
+            }
+        }
+
+        private void FixedUpdate()
+        {
+            float t = Time.fixedDeltaTime * 5.0f;
+            if (animator)
+            {
+                animator.speed = Mathf.Lerp(animator.speed, speed, t);
+            }
+        }
+
+        public void UpdateTexture(Texture2D texture)
+        {
+            OnTrigger();
+
+            if (texture == null)
+                return;
+
+            if (tex == null)
+            {
+                tex = new Texture2D(texture.width, texture.height, texture.format, true);
+            }
+
+            if (tex.width != texture.width || tex.height != texture.height)
+            {
+                tex.Resize(texture.width, texture.height);
+                tex.Apply();
+            }
+
+            tex.SetPixels(texture.GetPixels());
+            tex.Apply();
+
+            prop.texture = tex;
+        }
+
+        private void OnTrigger()
+        {
+            stamp = Time.time;
+            speed = 1.0f;
+        }
+        
+        public void Initialize()
+        {
+            prop.texture = blank_texture;
+            speed = 0.0f;
+        }
+    }
+
+
+}

03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/Portrait.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 21f70a2ec67c77142bb8578ced0ffec9
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/PortraitManager.cs

@@ -0,0 +1,98 @@
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.Events;
+using UnityEngine.EventSystems;
+using UnityEngine.UI;
+
+namespace UltraCombos.Frozen
+{
+    public class PortraitManager : MonoBehaviour
+    {
+        Dictionary<string, Portrait> portraits;
+        public string show_cur;
+
+        string show_nxt = null;
+
+        [SerializeField, Header("Debug")]
+        bool mode = false;
+        public string id = "";
+
+        [System.Serializable]
+        public class PositionEvent : UnityEvent<Vector3> { }
+        [Space(10)]
+        public PositionEvent onPaintingUpdated = new PositionEvent();
+
+        private void Start()
+        {
+            portraits = new Dictionary<string, Portrait>();
+            foreach (var p in GetComponentsInChildren<Portrait>())
+            {
+                portraits.Add(p.id, p);
+                p.isVisible = false;
+            }
+
+            if (portraits.Count == 0)
+            {
+                return;
+            }
+
+            if (!portraits.ContainsKey(show_cur))
+            {
+                show_cur = "";
+                show_nxt = portraits.Keys.GetEnumerator().Current;
+            }
+            else
+            {
+                show_nxt = show_cur;
+            }
+        }
+
+        private void Update()
+        {
+            if (portraits.Count == 0)
+            {
+                return;
+            }
+
+            if (show_nxt != null)
+            {
+                if (portraits.ContainsKey(show_cur))
+                {
+                    portraits[show_cur].isVisible = false;
+                }
+
+                show_cur = show_nxt;
+                show_nxt = null;
+                portraits[show_cur].isVisible = true;
+            }
+
+            if (Input.GetKeyDown(KeyCode.R))
+            {
+                foreach (var id in portraits.Keys)
+                {
+                    portraits[id].Initialize();
+                }
+            }
+
+            if (mode)
+            {
+                mode = false;
+                UpdateTexture(id, null);
+                //index = (index + 1) % portraits.Count;
+            }
+        }
+
+        public void UpdateTexture(string id, Texture2D texture)
+        {
+            if (portraits.ContainsKey(id))
+            {
+                var painting = portraits[id];
+                painting.UpdateTexture(texture);
+                onPaintingUpdated.Invoke(painting.transform.position);
+
+                show_nxt = id;
+            }
+        }
+    }
+
+}

03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/PortraitManager.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: d8813dde4fb2c304bbcde08119f57d54
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/RendererPropertyOverride.cs

@@ -0,0 +1,48 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace UltraCombos.Frozen
+{
+    public class RendererPropertyOverride : MonoBehaviour
+    {
+        Renderer rdr;
+        
+        public Texture texture;
+        public bool isVisible
+        {
+            set
+            {
+                m_isVisible = value;
+                rdr.enabled = m_isVisible;
+            }
+
+            get
+            {
+                return m_isVisible;
+            }
+        }
+
+        private bool m_isVisible = true;
+
+        private void Start()
+        {
+            rdr = GetComponent<Renderer>();
+        }
+
+        private void Update()
+        {
+            var prop = new MaterialPropertyBlock();
+            rdr.GetPropertyBlock(prop);
+
+            if (texture)
+            {
+                prop.SetTexture("_MainTex", texture);
+            }
+
+            rdr.SetPropertyBlock(prop);
+        }
+    }
+
+}
+

03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/RendererPropertyOverride.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: d2220dc78794eaa4b939e412e9f9b902
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/ResourceClient.cs

@@ -6,16 +6,16 @@ using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.Events;
 
-namespace UltraCombos.Minions
+namespace UltraCombos.Marvel.DrawHeroes
 {
-    [RequireComponent(typeof(ResourceServer))]
+    [RequireComponent(typeof(DrawHeroesGrpcServer))]
     public class ResourceClient : GrpcClientBase
     {
         public float interval = 1.0f;
         float stamp = 0.0f;
         Queue<DataRequest> data_pool;
 
-        ResourceServer server;
+        Marvel.DrawHeroes.DrawHeroesGrpcServer server;
 
         [Space(10)]
         public UnityEvent onTextureReceived = new UnityEvent();
@@ -32,7 +32,7 @@ namespace UltraCombos.Minions
             var options = new List<ChannelOption> { new ChannelOption(ChannelOptions.MaxSendMessageLength, int.MaxValue) };
             Connect(options);
 
-            server = GetComponent<ResourceServer>();
+            server = GetComponent<Marvel.DrawHeroes.DrawHeroesGrpcServer>();
             server.onMessageReceived += OnMessageReceived;
         }
 
@@ -54,8 +54,8 @@ namespace UltraCombos.Minions
 
         public void SendData(DataRequest request)
         {
-            if (State != ChannelState.Ready)
+            //if (State != ChannelState.Ready)
-                return;
+            //    return;
 
             SendDataAsync(request);
         }