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

03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/Resources.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 2b256610b1c85bb4aab826657d690b10
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/Resources/Shader/TransitionEffectShader.shader

@@ -47,7 +47,7 @@
                 fixed4 col_dst	= tex2D(_TargetTex, i.uv);
 				fixed4 col_tra	= tex2D(_TransitionTex, i.uv);
 
-				col_dst.rgb = col_dst.rgb * col_tra.g + col_src.rgb * (1 - col_tra.g);
+				col_dst.rgba = col_dst.rgba * col_tra.r + col_src.rgba * (1 - col_tra.r);
                 return col_dst;
             }
             ENDCG

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

@@ -3148,7 +3148,7 @@ Camera:
   m_Enabled: 1
   serializedVersion: 2
   m_ClearFlags: 2
-  m_BackGroundColor: {r: 0, g: 0, b: 0, a: 0}
+  m_BackGroundColor: {r: 1, g: 1, b: 1, a: 0}
   m_projectionMatrixMode: 1
   m_SensorSize: {x: 36, y: 24}
   m_LensShift: {x: 0, y: 0}
@@ -3192,7 +3192,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 1067656010}
-  m_RootOrder: 1
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &961139956
 MonoBehaviour:
@@ -3285,7 +3285,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 961139953}
-  m_Enabled: 0
+  m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 10f07b3f9fb96524db93eb42d89c229c, type: 3}
   m_Name: 
@@ -3294,7 +3294,7 @@ MonoBehaviour:
   LoadOnAwake: 1
   PlayOnStart: 0
   Looping: 0
-  AudioVolume: 1
+  AudioVolume: 0
 --- !u!114 &961139959
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -3302,7 +3302,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 961139953}
-  m_Enabled: 0
+  m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 197846e613a35e34aae5281af759652f, type: 3}
   m_Name: 
@@ -3492,7 +3492,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 1067656010}
-  m_RootOrder: 0
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!20 &998739363
 Camera:
@@ -3758,8 +3758,8 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 100}
   m_LocalScale: {x: 0.16666667, y: 0.16666667, z: 0.16666667}
   m_Children:
-  - {fileID: 998739362}
   - {fileID: 961139955}
+  - {fileID: 998739362}
   - {fileID: 2144215267}
   - {fileID: 2092843638}
   - {fileID: 1821221164}

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

@@ -151,6 +151,19 @@ namespace UltraCombos.Frozen
             } 
         }
 
