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/PaintingNavigator.unity

@@ -5599,7 +5599,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1147096825}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 91a9cabf19a634d2fac557d213b89a59, type: 3}
   m_Name: 
@@ -7485,7 +7485,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1610923704}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 91a9cabf19a634d2fac557d213b89a59, type: 3}
   m_Name: 

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

@@ -744,14 +744,14 @@ RectTransform:
   m_GameObject: {fileID: 374925485}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 2.5, y: 2.5, z: 1}
+  m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 1095845117}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 488, y: -626}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 1080, y: 1080}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &374925487
@@ -1808,15 +1808,15 @@ RectTransform:
   m_GameObject: {fileID: 820506440}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 3, y: 3, z: 1}
+  m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 1953387458}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 564, y: -789}
+  m_AnchoredPosition: {x: 0, y: 78}
-  m_SizeDelta: {x: 1216, y: 1216}
+  m_SizeDelta: {x: 1210, y: 1210}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &820506442
 MonoBehaviour:
@@ -2275,8 +2275,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 30}
+  m_AnchoredPosition: {x: 0, y: 33}
-  m_SizeDelta: {x: 1300, y: 1300}
+  m_SizeDelta: {x: 1290, y: 1290}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &937425705
 MonoBehaviour:
@@ -2448,7 +2448,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 961139953}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 91a9cabf19a634d2fac557d213b89a59, type: 3}
   m_Name: 
@@ -3533,14 +3533,14 @@ RectTransform:
   m_GameObject: {fileID: 1502836840}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 3, y: 3, z: 1}
+  m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 2092843638}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -92, y: -1202}
+  m_AnchoredPosition: {x: 0, y: 50}
   m_SizeDelta: {x: 1080, y: 1080}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1502836842
@@ -4587,8 +4587,8 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   count: 1
-  width: 1748
+  width: 1080
-  height: 500
+  height: 1920
   fps: 60
   mode: 1
   cursor: 1

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

@@ -3,25 +3,25 @@
 --- !u!310 &1
 UnityConnectSettings:
   m_ObjectHideFlags: 0
+  serializedVersion: 1
   m_Enabled: 1
   m_TestMode: 0
-  m_TestEventUrl: 
+  m_EventOldUrl: https://api.uca.cloud.unity3d.com/v1/events
-  m_TestConfigUrl: 
+  m_EventUrl: https://cdp.cloud.unity3d.com/v1/events
+  m_ConfigUrl: https://config.uca.cloud.unity3d.com
   m_TestInitMode: 0
   CrashReportingSettings:
-    m_EventUrl: https://perf-events.cloud.unity3d.com/api/events/crashes
+    m_EventUrl: https://perf-events.cloud.unity3d.com
-    m_NativeEventUrl: https://perf-events.cloud.unity3d.com/symbolicate
     m_Enabled: 0
+    m_LogBufferSize: 10
     m_CaptureEditorExceptions: 1
   UnityPurchasingSettings:
     m_Enabled: 0
     m_TestMode: 0
   UnityAnalyticsSettings:
     m_Enabled: 1
-    m_InitializeOnStartup: 1
     m_TestMode: 0
-    m_TestEventUrl: 
+    m_InitializeOnStartup: 1
-    m_TestConfigUrl: 
   UnityAdsSettings:
     m_Enabled: 0
     m_InitializeOnStartup: 1

03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Main-1-Intro.unity

@@ -920,7 +920,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -0.0000076293945, y: 9.07}
+  m_AnchoredPosition: {x: -0.0000076293945, y: -1.7}
   m_SizeDelta: {x: 322.7, y: 215.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &725555481
@@ -942,8 +942,8 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 12800000, guid: 77255e05c7f15b444bf3a7669db71623, type: 3}
+    m_Font: {fileID: 12800000, guid: 03ad2e2a2160ef747bf8b8434882a677, type: 3}
-    m_FontSize: 60
+    m_FontSize: 66
     m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 0
@@ -954,7 +954,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u4E2D"
+  m_Text: EN
 --- !u!222 &725555482
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -975,7 +975,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 5d4111d72b538b544860d085f76e5ad8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  language: 10
+  language: 40
   contexts:
   - language: 10
     text: "\u4E2D"
@@ -990,7 +990,7 @@ MonoBehaviour:
     fontSize: 66
     lineSpacing: 1
     baseline: -1.7
