Compare commits
No commits in common. "84c48d4adcf182d3d61584eaf2ce32dc1bb13d2b" and "0c0850a8629063c24baafdd6e033a159d14a5dbb" have entirely different histories.
84c48d4adc
...
0c0850a862
@ -42,7 +42,7 @@ TextureImporter:
|
||||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 2
|
||||
spriteMode: 1
|
||||
spriteExtrude: 1
|
||||
spriteMeshType: 1
|
||||
alignment: 0
|
||||
@ -127,28 +127,7 @@ TextureImporter:
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites:
|
||||
- serializedVersion: 2
|
||||
name: freepik__talk__90404_0
|
||||
rect:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
width: 2976
|
||||
height: 1248
|
||||
alignment: 0
|
||||
pivot: {x: 0, y: 0}
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
outline: []
|
||||
physicsShape: []
|
||||
tessellationDetail: 0
|
||||
bones: []
|
||||
spriteID: 21c672aa9945347a38173ee28daae4ac
|
||||
internalID: 417020444
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
@ -159,8 +138,7 @@ TextureImporter:
|
||||
edges: []
|
||||
weights: []
|
||||
secondaryTextures: []
|
||||
nameFileIdTable:
|
||||
freepik__talk__90404_0: 417020444
|
||||
nameFileIdTable: {}
|
||||
spritePackingTag:
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
|
||||
@ -27795,7 +27795,7 @@ GameObject:
|
||||
- component: {fileID: 5608193483192080391}
|
||||
- component: {fileID: 5608193483192080388}
|
||||
m_Layer: 5
|
||||
m_Name: Restart Button
|
||||
m_Name: Exit Button
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
@ -28297,10 +28297,10 @@ RectTransform:
|
||||
m_Father: {fileID: 5608193481910428232}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchorMin: {x: 0.5, y: 0}
|
||||
m_AnchorMax: {x: 0.5, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 3787.161, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &5608193483354237947
|
||||
GameObject:
|
||||
@ -28348,8 +28348,8 @@ MonoBehaviour:
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: 417020444, guid: 2e91ac215ecbd49a083f05cb08fa714a, type: 3}
|
||||
m_Type: 1
|
||||
m_Sprite: {fileID: 21300000, guid: a53473fac4f1049ce82d5a0ee54bce91, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 1
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
@ -28648,7 +28648,7 @@ MonoBehaviour:
|
||||
fadeDuration: 0
|
||||
homeBtn: {fileID: 5608193482802640775}
|
||||
playBtn: {fileID: 5608193482210820798}
|
||||
restartBtn: {fileID: 5608193483192080388}
|
||||
exitBtn: {fileID: 5608193483192080388}
|
||||
--- !u!1 &5608193483470603106
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -28667,7 +28667,7 @@ GameObject:
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
m_IsActive: 1
|
||||
--- !u!114 &5608193483470603108
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -28728,10 +28728,10 @@ RectTransform:
|
||||
m_Father: {fileID: 5608193482000915565}
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 708.5, y: -62.5}
|
||||
m_SizeDelta: {x: 249, y: 76}
|
||||
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.5, y: 0.5}
|
||||
--- !u!222 &5608193483470603110
|
||||
CanvasRenderer:
|
||||
|
||||
@ -6,24 +6,23 @@ public class PauseMenuPopup : PopupBase
|
||||
[Header("Buttons")]
|
||||
[SerializeField] private Button homeBtn;
|
||||
[SerializeField] private Button playBtn;
|
||||
[SerializeField] private Button restartBtn;
|
||||
[SerializeField] private Button exitBtn;
|
||||
|
||||
private GameManager gameManager;
|
||||
private SoundManager soundManager;
|
||||
private GameModeHandler gameModeHandler;
|
||||
private GameManager gameManager;
|
||||
|
||||
private void OnEnable()
|
||||
{
|
||||
playBtn.onClick.AddListener(OnClick_PlayButton);
|
||||
homeBtn.onClick.AddListener(OnClick_HomeButton);
|
||||
restartBtn.onClick.AddListener(OnClick_RestartButton);
|
||||
exitBtn.onClick.AddListener(OnClick_ExitButton);
|
||||
}
|
||||
|
||||
private void OnDisable()
|
||||
{
|
||||
playBtn.onClick.RemoveListener(OnClick_PlayButton);
|
||||
homeBtn.onClick.RemoveListener(OnClick_HomeButton);
|
||||
restartBtn.onClick.RemoveListener(OnClick_RestartButton);
|
||||
exitBtn.onClick.RemoveListener(OnClick_ExitButton);
|
||||
}
|
||||
|
||||
private void OnClick_PlayButton()
|
||||
@ -48,16 +47,9 @@ public class PauseMenuPopup : PopupBase
|
||||
gameManager.OnGameStateChanged(GameState.InMenu);
|
||||
}
|
||||
|
||||
private void OnClick_RestartButton()
|
||||
private void OnClick_ExitButton()
|
||||
{
|
||||
popupManager.HidePopup(popupType);
|
||||
|
||||
SetGameModeHandler();
|
||||
gameModeHandler.OnGameRestarted();
|
||||
Application.Quit();
|
||||
}
|
||||
|
||||
private void SetGameModeHandler()
|
||||
{
|
||||
gameModeHandler = gameModeHandler == null ? InterfaceManager.Instance.GetInterfaceInstance<GameModeHandler>() : gameModeHandler;
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user