+        public void OnPause()
+        {
+            if (BgMovie)
+            {
+                BgMovie.Pause();
+            }
+
+            if (FgMovie)
+            {
+                FgMovie.Pause();
+            }
+        }
+
         public void OnStop()
         {
             if (BgMovie)

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

@@ -141,6 +141,12 @@ namespace UltraCombos.Frozen.RoyalGallery
 
         IEnumerator OnTransition(string next)
         {
+            if (portraits.ContainsKey(PortraitKeyCur))
+            {
+                Portrait p_cur = portraits[PortraitKeyCur];
+                p_cur.OnPause();
+            }
+            
             isTransiting = true;
 
             Portrait p_nxt = portraits[next];
@@ -159,7 +165,6 @@ namespace UltraCombos.Frozen.RoyalGallery
 
         IEnumerator UpdateTransition(string next, TransitionScript transition)
         {
-            /*
             transition.OnPlay();
 
             while (true)
@@ -173,7 +178,6 @@ namespace UltraCombos.Frozen.RoyalGallery
             }
 
             transition.OnStop();
-            */
 
             string PortraitKeyPre = PortraitKeyCur;
             PortraitKeyCur = next;
@@ -200,14 +204,12 @@ namespace UltraCombos.Frozen.RoyalGallery
 
         IEnumerator OnStopPortrait(string pre)
         {
-            if (!portraits.ContainsKey(pre))
+            if (portraits.ContainsKey(pre))
             {
-                yield return null;
+                Portrait p = portraits[pre];
+                p.OnStop();
             }
 
-            Portrait p = portraits[pre];
-            p.OnStop();
-
             isTransiting = false;
 
             yield return null;

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

@@ -5,9 +5,20 @@ using System.Threading.Tasks;
 using UnityEngine;
 using UnityEngine.Events;
 using UnityEngine.Networking;
+//using System.Runtime.CompilerServices;
 
 namespace UltraCombos.Frozen.RoyalGallery
 {
+    /*
+    public static class AwaitExtensions
+    {
+        public static TaskAwaiter GetAwaiter(this System.TimeSpan timeSpan)
+        {
+            return Task.Delay(timeSpan).GetAwaiter();
+        }
+    }
+    */
+
     class IndexInfo
     {
         public string id;
@@ -91,41 +102,49 @@ namespace UltraCombos.Frozen.RoyalGallery
 
             if (data != null)
             {
-                string role_id = data.Id;
+                HandleData(data);
+            }
 
-                if (texture == null)
+            DebugInformation.Instance.UpdateProperty("Resouce Server", $"{port}");
-                {
+        }
-                    texture = new Texture2D(2048, 2048, TextureFormat.ARGB32, false);
-                }
 
-                if (tex_sign == null)
+        //async Task HandleData(DataRequest data)
-                {
+        void HandleData(DataRequest data)
-                    tex_sign = new Texture2D(1513, 625, TextureFormat.ARGB32, false);
+        {
-                }
+            string role_id = data.Id;
 
-                if (texture.LoadImage(data.Content.ToByteArray(), false))
+            if (texture == null)
-                {
+            {
-                    Texture2D tex_tmp = null;
+                texture = new Texture2D(2048, 2048, TextureFormat.ARGB32, false);
-                    if (tex_sign.LoadImage(data.Signature.ToByteArray(), false))
+            }
-                    {
+
-                        tex_tmp = tex_sign;
+            if (tex_sign == null)
-                        Log($"Signature {role_id} is loaded. ({tex_sign.width} x {tex_sign.height})");
+            {
-                    }
+                tex_sign = new Texture2D(1513, 625, TextureFormat.ARGB32, false);
-
+            }
-                    onMessageReceived.Invoke(data);
+
-                    onTextureReceived.Invoke(role_id, texture, tex_tmp);
+            if (texture.LoadImage(data.Content.ToByteArray(), false))
-                    Log($"Texture {role_id} is loaded. ({texture.width} x {texture.height})");
+            {
-
+                Texture2D tex_tmp = null;
-                    DebugInformation.Instance.UpdateProperty("Last painting", $"{role_id} ({texture.width} x {texture.height})");
+                if (tex_sign.LoadImage(data.Signature.ToByteArray(), false))
-                }
-                else
                 {
-                    Log("Texture load fail.", LogType.Error);
+                    tex_tmp = tex_sign;
-                    DebugInformation.Instance.UpdateProperty("Last painting", $"load fail");
+                    Log($"Signature {role_id} is loaded. ({tex_sign.width} x {tex_sign.height})");
                 }
+
+                onMessageReceived.Invoke(data);
+                onTextureReceived.Invoke(role_id, texture, tex_tmp);
+                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}");
+            //await System.TimeSpan.FromMilliseconds(100);
         }
 
         private void OnMessageReceived(DataRequest request)
@@ -139,15 +158,15 @@ namespace UltraCombos.Frozen.RoyalGallery
 
         private IndexInfo OnIndexRequest(int deviceId)
         {
-            IndexInfo info = new IndexInfo();
-            info.id = m_IdList[index];
-            info.color = onRequestColor(info.id);
-
             lock (idx_mtx)
             {
                 index = (index + 1) % m_IdList.Count;
             }
 
+            IndexInfo info = new IndexInfo();
+            info.id = m_IdList[index];
+            info.color = onRequestColor(info.id);
+
             return info;
         }
     }

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

@@ -30,13 +30,12 @@ namespace UltraCombos.Frozen.RoyalGallery
 
         public void OnPlay()
         {
-            enabled = true;
             MovPlayer.Play();
         }
 
         public void OnStop()
         {
-            enabled = false;
+
         }
 
         // Update is called once per frame

03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/ProjectSettings/ProjectSettings.asset

@@ -118,7 +118,7 @@ PlayerSettings:
     16:10: 1
     16:9: 1
     Others: 1
-  bundleVersion: 0.5
+  bundleVersion: 1.0
   preloadedAssets: []
   metroInputSource: 0
   wsaTransparentSwapchain: 0

03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/ProjectSettings/ProjectSettings.asset

@@ -118,7 +118,7 @@ PlayerSettings:
     16:10: 1
     16:9: 1
     Others: 1
-  bundleVersion: 0.5
+  bundleVersion: 1.0
   preloadedAssets: []
   metroInputSource: 0
   wsaTransparentSwapchain: 0

04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Scenes/Main_IceSlideV2.unity

@@ -192,6 +192,86 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4224728}
   m_CullTransparentMesh: 0
+--- !u!28 &26720473
+Texture2D:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_ImageContentsHash:
+    serializedVersion: 2
+    Hash: 00000000000000000000000000000000
+  m_ForcedFallbackFormat: 4
+  m_DownscaleFallback: 0
+  serializedVersion: 2
+  m_Width: 2
+  m_Height: 2
+  m_CompleteImageSize: 16
+  m_TextureFormat: 5
+  m_MipCount: 1
+  m_IsReadable: 1
+  m_StreamingMipmaps: 0
+  m_StreamingMipmapsPriority: 0
+  m_AlphaIsTransparency: 0
+  m_ImageCount: 1
+  m_TextureDimension: 2
+  m_TextureSettings:
+    serializedVersion: 2
+    m_FilterMode: 1
+    m_Aniso: 1
+    m_MipBias: 0
+    m_WrapU: 0
+    m_WrapV: 0
+    m_WrapW: 0
+  m_LightmapFormat: 0
+  m_ColorSpace: 1
+  image data: 16
+  _typelessdata: 00000000000000000000000000000000
+  m_StreamData:
+    offset: 0
+    size: 0
+    path: 
+--- !u!28 &106052240
+Texture2D:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_ImageContentsHash:
+    serializedVersion: 2
+    Hash: 00000000000000000000000000000000
+  m_ForcedFallbackFormat: 4
+  m_DownscaleFallback: 0
+  serializedVersion: 2
+  m_Width: 2
+  m_Height: 2
+  m_CompleteImageSize: 16
+  m_TextureFormat: 5
+  m_MipCount: 1
+  m_IsReadable: 1
+  m_StreamingMipmaps: 0
+  m_StreamingMipmapsPriority: 0
+  m_AlphaIsTransparency: 0
+  m_ImageCount: 1
+  m_TextureDimension: 2
+  m_TextureSettings:
+    serializedVersion: 2
+    m_FilterMode: 1
+    m_Aniso: 1
+    m_MipBias: 0
+    m_WrapU: 0
+    m_WrapV: 0
+    m_WrapW: 0
+  m_LightmapFormat: 0
+  m_ColorSpace: 1
+  image data: 16
+  _typelessdata: 00000000000000000000000000000000
+  m_StreamData:
+    offset: 0
+    size: 0
+    path: 
 --- !u!1 &124282309
 GameObject:
   m_ObjectHideFlags: 0
@@ -5213,7 +5293,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Texture: {fileID: 2087562404}
+  m_Texture: {fileID: 26720473}
   m_UVRect:
     serializedVersion: 2
     x: 0
@@ -15997,6 +16077,46 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: TouchArea+OnPointerExitEvent, Assembly-CSharp, Version=0.0.0.0, Culture=neutral,
       PublicKeyToken=null
+--- !u!28 &593259074
+Texture2D:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_ImageContentsHash:
+    serializedVersion: 2
+    Hash: 00000000000000000000000000000000
+  m_ForcedFallbackFormat: 4
+  m_DownscaleFallback: 0
+  serializedVersion: 2
+  m_Width: 2
+  m_Height: 2
+  m_CompleteImageSize: 16
+  m_TextureFormat: 5
+  m_MipCount: 1
+  m_IsReadable: 1
+  m_StreamingMipmaps: 0
+  m_StreamingMipmapsPriority: 0
+  m_AlphaIsTransparency: 0
+  m_ImageCount: 1
+  m_TextureDimension: 2
+  m_TextureSettings:
+    serializedVersion: 2
+    m_FilterMode: 1
+    m_Aniso: 1
+    m_MipBias: 0
+    m_WrapU: 0
+    m_WrapV: 0
+    m_WrapW: 0
+  m_LightmapFormat: 0
+  m_ColorSpace: 1
+  image data: 16
+  _typelessdata: 00000000000000000000000000000000
+  m_StreamData:
+    offset: 0
+    size: 0
+    path: 
 --- !u!1 &612500324
 GameObject:
   m_ObjectHideFlags: 0
@@ -21633,7 +21753,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Texture: {fileID: 1471250782}
+  m_Texture: {fileID: 2014479871}
   m_UVRect:
     serializedVersion: 2
     x: 0
@@ -22345,6 +22465,46 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!28 &998806426
+Texture2D:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_ImageContentsHash:
+    serializedVersion: 2
+    Hash: 00000000000000000000000000000000
+  m_ForcedFallbackFormat: 4
+  m_DownscaleFallback: 0
+  serializedVersion: 2
+  m_Width: 2
+  m_Height: 2
+  m_CompleteImageSize: 16
+  m_TextureFormat: 5
+  m_MipCount: 1
+  m_IsReadable: 1
+  m_StreamingMipmaps: 0
+  m_StreamingMipmapsPriority: 0
+  m_AlphaIsTransparency: 0
+  m_ImageCount: 1
+  m_TextureDimension: 2
+  m_TextureSettings:
+    serializedVersion: 2
+    m_FilterMode: 1
+    m_Aniso: 1
+    m_MipBias: 0
+    m_WrapU: 0
+    m_WrapV: 0
+    m_WrapW: 0
+  m_LightmapFormat: 0
+  m_ColorSpace: 1
+  image data: 16
+  _typelessdata: 00000000000000000000000000000000
+  m_StreamData:
+    offset: 0
+    size: 0
+    path: 
 --- !u!1001 &1008297175
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -22407,46 +22567,6 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 1f68bf7cec2600e49a46d2f0554453c8, type: 3}
---- !u!28 &1077889789
-Texture2D:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: 
-  m_ImageContentsHash:
-    serializedVersion: 2
-    Hash: 00000000000000000000000000000000
-  m_ForcedFallbackFormat: 4
-  m_DownscaleFallback: 0
-  serializedVersion: 2
-  m_Width: 2
-  m_Height: 2
-  m_CompleteImageSize: 16
-  m_TextureFormat: 5
-  m_MipCount: 1
-  m_IsReadable: 1
-  m_StreamingMipmaps: 0
-  m_StreamingMipmapsPriority: 0
-  m_AlphaIsTransparency: 0
-  m_ImageCount: 1
-  m_TextureDimension: 2
-  m_TextureSettings:
-    serializedVersion: 2
-    m_FilterMode: 1
-    m_Aniso: 1
-    m_MipBias: 0
-    m_WrapU: 0
-    m_WrapV: 0
-    m_WrapW: 0
-  m_LightmapFormat: 0
-  m_ColorSpace: 1
-  image data: 16
-  _typelessdata: 00000000000000000000000000000000
-  m_StreamData:
-    offset: 0
-    size: 0
-    path: 
 --- !u!1 &1084066362
 GameObject:
   m_ObjectHideFlags: 0
@@ -22615,7 +22735,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Texture: {fileID: 1077889789}
+  m_Texture: {fileID: 593259074}
   m_UVRect:
     serializedVersion: 2
     x: 0
@@ -22944,46 +23064,6 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 9
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!28 &1284061233
-Texture2D:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: 
-  m_ImageContentsHash:
-    serializedVersion: 2
-    Hash: 00000000000000000000000000000000
-  m_ForcedFallbackFormat: 4
-  m_DownscaleFallback: 0
-  serializedVersion: 2
-  m_Width: 2
-  m_Height: 2
-  m_CompleteImageSize: 16
-  m_TextureFormat: 5
-  m_MipCount: 1
-  m_IsReadable: 1
-  m_StreamingMipmaps: 0
-  m_StreamingMipmapsPriority: 0
-  m_AlphaIsTransparency: 0
-  m_ImageCount: 1
-  m_TextureDimension: 2
-  m_TextureSettings:
-    serializedVersion: 2
-    m_FilterMode: 1
-    m_Aniso: 1
-    m_MipBias: 0
-    m_WrapU: 0
-    m_WrapV: 0
-    m_WrapW: 0
-  m_LightmapFormat: 0
-  m_ColorSpace: 1
-  image data: 16
-  _typelessdata: 00000000000000000000000000000000
-  m_StreamData:
-    offset: 0
-    size: 0
-    path: 
 --- !u!1 &1290975428
 GameObject:
   m_ObjectHideFlags: 0
@@ -27860,6 +27940,50 @@ ParticleSystem:
         m_PostInfinity: 2
         m_RotationOrder: 4
     vectorLabel1_3: W
+--- !u!1 &1366442276
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1366442278}
+  - component: {fileID: 1366442277}
+  m_Layer: 0
+  m_Name: SytemConfig
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &1366442277
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1366442276}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e92877fdd13500346b9be002ab88890f, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  UseMouse: 0
+--- !u!4 &1366442278
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1366442276}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 23.768824, y: -10.28636, z: 90.919525}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 10
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1369086349
 GameObject:
   m_ObjectHideFlags: 0