-    baseX: 0
+    baseX: -0.0000076293945
 --- !u!1 &746257126
 GameObject:
   m_ObjectHideFlags: 0
@@ -1133,7 +1133,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 1, y: 6}
+  m_AnchoredPosition: {x: 1, y: 32.75}
   m_SizeDelta: {x: 0, y: 14.73}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &779108442
@@ -1155,8 +1155,8 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 12800000, guid: 03ad2e2a2160ef747bf8b8434882a677, type: 3}
+    m_Font: {fileID: 12800000, guid: 77255e05c7f15b444bf3a7669db71623, type: 3}
-    m_FontSize: 100
+    m_FontSize: 80
     m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 1
@@ -1167,7 +1167,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: START
+  m_Text: "\u5F00\u59CB"
 --- !u!222 &779108443
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -1188,7 +1188,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 5d4111d72b538b544860d085f76e5ad8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  language: 10
+  language: 40
   contexts:
   - language: 10
     text: START
@@ -1203,7 +1203,7 @@ MonoBehaviour:
     fontSize: 80
     lineSpacing: 1
     baseline: 32.75
-    baseX: 0
+    baseX: 1
 --- !u!1 &938718532
 GameObject:
   m_ObjectHideFlags: 0
@@ -3665,7 +3665,7 @@ PrefabInstance:
     - target: {fileID: 4352828657788332677, guid: d6764018e72489a4fa2bb9dd376cf95a,
         type: 3}
       propertyPath: names.Array.data[9]
-      value: he
+      value: 10
       objectReference: {fileID: 0}
     - target: {fileID: 4352828657788332677, guid: d6764018e72489a4fa2bb9dd376cf95a,
         type: 3}
@@ -3675,7 +3675,7 @@ PrefabInstance:
     - target: {fileID: 4352828657788332677, guid: d6764018e72489a4fa2bb9dd376cf95a,
         type: 3}
       propertyPath: names.Array.data[8]
-      value: he
+      value: 10
       objectReference: {fileID: 0}
     - target: {fileID: 4352828657788332678, guid: d6764018e72489a4fa2bb9dd376cf95a,
         type: 3}

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.3
+  bundleVersion: 0.4
   preloadedAssets: []
   metroInputSource: 0
   wsaTransparentSwapchain: 0

Unity-19050-05-BallPool/Assets/Frozen/DSAsset/Flake01.asset

@@ -0,0 +1,17 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b7eca376a120a0e49a97afa024778843, type: 3}
+  m_Name: Flake01
+  m_EditorClassIdentifier: 
+  m_VideoLocation: 1
+  m_VideoPath: ..\FrozenMaterial\flake\_flakeBurst01.avi
+  animationClip: {fileID: 0}

Unity-19050-05-BallPool/Assets/Frozen/DSAsset/Flake01.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 816937d7e890c524f96a6ae2e7c43f3b
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Unity-19050-05-BallPool/Assets/Frozen/DSAsset/Flake02.asset

@@ -0,0 +1,17 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b7eca376a120a0e49a97afa024778843, type: 3}
+  m_Name: Flake02
+  m_EditorClassIdentifier: 
+  m_VideoLocation: 1
+  m_VideoPath: ../FrozenMaterial/flake/_flakeBurst02.avi
+  animationClip: {fileID: 0}

Unity-19050-05-BallPool/Assets/Frozen/DSAsset/Flake02.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 5287d6a26b42bb84b981174a02c71d65
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Unity-19050-05-BallPool/Assets/Frozen/DSAsset/Flake03.asset

@@ -0,0 +1,17 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b7eca376a120a0e49a97afa024778843, type: 3}
+  m_Name: Flake03
+  m_EditorClassIdentifier: 
+  m_VideoLocation: 1
+  m_VideoPath: ../FrozenMaterial/flake/_flakeBurst03.avi
+  animationClip: {fileID: 0}

Unity-19050-05-BallPool/Assets/Frozen/DSAsset/Flake03.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: db42d41abde8e644eb89e337f6daf714
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Unity-19050-05-BallPool/Assets/Frozen/DSAsset/Flake04.asset

@@ -0,0 +1,17 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b7eca376a120a0e49a97afa024778843, type: 3}
+  m_Name: Flake04
+  m_EditorClassIdentifier: 
+  m_VideoLocation: 1
+  m_VideoPath: ../FrozenMaterial/flake/_flakeBurst04.avi
+  animationClip: {fileID: 0}

