diff --git a/Assets/GameObjects/Help Overlay.prefab b/Assets/GameObjects/Help Overlay.prefab new file mode 100644 index 0000000000000000000000000000000000000000..963448ca3d8368306d6eb33e7a9e6195961eee7e --- /dev/null +++ b/Assets/GameObjects/Help Overlay.prefab @@ -0,0 +1,366 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &9164510386519920008 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9164510386519920009} + - component: {fileID: 9164510386519920007} + - component: {fileID: 9164510386519920006} + m_Layer: 5 + m_Name: Text (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9164510386519920009 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9164510386519920008} + 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: 9164510386544795873} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 150, y: 8} + m_SizeDelta: {x: 248.9, y: 134.4} + m_Pivot: {x: 0, y: 0.5} +--- !u!222 &9164510386519920007 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9164510386519920008} + m_CullTransparentMesh: 0 +--- !u!114 &9164510386519920006 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9164510386519920008} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, 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_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 4cd369d29dd8c2b4a8e6db00d2da760d, type: 3} + m_FontSize: 23 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 'In future battles some effects may occur and will be displayed here. ' +--- !u!1 &9164510386530668641 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9164510386530668670} + - component: {fileID: 9164510386530668668} + - component: {fileID: 9164510386530668671} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9164510386530668670 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9164510386530668641} + 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: 9164510386544795873} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: -13, y: -295.9} + m_SizeDelta: {x: 547.3, y: 75.79999} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &9164510386530668668 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9164510386530668641} + m_CullTransparentMesh: 0 +--- !u!114 &9164510386530668671 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9164510386530668641} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, 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_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 4cd369d29dd8c2b4a8e6db00d2da760d, type: 3} + m_FontSize: 23 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: You (green) need to get a better score than your opponent (purple)! +--- !u!1 &9164510386544795872 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9164510386544795873} + - component: {fileID: 9164510386544795902} + m_Layer: 5 + m_Name: Help Overlay + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9164510386544795873 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9164510386544795872} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 9164510386530668670} + - {fileID: 9164510386519920009} + - {fileID: 9164510387592780629} + - {fileID: 9164510387443198444} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0.00012207031, y: 0.000061035156} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &9164510386544795902 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9164510386544795872} + m_CullTransparentMesh: 0 +--- !u!1 &9164510387443198447 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9164510387443198444} + - component: {fileID: 9164510387443198442} + - component: {fileID: 9164510387443198445} + m_Layer: 5 + m_Name: Text (3) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9164510387443198444 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9164510387443198447} + 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: 9164510386544795873} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 100, y: 237.3} + m_SizeDelta: {x: 311.4, y: 92.3} + m_Pivot: {x: 0, y: 0.5} +--- !u!222 &9164510387443198442 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9164510387443198447} + m_CullTransparentMesh: 0 +--- !u!114 &9164510387443198445 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9164510387443198447} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, 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_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 4cd369d29dd8c2b4a8e6db00d2da760d, type: 3} + m_FontSize: 23 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Cards cost energy to use and your energy pool is displayed here. +--- !u!1 &9164510387592780628 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9164510387592780629} + - component: {fileID: 9164510387592780627} + - component: {fileID: 9164510387592780626} + m_Layer: 5 + m_Name: Text (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9164510387592780629 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9164510387592780628} + 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: 9164510386544795873} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 43, y: 268} + m_SizeDelta: {x: 381, y: 75.79999} + m_Pivot: {x: 0.5, y: 0} +--- !u!222 &9164510387592780627 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9164510387592780628} + m_CullTransparentMesh: 0 +--- !u!114 &9164510387592780626 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9164510387592780628} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, 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_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 4cd369d29dd8c2b4a8e6db00d2da760d, type: 3} + m_FontSize: 23 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: This is your hand, play your cards to win the battle. diff --git a/Assets/GameObjects/Help Overlay.prefab.meta b/Assets/GameObjects/Help Overlay.prefab.meta new file mode 100644 index 0000000000000000000000000000000000000000..51b0641b2b68c73d04a7fd51a976a33c8cd61c3d --- /dev/null +++ b/Assets/GameObjects/Help Overlay.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d92137f6f51b8bd4caf0b6b73f93b182 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Game.unity b/Assets/Scenes/Game.unity index cd00402669677c9323173776e4dfda50e31df92a..43459e592d2f4cb753aefba04fccc0e037c1dd1e 100644 --- a/Assets/Scenes/Game.unity +++ b/Assets/Scenes/Game.unity @@ -138,85 +138,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2e1543283fedf0d4bb0d65a8d0a7a56a, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &98934739 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 98934740} - - component: {fileID: 98934742} - - component: {fileID: 98934741} - m_Layer: 5 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &98934740 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 98934739} - 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: 809165409} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -0.000030517578, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &98934741 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 98934739} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, 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_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_FontData: - m_Font: {fileID: 12800000, guid: 287383bed421b0149809de5b6c864be6, type: 3} - m_FontSize: 26 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 0 - m_MaxSize: 94 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: ' ftfzlfkzokfziokfziokfzofkozkfozkofkzokfozkfozkofkokokokokook' ---- !u!222 &98934742 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 98934739} - m_CullTransparentMesh: 0 --- !u!1 &134461202 GameObject: m_ObjectHideFlags: 0 @@ -250,9 +171,8 @@ RectTransform: - {fileID: 1324837649} - {fileID: 259032563} - {fileID: 2117013686} - - {fileID: 1409868150} m_Father: {fileID: 481556386} - m_RootOrder: 8 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -313,159 +233,12 @@ MonoBehaviour: - {fileID: 259032565} - {fileID: 2117013688} Pool: {fileID: 11400000, guid: 4dc02c97ea10d0d4dac39a8351f10ce8, type: 2} ---- !u!1 &171562247 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 171562248} - - component: {fileID: 171562250} - - component: {fileID: 171562249} - m_Layer: 5 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &171562248 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 171562247} - 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: 2075023670} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -0.000030517578, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &171562249 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 171562247} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, 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_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_FontData: - m_Font: {fileID: 12800000, guid: 287383bed421b0149809de5b6c864be6, type: 3} - m_FontSize: 26 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 0 - m_MaxSize: 94 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: ' ftfzlfkzokfziokfziokfzofkozkfozkofkzokfozkfozkofkokokokokook' ---- !u!222 &171562250 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 171562247} - m_CullTransparentMesh: 0 ---- !u!1 &185771888 +--- !u!1 &170164299 stripped GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 185771889} - - component: {fileID: 185771891} - - component: {fileID: 185771890} - m_Layer: 5 - m_Name: Panel - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &185771889 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 185771888} - 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: 1311090355} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -0.009933472, y: 0} - m_SizeDelta: {x: 0.022064209, y: 0.000061035156} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &185771890 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 185771888} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.49056602, g: 0.46511212, b: 0.46511212, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 ---- !u!222 &185771891 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 1460475886081959181, guid: 88f102e7bb5e245489dacc5ccac6fdfd, + type: 3} + m_PrefabInstance: {fileID: 808062726} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 185771888} - m_CullTransparentMesh: 0 --- !u!1 &259032562 GameObject: m_ObjectHideFlags: 0 @@ -619,7 +392,7 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 687538358} m_PrefabAsset: {fileID: 0} ---- !u!1 &446496069 +--- !u!1 &449465898 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -627,205 +400,59 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 446496070} - - component: {fileID: 446496074} - - component: {fileID: 446496073} - - component: {fileID: 446496072} - - component: {fileID: 446496071} - m_Layer: 5 - m_Name: FightSpot1 + - component: {fileID: 449465900} + - component: {fileID: 449465899} + - component: {fileID: 449465901} + m_Layer: 0 + m_Name: GameManager m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &446496070 -RectTransform: +--- !u!114 &449465899 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 449465898} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 36adc95eaa4eca145bc4a891d0071bd7, type: 3} + m_Name: + m_EditorClassIdentifier: + draftPhase: {fileID: 134461206} + fightSelection: {fileID: 1251018140} + fightStarter: {fileID: 481556388} + PlayerDeck: {fileID: 872592476} + Hand: {fileID: 577289747} + Score: {fileID: 66537584} + MusicPlayer: {fileID: 1177861255} + SoundEffectSource: {fileID: 449465901} + mDrawSound: {fileID: 8300000, guid: 8483c951894e05e47ae3242d47d2c2bc, type: 3} + mDiscardSound: {fileID: 8300000, guid: db5f46f5af6072a46992311349f593e3, type: 3} +--- !u!4 &449465900 +Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 446496069} + m_GameObject: {fileID: 449465898} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 618.5057, y: 260.64365, z: -1209.25} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 2075023670} - m_Father: {fileID: 1251018139} - m_RootOrder: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.21830761, y: 0.483} - m_AnchorMax: {x: 0.27, y: 0.586} - m_AnchoredPosition: {x: 533, y: -87} - m_SizeDelta: {x: 1, y: -3} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &446496071 -MonoBehaviour: +--- !u!82 &449465901 +AudioSource: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 446496069} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 446496072} - m_OnClick: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 446496074} - m_MethodName: Select - 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 - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null ---- !u!114 &446496072 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 446496069} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 0} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 ---- !u!222 &446496073 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 446496069} - m_CullTransparentMesh: 0 ---- !u!114 &446496074 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 446496069} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d1a05b825ad452247a680dbeb558109b, type: 3} - m_Name: - m_EditorClassIdentifier: - onHover: {fileID: 2075023669} ---- !u!1 &449465898 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 449465900} - - component: {fileID: 449465899} - - component: {fileID: 449465901} - m_Layer: 0 - m_Name: GameManager - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &449465899 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 449465898} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 36adc95eaa4eca145bc4a891d0071bd7, type: 3} - m_Name: - m_EditorClassIdentifier: - draftPhase: {fileID: 134461206} - fightSelection: {fileID: 1251018140} - fightStarter: {fileID: 481556388} - PlayerDeck: {fileID: 872592476} - Hand: {fileID: 577289747} - Score: {fileID: 66537584} - MusicPlayer: {fileID: 1177861255} - SoundEffectSource: {fileID: 449465901} - mDrawSound: {fileID: 8300000, guid: 8483c951894e05e47ae3242d47d2c2bc, type: 3} - mDiscardSound: {fileID: 8300000, guid: db5f46f5af6072a46992311349f593e3, type: 3} ---- !u!4 &449465900 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 449465898} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 618.5057, y: 260.64365, z: -1209.25} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 5 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!82 &449465901 -AudioSource: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 449465898} + m_GameObject: {fileID: 449465898} m_Enabled: 1 serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} @@ -1042,10 +669,10 @@ RectTransform: m_Father: {fileID: 481556386} m_RootOrder: 6 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.59998, y: 371} - m_SizeDelta: {x: 356.87, y: 89.55} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -100} + m_SizeDelta: {x: 360, y: 100} m_Pivot: {x: 0.50000006, y: 0.49999988} --- !u!1 &481556382 GameObject: @@ -1097,10 +724,10 @@ MonoBehaviour: m_Script: {fileID: 1980459831, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: - m_UiScaleMode: 0 + m_UiScaleMode: 1 m_ReferencePixelsPerUnit: 100 m_ScaleFactor: 1 - m_ReferenceResolution: {x: 800, y: 600} + m_ReferenceResolution: {x: 1920, y: 1080} m_ScreenMatchMode: 0 m_MatchWidthOrHeight: 0 m_PhysicalUnit: 3 @@ -1146,6 +773,7 @@ RectTransform: - {fileID: 66537583} - {fileID: 872592475} - {fileID: 479419672} + - {fileID: 1744303087} - {fileID: 1251018139} - {fileID: 134461203} m_Father: {fileID: 0} @@ -1187,6 +815,7 @@ MonoBehaviour: mEndTurnButton: {fileID: 479419668} mScore: {fileID: 66537584} mHand: {fileID: 577289747} + Helpoverlay: {fileID: 1744303086} --- !u!1 &569274361 GameObject: m_ObjectHideFlags: 0 @@ -1353,6 +982,91 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b80931cde1c39d64fa244f1af4d21bfe, type: 3} +--- !u!1 &625920090 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 625920091} + - component: {fileID: 625920093} + - component: {fileID: 625920092} + m_Layer: 5 + m_Name: Text (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &625920091 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 625920090} + 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: 1744303087} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 43, y: 268} + m_SizeDelta: {x: 381, y: 75.79999} + m_Pivot: {x: 0.5, y: 0} +--- !u!114 &625920092 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 625920090} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, 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_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 4cd369d29dd8c2b4a8e6db00d2da760d, type: 3} + m_FontSize: 23 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: This is your hand, play your cards to win the battle. +--- !u!222 &625920093 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 625920090} + m_CullTransparentMesh: 0 +--- !u!1 &643083964 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1460475886081959181, guid: 88f102e7bb5e245489dacc5ccac6fdfd, + type: 3} + m_PrefabInstance: {fileID: 2111594772} + m_PrefabAsset: {fileID: 0} --- !u!1 &687224282 GameObject: m_ObjectHideFlags: 0 @@ -1497,17 +1211,17 @@ PrefabInstance: - target: {fileID: 139765660913410017, guid: d0234dba4f26d784da07183cd1e0aa62, type: 3} propertyPath: m_AnchoredPosition.x - value: -439 + value: 150 objectReference: {fileID: 0} - target: {fileID: 139765660913410017, guid: d0234dba4f26d784da07183cd1e0aa62, type: 3} propertyPath: m_AnchoredPosition.y - value: 88.685 + value: -31 objectReference: {fileID: 0} - target: {fileID: 139765660913410017, guid: d0234dba4f26d784da07183cd1e0aa62, type: 3} propertyPath: m_SizeDelta.x - value: 54.45 + value: 54.450012 objectReference: {fileID: 0} - target: {fileID: 139765660913410017, guid: d0234dba4f26d784da07183cd1e0aa62, type: 3} @@ -1517,7 +1231,7 @@ PrefabInstance: - target: {fileID: 139765660913410017, guid: d0234dba4f26d784da07183cd1e0aa62, type: 3} propertyPath: m_AnchorMin.x - value: 0.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 139765660913410017, guid: d0234dba4f26d784da07183cd1e0aa62, type: 3} @@ -1527,7 +1241,7 @@ PrefabInstance: - target: {fileID: 139765660913410017, guid: d0234dba4f26d784da07183cd1e0aa62, type: 3} propertyPath: m_AnchorMax.x - value: 0.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 139765660913410017, guid: d0234dba4f26d784da07183cd1e0aa62, type: 3} @@ -1579,9 +1293,9 @@ RectTransform: m_Father: {fileID: 481556386} 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: 426.5, y: 209} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 150, y: 120} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &783529344 @@ -1652,14 +1366,14 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 809165409} + - {fileID: 808062727} m_Father: {fileID: 1251018139} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.77800006, y: 0.483} - m_AnchorMax: {x: 0.83100003, y: 0.586} - m_AnchoredPosition: {x: 0, y: -3.5} - m_SizeDelta: {x: -2, y: -3} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 584, y: 31} + m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.4999997, y: 0.5} --- !u!114 &798548319 MonoBehaviour: @@ -1673,7 +1387,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d1a05b825ad452247a680dbeb558109b, type: 3} m_Name: m_EditorClassIdentifier: - onHover: {fileID: 809165408} + onHover: {fileID: 170164299} --- !u!114 &798548320 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1767,83 +1481,132 @@ MonoBehaviour: m_CallState: 2 m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null ---- !u!1 &809165408 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 809165409} - - component: {fileID: 809165411} - - component: {fileID: 809165410} - m_Layer: 5 - m_Name: OnHover (2) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &809165409 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 809165408} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 1437392427} - - {fileID: 98934740} - m_Father: {fileID: 798548318} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -0, y: -83.60004} - m_SizeDelta: {x: 177.57007, y: 194.99994} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &809165410 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 809165408} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.392} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 ---- !u!222 &809165411 -CanvasRenderer: +--- !u!1001 &808062726 +PrefabInstance: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 798548318} + m_Modifications: + - target: {fileID: 1460475886081959181, guid: 88f102e7bb5e245489dacc5ccac6fdfd, + type: 3} + propertyPath: m_Name + value: OnHover (1) + objectReference: {fileID: 0} + - target: {fileID: 1460475886081959180, guid: 88f102e7bb5e245489dacc5ccac6fdfd, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1460475886081959180, guid: 88f102e7bb5e245489dacc5ccac6fdfd, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1460475886081959180, guid: 88f102e7bb5e245489dacc5ccac6fdfd, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1460475886081959180, guid: 88f102e7bb5e245489dacc5ccac6fdfd, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1460475886081959180, guid: 88f102e7bb5e245489dacc5ccac6fdfd, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1460475886081959180, guid: 88f102e7bb5e245489dacc5ccac6fdfd, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1460475886081959180, guid: 88f102e7bb5e245489dacc5ccac6fdfd, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1460475886081959180, guid: 88f102e7bb5e245489dacc5ccac6fdfd, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1460475886081959180, guid: 88f102e7bb5e245489dacc5ccac6fdfd, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1460475886081959180, guid: 88f102e7bb5e245489dacc5ccac6fdfd, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1460475886081959180, guid: 88f102e7bb5e245489dacc5ccac6fdfd, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1460475886081959180, guid: 88f102e7bb5e245489dacc5ccac6fdfd, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 1460475886081959180, guid: 88f102e7bb5e245489dacc5ccac6fdfd, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -83.60003 + objectReference: {fileID: 0} + - target: {fileID: 1460475886081959180, guid: 88f102e7bb5e245489dacc5ccac6fdfd, + type: 3} + propertyPath: m_SizeDelta.x + value: 177.07794 + objectReference: {fileID: 0} + - target: {fileID: 1460475886081959180, guid: 88f102e7bb5e245489dacc5ccac6fdfd, + type: 3} + propertyPath: m_SizeDelta.y + value: 194.99994 + objectReference: {fileID: 0} + - target: {fileID: 1460475886081959180, guid: 88f102e7bb5e245489dacc5ccac6fdfd, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1460475886081959180, guid: 88f102e7bb5e245489dacc5ccac6fdfd, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1460475886081959180, guid: 88f102e7bb5e245489dacc5ccac6fdfd, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1460475886081959180, guid: 88f102e7bb5e245489dacc5ccac6fdfd, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1460475886081959180, guid: 88f102e7bb5e245489dacc5ccac6fdfd, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1460475886081959180, guid: 88f102e7bb5e245489dacc5ccac6fdfd, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 88f102e7bb5e245489dacc5ccac6fdfd, type: 3} +--- !u!224 &808062727 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 1460475886081959180, guid: 88f102e7bb5e245489dacc5ccac6fdfd, + type: 3} + m_PrefabInstance: {fileID: 808062726} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 809165408} - m_CullTransparentMesh: 0 ---- !u!1 &853956213 +--- !u!1 &846953185 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1851,42 +1614,42 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 853956214} - - component: {fileID: 853956216} - - component: {fileID: 853956215} + - component: {fileID: 846953186} + - component: {fileID: 846953188} + - component: {fileID: 846953187} m_Layer: 5 - m_Name: Text + m_Name: Text (3) m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &853956214 +--- !u!224 &846953186 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 853956213} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_GameObject: {fileID: 846953185} + 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: 1311090355} - m_RootOrder: 1 + m_Father: {fileID: 1744303087} + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -0.000030517578, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &853956215 + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 100, y: 237.3} + m_SizeDelta: {x: 311.4, y: 92.3} + m_Pivot: {x: 0, y: 0.5} +--- !u!114 &846953187 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 853956213} + m_GameObject: {fileID: 846953185} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} @@ -1901,26 +1664,26 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: - m_Font: {fileID: 12800000, guid: 287383bed421b0149809de5b6c864be6, type: 3} - m_FontSize: 26 + m_Font: {fileID: 12800000, guid: 4cd369d29dd8c2b4a8e6db00d2da760d, type: 3} + m_FontSize: 23 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 0 - m_MaxSize: 94 - m_Alignment: 4 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: ' ftfzlfkzokfziokfziokfzofkozkfozkofkzokfozkfozkofkokokokokook' ---- !u!222 &853956216 + m_Text: Cards cost energy to use and your energy pool is displayed here. +--- !u!222 &846953188 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 853956213} + m_GameObject: {fileID: 846953185} m_CullTransparentMesh: 0 --- !u!224 &872592475 stripped RectTransform: @@ -1940,6 +1703,131 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c882b04e9b08e5444bb3474409d3551f, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1001 &902258305 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1113481712} + m_Modifications: + - target: {fileID: 1460475886081959181, guid: 88f102e7bb5e245489dacc5ccac6fdfd, + type: 3} + propertyPath: m_Name + value: OnHover (1) + objectReference: {fileID: 0} + - target: {fileID: 1460475886081959180, guid: 88f102e7bb5e245489dacc5ccac6fdfd, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1460475886081959180, guid: 88f102e7bb5e245489dacc5ccac6fdfd, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1460475886081959180, guid: 88f102e7bb5e245489dacc5ccac6fdfd, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1460475886081959180, guid: 88f102e7bb5e245489dacc5ccac6fdfd, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1460475886081959180, guid: 88f102e7bb5e245489dacc5ccac6fdfd, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1460475886081959180, guid: 88f102e7bb5e245489dacc5ccac6fdfd, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1460475886081959180, guid: 88f102e7bb5e245489dacc5ccac6fdfd, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1460475886081959180, guid: 88f102e7bb5e245489dacc5ccac6fdfd, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1460475886081959180, guid: 88f102e7bb5e245489dacc5ccac6fdfd, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1460475886081959180, guid: 88f102e7bb5e245489dacc5ccac6fdfd, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1460475886081959180, guid: 88f102e7bb5e245489dacc5ccac6fdfd, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1460475886081959180, guid: 88f102e7bb5e245489dacc5ccac6fdfd, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 1460475886081959180, guid: 88f102e7bb5e245489dacc5ccac6fdfd, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -83.60003 + objectReference: {fileID: 0} + - target: {fileID: 1460475886081959180, guid: 88f102e7bb5e245489dacc5ccac6fdfd, + type: 3} + propertyPath: m_SizeDelta.x + value: 177.07794 + objectReference: {fileID: 0} + - target: {fileID: 1460475886081959180, guid: 88f102e7bb5e245489dacc5ccac6fdfd, + type: 3} + propertyPath: m_SizeDelta.y + value: 194.99994 + objectReference: {fileID: 0} + - target: {fileID: 1460475886081959180, guid: 88f102e7bb5e245489dacc5ccac6fdfd, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1460475886081959180, guid: 88f102e7bb5e245489dacc5ccac6fdfd, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1460475886081959180, guid: 88f102e7bb5e245489dacc5ccac6fdfd, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1460475886081959180, guid: 88f102e7bb5e245489dacc5ccac6fdfd, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1460475886081959180, guid: 88f102e7bb5e245489dacc5ccac6fdfd, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1460475886081959180, guid: 88f102e7bb5e245489dacc5ccac6fdfd, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 88f102e7bb5e245489dacc5ccac6fdfd, type: 3} +--- !u!224 &902258306 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 1460475886081959180, guid: 88f102e7bb5e245489dacc5ccac6fdfd, + type: 3} + m_PrefabInstance: {fileID: 902258305} + m_PrefabAsset: {fileID: 0} --- !u!1 &908658328 GameObject: m_ObjectHideFlags: 0 @@ -2116,14 +2004,14 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 1311090355} + - {fileID: 902258306} m_Father: {fileID: 1251018139} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.21830761, y: 0.483} - m_AnchorMax: {x: 0.27, y: 0.586} - m_AnchoredPosition: {x: 2.5, y: -3.5} - m_SizeDelta: {x: 1, y: -3} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -488, y: 31} + m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1113481713 MonoBehaviour: @@ -2174,7 +2062,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d1a05b825ad452247a680dbeb558109b, type: 3} m_Name: m_EditorClassIdentifier: - onHover: {fileID: 1311090354} + onHover: {fileID: 1889548157} --- !u!114 &1113481716 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2274,12 +2162,12 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: -5} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 446496070} + - {fileID: 1283166458} - {fileID: 1113481712} - {fileID: 798548318} - {fileID: 2023522679} m_Father: {fileID: 481556386} - m_RootOrder: 7 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -2300,7 +2188,7 @@ MonoBehaviour: m_EditorClassIdentifier: mFightList: {fileID: 11400000, guid: 71bca705dc62a4a43b480382ca7f2402, type: 2} mSpots: - - {fileID: 446496074} + - {fileID: 1283166459} - {fileID: 1113481715} - {fileID: 798548319} --- !u!114 &1251018141 @@ -2355,7 +2243,7 @@ MonoBehaviour: state1: {fileID: 21300000, guid: e6b41250160d9454f820e29ecf617953, type: 3} state2: {fileID: 21300000, guid: b1834cc07e07ab041b604fcb0d8dfd5e, type: 3} image: {fileID: 1251018141} ---- !u!1 &1288275030 +--- !u!1 &1283166457 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2363,107 +2251,73 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1288275031} - - component: {fileID: 1288275032} + - component: {fileID: 1283166458} + - component: {fileID: 1283166461} + - component: {fileID: 1283166460} + - component: {fileID: 1283166459} + - component: {fileID: 1283166462} m_Layer: 5 - m_Name: Dump + m_Name: FightSpot1 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1288275031 +--- !u!224 &1283166458 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1288275030} + m_GameObject: {fileID: 1283166457} 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: 481556386} - m_RootOrder: 2 + m_Children: + - {fileID: 2111594773} + m_Father: {fileID: 1251018139} + 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: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1288275032 +--- !u!114 &1283166459 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1288275030} + m_GameObject: {fileID: 1283166457} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: db8123992f78b004a888a3ac87945fe3, type: 3} + m_Script: {fileID: 11500000, guid: d1a05b825ad452247a680dbeb558109b, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &1311090354 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1311090355} - - component: {fileID: 1311090357} - - component: {fileID: 1311090356} - m_Layer: 5 - m_Name: OnHover (1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1311090355 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1311090354} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 185771889} - - {fileID: 853956214} - m_Father: {fileID: 1113481712} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 8, y: -83.60003} - m_SizeDelta: {x: 177.07794, y: 194.99994} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1311090356 + onHover: {fileID: 643083964} +--- !u!114 &1283166460 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1311090354} + m_GameObject: {fileID: 1283166457} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.392} + m_Color: {r: 1, g: 1, b: 1, a: 0} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 0} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -2471,15 +2325,71 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!222 &1311090357 +--- !u!222 &1283166461 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1311090354} + m_GameObject: {fileID: 1283166457} m_CullTransparentMesh: 0 ---- !u!1 &1324837648 +--- !u!114 &1283166462 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1283166457} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1283166460} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1283166459} + m_MethodName: Select + 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 + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!1 &1288275030 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2487,56 +2397,47 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1324837649} - - component: {fileID: 1324837651} - - component: {fileID: 1324837653} + - component: {fileID: 1288275031} + - component: {fileID: 1288275032} m_Layer: 5 - m_Name: DraftOption + m_Name: Dump m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1324837649 +--- !u!224 &1288275031 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1324837648} + m_GameObject: {fileID: 1288275030} 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: 134461203} - m_RootOrder: 0 + m_Father: {fileID: 481556386} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -15.88, y: -41.18} - m_SizeDelta: {x: -993.86, y: -295.64} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1324837651 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1324837648} - m_CullTransparentMesh: 0 ---- !u!114 &1324837653 +--- !u!114 &1288275032 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1324837648} + m_GameObject: {fileID: 1288275030} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b61867857006a804bb19514977646b18, type: 3} + m_Script: {fileID: 11500000, guid: db8123992f78b004a888a3ac87945fe3, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &1409868149 +--- !u!1 &1324837648 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2544,77 +2445,55 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1409868150} - - component: {fileID: 1409868152} - - component: {fileID: 1409868151} + - component: {fileID: 1324837649} + - component: {fileID: 1324837651} + - component: {fileID: 1324837653} m_Layer: 5 - m_Name: Text + m_Name: DraftOption m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1409868150 +--- !u!224 &1324837649 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1409868149} + m_GameObject: {fileID: 1324837648} 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: 134461203} - m_RootOrder: 3 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.24961522, y: 0.595} - m_AnchorMax: {x: 0.73482907, y: 0.81500006} - m_AnchoredPosition: {x: -0.000030517578, y: -2} - m_SizeDelta: {x: 0, y: -4} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -15.88, y: -41.18} + m_SizeDelta: {x: -993.86, y: -295.64} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1409868151 +--- !u!222 &1324837651 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1324837648} + m_CullTransparentMesh: 0 +--- !u!114 &1324837653 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1409868149} + m_GameObject: {fileID: 1324837648} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: b61867857006a804bb19514977646b18, 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_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_FontData: - m_Font: {fileID: 12800000, guid: 4cd369d29dd8c2b4a8e6db00d2da760d, type: 3} - m_FontSize: 86 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 10 - m_MaxSize: 121 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: Choose your card ---- !u!222 &1409868152 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1409868149} - m_CullTransparentMesh: 0 --- !u!1 &1427303021 GameObject: m_ObjectHideFlags: 0 @@ -2698,7 +2577,165 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1437392426 +--- !u!1 &1679770479 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1679770480} + - component: {fileID: 1679770482} + - component: {fileID: 1679770481} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1679770480 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1679770479} + 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: 1744303087} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: -13, y: -295.9} + m_SizeDelta: {x: 547.3, y: 75.79999} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1679770481 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1679770479} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, 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_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 4cd369d29dd8c2b4a8e6db00d2da760d, type: 3} + m_FontSize: 23 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: You (green) need to get a better score than your opponent (purple)! +--- !u!222 &1679770482 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1679770479} + m_CullTransparentMesh: 0 +--- !u!1 &1702059654 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1702059655} + - component: {fileID: 1702059657} + - component: {fileID: 1702059656} + m_Layer: 5 + m_Name: Text (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1702059655 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1702059654} + 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: 1744303087} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 150, y: 8} + m_SizeDelta: {x: 248.9, y: 134.4} + m_Pivot: {x: 0, y: 0.5} +--- !u!114 &1702059656 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1702059654} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, 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_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 4cd369d29dd8c2b4a8e6db00d2da760d, type: 3} + m_FontSize: 23 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 'In future battles some effects may occur and will be displayed here. ' +--- !u!222 &1702059657 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1702059654} + m_CullTransparentMesh: 0 +--- !u!1 &1744303086 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2706,71 +2743,45 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1437392427} - - component: {fileID: 1437392429} - - component: {fileID: 1437392428} + - component: {fileID: 1744303087} + - component: {fileID: 1744303088} m_Layer: 5 - m_Name: Panel + m_Name: Help Overlay m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1437392427 +--- !u!224 &1744303087 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1437392426} + m_GameObject: {fileID: 1744303086} 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: 809165409} - m_RootOrder: 0 + m_Children: + - {fileID: 1679770480} + - {fileID: 1702059655} + - {fileID: 625920091} + - {fileID: 846953186} + m_Father: {fileID: 481556386} + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -0.009933472, y: 0} - m_SizeDelta: {x: 0.022064209, y: 0.000061035156} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0.00012207031, y: 0.000061035156} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1437392428 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1437392426} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.49056602, g: 0.46511212, b: 0.46511212, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 ---- !u!222 &1437392429 +--- !u!222 &1744303088 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1437392426} + m_GameObject: {fileID: 1744303086} m_CullTransparentMesh: 0 --- !u!1 &1810478631 GameObject: @@ -2871,6 +2882,12 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} +--- !u!1 &1889548157 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1460475886081959181, guid: 88f102e7bb5e245489dacc5ccac6fdfd, + type: 3} + m_PrefabInstance: {fileID: 902258305} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1986122864 PrefabInstance: m_ObjectHideFlags: 0 @@ -2946,7 +2963,7 @@ PrefabInstance: - target: {fileID: 3072710562047330836, guid: 4f4f0547ba7cb524d99380ce8b591908, type: 3} propertyPath: m_AnchoredPosition.y - value: 209 + value: -221.3 objectReference: {fileID: 0} - target: {fileID: 3072710562047330836, guid: 4f4f0547ba7cb524d99380ce8b591908, type: 3} @@ -2966,7 +2983,7 @@ PrefabInstance: - target: {fileID: 3072710562047330836, guid: 4f4f0547ba7cb524d99380ce8b591908, type: 3} propertyPath: m_AnchorMin.y - value: 0.5 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3072710562047330836, guid: 4f4f0547ba7cb524d99380ce8b591908, type: 3} @@ -2976,7 +2993,7 @@ PrefabInstance: - target: {fileID: 3072710562047330836, guid: 4f4f0547ba7cb524d99380ce8b591908, type: 3} propertyPath: m_AnchorMax.y - value: 0.5 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3072710562047330836, guid: 4f4f0547ba7cb524d99380ce8b591908, type: 3} @@ -3124,82 +3141,141 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2023522678} m_CullTransparentMesh: 0 ---- !u!1 &2075023669 -GameObject: +--- !u!1001 &2111594772 +PrefabInstance: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2075023670} - - component: {fileID: 2075023672} - - component: {fileID: 2075023671} - m_Layer: 5 - m_Name: OnHover - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2075023670 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1283166458} + m_Modifications: + - target: {fileID: 1460475886081959181, guid: 88f102e7bb5e245489dacc5ccac6fdfd, + type: 3} + propertyPath: m_Name + value: OnHover (1) + objectReference: {fileID: 0} + - target: {fileID: 1460475886081959180, guid: 88f102e7bb5e245489dacc5ccac6fdfd, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1460475886081959180, guid: 88f102e7bb5e245489dacc5ccac6fdfd, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1460475886081959180, guid: 88f102e7bb5e245489dacc5ccac6fdfd, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1460475886081959180, guid: 88f102e7bb5e245489dacc5ccac6fdfd, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1460475886081959180, guid: 88f102e7bb5e245489dacc5ccac6fdfd, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1460475886081959180, guid: 88f102e7bb5e245489dacc5ccac6fdfd, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1460475886081959180, guid: 88f102e7bb5e245489dacc5ccac6fdfd, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1460475886081959180, guid: 88f102e7bb5e245489dacc5ccac6fdfd, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1460475886081959180, guid: 88f102e7bb5e245489dacc5ccac6fdfd, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1460475886081959180, guid: 88f102e7bb5e245489dacc5ccac6fdfd, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1460475886081959180, guid: 88f102e7bb5e245489dacc5ccac6fdfd, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1460475886081959180, guid: 88f102e7bb5e245489dacc5ccac6fdfd, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 32 + objectReference: {fileID: 0} + - target: {fileID: 1460475886081959180, guid: 88f102e7bb5e245489dacc5ccac6fdfd, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -54.6 + objectReference: {fileID: 0} + - target: {fileID: 1460475886081959180, guid: 88f102e7bb5e245489dacc5ccac6fdfd, + type: 3} + propertyPath: m_SizeDelta.x + value: 179.8 + objectReference: {fileID: 0} + - target: {fileID: 1460475886081959180, guid: 88f102e7bb5e245489dacc5ccac6fdfd, + type: 3} + propertyPath: m_SizeDelta.y + value: 197.1 + objectReference: {fileID: 0} + - target: {fileID: 1460475886081959180, guid: 88f102e7bb5e245489dacc5ccac6fdfd, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1460475886081959180, guid: 88f102e7bb5e245489dacc5ccac6fdfd, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1460475886081959180, guid: 88f102e7bb5e245489dacc5ccac6fdfd, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1460475886081959180, guid: 88f102e7bb5e245489dacc5ccac6fdfd, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1460475886081959180, guid: 88f102e7bb5e245489dacc5ccac6fdfd, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1460475886081959180, guid: 88f102e7bb5e245489dacc5ccac6fdfd, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1460475887236900046, guid: 88f102e7bb5e245489dacc5ccac6fdfd, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -0.009887695 + objectReference: {fileID: 0} + - target: {fileID: 1460475887344653769, guid: 88f102e7bb5e245489dacc5ccac6fdfd, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 88f102e7bb5e245489dacc5ccac6fdfd, type: 3} +--- !u!224 &2111594773 stripped RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2075023669} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 2125143289} - - {fileID: 171562248} - m_Father: {fileID: 446496070} - m_RootOrder: 0 - 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: -0.099998474} - m_SizeDelta: {x: 177.07794, y: 194.99994} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &2075023671 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2075023669} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.392} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 ---- !u!222 &2075023672 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 1460475886081959180, guid: 88f102e7bb5e245489dacc5ccac6fdfd, + type: 3} + m_PrefabInstance: {fileID: 2111594772} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2075023669} - m_CullTransparentMesh: 0 --- !u!1 &2117013685 GameObject: m_ObjectHideFlags: 0 @@ -3257,80 +3333,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2117013685} m_CullTransparentMesh: 0 ---- !u!1 &2125143288 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2125143289} - - component: {fileID: 2125143291} - - component: {fileID: 2125143290} - m_Layer: 5 - m_Name: Panel - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2125143289 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2125143288} - 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: 2075023670} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -0.009933472, y: 0} - m_SizeDelta: {x: 0.022064209, y: 0.000061035156} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &2125143290 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2125143288} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.49056602, g: 0.46511212, b: 0.46511212, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 ---- !u!222 &2125143291 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2125143288} - m_CullTransparentMesh: 0 --- !u!1001 &1848200219665833529 PrefabInstance: m_ObjectHideFlags: 0 @@ -3401,12 +3403,12 @@ PrefabInstance: - target: {fileID: 1848200219088625707, guid: ac6deb71cfef7434b8632abd8aca308f, type: 3} propertyPath: m_AnchoredPosition.x - value: 0.6 + value: 92 objectReference: {fileID: 0} - target: {fileID: 1848200219088625707, guid: ac6deb71cfef7434b8632abd8aca308f, type: 3} propertyPath: m_AnchoredPosition.y - value: 113.3 + value: 144 objectReference: {fileID: 0} - target: {fileID: 1848200219088625707, guid: ac6deb71cfef7434b8632abd8aca308f, type: 3} @@ -3416,7 +3418,7 @@ PrefabInstance: - target: {fileID: 1848200219088625707, guid: ac6deb71cfef7434b8632abd8aca308f, type: 3} propertyPath: m_SizeDelta.y - value: 226.5 + value: 230 objectReference: {fileID: 0} - target: {fileID: 1848200219088625707, guid: ac6deb71cfef7434b8632abd8aca308f, type: 3} @@ -3665,7 +3667,7 @@ PrefabInstance: - target: {fileID: 6477196409435443291, guid: bdc35112fe6b03a4a93248988eb89992, type: 3} propertyPath: m_Pivot.y - value: 0.49999994 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6477196409435443292, guid: bdc35112fe6b03a4a93248988eb89992, type: 3} diff --git a/Assets/Scenes/Game.unity.meta b/Assets/Scenes/Game.unity.meta index ca4eb227e72433f04c7ceb93e382dbbcdb4d0d13..4be4a2bff54c807ca812a5a593b884f31e544650 100644 --- a/Assets/Scenes/Game.unity.meta +++ b/Assets/Scenes/Game.unity.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a1633885aff01f04688aa4a949522219 +guid: 9113430a45bd60240b07be6b472a32db DefaultImporter: externalObjects: {} userData: diff --git a/Assets/Scenes/MainMenu.unity b/Assets/Scenes/MainMenu.unity index 06aa160152232ceb9b0c5105510f3e0feef5c338..41c0455128a888168edac5ce92828ed18e18ab8d 100644 --- a/Assets/Scenes/MainMenu.unity +++ b/Assets/Scenes/MainMenu.unity @@ -721,7 +721,7 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4cd369d29dd8c2b4a8e6db00d2da760d, type: 3} m_FontSize: 26 m_FontStyle: 0 - m_BestFit: 0 + m_BestFit: 1 m_MinSize: 10 m_MaxSize: 69 m_Alignment: 4 @@ -1148,7 +1148,7 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4cd369d29dd8c2b4a8e6db00d2da760d, type: 3} m_FontSize: 26 m_FontStyle: 0 - m_BestFit: 0 + m_BestFit: 1 m_MinSize: 10 m_MaxSize: 69 m_Alignment: 4 diff --git a/Assets/Scripts/Alterations/AddScoreOnCardDraw.cs b/Assets/Scripts/Alterations/AddScoreOnCardDraw.cs index 050b554a317fc94c884dd94b7706a9ba7050fd38..8b1ba112e334560054548011d23be7b46234664b 100644 --- a/Assets/Scripts/Alterations/AddScoreOnCardDraw.cs +++ b/Assets/Scripts/Alterations/AddScoreOnCardDraw.cs @@ -21,7 +21,7 @@ public class AddScoreOnCardDraw : Alteration public override void CleanUp() { - CardEvent<Card>.Unregister(Event.CARD_PLAYED, OnCardPlayed); + CardEvent<Card>.Unregister(Event.CARD_DRAW, OnCardPlayed); mPool.Remove(this); } } diff --git a/Assets/Scripts/Cards/Card.cs b/Assets/Scripts/Cards/Card.cs index 7aa08e18e6feb3d3a73f728452b4daf32593bfc9..61c2241ff482486b6689368987d90d2826f06d43 100644 --- a/Assets/Scripts/Cards/Card.cs +++ b/Assets/Scripts/Cards/Card.cs @@ -94,8 +94,10 @@ public class Card : MonoBehaviour, IPointerEnterHandler, IPointerExitHandler public void OnCardPlayed(UnityAction onAnimationEnd) { mCardUi = GetComponent<CardUi>(); - if(mCardUi != null ) - mCardUi.OnCardPlayed(onAnimationEnd); + if (mCardUi != null) + { + mCardUi.OnCardPlayed(onAnimationEnd); + } } public void SetDraftChoice(DraftChoice choice) diff --git a/Assets/Scripts/Deck/Dump.cs b/Assets/Scripts/Deck/Dump.cs index d8ed6fd248f807d7b977179b21f8a5472b9bc249..84995c16a74f878c0b40f612584656ea8ba1be6f 100644 --- a/Assets/Scripts/Deck/Dump.cs +++ b/Assets/Scripts/Deck/Dump.cs @@ -31,15 +31,20 @@ public class Dump : MonoBehaviour Debug.Log("discarding"); // duplication flags are cleared on discard - card.OnCardPlayed(delegate { - card.wasDuplicated = false; - CardEvent<Card>.Trigger(Event.CARD_DISCARD,card); - card.transform.SetParent(transform); - card.gameObject.SetActive(false); dumpStack.Push(card); + card.OnCardPlayed(delegate { + DiscardNoAnim(card); }); } + public void DiscardNoAnim(Card card) + { + card.wasDuplicated = false; + CardEvent<Card>.Trigger(Event.CARD_DISCARD, card); + card.transform.SetParent(transform); + card.gameObject.SetActive(false); dumpStack.Push(card); + } + public void Init() { if (Instance == null) diff --git a/Assets/Scripts/Deck/Hand.cs b/Assets/Scripts/Deck/Hand.cs index 1055cc0ef8096c78e6d34d9c9a09705b9b62b532..40b0d6eb574b277efc35bd2f9f592f400a1339cc 100644 --- a/Assets/Scripts/Deck/Hand.cs +++ b/Assets/Scripts/Deck/Hand.cs @@ -66,10 +66,13 @@ public class Hand : MonoBehaviour } } - public void Discard(Card card) + public void Discard(Card card,bool noAnim = false) { hand.Remove(card); - Dump.Instance.Discard(card); + if (!noAnim) + Dump.Instance.Discard(card); + else + Dump.Instance.DiscardNoAnim(card); // If we are resetting we will discard and reshuffle in the same frame witch can cause problems } public void Reset() @@ -82,7 +85,7 @@ public class Hand : MonoBehaviour while(hand.Count > 0) { - Discard(hand[0]); + Discard(hand[0],true); } diff --git a/Assets/Scripts/Fights/FightStarter.cs b/Assets/Scripts/Fights/FightStarter.cs index 069b5f8c12c4eb45ffc5e5b322830d4604e835e7..1dd01bbf855e5828193e995b59f99b7979f8bdc8 100644 --- a/Assets/Scripts/Fights/FightStarter.cs +++ b/Assets/Scripts/Fights/FightStarter.cs @@ -27,20 +27,25 @@ public class FightStarter : MonoBehaviour public void StartFight(FightInfo fight) { + //Reset score mScore.ResetScore(); + //place bird mBird = Instantiate(fight.bird); mBird.transform.SetParent(mBirdSpot); mBird.transform.localPosition = new Vector3(0, 0, -1); mBird.GetComponent<Birb>()?.Dance(); + //set th enemy score mScore.ModifyScore(-fight.scoreToMatch); Player.Instance.Energy = Player.Instance.TotalEnergy; Player.Instance.InstanciatePlayerBirb(); mEndTurnButton.SetActive(true); + //reset hand + mHand.Reset(); + //add to pool foreach (Alteration.AlterationInfo alterationInfo in fight.alterationEffects) { Player.Instance.pool.AddToPool(alterationInfo); } - mHand.Reset(); ScoreBar.OnWin += EndFight; ScoreBar.OnLose += LoseFight; } diff --git a/Assets/Scripts/Ui/CardUi.cs b/Assets/Scripts/Ui/CardUi.cs index 59ddb213e6b5361a233fbf061b8aa818536610e8..8215d641ebb321b88c0b6ffc6f3b9d17cf1649d3 100644 --- a/Assets/Scripts/Ui/CardUi.cs +++ b/Assets/Scripts/Ui/CardUi.cs @@ -18,7 +18,7 @@ public class CardUi : MonoBehaviour // Field related to animations - private float mAnimationTime = .5f; + private float mAnimationTime = 2f; private float mMoveSpeed = 1f; public void OnPointerEnter(PointerEventData eventData) { @@ -27,7 +27,8 @@ public class CardUi : MonoBehaviour public void OnCardPlayed(UnityAction onAnimationEnd) { - //StartCoroutine(FadeOut(onAnimationEnd)); + if (gameObject.activeSelf) + StartCoroutine(FadeOut(onAnimationEnd)); } void Start() @@ -47,7 +48,7 @@ public class CardUi : MonoBehaviour { CanvasGroup image = GetComponent<CanvasGroup>(); Transform transform = GetComponent<Transform>(); - + if (image != null && transform != null) { image.blocksRaycasts = false; diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 7cca5905ab2e90f0b4ba110a1c1646f4b49bd690..6e31d4d386e703154efd2c7c06995eefb476c65e 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -11,6 +11,9 @@ EditorBuildSettings: - enabled: 1 path: Assets/Scenes/MainMenu.unity guid: 3c61257c9f1ecde4ab9e5d16cf0f56de + - enabled: 1 + path: Assets/Scenes/Game.unity + guid: 9113430a45bd60240b07be6b472a32db - enabled: 1 path: Assets/Scenes/Romaric.unity guid: e006de4c46665344ca108f7e917ec4d8 @@ -24,6 +27,6 @@ EditorBuildSettings: path: Assets/Scenes/Credits.unity guid: 390804f369176e048a38da574f370332 - enabled: 0 - path: Assets/Scenes/Game.unity + path: Assets/__DELETED_GUID_Trash/a1633885aff01f04688aa4a949522219 guid: a1633885aff01f04688aa4a949522219 m_configObjects: {}