@@ -27980,7 +28104,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Texture: {fileID: 1657439072}
+  m_Texture: {fileID: 998806426}
   m_UVRect:
     serializedVersion: 2
     x: 0
@@ -28212,46 +28336,6 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1459780327}
   m_CullTransparentMesh: 0
---- !u!28 &1471250782
-Texture2D:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: 
-  m_ImageContentsHash:
-    serializedVersion: 2
-    Hash: 00000000000000000000000000000000
-  m_ForcedFallbackFormat: 4
-  m_DownscaleFallback: 0
-  serializedVersion: 2
-  m_Width: 2
-  m_Height: 2
-  m_CompleteImageSize: 16
-  m_TextureFormat: 5
-  m_MipCount: 1
-  m_IsReadable: 1
-  m_StreamingMipmaps: 0
-  m_StreamingMipmapsPriority: 0
-  m_AlphaIsTransparency: 0
-  m_ImageCount: 1
-  m_TextureDimension: 2
-  m_TextureSettings:
-    serializedVersion: 2
-    m_FilterMode: 1
-    m_Aniso: 1
-    m_MipBias: 0
-    m_WrapU: 0
-    m_WrapV: 0
-    m_WrapW: 0
-  m_LightmapFormat: 0
-  m_ColorSpace: 1
-  image data: 16
-  _typelessdata: 00000000000000000000000000000000
-  m_StreamData:
-    offset: 0
-    size: 0
-    path: 
 --- !u!1 &1482923420
 GameObject:
   m_ObjectHideFlags: 0
