Compare commits
No commits in common. "84c48d4adcf182d3d61584eaf2ce32dc1bb13d2b" and "d465293ad794c2c9cdcb811e80685d5440608c23" have entirely different histories.
84c48d4adc
...
d465293ad7
Binary file not shown.
|
Before Width: | Height: | Size: 252 KiB |
@ -1,257 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 1467c87c1b60f4707b78abdf2804ec02
|
||||
TextureImporter:
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
serializedVersion: 12
|
||||
mipmaps:
|
||||
mipMapMode: 0
|
||||
enableMipMap: 0
|
||||
sRGBTexture: 1
|
||||
linearTexture: 0
|
||||
fadeOut: 0
|
||||
borderMipMap: 0
|
||||
mipMapsPreserveCoverage: 0
|
||||
alphaTestReferenceValue: 0.5
|
||||
mipMapFadeDistanceStart: 1
|
||||
mipMapFadeDistanceEnd: 3
|
||||
bumpmap:
|
||||
convertToNormalMap: 0
|
||||
externalNormalMap: 0
|
||||
heightScale: 0.25
|
||||
normalMapFilter: 0
|
||||
isReadable: 0
|
||||
streamingMipmaps: 0
|
||||
streamingMipmapsPriority: 0
|
||||
vTOnly: 0
|
||||
ignoreMasterTextureLimit: 0
|
||||
grayScaleToAlpha: 0
|
||||
generateCubemap: 6
|
||||
cubemapConvolution: 0
|
||||
seamlessCubemap: 0
|
||||
textureFormat: 1
|
||||
maxTextureSize: 2048
|
||||
textureSettings:
|
||||
serializedVersion: 2
|
||||
filterMode: 1
|
||||
aniso: 1
|
||||
mipBias: 0
|
||||
wrapU: 1
|
||||
wrapV: 1
|
||||
wrapW: 0
|
||||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 2
|
||||
spriteExtrude: 1
|
||||
spriteMeshType: 1
|
||||
alignment: 0
|
||||
spritePivot: {x: 0.5, y: 0.5}
|
||||
spritePixelsToUnits: 100
|
||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||
spriteGenerateFallbackPhysicsShape: 1
|
||||
alphaUsage: 1
|
||||
alphaIsTransparency: 1
|
||||
spriteTessellationDetail: -1
|
||||
textureType: 8
|
||||
textureShape: 1
|
||||
singleChannelComponent: 0
|
||||
flipbookRows: 1
|
||||
flipbookColumns: 1
|
||||
maxTextureSizeSet: 0
|
||||
compressionQualitySet: 0
|
||||
textureFormatSet: 0
|
||||
ignorePngGamma: 0
|
||||
applyGammaDecoding: 0
|
||||
cookieLightType: 0
|
||||
platformSettings:
|
||||
- serializedVersion: 3
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 3
|
||||
buildTarget: Standalone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 3
|
||||
buildTarget: iPhone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 3
|
||||
buildTarget: WebGL
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 3
|
||||
buildTarget: Android
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites:
|
||||
- serializedVersion: 2
|
||||
name: freepik__background__31280_0
|
||||
rect:
|
||||
serializedVersion: 2
|
||||
x: 11
|
||||
y: 213
|
||||
width: 162
|
||||
height: 165
|
||||
alignment: 0
|
||||
pivot: {x: 0, y: 0}
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
outline: []
|
||||
physicsShape: []
|
||||
tessellationDetail: 0
|
||||
bones: []
|
||||
spriteID: 0e61687d955b941e7a4f62c491534b65
|
||||
internalID: -2015733309
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
- serializedVersion: 2
|
||||
name: freepik__background__31280_1
|
||||
rect:
|
||||
serializedVersion: 2
|
||||
x: 221
|
||||
y: 213
|
||||
width: 161
|
||||
height: 165
|
||||
alignment: 0
|
||||
pivot: {x: 0, y: 0}
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
outline: []
|
||||
physicsShape: []
|
||||
tessellationDetail: 0
|
||||
bones: []
|
||||
spriteID: 7101dc76534ac462bb42109e5723fbb2
|
||||
internalID: 374418284
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
- serializedVersion: 2
|
||||
name: freepik__background__31280_2
|
||||
rect:
|
||||
serializedVersion: 2
|
||||
x: 431
|
||||
y: 213
|
||||
width: 162
|
||||
height: 165
|
||||
alignment: 0
|
||||
pivot: {x: 0, y: 0}
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
outline: []
|
||||
physicsShape: []
|
||||
tessellationDetail: 0
|
||||
bones: []
|
||||
spriteID: eeb10897644484d0a83063b474759149
|
||||
internalID: 243614357
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
- serializedVersion: 2
|
||||
name: freepik__background__31280_3
|
||||
rect:
|
||||
serializedVersion: 2
|
||||
x: 642
|
||||
y: 213
|
||||
width: 161
|
||||
height: 165
|
||||
alignment: 0
|
||||
pivot: {x: 0, y: 0}
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
outline: []
|
||||
physicsShape: []
|
||||
tessellationDetail: 0
|
||||
bones: []
|
||||
spriteID: 282372b64a41d4d748216f551701076b
|
||||
internalID: 420986955
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
- serializedVersion: 2
|
||||
name: freepik__background__31280_4
|
||||
rect:
|
||||
serializedVersion: 2
|
||||
x: 850
|
||||
y: 213
|
||||
width: 160
|
||||
height: 165
|
||||
alignment: 0
|
||||
pivot: {x: 0, y: 0}
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
outline: []
|
||||
physicsShape: []
|
||||
tessellationDetail: 0
|
||||
bones: []
|
||||
spriteID: 9fa66a57d26bd4c04900e8bfd6003c78
|
||||
internalID: 652690593
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: c86037367307f431082dee1f4ca3f63d
|
||||
internalID: 0
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
secondaryTextures: []
|
||||
nameFileIdTable:
|
||||
freepik__background__31280_0: -2015733309
|
||||
freepik__background__31280_1: 374418284
|
||||
freepik__background__31280_2: 243614357
|
||||
freepik__background__31280_3: 420986955
|
||||
freepik__background__31280_4: 652690593
|
||||
spritePackingTag:
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -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