diff --git a/Forest/Assets/Art/GameBuild/Prefab/UIMainBuild.prefab b/Forest/Assets/Art/GameBuild/Prefab/UIMainBuild.prefab index cb0324d..3d386b3 100644 --- a/Forest/Assets/Art/GameBuild/Prefab/UIMainBuild.prefab +++ b/Forest/Assets/Art/GameBuild/Prefab/UIMainBuild.prefab @@ -350,81 +350,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &1153247368971935202 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8076358048776253142} - - component: {fileID: 8752289973653988701} - - component: {fileID: 6196456040664606151} - m_Layer: 5 - m_Name: BG_Top - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &8076358048776253142 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1153247368971935202} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 5779450021806023445} - 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: 0, y: -40} - m_SizeDelta: {x: 1028, y: 342} - m_Pivot: {x: 0.5, y: 1} ---- !u!222 &8752289973653988701 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1153247368971935202} - m_CullTransparentMesh: 1 ---- !u!114 &6196456040664606151 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1153247368971935202} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 94e9a6bcb4a254f3ead700f1c15d51c5, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 --- !u!1 &1501056032042821150 GameObject: m_ObjectHideFlags: 0 @@ -904,8 +829,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 8076358048776253142} + m_Children: [] m_Father: {fileID: 6010059363226103516} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} @@ -1243,7 +1167,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 5779450021806023445} - - {fileID: 431076380073767305} - {fileID: 4094651243566561010} - {fileID: 8771054819511621763} m_Father: {fileID: 0} @@ -1289,81 +1212,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 300} m_Pivot: {x: 0.5, y: 0} ---- !u!1 &5998195394357419975 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 431076380073767305} - - component: {fileID: 3759613858973799751} - - component: {fileID: 8218175922295010116} - m_Layer: 5 - m_Name: Mask - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &431076380073767305 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5998195394357419975} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 6010059363226103516} - 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, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3759613858973799751 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5998195394357419975} - m_CullTransparentMesh: 1 ---- !u!114 &8218175922295010116 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5998195394357419975} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: ac2b55286c6bd4a6db3ce58d4ae50783, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 --- !u!1 &6139240320691519945 GameObject: m_ObjectHideFlags: 0 @@ -1460,8 +1308,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 50 - m_fontSizeBase: 50 + m_fontSize: 54 + m_fontSizeBase: 54 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -1909,7 +1757,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &8771054819511621763 RectTransform: m_ObjectHideFlags: 0 diff --git a/Forest/Assets/Art/Gfx/prefab/Effect_OpenKong.prefab b/Forest/Assets/Art/Gfx/prefab/Effect_OpenKong.prefab old mode 100755 new mode 100644 index e0998c6..f3a0340 --- a/Forest/Assets/Art/Gfx/prefab/Effect_OpenKong.prefab +++ b/Forest/Assets/Art/Gfx/prefab/Effect_OpenKong.prefab @@ -11,7 +11,7 @@ GameObject: - component: {fileID: 3778881883716864601} - component: {fileID: 4659908901998614325} - component: {fileID: 4308202874150851090} - m_Layer: 0 + m_Layer: 12 m_Name: smoke m_TagString: Untagged m_Icon: {fileID: 0} @@ -5024,7 +5024,7 @@ GameObject: - component: {fileID: 3635434706758641732} - component: {fileID: 4496719682121540773} - component: {fileID: 4955356159751900536} - m_Layer: 0 + m_Layer: 12 m_Name: shousuo m_TagString: Untagged m_Icon: {fileID: 0} @@ -9854,7 +9854,7 @@ GameObject: - component: {fileID: 6520940043758828497} - component: {fileID: 6520404064290056540} - component: {fileID: 1016618241292644614} - m_Layer: 0 + m_Layer: 12 m_Name: grow m_TagString: Untagged m_Icon: {fileID: 0} @@ -14742,7 +14742,7 @@ GameObject: - component: {fileID: 2226077434729802189} - component: {fileID: 415151634329835255} - component: {fileID: 438130401397249801} - m_Layer: 0 + m_Layer: 12 m_Name: Effect_OpenKong m_TagString: Untagged m_Icon: {fileID: 0} @@ -19577,7 +19577,7 @@ GameObject: - component: {fileID: 6339296916820390479} - component: {fileID: 426005790309851827} - component: {fileID: 4713557075374253511} - m_Layer: 0 + m_Layer: 12 m_Name: ci (1) m_TagString: Untagged m_Icon: {fileID: 0} @@ -24590,7 +24590,7 @@ GameObject: - component: {fileID: 7519921547415736211} - component: {fileID: 8419086538440742381} - component: {fileID: 3484528624727797789} - m_Layer: 0 + m_Layer: 12 m_Name: star (1) m_TagString: Untagged m_Icon: {fileID: 0} diff --git a/Forest/Assets/Art/Gfx/prefab/Effect_Plank.prefab b/Forest/Assets/Art/Gfx/prefab/Effect_Plank.prefab index 2226101..b62ef26 100644 --- a/Forest/Assets/Art/Gfx/prefab/Effect_Plank.prefab +++ b/Forest/Assets/Art/Gfx/prefab/Effect_Plank.prefab @@ -11,7 +11,7 @@ GameObject: - component: {fileID: 955335856186089280} - component: {fileID: 1129199502157233437} - component: {fileID: 8915187826299407487} - m_Layer: 0 + m_Layer: 12 m_Name: Effect_Plank m_TagString: Untagged m_Icon: {fileID: 0} @@ -4842,7 +4842,7 @@ GameObject: - component: {fileID: 7639380954389279947} - component: {fileID: 5429097049019424491} - component: {fileID: 3414391377468851285} - m_Layer: 0 + m_Layer: 12 m_Name: Particle System m_TagString: Untagged m_Icon: {fileID: 0} diff --git a/Forest/Assets/Art/Gfx/prefab/Effect_Revert.prefab b/Forest/Assets/Art/Gfx/prefab/Effect_Revert.prefab old mode 100755 new mode 100644 index c48b4d6..550a950 --- a/Forest/Assets/Art/Gfx/prefab/Effect_Revert.prefab +++ b/Forest/Assets/Art/Gfx/prefab/Effect_Revert.prefab @@ -11,7 +11,7 @@ GameObject: - component: {fileID: 7492795598145214032} - component: {fileID: 5830501755589583155} - component: {fileID: 3312519267816313216} - m_Layer: 0 + m_Layer: 12 m_Name: Effect_Revert m_TagString: Untagged m_Icon: {fileID: 0} @@ -4845,7 +4845,7 @@ GameObject: - component: {fileID: 9088590780195963643} - component: {fileID: 5048349401270823990} - component: {fileID: 851931191010106940} - m_Layer: 0 + m_Layer: 12 m_Name: zhong m_TagString: Untagged m_Icon: {fileID: 0} @@ -9733,7 +9733,7 @@ GameObject: - component: {fileID: 4473916027927607660} - component: {fileID: 6877549782315627561} - component: {fileID: 1817005981187920195} - m_Layer: 0 + m_Layer: 12 m_Name: chang m_TagString: Untagged m_Icon: {fileID: 0} @@ -14621,7 +14621,7 @@ GameObject: - component: {fileID: 7786016503220418769} - component: {fileID: 2367575269154838782} - component: {fileID: 6275165010396936663} - m_Layer: 0 + m_Layer: 12 m_Name: line m_TagString: Untagged m_Icon: {fileID: 0} @@ -19518,7 +19518,7 @@ GameObject: - component: {fileID: 1781634836514018412} - component: {fileID: 347258828371317002} - component: {fileID: 6000844841447093478} - m_Layer: 0 + m_Layer: 12 m_Name: duan m_TagString: Untagged m_Icon: {fileID: 0} diff --git a/Forest/Assets/Art/Gfx/prefab/Effect_SelectSequin.prefab b/Forest/Assets/Art/Gfx/prefab/Effect_SelectSequin.prefab index 4e0aae8..dd52c85 100644 --- a/Forest/Assets/Art/Gfx/prefab/Effect_SelectSequin.prefab +++ b/Forest/Assets/Art/Gfx/prefab/Effect_SelectSequin.prefab @@ -11,7 +11,7 @@ GameObject: - component: {fileID: 2257534591606795091} - component: {fileID: 9175913286212627645} - component: {fileID: 4029112452683683440} - m_Layer: 0 + m_Layer: 12 m_Name: Effect_SelectSequin m_TagString: Untagged m_Icon: {fileID: 0} @@ -4842,7 +4842,7 @@ GameObject: - component: {fileID: 8130314687356306845} - component: {fileID: 943054148301233248} - component: {fileID: 901868682466252713} - m_Layer: 0 + m_Layer: 12 m_Name: Particle System m_TagString: Untagged m_Icon: {fileID: 0} diff --git a/Forest/Assets/Art/Gfx/prefab/Effect_Sequin.prefab b/Forest/Assets/Art/Gfx/prefab/Effect_Sequin.prefab index e1e05df..4f05575 100644 --- a/Forest/Assets/Art/Gfx/prefab/Effect_Sequin.prefab +++ b/Forest/Assets/Art/Gfx/prefab/Effect_Sequin.prefab @@ -11,7 +11,7 @@ GameObject: - component: {fileID: 2133370093987187525} - component: {fileID: 7075253158344504820} - component: {fileID: 1751640746023822805} - m_Layer: 5 + m_Layer: 12 m_Name: star (1) m_TagString: Untagged m_Icon: {fileID: 0} @@ -4895,7 +4895,7 @@ GameObject: - component: {fileID: 6765020928358913440} - component: {fileID: 8183106733962693299} - component: {fileID: 4084524320110997530} - m_Layer: 5 + m_Layer: 12 m_Name: star m_TagString: Untagged m_Icon: {fileID: 0} @@ -9779,7 +9779,7 @@ GameObject: - component: {fileID: 4189521012196689175} - component: {fileID: 3992933656309648722} - component: {fileID: 6876956608991756574} - m_Layer: 0 + m_Layer: 12 m_Name: Effect_Sequin m_TagString: Untagged m_Icon: {fileID: 0} @@ -14610,7 +14610,7 @@ GameObject: - component: {fileID: 8381669259252692525} - component: {fileID: 582469359030818034} - component: {fileID: 4387113395662291404} - m_Layer: 0 + m_Layer: 12 m_Name: lizi m_TagString: Untagged m_Icon: {fileID: 0} diff --git a/Forest/Assets/Art/Gfx/prefab/Effect_Up.prefab b/Forest/Assets/Art/Gfx/prefab/Effect_Up.prefab index b37ccaf..1b50478 100644 --- a/Forest/Assets/Art/Gfx/prefab/Effect_Up.prefab +++ b/Forest/Assets/Art/Gfx/prefab/Effect_Up.prefab @@ -11,7 +11,7 @@ GameObject: - component: {fileID: 1154180616488827345} - component: {fileID: 4513295663823365401} - component: {fileID: 6592746964326557024} - m_Layer: 0 + m_Layer: 12 m_Name: ci m_TagString: Untagged m_Icon: {fileID: 0} @@ -4908,7 +4908,7 @@ GameObject: - component: {fileID: 4306480795056187258} - component: {fileID: 2222026921592932435} - component: {fileID: 8649307057857924349} - m_Layer: 0 + m_Layer: 12 m_Name: Effect_Up m_TagString: Untagged m_Icon: {fileID: 0} @@ -9740,7 +9740,7 @@ GameObject: - component: {fileID: 846109656009410769} - component: {fileID: 64076242357589484} - component: {fileID: 2629070701617610497} - m_Layer: 0 + m_Layer: 12 m_Name: star m_TagString: Untagged m_Icon: {fileID: 0} diff --git a/Forest/Assets/Art/Gfx/prefab/Effect_Win.prefab b/Forest/Assets/Art/Gfx/prefab/Effect_Win.prefab index 25fbef2..f262d0e 100644 --- a/Forest/Assets/Art/Gfx/prefab/Effect_Win.prefab +++ b/Forest/Assets/Art/Gfx/prefab/Effect_Win.prefab @@ -11,7 +11,7 @@ GameObject: - component: {fileID: 4785987739271663695} - component: {fileID: 1441533105526355057} - component: {fileID: 6151462998119791117} - m_Layer: 0 + m_Layer: 12 m_Name: trail01 m_TagString: Untagged m_Icon: {fileID: 0} @@ -5314,7 +5314,7 @@ GameObject: - component: {fileID: 7316138752369268210} - component: {fileID: 3517955528733144870} - component: {fileID: 4451036537690820458} - m_Layer: 0 + m_Layer: 12 m_Name: trail02 m_TagString: Untagged m_Icon: {fileID: 0} @@ -10617,7 +10617,7 @@ GameObject: - component: {fileID: 999644770055694368} - component: {fileID: 4407079131673588825} - component: {fileID: 3045884443328701571} - m_Layer: 0 + m_Layer: 12 m_Name: star01 m_TagString: Untagged m_Icon: {fileID: 0} @@ -15633,7 +15633,7 @@ GameObject: - component: {fileID: 5067489744792564589} - component: {fileID: 1795507102265372491} - component: {fileID: 1333287972009722814} - m_Layer: 0 + m_Layer: 12 m_Name: suipian02 m_TagString: Untagged m_Icon: {fileID: 0} @@ -20647,7 +20647,7 @@ GameObject: - component: {fileID: 6669856472244809042} - component: {fileID: 1163285752122340456} - component: {fileID: 4031494521602200121} - m_Layer: 0 + m_Layer: 12 m_Name: suipian01 m_TagString: Untagged m_Icon: {fileID: 0} @@ -25661,7 +25661,7 @@ GameObject: - component: {fileID: 1608083058493234796} - component: {fileID: 4402858078123063212} - component: {fileID: 2363543529095014234} - m_Layer: 0 + m_Layer: 12 m_Name: star02 m_TagString: Untagged m_Icon: {fileID: 0} @@ -30677,7 +30677,7 @@ GameObject: - component: {fileID: 2988796464261949047} - component: {fileID: 3005398497302982506} - component: {fileID: 7712772630239863711} - m_Layer: 0 + m_Layer: 12 m_Name: Effect_Win m_TagString: Untagged m_Icon: {fileID: 0} diff --git a/Forest/Assets/Art/UI/Prefab/UILevelPanel.prefab b/Forest/Assets/Art/UI/Prefab/UILevelPanel.prefab index fd3ff12..550d793 100644 --- a/Forest/Assets/Art/UI/Prefab/UILevelPanel.prefab +++ b/Forest/Assets/Art/UI/Prefab/UILevelPanel.prefab @@ -73,7 +73,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 366.22888, y: 787.87646} + m_AnchoredPosition: {x: -140, y: -140} m_SizeDelta: {x: 196.5315, y: 186.0006} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3978962128240262342 @@ -287,7 +287,7 @@ RectTransform: 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: 125, y: 160} + m_AnchoredPosition: {x: 125, y: 113} m_SizeDelta: {x: 175, y: 174} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7952034310583157965 @@ -616,7 +616,7 @@ RectTransform: 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: -125, y: 160} + m_AnchoredPosition: {x: -125, y: 113} m_SizeDelta: {x: 175, y: 174} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &371699258998919673 @@ -1007,7 +1007,7 @@ RectTransform: 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: -380, y: 160} + m_AnchoredPosition: {x: -380, y: 113} m_SizeDelta: {x: 175, y: 174} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &391733589424193186 @@ -1262,7 +1262,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -20, y: 584} + m_AnchoredPosition: {x: -20, y: -162} m_SizeDelta: {x: 200, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3689785446341081734 @@ -1628,7 +1628,7 @@ RectTransform: 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: 15, y: 670} + m_AnchoredPosition: {x: 15, y: -270} m_SizeDelta: {x: 530, y: 178} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1894465244857922080 @@ -1776,11 +1776,11 @@ RectTransform: - {fileID: 8998708418089630493} m_Father: {fileID: 7569070711472288333} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} + m_SizeDelta: {x: 0, y: 300} + m_Pivot: {x: 0.5, y: 0} --- !u!1 &7238656281113263196 GameObject: m_ObjectHideFlags: 0 @@ -1907,11 +1907,11 @@ RectTransform: - {fileID: 1273595365895898824} m_Father: {fileID: 7569070711472288333} 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: 0, y: -960} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 500} + m_Pivot: {x: 0.5, y: 1} --- !u!1 &7398484115381755473 GameObject: m_ObjectHideFlags: 0 @@ -2398,7 +2398,7 @@ RectTransform: 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: 380, y: 160} + m_AnchoredPosition: {x: 380, y: 113} m_SizeDelta: {x: 175, y: 174} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6210102985534662818 diff --git a/Forest/Assets/Art/UI/Prefab/UIStartMain.prefab b/Forest/Assets/Art/UI/Prefab/UIStartMain.prefab index 8af949e..d22c18f 100644 --- a/Forest/Assets/Art/UI/Prefab/UIStartMain.prefab +++ b/Forest/Assets/Art/UI/Prefab/UIStartMain.prefab @@ -648,11 +648,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 8857395475620571252} + m_Father: {fileID: 1683202030608543866} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -40, y: -190} + m_AnchoredPosition: {x: -14, y: -177} m_SizeDelta: {x: 140, y: 150} m_Pivot: {x: 1, y: 1} --- !u!222 &1903253691253264977 @@ -768,11 +768,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 8857395475620571252} + m_Father: {fileID: 1683202030608543866} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 40, y: -190} + m_AnchoredPosition: {x: 14, y: -249} m_SizeDelta: {x: 173, y: 167} m_Pivot: {x: 0, y: 1} --- !u!222 &1893356969540545168 @@ -888,11 +888,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 8857395475620571252} + m_Father: {fileID: 1683202030608543866} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -40, y: -375} + m_AnchoredPosition: {x: -14, y: -362} m_SizeDelta: {x: 135, y: 146.4} m_Pivot: {x: 1, y: 1} --- !u!222 &8550582288838996399 @@ -1128,11 +1128,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 8857395475620571252} + m_Father: {fileID: 1683202030608543866} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -40, y: -557} + m_AnchoredPosition: {x: -14, y: -544} m_SizeDelta: {x: 135, y: 146.4} m_Pivot: {x: 1, y: 1} --- !u!222 &2455664696496169119 @@ -1338,6 +1338,85 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] +--- !u!1 &7922367951827673960 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1683202030608543866} + - component: {fileID: 5588182828024035222} + - component: {fileID: 8945854223031111770} + m_Layer: 5 + m_Name: BG_Top + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1683202030608543866 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7922367951827673960} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2506899326898321492} + - {fileID: 2932034157699266402} + - {fileID: 6537855527602855844} + - {fileID: 6180863349140604280} + m_Father: {fileID: 8857395475620571252} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -30} + m_SizeDelta: {x: -52, y: 342} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &5588182828024035222 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7922367951827673960} + m_CullTransparentMesh: 1 +--- !u!114 &8945854223031111770 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7922367951827673960} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 94e9a6bcb4a254f3ead700f1c15d51c5, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &9129577244723562157 GameObject: m_ObjectHideFlags: 0 @@ -1366,10 +1445,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 2506899326898321492} - - {fileID: 2932034157699266402} - - {fileID: 6537855527602855844} - - {fileID: 6180863349140604280} + - {fileID: 1683202030608543866} m_Father: {fileID: 891812303934638700} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} diff --git a/Forest/Assets/Scenes/Build/Build_1.unity b/Forest/Assets/Scenes/Build/Build_1.unity index 2da6309..305272d 100644 --- a/Forest/Assets/Scenes/Build/Build_1.unity +++ b/Forest/Assets/Scenes/Build/Build_1.unity @@ -836,61 +836,21 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 374389568} m_Modifications: - - target: {fileID: 231336066453800405, guid: e9c96c211fb08417084dbd9a3f85ab3c, + - target: {fileID: 214722096557692541, guid: e9c96c211fb08417084dbd9a3f85ab3c, + type: 3} + propertyPath: m_Name + value: Mask + objectReference: {fileID: 0} + - target: {fileID: 214722096557692541, guid: e9c96c211fb08417084dbd9a3f85ab3c, type: 3} propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 1153247368971935202, guid: e9c96c211fb08417084dbd9a3f85ab3c, - type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - target: {fileID: 1501056032042821150, guid: e9c96c211fb08417084dbd9a3f85ab3c, type: 3} propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 1665594906165725798, guid: e9c96c211fb08417084dbd9a3f85ab3c, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2181581025797918851, guid: e9c96c211fb08417084dbd9a3f85ab3c, - type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3971867689370811158, guid: e9c96c211fb08417084dbd9a3f85ab3c, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3971867689370811158, guid: e9c96c211fb08417084dbd9a3f85ab3c, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3971867689370811158, guid: e9c96c211fb08417084dbd9a3f85ab3c, - type: 3} - propertyPath: m_SizeDelta.x - value: 240 - objectReference: {fileID: 0} - - target: {fileID: 3971867689370811158, guid: e9c96c211fb08417084dbd9a3f85ab3c, - type: 3} - propertyPath: m_SizeDelta.y - value: 240 - objectReference: {fileID: 0} - - target: {fileID: 3971867689370811158, guid: e9c96c211fb08417084dbd9a3f85ab3c, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 120 - objectReference: {fileID: 0} - - target: {fileID: 3971867689370811158, guid: e9c96c211fb08417084dbd9a3f85ab3c, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -125 - objectReference: {fileID: 0} - target: {fileID: 5333295855086785665, guid: e9c96c211fb08417084dbd9a3f85ab3c, type: 3} propertyPath: m_Name @@ -996,61 +956,8 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 7090350705444720894, guid: e9c96c211fb08417084dbd9a3f85ab3c, - type: 3} - propertyPath: m_fontSize - value: 54 - objectReference: {fileID: 0} - - target: {fileID: 7090350705444720894, guid: e9c96c211fb08417084dbd9a3f85ab3c, - type: 3} - propertyPath: m_fontStyle - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7090350705444720894, guid: e9c96c211fb08417084dbd9a3f85ab3c, - type: 3} - propertyPath: m_fontColor.b - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7090350705444720894, guid: e9c96c211fb08417084dbd9a3f85ab3c, - type: 3} - propertyPath: m_fontColor.g - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7090350705444720894, guid: e9c96c211fb08417084dbd9a3f85ab3c, - type: 3} - propertyPath: m_fontColor.r - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7090350705444720894, guid: e9c96c211fb08417084dbd9a3f85ab3c, - type: 3} - propertyPath: m_fontSizeBase - value: 54 - objectReference: {fileID: 0} - - target: {fileID: 7090350705444720894, guid: e9c96c211fb08417084dbd9a3f85ab3c, - type: 3} - propertyPath: m_fontColor32.rgba - value: 4294967295 - objectReference: {fileID: 0} - - target: {fileID: 7644366489302203207, guid: e9c96c211fb08417084dbd9a3f85ab3c, - type: 3} - propertyPath: m_text - value: Start Game - objectReference: {fileID: 0} - - target: {fileID: 8263868880915436829, guid: e9c96c211fb08417084dbd9a3f85ab3c, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8779257074991400646, guid: e9c96c211fb08417084dbd9a3f85ab3c, - type: 3} - propertyPath: m_text - value: 'Not yet unlocked - - Go explore more levels!' - objectReference: {fileID: 0} m_RemovedComponents: [] - m_RemovedGameObjects: - - {fileID: 5998195394357419975, guid: e9c96c211fb08417084dbd9a3f85ab3c, type: 3} + m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e9c96c211fb08417084dbd9a3f85ab3c, type: 3} @@ -1224,7 +1131,7 @@ Canvas: m_AdditionalShaderChannelsFlag: 25 m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 - m_SortingOrder: 101 + m_SortingOrder: 100 m_TargetDisplay: 0 --- !u!1 &397456829 GameObject: @@ -2082,7 +1989,6 @@ Transform: - {fileID: 1299234180} - {fileID: 1300764260} - {fileID: 1249090787} - - {fileID: 1445594860} - {fileID: 28552809} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -3916,90 +3822,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &1445594859 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1445594860} - - component: {fileID: 1445594861} - m_Layer: 0 - m_Name: Top - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &1445594860 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1445594859} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 3.83, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 761812202} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &1445594861 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1445594859} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: 94e9a6bcb4a254f3ead700f1c15d51c5, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 10.28, y: 3.42} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &1497732327 GameObject: m_ObjectHideFlags: 0 diff --git a/Forest/Assets/Scenes/BuildTemplate.unity b/Forest/Assets/Scenes/BuildTemplate.unity index 41b18ae..72b794a 100644 --- a/Forest/Assets/Scenes/BuildTemplate.unity +++ b/Forest/Assets/Scenes/BuildTemplate.unity @@ -123,6 +123,90 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &28552808 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 28552809} + - component: {fileID: 28552810} + m_Layer: 0 + m_Name: Mask + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &28552809 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 28552808} + serializedVersion: 2 + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 761812202} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &28552810 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 28552808} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 99 + m_Sprite: {fileID: 21300000, guid: 83147324783244689a9d72b9fbe03a75, type: 3} + m_Color: {r: 0, g: 0, b: 0, a: 0.7529412} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 10.8, y: 19.2} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &76654113 GameObject: m_ObjectHideFlags: 0 @@ -154,6 +238,156 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &158575876 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 158575881} + - component: {fileID: 158575877} + - component: {fileID: 158575880} + - component: {fileID: 158575879} + - component: {fileID: 158575878} + m_Layer: 0 + m_Name: BuildCamera + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!20 &158575877 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 158575876} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 1 + orthographic size: 5 + m_Depth: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!114 &158575878 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 158575876} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fff49514adc6448d0a4cbea3ff37308b, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &158575879 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 158575876} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_RenderShadows: 1 + m_RequiresDepthTextureOption: 2 + m_RequiresOpaqueTextureOption: 2 + m_CameraType: 0 + m_Cameras: [] + m_RendererIndex: -1 + m_VolumeLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_VolumeTrigger: {fileID: 0} + m_VolumeFrameworkUpdateModeOption: 2 + m_RenderPostProcessing: 0 + m_Antialiasing: 0 + m_AntialiasingQuality: 2 + m_StopNaN: 0 + m_Dithering: 0 + m_ClearDepth: 1 + m_AllowXRRendering: 1 + m_AllowHDROutput: 1 + m_UseScreenCoordOverride: 0 + m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0} + m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0} + m_RequiresDepthTexture: 0 + m_RequiresColorTexture: 0 + m_Version: 2 + m_TaaSettings: + quality: 3 + frameInfluence: 0.1 + jitterScale: 1 + mipBias: 0 + varianceClampScale: 0.9 + contrastAdaptiveSharpening: 0 +--- !u!81 &158575880 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 158575876} + m_Enabled: 1 +--- !u!4 &158575881 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 158575876} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -15} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &334302849 PrefabInstance: m_ObjectHideFlags: 0 @@ -162,7 +396,12 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 374389568} m_Modifications: - - target: {fileID: 231336066453800405, guid: e9c96c211fb08417084dbd9a3f85ab3c, + - target: {fileID: 214722096557692541, guid: e9c96c211fb08417084dbd9a3f85ab3c, + type: 3} + propertyPath: m_Name + value: Mask + objectReference: {fileID: 0} + - target: {fileID: 214722096557692541, guid: e9c96c211fb08417084dbd9a3f85ab3c, type: 3} propertyPath: m_IsActive value: 0 @@ -172,46 +411,6 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 1665594906165725798, guid: e9c96c211fb08417084dbd9a3f85ab3c, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2181581025797918851, guid: e9c96c211fb08417084dbd9a3f85ab3c, - type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3971867689370811158, guid: e9c96c211fb08417084dbd9a3f85ab3c, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3971867689370811158, guid: e9c96c211fb08417084dbd9a3f85ab3c, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3971867689370811158, guid: e9c96c211fb08417084dbd9a3f85ab3c, - type: 3} - propertyPath: m_SizeDelta.x - value: 240 - objectReference: {fileID: 0} - - target: {fileID: 3971867689370811158, guid: e9c96c211fb08417084dbd9a3f85ab3c, - type: 3} - propertyPath: m_SizeDelta.y - value: 240 - objectReference: {fileID: 0} - - target: {fileID: 3971867689370811158, guid: e9c96c211fb08417084dbd9a3f85ab3c, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 120 - objectReference: {fileID: 0} - - target: {fileID: 3971867689370811158, guid: e9c96c211fb08417084dbd9a3f85ab3c, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -125 - objectReference: {fileID: 0} - target: {fileID: 5333295855086785665, guid: e9c96c211fb08417084dbd9a3f85ab3c, type: 3} propertyPath: m_Name @@ -317,23 +516,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 7644366489302203207, guid: e9c96c211fb08417084dbd9a3f85ab3c, - type: 3} - propertyPath: m_text - value: Start Game - objectReference: {fileID: 0} - - target: {fileID: 8263868880915436829, guid: e9c96c211fb08417084dbd9a3f85ab3c, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8779257074991400646, guid: e9c96c211fb08417084dbd9a3f85ab3c, - type: 3} - propertyPath: m_text - value: 'Not yet unlocked - - Go explore more levels!' - objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -434,7 +616,7 @@ Canvas: m_Enabled: 1 serializedVersion: 3 m_RenderMode: 1 - m_Camera: {fileID: 1816475335} + m_Camera: {fileID: 158575877} m_PlaneDistance: 100 m_PixelPerfect: 0 m_ReceivesEvents: 1 @@ -445,7 +627,7 @@ Canvas: m_AdditionalShaderChannelsFlag: 25 m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 - m_SortingOrder: 15 + m_SortingOrder: 100 m_TargetDisplay: 0 --- !u!1 &644199642 GameObject: @@ -478,9 +660,6 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 374389568} - - {fileID: 669029242} - - {fileID: 1768877335} - - {fileID: 1300764260} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &644199645 @@ -495,8 +674,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9b618b5bdf3884745b8cccd94ea6fcf1, type: 3} m_Name: m_EditorClassIdentifier: - CurCondition: 30 ---- !u!1 &669029241 + CurCondition: 0 +--- !u!1 &761812201 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -504,21 +683,21 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 669029242} + - component: {fileID: 761812202} m_Layer: 0 - m_Name: BuildGfxRoot + m_Name: OtherRoot m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &669029242 +--- !u!4 &761812202 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 669029241} + m_GameObject: {fileID: 761812201} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -526,7 +705,10 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1299234180} - m_Father: {fileID: 644199644} + - {fileID: 1300764260} + - {fileID: 1249090787} + - {fileID: 28552809} + m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1091311622 GameObject: @@ -572,8 +754,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 07fd0ab2afc1942f6a44d3187ed1df7c, type: 3} m_Name: m_EditorClassIdentifier: - buildDataJson: {fileID: 0} ---- !u!1 &1199349760 + buildDataJson: {fileID: 4900000, guid: 1c28340ad39284e1eb01a0a729ed60ca, type: 3} +--- !u!1 &1249090786 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -581,86 +763,100 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1199349761} - - component: {fileID: 1199349763} - - component: {fileID: 1199349762} - m_Layer: 5 - m_Name: Panel + - component: {fileID: 1249090787} + - component: {fileID: 1249090788} + m_Layer: 0 + m_Name: Bg m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1199349761 -RectTransform: +--- !u!4 &1249090787 +Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1199349760} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_GameObject: {fileID: 1249090786} + serializedVersion: 2 + 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_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1768877335} + m_Father: {fileID: 761812202} 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, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1199349762 -MonoBehaviour: +--- !u!212 &1249090788 +SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1199349760} + m_GameObject: {fileID: 1249090786} m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: -10 m_Sprite: {fileID: 21300000, guid: 83147324783244689a9d72b9fbe03a75, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1199349763 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1199349760} - m_CullTransparentMesh: 1 + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 10.8, y: 19.2} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1001 &1299234179 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 669029242} + m_TransformParent: {fileID: 761812202} m_Modifications: - target: {fileID: 3173181722133883429, guid: 3227b87917af4fb4a822c24b839b20d8, type: 3} propertyPath: m_Name value: Effect_Cloud objectReference: {fileID: 0} + - target: {fileID: 3901427855422900987, guid: 3227b87917af4fb4a822c24b839b20d8, + type: 3} + propertyPath: m_SortingOrder + value: -9 + objectReference: {fileID: 0} - target: {fileID: 6061058115687202260, guid: 3227b87917af4fb4a822c24b839b20d8, type: 3} propertyPath: m_LocalPosition.x @@ -669,7 +865,7 @@ PrefabInstance: - target: {fileID: 6061058115687202260, guid: 3227b87917af4fb4a822c24b839b20d8, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: -0.11 objectReference: {fileID: 0} - target: {fileID: 6061058115687202260, guid: 3227b87917af4fb4a822c24b839b20d8, type: 3} @@ -714,7 +910,7 @@ PrefabInstance: - target: {fileID: 8718048237657072417, guid: 3227b87917af4fb4a822c24b839b20d8, type: 3} propertyPath: m_SortingOrder - value: 0 + value: -9 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] @@ -752,12 +948,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1300764259} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 644199644} + m_Father: {fileID: 761812202} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &1300764261 SpriteRenderer: @@ -799,275 +995,24 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 50 + m_SortingOrder: 100 m_Sprite: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 11.6, y: 10.15} + m_Size: {x: 0.425, y: 2.72} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 0 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &1768877334 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1768877335} - - component: {fileID: 1768877338} - - component: {fileID: 1768877337} - - component: {fileID: 1768877336} - m_Layer: 5 - m_Name: BuildBGRoot - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1768877335 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1768877334} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0, y: 0, z: 0} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1199349761} - m_Father: {fileID: 644199644} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0, y: 0} ---- !u!114 &1768877336 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1768877334} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreReversedGraphics: 1 - m_BlockingObjects: 0 - m_BlockingMask: - serializedVersion: 2 - m_Bits: 55 ---- !u!114 &1768877337 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1768877334} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} - m_Name: - m_EditorClassIdentifier: - m_UiScaleMode: 1 - m_ReferencePixelsPerUnit: 100 - m_ScaleFactor: 1 - m_ReferenceResolution: {x: 1080, y: 1920} - m_ScreenMatchMode: 1 - m_MatchWidthOrHeight: 0 - m_PhysicalUnit: 3 - m_FallbackScreenDPI: 96 - m_DefaultSpriteDPI: 96 - m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 0 ---- !u!223 &1768877338 -Canvas: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1768877334} - m_Enabled: 1 - serializedVersion: 3 - m_RenderMode: 1 - m_Camera: {fileID: 1816475335} - m_PlaneDistance: 100 - m_PixelPerfect: 0 - m_ReceivesEvents: 1 - m_OverrideSorting: 0 - m_OverridePixelPerfect: 0 - m_SortingBucketNormalizedSize: 0 - m_VertexColorAlwaysGammaSpace: 1 - m_AdditionalShaderChannelsFlag: 25 - m_UpdateRectTransformForStandalone: 0 - m_SortingLayerID: 0 - m_SortingOrder: -10 - m_TargetDisplay: 0 ---- !u!1 &1816475331 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1816475336} - - component: {fileID: 1816475335} - - component: {fileID: 1816475334} - - component: {fileID: 1816475333} - - component: {fileID: 1816475332} - m_Layer: 0 - m_Name: BuildCamera - m_TagString: MainCamera - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1816475332 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1816475331} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fff49514adc6448d0a4cbea3ff37308b, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &1816475333 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1816475331} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} - m_Name: - m_EditorClassIdentifier: - m_RenderShadows: 1 - m_RequiresDepthTextureOption: 2 - m_RequiresOpaqueTextureOption: 2 - m_CameraType: 0 - m_Cameras: [] - m_RendererIndex: -1 - m_VolumeLayerMask: - serializedVersion: 2 - m_Bits: 1 - m_VolumeTrigger: {fileID: 0} - m_VolumeFrameworkUpdateModeOption: 2 - m_RenderPostProcessing: 0 - m_Antialiasing: 0 - m_AntialiasingQuality: 2 - m_StopNaN: 0 - m_Dithering: 0 - m_ClearDepth: 1 - m_AllowXRRendering: 1 - m_AllowHDROutput: 1 - m_UseScreenCoordOverride: 0 - m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0} - m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0} - m_RequiresDepthTexture: 0 - m_RequiresColorTexture: 0 - m_Version: 2 - m_TaaSettings: - quality: 3 - frameInfluence: 0.1 - jitterScale: 1 - mipBias: 0 - varianceClampScale: 0.9 - contrastAdaptiveSharpening: 0 ---- !u!81 &1816475334 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1816475331} - m_Enabled: 1 ---- !u!20 &1816475335 -Camera: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1816475331} - m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} - m_projectionMatrixMode: 1 - m_GateFitMode: 2 - m_FOVAxisMode: 0 - m_Iso: 200 - m_ShutterSpeed: 0.005 - m_Aperture: 16 - m_FocusDistance: 10 - m_FocalLength: 50 - m_BladeCount: 5 - m_Curvature: {x: 2, y: 11} - m_BarrelClipping: 0.25 - m_Anamorphism: 0 - m_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: 0.3 - far clip plane: 1000 - field of view: 60 - orthographic: 1 - orthographic size: 5 - m_Depth: 0 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 0} - m_TargetDisplay: 0 - m_TargetEye: 3 - m_HDR: 1 - m_AllowMSAA: 1 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 ---- !u!4 &1816475336 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1816475331} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -15} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 m_Roots: - {fileID: 1091311623} + - {fileID: 158575881} - {fileID: 76654114} + - {fileID: 761812202} - {fileID: 644199644} - - {fileID: 1816475336} diff --git a/Forest/Assets/Scenes/BuildTemplate.unity.meta b/Forest/Assets/Scenes/BuildTemplate.unity.meta index dc05980..202f666 100644 --- a/Forest/Assets/Scenes/BuildTemplate.unity.meta +++ b/Forest/Assets/Scenes/BuildTemplate.unity.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 5dd3492a2616e404cbfb904bd8d05590 +guid: 8ef5ac4bbad4741fdba0588729e06dd7 DefaultImporter: externalObjects: {} userData: diff --git a/Forest/Assets/Scenes/StartScene.unity b/Forest/Assets/Scenes/StartScene.unity index 9ce40df..4105f27 100644 --- a/Forest/Assets/Scenes/StartScene.unity +++ b/Forest/Assets/Scenes/StartScene.unity @@ -669,7 +669,7 @@ Canvas: m_AdditionalShaderChannelsFlag: 25 m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 - m_SortingOrder: 101 + m_SortingOrder: 102 m_TargetDisplay: 0 --- !u!1 &403430398 GameObject: @@ -961,7 +961,7 @@ Canvas: m_AdditionalShaderChannelsFlag: 25 m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 - m_SortingOrder: 100 + m_SortingOrder: 101 m_TargetDisplay: 0 --- !u!1 &1436771296 GameObject: diff --git a/Forest/Assets/Scripts/Framework/GameBuild/BuildBoot.cs b/Forest/Assets/Scripts/Framework/GameBuild/BuildBoot.cs index 5919789..5b17888 100644 --- a/Forest/Assets/Scripts/Framework/GameBuild/BuildBoot.cs +++ b/Forest/Assets/Scripts/Framework/GameBuild/BuildBoot.cs @@ -507,15 +507,16 @@ public class BuildBoot : MonoBehaviour _mask.SetActive(false); _pickItem.SetActive(false); _buildBar.Close(); + EventManager.Instance.Send(EventManager.EventName.CloseUI); + EventManager.Instance.Send(EventManager.EventName.ShowMainUI); if (_curNode == null || _newOption == null) { _curBubble.SetActive(true); return; } - - EventManager.Instance.Send(EventManager.EventName.ShowMainUI); + BuildManager.Instance.SaveNodeInfo(_curNode.Name, _newOption.Name); _curNode = null; _curOption = null; diff --git a/Forest/Assets/Scripts/Framework/Guide/GuideMananger.cs b/Forest/Assets/Scripts/Framework/Guide/GuideMananger.cs index c2b298b..e9209db 100644 --- a/Forest/Assets/Scripts/Framework/Guide/GuideMananger.cs +++ b/Forest/Assets/Scripts/Framework/Guide/GuideMananger.cs @@ -41,8 +41,16 @@ public class GuideMananger : Singlenton, IInitable /// public bool IsGuiding; + /// + /// 新手引导通关ID + /// public string PassLevelID; + /// + /// 是否能渗透点击事件 + /// + public bool CanPermeate; + /// /// 获取引导配置 /// diff --git a/Forest/Assets/Scripts/Framework/Manager/BuildManager.cs b/Forest/Assets/Scripts/Framework/Manager/BuildManager.cs index 8f34870..634d8c9 100644 --- a/Forest/Assets/Scripts/Framework/Manager/BuildManager.cs +++ b/Forest/Assets/Scripts/Framework/Manager/BuildManager.cs @@ -150,6 +150,8 @@ namespace Framework.Manager public Dictionary NodeInfos; + public bool IsChanging = false; + //玩家存盘选择信息 private UserBuildInfo _userBuildInfo; diff --git a/Forest/Assets/Scripts/Framework/Manager/InputManager.cs b/Forest/Assets/Scripts/Framework/Manager/InputManager.cs index e5bb9fb..9c5a33a 100644 --- a/Forest/Assets/Scripts/Framework/Manager/InputManager.cs +++ b/Forest/Assets/Scripts/Framework/Manager/InputManager.cs @@ -74,6 +74,7 @@ namespace Framework.Manager } _isMousePressedLastFrame = _mouseButtonAsFinger.isPressed; + #endif } @@ -102,13 +103,15 @@ namespace Framework.Manager break; } - if (collider.gameObject.layer == LayerMask.NameToLayer("BuildItem")) + if (collider.gameObject.layer == LayerMask.NameToLayer("BuildItem") && + !BuildManager.Instance.IsChanging) { OnBuildItemClick?.Invoke(collider.gameObject); break; } - if (collider.gameObject.layer == LayerMask.NameToLayer("BuildBubble")) + if (collider.gameObject.layer == LayerMask.NameToLayer("BuildBubble") && + !BuildManager.Instance.IsChanging) { OnBuildBubbleClick?.Invoke(collider.gameObject); break; diff --git a/Forest/Assets/Scripts/Gameplay/UI/StartPanel/UIStartMainController.cs b/Forest/Assets/Scripts/Gameplay/UI/StartPanel/UIStartMainController.cs index b22eb9f..48d6f9f 100644 --- a/Forest/Assets/Scripts/Gameplay/UI/StartPanel/UIStartMainController.cs +++ b/Forest/Assets/Scripts/Gameplay/UI/StartPanel/UIStartMainController.cs @@ -24,10 +24,10 @@ public class UIStartMainController : UIWindow BindButton("MaskPanel", ShowAllUI); BindButton("UI_LiuHaiBottom/Btn_Game", OnEnterLevel); BindButton("UI_LiuHaiBottom/Btn_Level", OnSelectLevel); - BindButton("UI_LiuHaiTop/Btn_Setting", OpenSettingPanel); - BindButton("UI_LiuHaiTop/Btn_Shop", OpenShop); - BindButton("UI_LiuHaiTop/Btn_HideUI", HideAllUI); - BindButton("UI_LiuHaiTop/Btn_ViewResult", ViewResult); + BindButton("UI_LiuHaiTop/BG_Top/Btn_Setting", OpenSettingPanel); + BindButton("UI_LiuHaiTop/BG_Top/Btn_Shop", OpenShop); + BindButton("UI_LiuHaiTop/BG_Top/Btn_HideUI", HideAllUI); + BindButton("UI_LiuHaiTop/BG_Top/Btn_ViewResult", ViewResult); CommonUIUtils.CaptureScreenshot(); }