@@ -33450,46 +33534,6 @@ ParticleSystem:
         m_PostInfinity: 2
         m_RotationOrder: 4
     vectorLabel1_3: W
---- !u!28 &1657439072
-Texture2D:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: 
-  m_ImageContentsHash:
-    serializedVersion: 2
-    Hash: 00000000000000000000000000000000
-  m_ForcedFallbackFormat: 4
-  m_DownscaleFallback: 0
-  serializedVersion: 2
-  m_Width: 2
-  m_Height: 2
-  m_CompleteImageSize: 16
-  m_TextureFormat: 5
-  m_MipCount: 1
-  m_IsReadable: 1
-  m_StreamingMipmaps: 0
-  m_StreamingMipmapsPriority: 0
-  m_AlphaIsTransparency: 0
-  m_ImageCount: 1
-  m_TextureDimension: 2
-  m_TextureSettings:
-    serializedVersion: 2
-    m_FilterMode: 1
-    m_Aniso: 1
-    m_MipBias: 0
-    m_WrapU: 0
-    m_WrapV: 0
-    m_WrapW: 0
-  m_LightmapFormat: 0
-  m_ColorSpace: 1
-  image data: 16
-  _typelessdata: 00000000000000000000000000000000
-  m_StreamData:
-    offset: 0
-    size: 0
-    path: 
 --- !u!1 &1670462219
 GameObject:
   m_ObjectHideFlags: 0