Unity-19050-05-BallPool/Assets/Frozen/DSAsset/Flake04.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 90d4f4af7afb387479eeb0318c32b2d7
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Unity-19050-05-BallPool/Assets/Frozen/DSAsset/Flake05.asset

@@ -0,0 +1,17 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b7eca376a120a0e49a97afa024778843, type: 3}
+  m_Name: Flake05
+  m_EditorClassIdentifier: 
+  m_VideoLocation: 1
+  m_VideoPath: ../FrozenMaterial/flake/_flakeBurst05.avi
+  animationClip: {fileID: 0}

Unity-19050-05-BallPool/Assets/Frozen/DSAsset/Flake05.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 193ffabd554d6ae4d91a4eaed819ae7b
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Unity-19050-05-BallPool/Assets/Frozen/DSAsset/Flake06.asset

@@ -0,0 +1,17 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b7eca376a120a0e49a97afa024778843, type: 3}
+  m_Name: Flake06
+  m_EditorClassIdentifier: 
+  m_VideoLocation: 1
+  m_VideoPath: ../FrozenMaterial/flake/_flakeBurst06.avi
+  animationClip: {fileID: 0}

Unity-19050-05-BallPool/Assets/Frozen/DSAsset/Flake06.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: abe51c9457124c143b14d92150d95dfa
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Unity-19050-05-BallPool/Assets/Frozen/DSAsset/Flake07.asset

@@ -0,0 +1,17 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b7eca376a120a0e49a97afa024778843, type: 3}
+  m_Name: Flake07
+  m_EditorClassIdentifier: 
+  m_VideoLocation: 1
+  m_VideoPath: ../FrozenMaterial/flake/_flakeBurst07.avi
+  animationClip: {fileID: 0}

Unity-19050-05-BallPool/Assets/Frozen/DSAsset/Flake07.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ac2d4bf19575fe24a928032038336685
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Unity-19050-05-BallPool/Assets/Frozen/DSAsset/Flake08.asset

@@ -0,0 +1,17 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b7eca376a120a0e49a97afa024778843, type: 3}
+  m_Name: Flake08
+  m_EditorClassIdentifier: 
+  m_VideoLocation: 1
+  m_VideoPath: ../FrozenMaterial/flake/_flakeBurst08.avi
+  animationClip: {fileID: 0}

Unity-19050-05-BallPool/Assets/Frozen/DSAsset/Flake08.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 89428c9838a898e49986b6171b24e85b
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Unity-19050-05-BallPool/Assets/Frozen/DSAsset/Flake09.asset

@@ -0,0 +1,17 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b7eca376a120a0e49a97afa024778843, type: 3}
+  m_Name: Flake09
+  m_EditorClassIdentifier: 
+  m_VideoLocation: 1
+  m_VideoPath: ../FrozenMaterial/flake/_flakeBurst09.avi
+  animationClip: {fileID: 0}

Unity-19050-05-BallPool/Assets/Frozen/DSAsset/Flake09.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 0fb93ec870347e241b87c299ff094410
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Unity-19050-05-BallPool/Assets/Frozen/DSAsset/Flake10.asset

@@ -0,0 +1,17 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b7eca376a120a0e49a97afa024778843, type: 3}
+  m_Name: Flake10
+  m_EditorClassIdentifier: 
+  m_VideoLocation: 1
+  m_VideoPath: ../FrozenMaterial/flake/_flakeBurst10.avi
+  animationClip: {fileID: 0}

Unity-19050-05-BallPool/Assets/Frozen/DSAsset/Flake10.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 620b2f255a874df4c827f25936d5f40b
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Unity-19050-05-BallPool/Assets/Frozen/Flake.prefab

