Remove cut in animation option, reverted potential fix, updated opening scene

Assets/Prefab/GameplayPanel.prefab

@@ -6650,7 +6650,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &7928374915970859287
 RectTransform:
   m_ObjectHideFlags: 0
@@ -7689,7 +7689,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 1384.76, y: -438.595}
+  m_AnchoredPosition: {x: 1380.62, y: -269.8}
   m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &7928374916272943219

Assets/Scenes/Opening.unity

@@ -8394,7 +8394,7 @@ GameObject:
   - component: {fileID: 195562656}
   - component: {fileID: 195562655}
   m_Layer: 0
-  m_Name: Canvas3
+  m_Name: Friend Lobby
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -25088,97 +25088,6 @@ RectTransform:
   m_AnchoredPosition: {x: 50, y: 111.149994}
   m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!21 &600610283
-Material:
-  serializedVersion: 8
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: Shapes2D Material
-  m_Shader: {fileID: 4800000, guid: 44f74e30da9814584b2fdcdbe799e51a, type: 3}
-  m_ValidKeywords:
-  - FILL_OUTLINE_COLOR
-  - RECTANGLE
-  m_InvalidKeywords:
-  - _EMISSION
-  m_LightmapFlags: 1
-  m_EnableInstancingVariants: 0
-  m_DoubleSidedGI: 0
-  m_CustomRenderQueue: 3000
-  stringTagMap: {}
-  disabledShaderPasses: []
-  m_SavedProperties:
-    serializedVersion: 3
-    m_TexEnvs:
-    - _BumpMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailAlbedoMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailMask:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailNormalMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _EmissionMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _MainTex:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _MetallicGlossMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _OcclusionMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _ParallaxMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    m_Ints: []
-    m_Floats:
-    - _BumpScale: 1
-    - _ColorMask: 15
-    - _Cutoff: 0.5
-    - _DetailNormalMapScale: 1
-    - _DstBlend: 0
-    - _GlossMapScale: 1
-    - _Glossiness: 0.5
-    - _GlossyReflections: 1
-    - _Metallic: 0
-    - _Mode: 0
-    - _OcclusionStrength: 1
-    - _Parallax: 0.02
-    - _Shapes2D_DstAlpha: 1
-    - _Shapes2D_DstBlend: 10
-    - _Shapes2D_SrcAlpha: 1
-    - _Shapes2D_SrcBlend: 1
-    - _SmoothnessTextureChannel: 0
-    - _SpecularHighlights: 1
-    - _SrcBlend: 1
-    - _Stencil: 0
-    - _StencilComp: 8
-    - _StencilOp: 0
-    - _StencilReadMask: 255
-    - _StencilWriteMask: 255
-    - _UVSec: 0
-    - _ZWrite: 1
-    m_Colors:
-    - _Color: {r: 1, g: 1, b: 1, a: 1}
-    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
-  m_BuildTextureStacks: []
 --- !u!114 &601519770 stripped
 MonoBehaviour:
   m_CorrespondingSourceObject: {fileID: 2357870368142129188, guid: e358e77ca0e59034894b27870d5d0b04, type: 3}
@@ -39988,7 +39897,7 @@ GameObject:
   - component: {fileID: 993687782}
   - component: {fileID: 993687781}
   m_Layer: 0
-  m_Name: Canvas4
+  m_Name: Other panels/Random Match
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -50369,6 +50278,97 @@ MonoBehaviour:
   minY: -800
   maxY: 800
   defaultPos: {x: 0, y: 0, z: 0}
+--- !u!21 &1226454526
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Shapes2D Material
+  m_Shader: {fileID: 4800000, guid: 44f74e30da9814584b2fdcdbe799e51a, type: 3}
+  m_ValidKeywords:
+  - FILL_SOLID_COLOR
+  - RECTANGLE
+  m_InvalidKeywords:
+  - _EMISSION
+  m_LightmapFlags: 1
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: 3000
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _BumpScale: 1
+    - _ColorMask: 15
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _GlossMapScale: 1
+    - _Glossiness: 0.5
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _Shapes2D_DstAlpha: 1
+    - _Shapes2D_DstBlend: 10
+    - _Shapes2D_SrcAlpha: 1
+    - _Shapes2D_SrcBlend: 1
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _Stencil: 0
+    - _StencilComp: 8
+    - _StencilOp: 0
+    - _StencilReadMask: 255
+    - _StencilWriteMask: 255
+    - _UVSec: 0
+    - _ZWrite: 1
+    m_Colors:
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+  m_BuildTextureStacks: []
 --- !u!1 &1226836294
 GameObject:
   m_ObjectHideFlags: 0