@@ -34289,7 +34333,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Texture: {fileID: 1284061233}
+  m_Texture: {fileID: 106052240}
   m_UVRect:
     serializedVersion: 2
     x: 0
@@ -34377,6 +34421,46 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1999590984}
   m_CullTransparentMesh: 0
+--- !u!28 &2014479871
+Texture2D:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_ImageContentsHash:
+    serializedVersion: 2
+    Hash: 00000000000000000000000000000000
+  m_ForcedFallbackFormat: 4
+  m_DownscaleFallback: 0
+  serializedVersion: 2
+  m_Width: 2
+  m_Height: 2
+  m_CompleteImageSize: 16
+  m_TextureFormat: 5
+  m_MipCount: 1
+  m_IsReadable: 1
+  m_StreamingMipmaps: 0
+  m_StreamingMipmapsPriority: 0
+  m_AlphaIsTransparency: 0
+  m_ImageCount: 1
+  m_TextureDimension: 2
+  m_TextureSettings:
+    serializedVersion: 2
+    m_FilterMode: 1
+    m_Aniso: 1
+    m_MipBias: 0
+    m_WrapU: 0
+    m_WrapV: 0
+    m_WrapW: 0
+  m_LightmapFormat: 0
+  m_ColorSpace: 1
+  image data: 16
+  _typelessdata: 00000000000000000000000000000000
+  m_StreamData:
+    offset: 0
+    size: 0
+    path: 
 --- !u!1 &2025760255
 GameObject:
   m_ObjectHideFlags: 0
@@ -34646,46 +34730,6 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2063636334}
   m_CullTransparentMesh: 0
