menu fix
This commit is contained in:
parent
5e9d69eab8
commit
ac7e2a0b52
@ -246,12 +246,12 @@ PrefabInstance:
|
||||
- target: {fileID: 8170153791961219456, guid: 0d230cc8be529a542a08cb878ab14b18,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 50
|
||||
value: 180
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8170153791961219456, guid: 0d230cc8be529a542a08cb878ab14b18,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 50
|
||||
value: 180
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8170153791961219459, guid: 0d230cc8be529a542a08cb878ab14b18,
|
||||
type: 3}
|
||||
@ -268,12 +268,12 @@ PrefabInstance:
|
||||
- target: {fileID: 8170153792821263258, guid: 0d230cc8be529a542a08cb878ab14b18,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 100
|
||||
value: 512
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8170153792821263258, guid: 0d230cc8be529a542a08cb878ab14b18,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 100
|
||||
value: 512
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8170153792821263258, guid: 0d230cc8be529a542a08cb878ab14b18,
|
||||
type: 3}
|
||||
@ -425,22 +425,22 @@ PrefabInstance:
|
||||
- target: {fileID: 8170153791961219456, guid: 0d230cc8be529a542a08cb878ab14b18,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 50
|
||||
value: 182
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8170153791961219456, guid: 0d230cc8be529a542a08cb878ab14b18,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 50
|
||||
value: 182
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8170153792821263258, guid: 0d230cc8be529a542a08cb878ab14b18,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 100
|
||||
value: 512
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8170153792821263258, guid: 0d230cc8be529a542a08cb878ab14b18,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 100
|
||||
value: 512
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8170153792821263258, guid: 0d230cc8be529a542a08cb878ab14b18,
|
||||
type: 3}
|
||||
|
@ -1,7 +1,19 @@
|
||||
fileFormatVersion: 2
|
||||
guid: a46675f9b4ecabf48a87c8ca677f6421
|
||||
TextureImporter:
|
||||
internalIDToNameTable: []
|
||||
internalIDToNameTable:
|
||||
- first:
|
||||
213: 8536133104978798909
|
||||
second: HomeBotton_0
|
||||
- first:
|
||||
213: 3401388886711715988
|
||||
second: HomeBotton_1
|
||||
- first:
|
||||
213: -8767154470008726834
|
||||
second: HomeBotton_2
|
||||
- first:
|
||||
213: 633053397979461921
|
||||
second: HomeBotton_3
|
||||
externalObjects: {}
|
||||
serializedVersion: 11
|
||||
mipmaps:
|
||||
@ -113,7 +125,91 @@ TextureImporter:
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
sprites:
|
||||
- serializedVersion: 2
|
||||
name: HomeBotton_0
|
||||
rect:
|
||||
serializedVersion: 2
|
||||
x: 64
|
||||
y: 49
|
||||
width: 212
|
||||
height: 993
|
||||
alignment: 0
|
||||
pivot: {x: 0.5, y: 0.5}
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
outline: []
|
||||
physicsShape: []
|
||||
tessellationDetail: 0
|
||||
bones: []
|
||||
spriteID: d39a6b525df667670800000000000000
|
||||
internalID: 8536133104978798909
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
- serializedVersion: 2
|
||||
name: HomeBotton_1
|
||||
rect:
|
||||
serializedVersion: 2
|
||||
x: 357
|
||||
y: 370
|
||||
width: 308
|
||||
height: 360
|
||||
alignment: 0
|
||||
pivot: {x: 0.5, y: 0.5}
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
outline: []
|
||||
physicsShape: []
|
||||
tessellationDetail: 0
|
||||
bones: []
|
||||
spriteID: 498c96fcb29243f20800000000000000
|
||||
internalID: 3401388886711715988
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
- serializedVersion: 2
|
||||
name: HomeBotton_2
|
||||
rect:
|
||||
serializedVersion: 2
|
||||
x: 820
|
||||
y: 368
|
||||
width: 310
|
||||
height: 344
|
||||
alignment: 0
|
||||
pivot: {x: 0.5, y: 0.5}
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
outline: []
|
||||
physicsShape: []
|
||||
tessellationDetail: 0
|
||||
bones: []
|
||||
spriteID: ecad62cb57fc45680800000000000000
|
||||
internalID: -8767154470008726834
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
- serializedVersion: 2
|
||||
name: HomeBotton_3
|
||||
rect:
|
||||
serializedVersion: 2
|
||||
x: 1143
|
||||
y: 417
|
||||
width: 756
|
||||
height: 246
|
||||
alignment: 0
|
||||
pivot: {x: 0.5, y: 0.5}
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
outline: []
|
||||
physicsShape: []
|
||||
tessellationDetail: 0
|
||||
bones: []
|
||||
spriteID: 1297b6e16be09c800800000000000000
|
||||
internalID: 633053397979461921
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
|
@ -192,6 +192,106 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: a7fb19d4a93bce94bba24aacfe92a572, type: 3}
|
||||
--- !u!1 &763084228
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 763084232}
|
||||
- component: {fileID: 763084231}
|
||||
- component: {fileID: 763084230}
|
||||
- component: {fileID: 763084229}
|
||||
m_Layer: 5
|
||||
m_Name: Canvas
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!114 &763084229
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 763084228}
|
||||
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: 4294967295
|
||||
--- !u!114 &763084230
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 763084228}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_UiScaleMode: 0
|
||||
m_ReferencePixelsPerUnit: 100
|
||||
m_ScaleFactor: 1
|
||||
m_ReferenceResolution: {x: 800, y: 600}
|
||||
m_ScreenMatchMode: 0
|
||||
m_MatchWidthOrHeight: 0
|
||||
m_PhysicalUnit: 3
|
||||
m_FallbackScreenDPI: 96
|
||||
m_DefaultSpriteDPI: 96
|
||||
m_DynamicPixelsPerUnit: 1
|
||||
m_PresetInfoIsWorld: 0
|
||||
--- !u!223 &763084231
|
||||
Canvas:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 763084228}
|
||||
m_Enabled: 1
|
||||
serializedVersion: 3
|
||||
m_RenderMode: 0
|
||||
m_Camera: {fileID: 0}
|
||||
m_PlaneDistance: 100
|
||||
m_PixelPerfect: 0
|
||||
m_ReceivesEvents: 1
|
||||
m_OverrideSorting: 0
|
||||
m_OverridePixelPerfect: 0
|
||||
m_SortingBucketNormalizedSize: 0
|
||||
m_AdditionalShaderChannelsFlag: 0
|
||||
m_SortingLayerID: 0
|
||||
m_SortingOrder: 0
|
||||
m_TargetDisplay: 0
|
||||
--- !u!224 &763084232
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 763084228}
|
||||
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_Children:
|
||||
- {fileID: 1475618469}
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 4
|
||||
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!1 &963194225
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -275,6 +375,95 @@ Transform:
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 60, y: 0, z: 0}
|
||||
--- !u!1 &1475618468
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1475618469}
|
||||
- component: {fileID: 1475618472}
|
||||
- component: {fileID: 1475618471}
|
||||
- component: {fileID: 1475618470}
|
||||
m_Layer: 5
|
||||
m_Name: Loading
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &1475618469
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1475618468}
|
||||
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: 763084232}
|
||||
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, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &1475618470
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1475618468}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: ac42f823a8de86b4d8175e8025500660, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
duration: 0
|
||||
--- !u!114 &1475618471
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1475618468}
|
||||
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: 0, g: 0, b: 0, 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: 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
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!222 &1475618472
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1475618468}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!1 &1750604535
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
File diff suppressed because it is too large
Load Diff
3
Assets/Scripts/MainMenu.meta
Normal file
3
Assets/Scripts/MainMenu.meta
Normal file
@ -0,0 +1,3 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 5d6c9d17499749389f68cd58dbe7f6f7
|
||||
timeCreated: 1639769493
|
16
Assets/Scripts/MainMenu/FadeIn.cs
Normal file
16
Assets/Scripts/MainMenu/FadeIn.cs
Normal file
@ -0,0 +1,16 @@
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using DG.Tweening;
|
||||
using UnityEngine;
|
||||
using UnityEngine.UI;
|
||||
|
||||
public class FadeIn : MonoBehaviour
|
||||
{
|
||||
[SerializeField] private float duration;
|
||||
private void OnEnable()
|
||||
{
|
||||
var back = GetComponent<Image>();
|
||||
back.DOFade(0, 5).OnComplete(() => gameObject.SetActive(false));
|
||||
}
|
||||
}
|
11
Assets/Scripts/MainMenu/FadeIn.cs.meta
Normal file
11
Assets/Scripts/MainMenu/FadeIn.cs.meta
Normal file
@ -0,0 +1,11 @@
|
||||
fileFormatVersion: 2
|
||||
guid: ac42f823a8de86b4d8175e8025500660
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
30
Assets/Scripts/MainMenu/FadeOut.cs
Normal file
30
Assets/Scripts/MainMenu/FadeOut.cs
Normal file
@ -0,0 +1,30 @@
|
||||
using System;
|
||||
using DG.Tweening;
|
||||
using UnityEngine;
|
||||
using UnityEngine.UI;
|
||||
|
||||
namespace MainMenu
|
||||
{
|
||||
public class FadeOut : MonoBehaviour
|
||||
{
|
||||
[SerializeField] private float duration;
|
||||
private Image _target;
|
||||
|
||||
private void Awake()
|
||||
{
|
||||
_target = GetComponent<Image>();
|
||||
}
|
||||
|
||||
private void OnEnable()
|
||||
{
|
||||
_target.DOFade(1, duration);
|
||||
}
|
||||
|
||||
private void OnDisable()
|
||||
{
|
||||
var color = _target.color;
|
||||
color.a = 0f;
|
||||
_target.color = color;
|
||||
}
|
||||
}
|
||||
}
|
11
Assets/Scripts/MainMenu/FadeOut.cs.meta
Normal file
11
Assets/Scripts/MainMenu/FadeOut.cs.meta
Normal file
@ -0,0 +1,11 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 72f9e7d63b4c86e4d95d092972e6e9c7
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
@ -1,4 +1,7 @@
|
||||
using System;
|
||||
using DG.Tweening;
|
||||
using MainMenu;
|
||||
using TMPro;
|
||||
using UnityEngine;
|
||||
using UnityEngine.SceneManagement;
|
||||
using UnityEngine.UI;
|
||||
@ -9,13 +12,18 @@ namespace DefaultNamespace
|
||||
{
|
||||
[SerializeField] private LevelData _data;
|
||||
[SerializeField] private Image LevelImage;
|
||||
[SerializeField] private GameObject loadUI;
|
||||
private int index = 0;
|
||||
private TMP_Text _percentText;
|
||||
private bool _isLoadingLevel = false;
|
||||
private LevelData.Level _curLevel;
|
||||
private AsyncOperation _loadOpertion;
|
||||
|
||||
private void Start()
|
||||
{
|
||||
_curLevel = _data.Levels[0];
|
||||
SetLevelImage();
|
||||
_percentText = loadUI.GetComponentInChildren<TMP_Text>();
|
||||
}
|
||||
|
||||
public void NextLevel()
|
||||
@ -43,8 +51,22 @@ namespace DefaultNamespace
|
||||
|
||||
public void LoadLevel()
|
||||
{
|
||||
SceneManager.LoadScene(_curLevel.sceneName);
|
||||
loadUI.GetComponent<Image>().DOFade(1, 0.3f).OnComplete( () =>
|
||||
{
|
||||
_isLoadingLevel = true;
|
||||
_loadOpertion = SceneManager.LoadSceneAsync(_curLevel.sceneName);
|
||||
});
|
||||
loadUI.SetActive(true);
|
||||
}
|
||||
|
||||
private void Update()
|
||||
{
|
||||
if (_isLoadingLevel && !_loadOpertion.isDone)
|
||||
{
|
||||
float progressValue = Mathf.Clamp01(_loadOpertion.progress / 0.9f);
|
||||
|
||||
_percentText.text = Mathf.Round(progressValue * 100) + "%";
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
@ -14,7 +14,6 @@ public class SettingsController : MonoBehaviour
|
||||
[SerializeField] private GameMenuData GameData;
|
||||
[SerializeField] private Transform targetSlideTransform;
|
||||
[SerializeField] private float slideTime;
|
||||
private Animator _ac;
|
||||
private bool _isActive = false;
|
||||
private bool _isMusicAllowed = true;
|
||||
private bool _isSFXAllowed = true;
|
||||
@ -23,7 +22,6 @@ public class SettingsController : MonoBehaviour
|
||||
private void Start()
|
||||
{
|
||||
defailtPosition = transform.position;
|
||||
_ac = GetComponent<Animator>();
|
||||
SetMenuMusicState();
|
||||
UpdateVisuals();
|
||||
}
|
File diff suppressed because one or more lines are too long
Loading…
x
Reference in New Issue
Block a user