[03_RoyalGallery/Unity-19050-03_RoyalGallery_Navigator_PC]

Added bg/fg feature.

03_RoyalGallery/Unity-19050-03_RoyalGallery_Navigator_PC/19050-03_RoyalGallery_Navigator_PC/Assets/PaintingNavigator.unity

@@ -766,7 +766,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 3
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &136420940
 GameObject:
@@ -966,6 +966,50 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 143218146}
   m_CullTransparentMesh: 0
+--- !u!1 &164669281
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 164669282}
+  - component: {fileID: 164669283}
+  m_Layer: 0
+  m_Name: BG FG ResourceLoader
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &164669282
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 164669281}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -1863.5195, y: 485.2947, z: 81.5}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &164669283
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 164669281}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ce0526a412d645f41b6e492af273cfa4, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  maxNum: 16
 --- !u!1 &166703764
 GameObject:
   m_ObjectHideFlags: 0
@@ -2531,7 +2575,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 5
+  m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &549065342
 GameObject:
@@ -4050,7 +4094,7 @@ Transform:
   - {fileID: 166703765}
   - {fileID: 1005367767}
   m_Father: {fileID: 0}
-  m_RootOrder: 8
+  m_RootOrder: 9
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &828921603
 GameObject:
@@ -4666,7 +4710,7 @@ Transform:
   - {fileID: 1610923707}
   - {fileID: 1147096828}
   m_Father: {fileID: 0}
-  m_RootOrder: 7
+  m_RootOrder: 8
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &969675704
 GameObject:
@@ -5221,6 +5265,11 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 621046121}
     m_Modifications:
+    - target: {fileID: 4765193242083809103, guid: eb773073a5b065b44b81ea4b2520c480,
+        type: 3}
+      propertyPath: loader
+      value: 
+      objectReference: {fileID: 164669283}
     - target: {fileID: 6457669733996986344, guid: eb773073a5b065b44b81ea4b2520c480,
         type: 3}
       propertyPath: m_Name
@@ -6996,7 +7045,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 4
+  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1522636371
 GameObject:
@@ -7374,7 +7423,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 2
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1610923704
 GameObject:
@@ -8406,7 +8455,7 @@ RectTransform:
   - {fileID: 690203094}
   - {fileID: 136420941}
   m_Father: {fileID: 0}
-  m_RootOrder: 6
+  m_RootOrder: 7
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -9725,6 +9774,11 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 71193839}
     m_Modifications:
+    - target: {fileID: 4765193242083809103, guid: eb773073a5b065b44b81ea4b2520c480,
+        type: 3}
+      propertyPath: loader
+      value: 
+      objectReference: {fileID: 164669283}
     - target: {fileID: 6457669733996986344, guid: eb773073a5b065b44b81ea4b2520c480,
         type: 3}
       propertyPath: m_Name

03_RoyalGallery/Unity-19050-03_RoyalGallery_Navigator_PC/19050-03_RoyalGallery_Navigator_PC/Assets/PaintingNavigator/Script/Artwork.cs

@@ -0,0 +1,42 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace UltraCombos.Frozen.RoyalGallery
+{
+    public class Artwork
+    {
+        public string serial = "";
+        public Texture2D    painting = null;
+        public Texture2D    signature = null;
+        public Color32      color;
+
+        public void CopyTo(Artwork artwork)
+        {
+            artwork.serial = serial;
+            if (artwork.painting != null)
+            {
+                Object.Destroy(artwork.painting);
+                artwork.painting = null;
+            }
+            if (artwork.signature != null)
+            {
+                Object.Destroy(artwork.signature);
+                artwork.signature = null;
+            }
+            artwork.painting = painting;
+            artwork.signature = signature;
+            artwork.color = color;
+        }
+    }
+
+    public class ArtworkThumbnail
+    {
+        public string serial = "";
+        public Texture2D thumbnail = null;
+        public string painting_path = "";
+        public string signature_path = "";
+        public string message_path = "";
+    }
+}
+

03_RoyalGallery/Unity-19050-03_RoyalGallery_Navigator_PC/19050-03_RoyalGallery_Navigator_PC/Assets/PaintingNavigator/Script/Artwork.cs.meta

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