@@ -102824,7 +102824,7 @@ GameObject:
   - component: {fileID: 7827412352163992437}
   - component: {fileID: 7827412352163992436}
   m_Layer: 5
-  m_Name: Canvas1
+  m_Name: DeckSelection/Battle Selection
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -105633,7 +105633,7 @@ GameObject:
   - component: {fileID: 7827412353158085701}
   - component: {fileID: 7827412353158085700}
   m_Layer: 5
-  m_Name: Canvas0
+  m_Name: Main Menu
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -105804,7 +105804,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_Material: {fileID: 600610283}
+  m_Material: {fileID: 1226454526}
   m_Color: {r: 0.122641504, g: 0.122641504, b: 0.122641504, a: 0}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
@@ -106074,7 +106074,7 @@ GameObject:
   - component: {fileID: 7827412353509478733}
   - component: {fileID: 7827412353509478732}
   m_Layer: 5
-  m_Name: Canvas10
+  m_Name: Loading Objects
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -107812,11 +107812,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7928374914713416426, guid: aa8ce49467fcea94aae7d999af274a72, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 480
+      value: 1380.62
       objectReference: {fileID: 0}
     - target: {fileID: 7928374914713416426, guid: aa8ce49467fcea94aae7d999af274a72, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -625.4
+      value: -447.6
       objectReference: {fileID: 0}
     - target: {fileID: 7928374914732064316, guid: aa8ce49467fcea94aae7d999af274a72, type: 3}
       propertyPath: m_AnchorMax.y
@@ -107836,11 +107836,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7928374914732064316, guid: aa8ce49467fcea94aae7d999af274a72, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 480
+      value: 1380.62
       objectReference: {fileID: 0}
     - target: {fileID: 7928374914732064316, guid: aa8ce49467fcea94aae7d999af274a72, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -803.2
+      value: -625.4
       objectReference: {fileID: 0}
     - target: {fileID: 7928374914864650546, guid: aa8ce49467fcea94aae7d999af274a72, type: 3}
       propertyPath: m_Delegates.Array.data[0].callback.m_PersistentCalls.m_Calls.Array.data[0].m_Target
@@ -107872,11 +107872,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7928374915092997801, guid: aa8ce49467fcea94aae7d999af274a72, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 480
+      value: 1380.62
       objectReference: {fileID: 0}
     - target: {fileID: 7928374915092997801, guid: aa8ce49467fcea94aae7d999af274a72, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -269.8
+      value: -92
       objectReference: {fileID: 0}
     - target: {fileID: 7928374915095919510, guid: aa8ce49467fcea94aae7d999af274a72, type: 3}
       propertyPath: m_Pivot.x
@@ -107996,7 +107996,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7928374915230148751, guid: aa8ce49467fcea94aae7d999af274a72, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 1380.62
+      value: 480
       objectReference: {fileID: 0}
     - target: {fileID: 7928374915230148751, guid: aa8ce49467fcea94aae7d999af274a72, type: 3}
       propertyPath: m_AnchoredPosition.y
@@ -108036,7 +108036,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7928374915654171919, guid: aa8ce49467fcea94aae7d999af274a72, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 1380.62
+      value: 480
       objectReference: {fileID: 0}
     - target: {fileID: 7928374915654171919, guid: aa8ce49467fcea94aae7d999af274a72, type: 3}
       propertyPath: m_AnchoredPosition.y
@@ -108060,11 +108060,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7928374915836328847, guid: aa8ce49467fcea94aae7d999af274a72, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 480
+      value: 1380.62
       objectReference: {fileID: 0}
     - target: {fileID: 7928374915836328847, guid: aa8ce49467fcea94aae7d999af274a72, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -447.6
+      value: -269.8
       objectReference: {fileID: 0}
     - target: {fileID: 7928374915840589320, guid: aa8ce49467fcea94aae7d999af274a72, type: 3}
       propertyPath: m_Delegates.Array.data[0].callback.m_PersistentCalls.m_Calls.Array.data[0].m_Target
@@ -108072,27 +108072,27 @@ PrefabInstance:
       objectReference: {fileID: 7827412352956199573}
     - target: {fileID: 7928374915970859287, guid: aa8ce49467fcea94aae7d999af274a72, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 7928374915970859287, guid: aa8ce49467fcea94aae7d999af274a72, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 7928374915970859287, guid: aa8ce49467fcea94aae7d999af274a72, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 100
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 7928374915970859287, guid: aa8ce49467fcea94aae7d999af274a72, type: 3}
       propertyPath: m_SizeDelta.y
-      value: 100
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 7928374915970859287, guid: aa8ce49467fcea94aae7d999af274a72, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 1380.62
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 7928374915970859287, guid: aa8ce49467fcea94aae7d999af274a72, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -92
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 7928374916004630462, guid: aa8ce49467fcea94aae7d999af274a72, type: 3}
       propertyPath: m_Delegates.Array.data[0].callback.m_PersistentCalls.m_Calls.Array.data[0].m_Target
@@ -108122,6 +108122,30 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: -92
       objectReference: {fileID: 0}
+    - target: {fileID: 7928374916266468725, guid: aa8ce49467fcea94aae7d999af274a72, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7928374916266468725, guid: aa8ce49467fcea94aae7d999af274a72, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7928374916266468725, guid: aa8ce49467fcea94aae7d999af274a72, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7928374916266468725, guid: aa8ce49467fcea94aae7d999af274a72, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7928374916266468725, guid: aa8ce49467fcea94aae7d999af274a72, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7928374916266468725, guid: aa8ce49467fcea94aae7d999af274a72, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 7928374916272943217, guid: aa8ce49467fcea94aae7d999af274a72, type: 3}
       propertyPath: m_Delegates.Array.data[0].callback.m_PersistentCalls.m_Calls.Array.data[0].m_Target
       value: 
@@ -108148,7 +108172,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7928374916357260136, guid: aa8ce49467fcea94aae7d999af274a72, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 1380.62
+      value: 480
       objectReference: {fileID: 0}
     - target: {fileID: 7928374916357260136, guid: aa8ce49467fcea94aae7d999af274a72, type: 3}
       propertyPath: m_AnchoredPosition.y
@@ -108172,7 +108196,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7928374916528301011, guid: aa8ce49467fcea94aae7d999af274a72, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 1380.62
+      value: 480
       objectReference: {fileID: 0}
     - target: {fileID: 7928374916528301011, guid: aa8ce49467fcea94aae7d999af274a72, type: 3}
       propertyPath: m_AnchoredPosition.y

Assets/Scripts/ContinuousController.cs

@@ -510,7 +510,9 @@ public class ContinuousController : MonoBehaviour
     }
     public void LoadShowCutInAnimation()
     {
-        showCutInAnimation = PlayerPrefsUtil.GetBool(_showCutInAnimationKey, true);
+        //TODO: Setting default to false, to fix animation syncing bug, MB
+        showCutInAnimation = false;
+        //showCutInAnimation = PlayerPrefsUtil.GetBool(_showCutInAnimationKey, true);
     }
     #endregion
 

Assets/Scripts/GameplayOption.cs

@@ -58,11 +58,11 @@ public class GameplayOption : OffAnimation
                 value: ContinuousController.instance.reverseOpponentsCards
             );
 
-            OptionUtility.InitToggle(
+            /*OptionUtility.InitToggle(
                 toggle: _showCutInAnimationToggle,
                 onToggleChanged: OnShowCutInAnimationToggleChanged,
                 value: ContinuousController.instance.showCutInAnimation
-            );
+            );*/
 
             OptionUtility.InitToggle(
                 toggle: _turnSuspendedCardsToggle,

Assets/Scripts/PhotonWaitController.cs

@@ -226,10 +226,10 @@ public class PhotonWaitController : MonoBehaviour
             key += "_" + PhotonNetwork.CurrentRoom.Name;
         }
         //TODO Currently Disabled For Alpha Testing To Fix Xross Issues
-        //key += "_" + UnityEngine.Random.Range(0, 9999999).ToString();
-        int synchronizedSeed = PhotonNetwork.CurrentRoom.Name.GetHashCode() + waitCount;
-        System.Random random = new System.Random(synchronizedSeed);
-        key += "_" + random.Next(0, 9999999).ToString();
+        key += "_" + UnityEngine.Random.Range(0, 9999999).ToString();
+        //int synchronizedSeed = PhotonNetwork.CurrentRoom.Name.GetHashCode() + waitCount;
+        //System.Random random = new System.Random(synchronizedSeed);
+        //key += "_" + random.Next(0, 9999999).ToString();
         
         keys.Add(key);