---- !u!28 &2087562404
-Texture2D:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: 
-  m_ImageContentsHash:
-    serializedVersion: 2
-    Hash: 00000000000000000000000000000000
-  m_ForcedFallbackFormat: 4
-  m_DownscaleFallback: 0
-  serializedVersion: 2
-  m_Width: 2
-  m_Height: 2
-  m_CompleteImageSize: 16
-  m_TextureFormat: 5
-  m_MipCount: 1
-  m_IsReadable: 1
-  m_StreamingMipmaps: 0
-  m_StreamingMipmapsPriority: 0
-  m_AlphaIsTransparency: 0
-  m_ImageCount: 1
-  m_TextureDimension: 2
-  m_TextureSettings:
-    serializedVersion: 2
-    m_FilterMode: 1
-    m_Aniso: 1
-    m_MipBias: 0
-    m_WrapU: 0
-    m_WrapV: 0
-    m_WrapW: 0
-  m_LightmapFormat: 0
-  m_ColorSpace: 1
-  image data: 16
-  _typelessdata: 00000000000000000000000000000000
-  m_StreamData:
-    offset: 0
-    size: 0
-    path: 
 --- !u!1 &2114361731
 GameObject:
   m_ObjectHideFlags: 0

04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Script/SystemConfig.cs

@@ -0,0 +1,18 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class SystemConfig : MonoBehaviour
+{
+
+    public static SystemConfig Instance;
+
+    [AutoUI] public bool UseMouse;
+
+    // Start is called before the first frame update
+    void Awake()
+    {
+        Instance = this;
+    }
+
+}

04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Script/SystemConfig.cs.meta

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

04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Script/TouchArea.cs

@@ -63,17 +63,19 @@ public class TouchArea : MonoBehaviour, IPointerDownHandler, IDragHandler, IPoin
     {
         if (RayNoHit != null)
             RayNoHit.Invoke(null);
-        foreach (PointerEventData pointerdata in inputmodule.GetPointerDatas.Values)
+        foreach (PointerEventData eventData in inputmodule.GetPointerDatas.Values)
         {
+            if (SystemConfig.Instance.UseMouse == false && eventData.pointerId <= 0)
+                continue;
             List<RaycastResult> raycastResult = new List<RaycastResult>();
-            EventSystem.current.RaycastAll(pointerdata, raycastResult);
+            EventSystem.current.RaycastAll(eventData, raycastResult);
             if(raycastResult.Count != 0)
             {
                 foreach(RaycastResult result in raycastResult)
                 {
                     if(result.gameObject == gameObject)
                     {
-                        RayHit.Invoke(pointerdata);
+                        RayHit.Invoke(eventData);
                     }
                 }
             }
@@ -83,6 +85,8 @@ public class TouchArea : MonoBehaviour, IPointerDownHandler, IDragHandler, IPoin
 
     public void OnPointerDown(PointerEventData eventData)
     {
+        if (SystemConfig.Instance.UseMouse == false && eventData.pointerId <= 0)
+            return;
         if (PointerDown == null)
             return;
         if (skip_on_mouse_only(eventData))
@@ -109,6 +113,8 @@ public class TouchArea : MonoBehaviour, IPointerDownHandler, IDragHandler, IPoin
 
     public void OnPointerExit(PointerEventData eventData)
     {
+        if (SystemConfig.Instance.UseMouse == false && eventData.pointerId <= 0)
+            return;
         if (PointerExit == null)
             return;
         if (skip_on_mouse_only(eventData))
@@ -118,6 +124,8 @@ public class TouchArea : MonoBehaviour, IPointerDownHandler, IDragHandler, IPoin
 
     public void OnPointerEnter(PointerEventData eventData)
     {
+        if (SystemConfig.Instance.UseMouse == false && eventData.pointerId <= 0)
+            return;
         if (PointerEnter == null)
             return;
         if (skip_on_mouse_only(eventData))
@@ -127,6 +135,8 @@ public class TouchArea : MonoBehaviour, IPointerDownHandler, IDragHandler, IPoin
 
     public void OnPointerClick(PointerEventData eventData)
     {
+        if (SystemConfig.Instance.UseMouse == false && eventData.pointerId <= 0)
+            return;
         if (PointerClick == null)
             return;
         if (skip_on_mouse_only(eventData))

_Package/com.ultracombos.frozen.royal-gallery-asset

@@ -1 +1 @@
-Subproject commit 20010f9d78777a7d3b5c20a0d879cf26b996ce04
+Subproject commit 240bddf13ed5fccb8d457bcbe39197ac81a64463