@@ -0,0 +1,199 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &7076451182801938125
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7076451182801938124}
+  - component: {fileID: 7076451182801938127}
+  - component: {fileID: 7076451182801938112}
+  - component: {fileID: 7076451182801938113}
+  - component: {fileID: 7076451182801938126}
+  - component: {fileID: 114582606103199088}
+  - component: {fileID: 114660513081991560}
+  - component: {fileID: 114090349892134162}
+  m_Layer: 12
+  m_Name: Flake
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &7076451182801938124
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7076451182801938125}
+  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: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 824, y: 907}
+  m_SizeDelta: {x: 256, y: 256}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &7076451182801938127
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7076451182801938125}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d53297394c1244540a97de387414e4c6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  VideoAsset: {fileID: 0}
+  playOnEnable: 1
+  Looping: 0
+  strategy: 1
+--- !u!222 &7076451182801938112
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7076451182801938125}
+  m_CullTransparentMesh: 0
+--- !u!114 &7076451182801938113
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7076451182801938125}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -98529514, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Texture: {fileID: 0}
+  m_UVRect:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 1
+    height: -1
+--- !u!114 &7076451182801938126
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7076451182801938125}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 03dae28dfe6734f4eb76c922ac72dd34, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  target: 0
+  materials: []
+  attributeName: 
+  targetObject: {fileID: 7076451182801938125}
+--- !u!114 &114582606103199088
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7076451182801938125}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 6578b62836f06c246b877ded2ab2a219, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  duration: 0.3
+  actionOnStart: 1
+  actionOnEnable: 0
+  actionOnDisable: 0
+  onTimeUp:
+    m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 7076451182801938113}
+        m_MethodName: set_raycastTarget
+        m_Mode: 6
+        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
+  onStartRunning:
+    m_PersistentCalls:
+      m_Calls: []
+  onStopRunning:
+    m_PersistentCalls:
+      m_Calls: []
+  onStart:
+    m_PersistentCalls:
+      m_Calls: []
+  onStop:
+    m_PersistentCalls:
+      m_Calls: []
+  onRestart:
+    m_PersistentCalls:
+      m_Calls: []
+  onReset:
+    m_PersistentCalls:
+      m_Calls: []
+  elapsedTime: 0
+--- !u!114 &114660513081991560
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7076451182801938125}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 101138eedb4022b4dbd5ab1609c7bde2, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!114 &114090349892134162
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7076451182801938125}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: c1c91de44cd3e914380ed9b283a39044, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  onAfterPlayed:
+    m_PersistentCalls:
+      m_Calls: []
+  onAfterStoped:
+    m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 114660513081991560}
+        m_MethodName: DestroySelf
+        m_Mode: 1
+        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

Unity-19050-05-BallPool/Assets/Frozen/Flake.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: caece935f8ce3bc47b735400cd631fbe
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Unity-19050-05-BallPool/Assets/Frozen/Script/Destroyer.cs

@@ -0,0 +1,11 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class Destroyer : MonoBehaviour
+{
+    public void DestroySelf()
+    {
+        Destroy(gameObject);
+    }
+}

Unity-19050-05-BallPool/Assets/Frozen/Script/Destroyer.cs.meta

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

Unity-19050-05-BallPool/Assets/Frozen/Script/FlakeSpawner.cs

@@ -0,0 +1,55 @@
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using UltraCombos;
+using UnityEngine;
+using UnityEngine.EventSystems;
+
+public class FlakeSpawner : MonoBehaviour
+{
+    // Start is called before the first frame update
+    public Rect roiFilterSrc;
+    public Rect roiFilterDst;
+
+    public GameObject prefab;
+
+    public DShowClip[] clips;
+
+    void Update()
+    {
+        if (EventSystem.current == null || EventSystem.current.currentInputModule == null)
+            return;
+
+        BaseInput input = EventSystem.current.currentInputModule.input;
+
+        if (input.GetMouseButton(0))
+        {
+            TrySpawn(input.mousePosition);
+        }
+
+        for (int i = 0; i < input.touchCount; i++)
+        {
+            Touch t = input.GetTouch(i);
+            TrySpawn(t.position);
+        }
+    }
+    List<RaycastResult> raycastResults = new List<RaycastResult>();
+
+    void TrySpawn(Vector2 position)
+    {
+        position = Rect.PointToNormalized(roiFilterSrc, position);
+        position = Rect.NormalizedToPoint(roiFilterDst, position);
+        PointerEventData data = new PointerEventData(EventSystem.current);
+        data.position = position;
+        raycastResults.Clear();
+        EventSystem.current.RaycastAll(data, raycastResults);
+        bool found = raycastResults.Select(r => r.gameObject.layer == LayerMask.NameToLayer("Flake")).Any(b => b);
+        if (found)
+            return;
+
+        GameObject obj = Instantiate(prefab, transform.parent);
+        (obj.transform as RectTransform).anchoredPosition = position;
+        obj.GetComponent<DShowPooledMoviePlayer>().VideoAsset = clips[Random.Range(0, clips.Length)];
+        obj.SetActive(true);
+    }
+}

Unity-19050-05-BallPool/Assets/Frozen/Script/FlakeSpawner.cs.meta

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

Unity-19050-05-BallPool/Assets/Frozen/Script/SceneController.cs

@@ -13,6 +13,11 @@ namespace UltraCombos.Frozen
         Standby,
         Day,
         Night,
+        Night1,
+        Night2,
+        Night3,
+        Night4,
+        Night5,
     }
 
     public enum Form
@@ -26,6 +31,7 @@ namespace UltraCombos.Frozen
         public State state = State.Standby;
         public Form format = Form.FullSpace;
 
+        public UnityEvent onStart = new UnityEvent();
         public UnityEvent onSceneStandby = new UnityEvent();
         public UnityEvent onSceneDay = new UnityEvent();
         public UnityEvent onSceneNight = new UnityEvent();
@@ -39,7 +45,7 @@ namespace UltraCombos.Frozen
         [ReadOnly, SerializeField]
         List<CharacterBehaviour> characters;
 
-        private void Start()
+        private IEnumerator Start()
         {
             characters = FindObjectsOfType<CharacterBehaviour>().ToList();
             switch (state)
@@ -53,7 +59,24 @@ namespace UltraCombos.Frozen
                 case State.Night:
                     GoNight();
                     break;
+                case State.Night1:
+                    GoNight1();
+                    break;
+                case State.Night2:
+                    GoNight2();
+                    break;
+                case State.Night3:
+                    GoNight3();
+                    break;
+                case State.Night4:
+                    GoNight4();
+                    break;
+                case State.Night5:
+                    GoNight5();
+                    break;
             }
+            yield return new WaitForSeconds(1);
+            onStart.Invoke();
         }
 
         private void Update()
@@ -87,5 +110,31 @@ namespace UltraCombos.Frozen
             target_rate = 1.0f;
             onSceneNight.Invoke();
         }
+
+        public void GoNight1()
+        {
+            state = State.Night1;
+            target_rate = 1.0f;
+        }
+        public void GoNight2()
+        {
+            state = State.Night2;
+            target_rate = 1.0f;
+        }
+        public void GoNight3()
+        {
+            state = State.Night3;
+            target_rate = 1.0f;
+        }
+        public void GoNight4()
+        {
+            state = State.Night4;
+            target_rate = 1.0f;
+        }
+        public void GoNight5()
+        {
+            state = State.Night5;
+            target_rate = 1.0f;
+        }
     }
 }

Unity-19050-05-BallPool/Assets/Frozen/Script/SoundLoader.cs

@@ -14,12 +14,12 @@ namespace UltraCombos
         [SerializeField]
         List<string> filenames = new List<string>();
 
-        List<AudioClip> clips = new List<AudioClip>();
+        public List<AudioClip> clips = new List<AudioClip>();
 
         AudioSource source = null;
 
         [SerializeField, Range(0, 1)]
-        float volumeScale = 1.0f;
+        public float volumeScale = 1.0f;
 
         float target_volume = 1.0f;
 
@@ -89,6 +89,7 @@ namespace UltraCombos
             }
         }
 
