Commit 4d0df2ee authored by Bene's avatar Bene

Merge remote-tracking branch 'origin/master'

parents 19d1b513 3107c04d
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 84c523596ac9b3048a65aa0732219edd, type: 3}
m_Name: Super Plumber
m_EditorClassIdentifier:
scenePath: Assets/_Game/SuperPlumber/SuperPlumber0.unity
displayName: Super Plumber
sprite: {fileID: 21300000, guid: b70b4eb13812b394897bee24c8924412, type: 3}
fileFormatVersion: 2
guid: 78a968ca5f0052741adaecda885090f1
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 84c523596ac9b3048a65aa0732219edd, type: 3}
m_Name: Art Attack
m_EditorClassIdentifier:
scenePath:
displayName: Art Attack
sprite: {fileID: 21300000, guid: 780a848519d48a34a9a86858668f1f4a, type: 3}
fileFormatVersion: 2
guid: eca9fcdf3e78f0042a85798d3e1db543
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 84c523596ac9b3048a65aa0732219edd, type: 3}
m_Name: Bloki is Mutated
m_EditorClassIdentifier:
scenePath:
displayName: Bloki is Mutated
sprite: {fileID: 21300000, guid: 5ae406d8e4a5c9b4c9659cbc2b056825, type: 3}
fileFormatVersion: 2
guid: 27203a27ebcc22b49ae07f9421adc96c
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 84c523596ac9b3048a65aa0732219edd, type: 3}
m_Name: Overbrewed
m_EditorClassIdentifier:
scenePath:
displayName: Overbrewed
sprite: {fileID: 21300000, guid: 0e696074a569ee445b9274875b767ba5, type: 3}
fileFormatVersion: 2
guid: 0a51d796e5131ea4f997a91c4bd67c1f
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
......@@ -5,7 +5,7 @@ using UnityEngine;
namespace Utilities {
[CustomPropertyDrawer(typeof(ScenePathAttribute))]
public class ScenePathAttributeDrawer : PropertyDrawer {
private const float FIX_BUTTON_WIDTH = 70.0f;
private const float FixButtonWidth = 70.0f;
private static SceneAsset GetSceneAsset(SerializedProperty property) {
return AssetDatabase.LoadAssetAtPath<SceneAsset>(property.stringValue);
......@@ -61,8 +61,8 @@ namespace Utilities {
float singleLineHeight = EditorGUIUtility.singleLineHeight;
Rect helpBox = new Rect(position.x, position.yMax - singleLineHeight, position.width - FIX_BUTTON_WIDTH, singleLineHeight);
Rect buttonRect = new Rect(position.xMax - FIX_BUTTON_WIDTH, position.yMax - singleLineHeight, FIX_BUTTON_WIDTH, singleLineHeight);
Rect helpBox = new Rect(position.x, position.yMax - singleLineHeight, position.width - FixButtonWidth, singleLineHeight);
Rect buttonRect = new Rect(position.xMax - FixButtonWidth, position.yMax - singleLineHeight, FixButtonWidth, singleLineHeight);
EditorGUI.HelpBox(helpBox, "Scene is not added to build settings", MessageType.Warning);
......
fileFormatVersion: 2
guid: 32bfc638d66c5ef4badd3ef362fe0744
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: d05eb7cbd28c5f84fa0ee877d44ddbfc
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 780a848519d48a34a9a86858668f1f4a
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 10
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
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
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
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 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
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 5ae406d8e4a5c9b4c9659cbc2b056825
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 10
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
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
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
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 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
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 0e696074a569ee445b9274875b767ba5
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 10
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
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
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
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 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
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
......@@ -97,7 +97,7 @@ LightmapSettings:
m_ExportTrainingData: 0
m_TrainingDataDestination: TrainingData
m_LightingDataAsset: {fileID: 0}
m_UseShadowmask: 0
m_UseShadowmask: 1
--- !u!196 &4
NavMeshSettings:
serializedVersion: 2
......@@ -210,14 +210,13 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_text: 'Exit
'
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_fontAsset: {fileID: 11400000, guid: b5d724c874bb3824283482e0fca21c9f, type: 2}
m_sharedMaterial: {fileID: -2204466376032302039, guid: b5d724c874bb3824283482e0fca21c9f,
type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
......@@ -369,8 +368,6 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_text:
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: b5d724c874bb3824283482e0fca21c9f, type: 2}
......@@ -689,10 +686,9 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 5462054124401547127, guid: cf14fdd0034610d4389779e64b8989d1,
type: 3}
propertyPath: sharedProfile
value:
objectReference: {fileID: 11400000, guid: 8d94c6726643bb24bacffb32f7f347f8,
type: 2}
propertyPath: isGlobal
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: cf14fdd0034610d4389779e64b8989d1, type: 3}
--- !u!1 &602798323
......@@ -788,8 +784,6 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 1
m_CallState: 2
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!114 &602798326
MonoBehaviour:
m_ObjectHideFlags: 0
......@@ -808,8 +802,6 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
m_Type: 1
m_PreserveAspect: 0
......@@ -883,8 +875,6 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_text: Supergame Box
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: b5d724c874bb3824283482e0fca21c9f, type: 2}
......@@ -1025,13 +1015,13 @@ MonoBehaviour:
buttonRoot: {fileID: 191301160}
games:
- {fileID: 11400000, guid: a303eeabcc42b454e9498a98a2c46484, type: 2}
- {fileID: 11400000, guid: 3050f242b6d1b7b40bae99d6432cc741, type: 2}
- {fileID: 11400000, guid: 3050f242b6d1b7b40bae99d6432cc741, type: 2}
- {fileID: 11400000, guid: eca9fcdf3e78f0042a85798d3e1db543, type: 2}
- {fileID: 11400000, guid: 0a51d796e5131ea4f997a91c4bd67c1f, type: 2}
- {fileID: 11400000, guid: d441c37be1a7c7f44bf12fcb36e16e49, type: 2}
- {fileID: 11400000, guid: 3050f242b6d1b7b40bae99d6432cc741, type: 2}
- {fileID: 11400000, guid: 27203a27ebcc22b49ae07f9421adc96c, type: 2}
- {fileID: 11400000, guid: 1bc9ca6600f9f9042b0e5c45fe686b9b, type: 2}
- {fileID: 11400000, guid: 0c417f16901c7114aa1e9d5dd497c276, type: 2}
- {fileID: 11400000, guid: 3050f242b6d1b7b40bae99d6432cc741, type: 2}
- {fileID: 11400000, guid: 78a968ca5f0052741adaecda885090f1, type: 2}
- {fileID: 11400000, guid: 3050f242b6d1b7b40bae99d6432cc741, type: 2}
- {fileID: 11400000, guid: 3050f242b6d1b7b40bae99d6432cc741, type: 2}
- {fileID: 11400000, guid: 3050f242b6d1b7b40bae99d6432cc741, type: 2}
......@@ -1213,8 +1203,6 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 1
m_CallState: 2
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!114 &988173345
MonoBehaviour:
m_ObjectHideFlags: 0
......@@ -1233,8 +1221,6 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
m_Type: 1
m_PreserveAspect: 0
......@@ -1308,12 +1294,11 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_text: Credits
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_fontAsset: {fileID: 11400000, guid: b5d724c874bb3824283482e0fca21c9f, type: 2}
m_sharedMaterial: {fileID: -2204466376032302039, guid: b5d724c874bb3824283482e0fca21c9f,
type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
......@@ -1594,8 +1579,6 @@ MonoBehaviour:
m_OnValueChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.ScrollRect+ScrollRectEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!222 &1131371563
CanvasRenderer:
m_ObjectHideFlags: 0
......@@ -1638,8 +1621,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.85, y: 0}
m_AnchorMax: {x: 0.85, y: 0.3}
m_AnchoredPosition: {x: 0, y: 112.49997}
m_SizeDelta: {x: 150, y: -225}
m_AnchoredPosition: {x: 0, y: 112.49996}
m_SizeDelta: {x: 175, y: -225}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &1764178983
GameObject:
......@@ -1711,8 +1694,6 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 10917, guid: 0000000000000000f000000000000000, type: 0}
m_Type: 1
m_PreserveAspect: 0
......
......@@ -171,7 +171,7 @@ GameObject:
m_Component:
- component: {fileID: 4994692637312868614}
m_Layer: 5
m_Name: Padding
m_Name: Game Select
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
......@@ -346,7 +346,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 9082363233416221668}
m_MethodName: OnPointerEnter
m_MethodName: Select
m_Mode: 1
m_Arguments: