From a7fca03a95f391f02afccf8255d709b3b16ef90e Mon Sep 17 00:00:00 2001 From: Benxidosz <benxidosz@sch.bme.hu> Date: Thu, 12 Aug 2021 23:44:13 +0200 Subject: [PATCH] Merge Fixes --- .../Editor/Scripts.meta | 3 + .../Editor/Scripts/Components.meta | 3 + .../Editor/Scripts/Panels.meta | 3 + .../Editor/Scripts/PlayFabEditorSDK.meta | 3 + .../Editor/Scripts/Utils.meta | 3 + Assets/Prefabs/Camera/Main Camera.prefab | 4 +- Assets/Prefabs/GameManager.prefab | 27 ++++--- Assets/Prefabs/Onkoltseg.prefab | 6 +- Assets/Prefabs/ScoreCanvas.prefab | 4 +- Assets/Scenes/Menu.unity | 81 +++++++++++-------- 10 files changed, 84 insertions(+), 53 deletions(-) create mode 100644 Assets/PlayFabEditorExtensions/Editor/Scripts.meta create mode 100644 Assets/PlayFabEditorExtensions/Editor/Scripts/Components.meta create mode 100644 Assets/PlayFabEditorExtensions/Editor/Scripts/Panels.meta create mode 100644 Assets/PlayFabEditorExtensions/Editor/Scripts/PlayFabEditorSDK.meta create mode 100644 Assets/PlayFabEditorExtensions/Editor/Scripts/Utils.meta diff --git a/Assets/PlayFabEditorExtensions/Editor/Scripts.meta b/Assets/PlayFabEditorExtensions/Editor/Scripts.meta new file mode 100644 index 0000000..d813b06 --- /dev/null +++ b/Assets/PlayFabEditorExtensions/Editor/Scripts.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: b90830a6456443f88c042bc7ca92eea3 +timeCreated: 1628803751 \ No newline at end of file diff --git a/Assets/PlayFabEditorExtensions/Editor/Scripts/Components.meta b/Assets/PlayFabEditorExtensions/Editor/Scripts/Components.meta new file mode 100644 index 0000000..40b08f1 --- /dev/null +++ b/Assets/PlayFabEditorExtensions/Editor/Scripts/Components.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 07268edc4a6a4822b54fb297c07b2312 +timeCreated: 1628803764 \ No newline at end of file diff --git a/Assets/PlayFabEditorExtensions/Editor/Scripts/Panels.meta b/Assets/PlayFabEditorExtensions/Editor/Scripts/Panels.meta new file mode 100644 index 0000000..e1d1b0c --- /dev/null +++ b/Assets/PlayFabEditorExtensions/Editor/Scripts/Panels.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 4c3acb1fd1414c469ec8386c90b0ef2a +timeCreated: 1628803755 \ No newline at end of file diff --git a/Assets/PlayFabEditorExtensions/Editor/Scripts/PlayFabEditorSDK.meta b/Assets/PlayFabEditorExtensions/Editor/Scripts/PlayFabEditorSDK.meta new file mode 100644 index 0000000..4956d18 --- /dev/null +++ b/Assets/PlayFabEditorExtensions/Editor/Scripts/PlayFabEditorSDK.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 0b0414cc4693420183595a0ff3bd0bbf +timeCreated: 1628803763 \ No newline at end of file diff --git a/Assets/PlayFabEditorExtensions/Editor/Scripts/Utils.meta b/Assets/PlayFabEditorExtensions/Editor/Scripts/Utils.meta new file mode 100644 index 0000000..664d960 --- /dev/null +++ b/Assets/PlayFabEditorExtensions/Editor/Scripts/Utils.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 209fe4b4a18a4f0a8757011b79d00368 +timeCreated: 1628803762 \ No newline at end of file diff --git a/Assets/Prefabs/Camera/Main Camera.prefab b/Assets/Prefabs/Camera/Main Camera.prefab index 4989ec2..33def5a 100644 --- a/Assets/Prefabs/Camera/Main Camera.prefab +++ b/Assets/Prefabs/Camera/Main Camera.prefab @@ -171,7 +171,7 @@ MonoBehaviour: m_GameObject: {fileID: 2658327407142783670} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 62fff5dd8f0ce9a4ea3cc2832ef5e8a3, type: 3} + m_Script: {fileID: 11500000, guid: 5dbaa0ef5fbfe534ca6b31846696cf7a, type: 3} m_Name: m_EditorClassIdentifier: --- !u!1 &8662130499674655633 @@ -241,6 +241,6 @@ MonoBehaviour: m_GameObject: {fileID: 8662130499674655633} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2c337c71b0ca81d4cabc0efcf6a32922, type: 3} + m_Script: {fileID: 11500000, guid: 20ba6e5a58c196f46bd2730c6533e92f, type: 3} m_Name: m_EditorClassIdentifier: diff --git a/Assets/Prefabs/GameManager.prefab b/Assets/Prefabs/GameManager.prefab index 644a858..66baae4 100644 --- a/Assets/Prefabs/GameManager.prefab +++ b/Assets/Prefabs/GameManager.prefab @@ -10,8 +10,8 @@ GameObject: m_Component: - component: {fileID: 1739828243584991408} - component: {fileID: 1739828243584991409} - - component: {fileID: 7009192361258235585} - component: {fileID: 1668867271683391002} + - component: {fileID: 4321672958345957267} m_Layer: 0 m_Name: GameManager m_TagString: Untagged @@ -67,8 +67,9 @@ MonoBehaviour: OnkoltsegController: {fileID: 0} InputCanvas: {fileID: 0} scoreController: {fileID: 0} + _scoreData: {fileID: 0} m_FellOffController: {fileID: 0} ---- !u!114 &7009192361258235585 +--- !u!114 &1668867271683391002 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -77,20 +78,22 @@ MonoBehaviour: m_GameObject: {fileID: 1739828243584991410} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 616440c7c868257439ec39a2ac72a4b9, type: 3} + m_Script: {fileID: 11500000, guid: a9fa613fe0f950b45bd971e6b09ea090, type: 3} m_Name: m_EditorClassIdentifier: - chanceToSpawnSpecial: 0.2 + chanceToSpawnSpecial: 0.4 maxSpecialNum: 3 minSpecialNum: 0 - specialItems: [] - chanceToSpawnCoin: 0.6 + specialItems: + - {fileID: 8290702630681037200, guid: 3b8a0f9417ff1304590d6bb7d6f3cf9e, type: 3} + - {fileID: 8890690931224716302, guid: ed587526362af914ba447a5fac93325b, type: 3} + chanceToSpawnCoin: 0.8 maxCoinNum: 5 minCoinNum: 1 - coinPrefab: {fileID: 0} + coinPrefab: {fileID: 3462310278958733585, guid: 39beb763e9e5f7c46b82ad1ee4e30241, type: 3} minCoinValue: 50 maxCoinValue: 500 ---- !u!114 &1668867271683391002 +--- !u!114 &4321672958345957267 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -99,9 +102,9 @@ MonoBehaviour: m_GameObject: {fileID: 1739828243584991410} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 76e401c1083713d4891fdd07806c39d8, type: 3} + m_Script: {fileID: 11500000, guid: b3bf1c4775b94fc4bafc2c39dd8ec24a, type: 3} m_Name: m_EditorClassIdentifier: - owlPrefab: {fileID: 0} - enemySpawningOffset: 0 - ySpawningOffset: 0 + owlPrefab: {fileID: 4801316083981629696, guid: 397a87147f92f034fb2b031ffe8e210a, type: 3} + enemySpawningOffset: 3 + ySpawningOffset: 4 diff --git a/Assets/Prefabs/Onkoltseg.prefab b/Assets/Prefabs/Onkoltseg.prefab index 2146882..aaf3549 100644 --- a/Assets/Prefabs/Onkoltseg.prefab +++ b/Assets/Prefabs/Onkoltseg.prefab @@ -94,11 +94,11 @@ MonoBehaviour: m_GameObject: {fileID: 8393235153809110714} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3bc2e633913ded64886a4669a8dc1934, type: 3} + m_Script: {fileID: 11500000, guid: 7e209c2cce12c254fbf93278199b21d6, type: 3} m_Name: m_EditorClassIdentifier: - waitingTime: 3 - raisingSpeed: 3 + waitingTime: 5 + raisingSpeed: 1 --- !u!61 &8393235153809110725 BoxCollider2D: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/ScoreCanvas.prefab b/Assets/Prefabs/ScoreCanvas.prefab index f072eba..9ef57b1 100644 --- a/Assets/Prefabs/ScoreCanvas.prefab +++ b/Assets/Prefabs/ScoreCanvas.prefab @@ -110,10 +110,10 @@ MonoBehaviour: m_GameObject: {fileID: 1206618765715088053} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d67a4f3940499a1459177d175a88673e, type: 3} + m_Script: {fileID: 11500000, guid: d3ef8307452660d489e04484925e0617, type: 3} m_Name: m_EditorClassIdentifier: - multiplier: 0 + multiplier: 1 pointDiffToHarden: 50 --- !u!1 &1206618765819874103 GameObject: diff --git a/Assets/Scenes/Menu.unity b/Assets/Scenes/Menu.unity index 7cf1d46..49bea6a 100644 --- a/Assets/Scenes/Menu.unity +++ b/Assets/Scenes/Menu.unity @@ -639,7 +639,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4663329718610754680, guid: 99aa5892cf577c140afcb85f68306d01, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4663329718610754680, guid: 99aa5892cf577c140afcb85f68306d01, type: 3} propertyPath: m_AnchorMin.x @@ -647,11 +647,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4663329718610754680, guid: 99aa5892cf577c140afcb85f68306d01, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4663329718610754680, guid: 99aa5892cf577c140afcb85f68306d01, type: 3} propertyPath: m_SizeDelta.x - value: 639.44 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4663329718610754680, guid: 99aa5892cf577c140afcb85f68306d01, type: 3} propertyPath: m_SizeDelta.y @@ -687,11 +687,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4663329718610754680, guid: 99aa5892cf577c140afcb85f68306d01, type: 3} propertyPath: m_AnchoredPosition.x - value: 319.72 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4663329718610754680, guid: 99aa5892cf577c140afcb85f68306d01, type: 3} propertyPath: m_AnchoredPosition.y - value: -374.48965 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4663329718610754680, guid: 99aa5892cf577c140afcb85f68306d01, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -1270,7 +1270,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &741943918 RectTransform: m_ObjectHideFlags: 0 @@ -1352,7 +1352,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4663329718610754680, guid: 99aa5892cf577c140afcb85f68306d01, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4663329718610754680, guid: 99aa5892cf577c140afcb85f68306d01, type: 3} propertyPath: m_AnchorMin.x @@ -1360,11 +1360,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4663329718610754680, guid: 99aa5892cf577c140afcb85f68306d01, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4663329718610754680, guid: 99aa5892cf577c140afcb85f68306d01, type: 3} propertyPath: m_SizeDelta.x - value: 639.44 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4663329718610754680, guid: 99aa5892cf577c140afcb85f68306d01, type: 3} propertyPath: m_SizeDelta.y @@ -1400,11 +1400,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4663329718610754680, guid: 99aa5892cf577c140afcb85f68306d01, type: 3} propertyPath: m_AnchoredPosition.x - value: 319.72 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4663329718610754680, guid: 99aa5892cf577c140afcb85f68306d01, type: 3} propertyPath: m_AnchoredPosition.y - value: -257.9867 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4663329718610754680, guid: 99aa5892cf577c140afcb85f68306d01, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -1582,7 +1582,7 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 2071320554} + - m_Target: {fileID: 1891644866} m_TargetAssemblyTypeName: menuButtons, Assembly-CSharp m_MethodName: playButtonPress m_Mode: 1 @@ -1791,7 +1791,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4663329718610754680, guid: 99aa5892cf577c140afcb85f68306d01, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4663329718610754680, guid: 99aa5892cf577c140afcb85f68306d01, type: 3} propertyPath: m_AnchorMin.x @@ -1799,11 +1799,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4663329718610754680, guid: 99aa5892cf577c140afcb85f68306d01, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4663329718610754680, guid: 99aa5892cf577c140afcb85f68306d01, type: 3} propertyPath: m_SizeDelta.x - value: 639.44 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4663329718610754680, guid: 99aa5892cf577c140afcb85f68306d01, type: 3} propertyPath: m_SizeDelta.y @@ -1839,11 +1839,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4663329718610754680, guid: 99aa5892cf577c140afcb85f68306d01, type: 3} propertyPath: m_AnchoredPosition.x - value: 319.72 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4663329718610754680, guid: 99aa5892cf577c140afcb85f68306d01, type: 3} propertyPath: m_AnchoredPosition.y - value: -24.980804 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4663329718610754680, guid: 99aa5892cf577c140afcb85f68306d01, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -2027,7 +2027,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4663329718610754680, guid: 99aa5892cf577c140afcb85f68306d01, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4663329718610754680, guid: 99aa5892cf577c140afcb85f68306d01, type: 3} propertyPath: m_AnchorMin.x @@ -2035,11 +2035,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4663329718610754680, guid: 99aa5892cf577c140afcb85f68306d01, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4663329718610754680, guid: 99aa5892cf577c140afcb85f68306d01, type: 3} propertyPath: m_SizeDelta.x - value: 639.44 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4663329718610754680, guid: 99aa5892cf577c140afcb85f68306d01, type: 3} propertyPath: m_SizeDelta.y @@ -2075,11 +2075,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4663329718610754680, guid: 99aa5892cf577c140afcb85f68306d01, type: 3} propertyPath: m_AnchoredPosition.x - value: 319.72 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4663329718610754680, guid: 99aa5892cf577c140afcb85f68306d01, type: 3} propertyPath: m_AnchoredPosition.y - value: -490.9926 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4663329718610754680, guid: 99aa5892cf577c140afcb85f68306d01, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -2413,7 +2413,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4663329718610754680, guid: 99aa5892cf577c140afcb85f68306d01, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4663329718610754680, guid: 99aa5892cf577c140afcb85f68306d01, type: 3} propertyPath: m_AnchorMin.x @@ -2421,11 +2421,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4663329718610754680, guid: 99aa5892cf577c140afcb85f68306d01, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4663329718610754680, guid: 99aa5892cf577c140afcb85f68306d01, type: 3} propertyPath: m_SizeDelta.x - value: 639.44 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4663329718610754680, guid: 99aa5892cf577c140afcb85f68306d01, type: 3} propertyPath: m_SizeDelta.y @@ -2461,11 +2461,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4663329718610754680, guid: 99aa5892cf577c140afcb85f68306d01, type: 3} propertyPath: m_AnchoredPosition.x - value: 319.72 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4663329718610754680, guid: 99aa5892cf577c140afcb85f68306d01, type: 3} propertyPath: m_AnchoredPosition.y - value: -607.4956 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4663329718610754680, guid: 99aa5892cf577c140afcb85f68306d01, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -2702,7 +2702,7 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 2071320554} + - m_Target: {fileID: 1891644866} m_TargetAssemblyTypeName: menuButtons, Assembly-CSharp m_MethodName: quitButtonPress m_Mode: 1 @@ -2777,7 +2777,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4663329718610754680, guid: 99aa5892cf577c140afcb85f68306d01, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4663329718610754680, guid: 99aa5892cf577c140afcb85f68306d01, type: 3} propertyPath: m_AnchorMin.x @@ -2785,11 +2785,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4663329718610754680, guid: 99aa5892cf577c140afcb85f68306d01, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4663329718610754680, guid: 99aa5892cf577c140afcb85f68306d01, type: 3} propertyPath: m_SizeDelta.x - value: 639.44 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4663329718610754680, guid: 99aa5892cf577c140afcb85f68306d01, type: 3} propertyPath: m_SizeDelta.y @@ -2825,11 +2825,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4663329718610754680, guid: 99aa5892cf577c140afcb85f68306d01, type: 3} propertyPath: m_AnchoredPosition.x - value: 319.72 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4663329718610754680, guid: 99aa5892cf577c140afcb85f68306d01, type: 3} propertyPath: m_AnchoredPosition.y - value: -141.48376 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4663329718610754680, guid: 99aa5892cf577c140afcb85f68306d01, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -3137,6 +3137,7 @@ GameObject: m_Component: - component: {fileID: 1891644865} - component: {fileID: 1891644864} + - component: {fileID: 1891644866} m_Layer: 0 m_Name: MenuController m_TagString: Untagged @@ -3153,7 +3154,7 @@ MonoBehaviour: m_GameObject: {fileID: 1891644863} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bc687a0428b1c9249907e57f5201647e, type: 3} + m_Script: {fileID: 11500000, guid: 179eb137c404bf94d8d3b642861d8b32, type: 3} m_Name: m_EditorClassIdentifier: mainMenuAnimator: {fileID: 2071320555} @@ -3173,6 +3174,18 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1891644866 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1891644863} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 50e0e77bd41942245b69f6035b6292e7, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!224 &2060335348 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 4663329718610754680, guid: 99aa5892cf577c140afcb85f68306d01, type: 3} -- GitLab