+        [ContextMenu("Play Audio")]
         public void PlayOneShot()
         {
             if (clips.Count == 0)

Unity-19050-05-BallPool/Packages/com.ultracombos.chwan1

@@ -1 +1 @@
-Subproject commit 1d6492ff8067b3ca634e60dda3f69c0a0b5e3e98
+Subproject commit 606f26de5c827cc625098cff9995d523e5d6cdc5

Unity-19050-05-BallPool/Packages/manifest.json

@@ -6,6 +6,7 @@
     "com.ultracombos.osc": "file:<project>/../../../_Package/com.ultracombos.osc",
     "com.ultracombos.tuio": "file:<project>/../../../_Package/com.ultracombos.tuio",
     "com.ultracombos.utility": "file:<project>/../../../_Package/com.ultracombos.utility",
+    "com.ultracombos.activity": "file:<project>/../../../_Package/com.ultracombos.activity",
     "com.unity.ads": "2.0.8",
     "com.unity.analytics": "3.2.2",
     "com.unity.collab-proxy": "1.2.15",

Unity-19050-05-BallPool/ProjectSettings/TagManager.asset

@@ -17,7 +17,7 @@ TagManager:
   - Particle
   - Post
   - Post2
-  - 
+  - Flake
   - 
   - 
   - 

_Package/com.ultracombos.flockaroo

@@ -1 +1 @@
-Subproject commit df32609c70bfe811df7a7bbe04c2251c20fcc9e5
+Subproject commit 0d878b63b170d68240983276f951cac7551c0b54

_Package/com.ultracombos.movie-player

@@ -1 +1 @@
-Subproject commit 73698dd9c424a532ebd272e6f4f79581d9e0bfc9
+Subproject commit ae67451532935d299c85afcf96c3b2e6b9b1497e

_Setup/README.md

@@ -1,15 +1,15 @@
 # Resilio Sync
 
 | Device                    | Read/Write                        | Read Only                         |
-| ------ | -------- | -------- |
+| ------------------------- | --------------------------------- | --------------------------------- |
-| 01     | AR3HNOYJSMWFTY2ABIGEIGVKIPPAPW2VB | BPIRVC4UOSYO2IQEKCULGSFG4WO5NWZYQ |
+| 01_ForstCoronation        | AR3HNOYJSMWFTY2ABIGEIGVKIPPAPW2VB | BPIRVC4UOSYO2IQEKCULGSFG4WO5NWZYQ |
-| 03     | dummy | dummy |
+| 03_RoyalGallery_Portrait  | A7LKLFO7YRW533ECKCUMQVA2NY55VKLE5 | BTFJANOLC6YIEWAGYVWTQ5KJ72OMG5SWF |
-| 03     | dummy | dummy |
+| 03_RoyalGallery_Navigator | ASBQMD3K6XSHHCVNELTTYKRKHJBDBS3CS | BHVO6SHJWB7P7HJI7HCYW6OX7ZXU2FIGD |
-| 03     | dummy | dummy |
+| 03 iPad                   | ADXCMVZ4RYXZ4GRNN35CJOL4HHIUBJVD6 | BOKTA525FABEL5IRYBT5XWSHJPMP75QN4 |
-| 04     | ATGFQAUSFWHCTSKWZZ7BB23TWTK3BYJQO | BOVGCXZ5BRD5Z5MQAQWD2PIHUP5A672TE |
+| 04_IceSlide               | ATGFQAUSFWHCTSKWZZ7BB23TWTK3BYJQO | BOVGCXZ5BRD5Z5MQAQWD2PIHUP5A672TE |
-| 05     | dummy | dummy |
+| 05_BallPool               | AED5Y4EJ6SVVD3GQRJSPZPA4JAXA5EIJR | BKSEQCSBPGPYNBRLPTRPQUZD7EZ674VAC |
-| 06     | dummy | dummy |
+| 06                        | --------------------------------- | --------------------------------- |
-| 08     | AJR4HEEZXQ4NFXS2BQA2CCGAHSRTGFCKB | BUDFWE3TYAPFAIZEWWEHD5PCMKQTIUTBH |
+| 08_DarkSea                | AJR4HEEZXQ4NFXS2BQA2CCGAHSRTGFCKB | BUDFWE3TYAPFAIZEWWEHD5PCMKQTIUTBH |
 
 
 

_Setup/[UnityBuild] 05_BallPool.bat

@@ -0,0 +1,5 @@
+@ECHO OFF
+TASKKILL /IM "Resilio Sync.exe" /F
+COPY /Y conf\UnityBuild-05_BallPool.conf "%USERPROFILE%\AppData\Roaming\Resilio Sync\sync.conf"
+START "" "%USERPROFILE%\AppData\Roaming\Resilio Sync\Resilio Sync.exe"
+REM PAUSE

_Setup/conf/UnityBuild-05_BallPool.conf

@@ -0,0 +1,16 @@
+//samples can be found here: http://internal.getsync.com/support/sample.conf
+{
+  "shared_folders" :
+  [
+    {
+      "secret" : "AED5Y4EJ6SVVD3GQRJSPZPA4JAXA5EIJR", 
+      "dir" : "C:/UC/Project-19050-Frozen2/_Deploy_PC/05_BallPool/UnityBuild-19050-05_BallPool", // * required field
+      "use_relay_server" : true, //  use relay server when direct connection fails
+      "use_tracker" : true,
+      "search_lan" : true,
+      "use_sync_trash" : false, // enable SyncArchive to store files deleted on remote devices
+      "overwrite_changes" : true, // restore modified files to original version, ONLY for Read-Only folders
+      "selective_sync" : false//, // add folder in selective sync mode
+    }
+  ]
+}