03_RoyalGallery/Unity-19050-03_RoyalGallery_Navigator_PC/19050-03_RoyalGallery_Navigator_PC/Assets/PaintingNavigator/Script/ArtworkGenerator.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.Events;
 
-namespace UltraCombos.Minions.GirlsRoom.Nav
+namespace UltraCombos.Frozen.RoyalGallery
 {
     [RequireComponent(typeof(Camera))]
     public class ArtworkGenerator : MonoBehaviour

03_RoyalGallery/Unity-19050-03_RoyalGallery_Navigator_PC/19050-03_RoyalGallery_Navigator_PC/Assets/PaintingNavigator/Script/BG_FG_Loader.cs

@@ -0,0 +1,77 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace UltraCombos.Frozen.RoyalGallery
+{
+    public class BG_FG_Loader : MonoBehaviour
+    {
+        public int maxNum = 16;
+
+        Dictionary<string, Texture2D> bgs = new Dictionary<string, Texture2D>();
+        Dictionary<string, Texture2D> fgs = new Dictionary<string, Texture2D>();
+
+        // Start is called before the first frame update
+        void Start()
+        {
+            for (int i = 0; i < maxNum; ++i)
+            {
+                string key = $"{i}".PadLeft(2, '0');
+                {
+                    string name = $"bg_{key}";
+
+                    Texture2D tex = Resources.Load<Texture2D>(name);
+                    if (tex)
+                    {
+                        bgs.Add(key, tex);
+                    }
+                }
+
+                {
+                    string name = $"fg_{key}";
+                    Texture2D tex = Resources.Load<Texture2D>(name);
+                    if (tex)
+                    {
+                        fgs.Add(key, tex);
+                    }
+                }
+            }
+        }
+
+        public Texture2D GetBackground(string serial)
+        {
+            string key = GetKey(serial);
+            if (!bgs.ContainsKey(key))
+            {
+                return null;
+            }
+
+            return bgs[key];
+        }
+
+        public Texture2D GetForeground(string serial)
+        {
+            string key = GetKey(serial);
+            if (!fgs.ContainsKey(key))
+            {
+                return null;
+            }
+
+            return fgs[key];
+        }
+
+        private string GetKey(string serial)
+        {
+            string str_no = serial.Substring(serial.Length - 1);
+            int no = int.Parse(str_no, System.Globalization.NumberStyles.HexNumber);
+            return no.ToString("D2");
+        }
+
+        // Update is called once per frame
+        void Update()
+        {
+
+        }
+    }
+}
+

03_RoyalGallery/Unity-19050-03_RoyalGallery_Navigator_PC/19050-03_RoyalGallery_Navigator_PC/Assets/PaintingNavigator/Script/BG_FG_Loader.cs.meta

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

03_RoyalGallery/Unity-19050-03_RoyalGallery_Navigator_PC/19050-03_RoyalGallery_Navigator_PC/Assets/PaintingNavigator/Script/Painting.cs

@@ -0,0 +1,64 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+using UnityEngine.EventSystems;
+using UnityEngine.Events;
+
+namespace UltraCombos.Frozen.RoyalGallery
+{
+    public class Painting : MonoBehaviour
+    {
+        public BG_FG_Loader loader;
+
+        RawImage bg_image;
+        RawImage painting_image;
+        RawImage fg_image;
+        RawImage signature_image;
+
+        private void Start()
+        {
+            var raw_images = GetComponentsInChildren<RawImage>(true);
+            bg_image = raw_images[1];
+            bg_image.texture = Texture2D.whiteTexture;
+
+            painting_image = raw_images[2];
+            painting_image.texture = Texture2D.whiteTexture;
+
+            fg_image = raw_images[3];
+            fg_image.texture = Texture2D.whiteTexture;
+
+            signature_image = raw_images[4];
+            signature_image.texture = Texture2D.whiteTexture;
+        }
+
+        private void Update()
+        {
+
+        }
+
+        private void FixedUpdate()
+        {
+
+        }
+
+        public void UpdateArtwork(Artwork artwork)
+        {
+            UpdateArtwork(artwork.serial, artwork.painting, artwork.signature, artwork.color);
+        }
+
+        public void UpdateArtwork(string serial, Texture painting, Texture signature, Color32 color)
+        {
+            //bg_image.color = color;
+            painting_image.texture = painting;
+            signature_image.texture = signature;
+            if (loader)
+            {
+                bg_image.texture = loader.GetBackground(serial);
+                fg_image.texture = loader.GetForeground(serial);
+            }
+        }
+
+    }
+
+}

03_RoyalGallery/Unity-19050-03_RoyalGallery_Navigator_PC/19050-03_RoyalGallery_Navigator_PC/Assets/PaintingNavigator/Script/Painting.cs.meta

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

03_RoyalGallery/Unity-19050-03_RoyalGallery_Navigator_PC/19050-03_RoyalGallery_Navigator_PC/Assets/PaintingNavigator/Script/PaintingManager.cs

@@ -4,7 +4,7 @@ using UnityEngine;
 using UnityEngine.EventSystems;
 using UnityEngine.UI;
 
-namespace UltraCombos.Minions.GirlsRoom.Nav
+namespace UltraCombos.Frozen.RoyalGallery
 {
     public class PaintingManager : MonoBehaviour, IDragHandler
     {

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

@@ -5,7 +5,7 @@ using UnityEngine;
 using UnityEngine.Events;
 using UnityEngine.Networking;
 
-namespace UltraCombos.Minions.GirlsRoom.Nav
+namespace UltraCombos.Frozen.RoyalGallery
 {
     [RequireComponent(typeof(Camera))]
     public class PrintingGenerator : MonoBehaviour

03_RoyalGallery/Unity-19050-03_RoyalGallery_Navigator_PC/19050-03_RoyalGallery_Navigator_PC/Assets/PaintingNavigator/Script/PrintingManager.cs

@@ -4,7 +4,7 @@ using UnityEngine;
 using UnityEngine.Events;
 using UnityEngine.UI;
 
-namespace UltraCombos.Minions.GirlsRoom.Nav
+namespace UltraCombos.Frozen.RoyalGallery
 {
     public class PrintingManager : MonoBehaviour
     {

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

@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 using UnityEngine;
 using UnityEngine.Events;
 using UnityEngine.Networking;
-using UltraCombos.Minions.GirlsRoom.Nav;
+//using UltraCombos.Minions.GirlsRoom.Nav;
 
 namespace UltraCombos.Frozen.RoyalGallery
 {
@@ -211,7 +211,7 @@ namespace UltraCombos.Frozen.RoyalGallery
 
             color = Utils.HexToColor(data.Message);
 
-            var artwork = new Minions.GirlsRoom.Nav.Artwork() { serial = data.Serial, painting = painting, signature = signature, color = color };
+            var artwork = new Artwork() { serial = data.Serial, painting = painting, signature = signature, color = color };
 
             var folder = Directory.CreateDirectory($"{store_dir.FullName}/{data.Serial}");
             string painting_path = $"{folder.FullName}/{painting_filename}";

03_RoyalGallery/Unity-19050-03_RoyalGallery_Navigator_PC/19050-03_RoyalGallery_Navigator_PC/Assets/PaintingNavigator/Script/Thumbnail.cs

@@ -5,7 +5,7 @@ using UnityEngine.UI;
 using UnityEngine.EventSystems;
 using UnityEngine.Events;
 
-namespace UltraCombos.Minions.GirlsRoom.Nav
+namespace UltraCombos.Frozen.RoyalGallery
 {
     public class Thumbnail : MonoBehaviour, IPointerClickHandler
     {

03_RoyalGallery/Unity-19050-03_RoyalGallery_Navigator_PC/19050-03_RoyalGallery_Navigator_PC/Assets/PaintingNavigator/Script/WarningDialogue.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-namespace UltraCombos.Minions.GirlsRoom.Nav
+namespace UltraCombos.Frozen.RoyalGallery
 {
     [RequireComponent(typeof(CanvasGroup))]
     public class WarningDialogue : MonoBehaviour