Fixed merge errors and made the shop open

main
RedStealthDev 2 years ago
parent 6869737ba7
commit 16f14baf55

@ -107,6 +107,15 @@ public partial class @Inputs : IInputActionCollection2, IDisposable
""processors"": """",
""interactions"": """",
""initialStateCheck"": true
},
{
""name"": ""Eat"",
""type"": ""Button"",
""id"": ""c0a3cd1e-8946-4ce6-80e8-2efe992809a7"",
""expectedControlType"": ""Button"",
""processors"": """",
""interactions"": """",
""initialStateCheck"": false
}
],
""bindings"": [
@ -252,6 +261,17 @@ public partial class @Inputs : IInputActionCollection2, IDisposable
""action"": ""Mouse_Pos"",
""isComposite"": false,
""isPartOfComposite"": false
},
{
""name"": """",
""id"": ""5f2b2db3-f57a-4450-9657-8dac2df34b4d"",
""path"": ""<Keyboard>/1"",
""interactions"": """",
""processors"": """",
""groups"": """",
""action"": ""Eat"",
""isComposite"": false,
""isPartOfComposite"": false
}
]
}
@ -269,6 +289,7 @@ public partial class @Inputs : IInputActionCollection2, IDisposable
m_Movement_Aim = m_Movement.FindAction("Aim", throwIfNotFound: true);
m_Movement_Interact = m_Movement.FindAction("Interact", throwIfNotFound: true);
m_Movement_Mouse_Pos = m_Movement.FindAction("Mouse_Pos", throwIfNotFound: true);
m_Movement_Eat = m_Movement.FindAction("Eat", throwIfNotFound: true);
}
public void Dispose()
@ -337,6 +358,7 @@ public partial class @Inputs : IInputActionCollection2, IDisposable
private readonly InputAction m_Movement_Aim;
private readonly InputAction m_Movement_Interact;
private readonly InputAction m_Movement_Mouse_Pos;
private readonly InputAction m_Movement_Eat;
public struct MovementActions
{
private @Inputs m_Wrapper;
@ -350,6 +372,7 @@ public partial class @Inputs : IInputActionCollection2, IDisposable
public InputAction @Aim => m_Wrapper.m_Movement_Aim;
public InputAction @Interact => m_Wrapper.m_Movement_Interact;
public InputAction @Mouse_Pos => m_Wrapper.m_Movement_Mouse_Pos;
public InputAction @Eat => m_Wrapper.m_Movement_Eat;
public InputActionMap Get() { return m_Wrapper.m_Movement; }
public void Enable() { Get().Enable(); }
public void Disable() { Get().Disable(); }
@ -386,6 +409,9 @@ public partial class @Inputs : IInputActionCollection2, IDisposable
@Mouse_Pos.started -= m_Wrapper.m_MovementActionsCallbackInterface.OnMouse_Pos;
@Mouse_Pos.performed -= m_Wrapper.m_MovementActionsCallbackInterface.OnMouse_Pos;
@Mouse_Pos.canceled -= m_Wrapper.m_MovementActionsCallbackInterface.OnMouse_Pos;
@Eat.started -= m_Wrapper.m_MovementActionsCallbackInterface.OnEat;
@Eat.performed -= m_Wrapper.m_MovementActionsCallbackInterface.OnEat;
@Eat.canceled -= m_Wrapper.m_MovementActionsCallbackInterface.OnEat;
}
m_Wrapper.m_MovementActionsCallbackInterface = instance;
if (instance != null)
@ -417,6 +443,9 @@ public partial class @Inputs : IInputActionCollection2, IDisposable
@Mouse_Pos.started += instance.OnMouse_Pos;
@Mouse_Pos.performed += instance.OnMouse_Pos;
@Mouse_Pos.canceled += instance.OnMouse_Pos;
@Eat.started += instance.OnEat;
@Eat.performed += instance.OnEat;
@Eat.canceled += instance.OnEat;
}
}
}
@ -432,5 +461,6 @@ public partial class @Inputs : IInputActionCollection2, IDisposable
void OnAim(InputAction.CallbackContext context);
void OnInteract(InputAction.CallbackContext context);
void OnMouse_Pos(InputAction.CallbackContext context);
void OnEat(InputAction.CallbackContext context);
}
}

@ -85,6 +85,15 @@
"processors": "",
"interactions": "",
"initialStateCheck": true
},
{
"name": "Eat",
"type": "Button",
"id": "c0a3cd1e-8946-4ce6-80e8-2efe992809a7",
"expectedControlType": "Button",
"processors": "",
"interactions": "",
"initialStateCheck": false
}
],
"bindings": [
@ -230,6 +239,17 @@
"action": "Mouse_Pos",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "5f2b2db3-f57a-4450-9657-8dac2df34b4d",
"path": "<Keyboard>/1",
"interactions": "",
"processors": "",
"groups": "",
"action": "Eat",
"isComposite": false,
"isPartOfComposite": false
}
]
}

@ -46,9 +46,9 @@ Tilemap:
second:
serializedVersion: 2
m_TileIndex: 43
m_TileSpriteIndex: 43
m_TileSpriteIndex: 9
m_TileMatrixIndex: 0
m_TileColorIndex: 16
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
@ -56,9 +56,9 @@ Tilemap:
second:
serializedVersion: 2
m_TileIndex: 38
m_TileSpriteIndex: 38
m_TileSpriteIndex: 2
m_TileMatrixIndex: 0
m_TileColorIndex: 16
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
@ -66,9 +66,9 @@ Tilemap:
second:
serializedVersion: 2
m_TileIndex: 34
m_TileSpriteIndex: 34
m_TileSpriteIndex: 10
m_TileMatrixIndex: 0
m_TileColorIndex: 16
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
@ -76,9 +76,9 @@ Tilemap:
second:
serializedVersion: 2
m_TileIndex: 32
m_TileSpriteIndex: 32
m_TileSpriteIndex: 11
m_TileMatrixIndex: 0
m_TileColorIndex: 16
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
@ -86,9 +86,9 @@ Tilemap:
second:
serializedVersion: 2
m_TileIndex: 31
m_TileSpriteIndex: 31
m_TileSpriteIndex: 12
m_TileMatrixIndex: 0
m_TileColorIndex: 16
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
@ -96,9 +96,9 @@ Tilemap:
second:
serializedVersion: 2
m_TileIndex: 30
m_TileSpriteIndex: 30
m_TileSpriteIndex: 13
m_TileMatrixIndex: 0
m_TileColorIndex: 16
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
@ -106,9 +106,9 @@ Tilemap:
second:
serializedVersion: 2
m_TileIndex: 29
m_TileSpriteIndex: 29
m_TileSpriteIndex: 14
m_TileMatrixIndex: 0
m_TileColorIndex: 16
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
@ -116,9 +116,9 @@ Tilemap:
second:
serializedVersion: 2
m_TileIndex: 28
m_TileSpriteIndex: 28
m_TileSpriteIndex: 15
m_TileMatrixIndex: 0
m_TileColorIndex: 16
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
@ -126,9 +126,9 @@ Tilemap:
second:
serializedVersion: 2
m_TileIndex: 42
m_TileSpriteIndex: 42
m_TileSpriteIndex: 0
m_TileMatrixIndex: 0
m_TileColorIndex: 16
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
@ -136,9 +136,9 @@ Tilemap:
second:
serializedVersion: 2
m_TileIndex: 33
m_TileSpriteIndex: 33
m_TileSpriteIndex: 1
m_TileMatrixIndex: 0
m_TileColorIndex: 16
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
@ -146,9 +146,9 @@ Tilemap:
second:
serializedVersion: 2
m_TileIndex: 35
m_TileSpriteIndex: 35
m_TileSpriteIndex: 5
m_TileMatrixIndex: 0
m_TileColorIndex: 16
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
@ -156,9 +156,9 @@ Tilemap:
second:
serializedVersion: 2
m_TileIndex: 41
m_TileSpriteIndex: 41
m_TileSpriteIndex: 6
m_TileMatrixIndex: 0
m_TileColorIndex: 16
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
@ -166,9 +166,9 @@ Tilemap:
second:
serializedVersion: 2
m_TileIndex: 36
m_TileSpriteIndex: 36
m_TileSpriteIndex: 4
m_TileMatrixIndex: 0
m_TileColorIndex: 16
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
@ -176,9 +176,9 @@ Tilemap:
second:
serializedVersion: 2
m_TileIndex: 39
m_TileSpriteIndex: 39
m_TileSpriteIndex: 3
m_TileMatrixIndex: 0
m_TileColorIndex: 16
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
@ -186,9 +186,9 @@ Tilemap:
second:
serializedVersion: 2
m_TileIndex: 37
m_TileSpriteIndex: 37
m_TileSpriteIndex: 7
m_TileMatrixIndex: 0
m_TileColorIndex: 16
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
@ -196,17 +196,7 @@ Tilemap:
second:
serializedVersion: 2
m_TileIndex: 40
m_TileSpriteIndex: 40
m_TileMatrixIndex: 0
m_TileColorIndex: 16
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: 10, y: 5, z: 0}
second:
serializedVersion: 2
m_TileIndex: 35
m_TileSpriteIndex: 35
m_TileSpriteIndex: 8
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
@ -303,94 +293,38 @@ Tilemap:
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: bda6db296ffe96eaebb6e1b81267f854, type: 2}
m_TileSpriteArray:
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 1
m_Data: {fileID: 1459631954, guid: d6ca77f9c3a8f326b9a1805146a53698, type: 3}
m_Data: {fileID: 1235324307072923947, guid: d6ca77f9c3a8f326b9a1805146a53698, type: 3}
- m_RefCount: 1
m_Data: {fileID: -815989235, guid: d6ca77f9c3a8f326b9a1805146a53698, type: 3}
m_Data: {fileID: -4040445917375253943, guid: d6ca77f9c3a8f326b9a1805146a53698, type: 3}
- m_RefCount: 1
m_Data: {fileID: -1079252833, guid: d6ca77f9c3a8f326b9a1805146a53698, type: 3}
m_Data: {fileID: -132663228765594847, guid: d6ca77f9c3a8f326b9a1805146a53698, type: 3}
- m_RefCount: 1
m_Data: {fileID: 1923892557, guid: d6ca77f9c3a8f326b9a1805146a53698, type: 3}
m_Data: {fileID: 6034416393271609779, guid: d6ca77f9c3a8f326b9a1805146a53698, type: 3}
- m_RefCount: 1
m_Data: {fileID: 538011823, guid: d6ca77f9c3a8f326b9a1805146a53698, type: 3}
m_Data: {fileID: -3514291349347476312, guid: d6ca77f9c3a8f326b9a1805146a53698, type: 3}
- m_RefCount: 1
m_Data: {fileID: 1646476331, guid: d6ca77f9c3a8f326b9a1805146a53698, type: 3}
m_Data: {fileID: -2813370593516408627, guid: d6ca77f9c3a8f326b9a1805146a53698, type: 3}
- m_RefCount: 1
m_Data: {fileID: 1161249499, guid: d6ca77f9c3a8f326b9a1805146a53698, type: 3}
m_Data: {fileID: 3873790443560919348, guid: d6ca77f9c3a8f326b9a1805146a53698, type: 3}
- m_RefCount: 1
m_Data: {fileID: 1070215111, guid: d6ca77f9c3a8f326b9a1805146a53698, type: 3}
m_Data: {fileID: -5881142417515879299, guid: d6ca77f9c3a8f326b9a1805146a53698, type: 3}
- m_RefCount: 1
m_Data: {fileID: -1271397342, guid: d6ca77f9c3a8f326b9a1805146a53698, type: 3}
m_Data: {fileID: 6692561882392913724, guid: d6ca77f9c3a8f326b9a1805146a53698, type: 3}
- m_RefCount: 1
m_Data: {fileID: 2010503647, guid: d6ca77f9c3a8f326b9a1805146a53698, type: 3}
m_Data: {fileID: 2311780464020470984, guid: d6ca77f9c3a8f326b9a1805146a53698, type: 3}
- m_RefCount: 1
m_Data: {fileID: -1977288218, guid: d6ca77f9c3a8f326b9a1805146a53698, type: 3}
m_Data: {fileID: -1701756720340378004, guid: d6ca77f9c3a8f326b9a1805146a53698, type: 3}
- m_RefCount: 1
m_Data: {fileID: -1078546567, guid: d6ca77f9c3a8f326b9a1805146a53698, type: 3}
m_Data: {fileID: -2029879525978623307, guid: d6ca77f9c3a8f326b9a1805146a53698, type: 3}
- m_RefCount: 1
m_Data: {fileID: -43068007, guid: d6ca77f9c3a8f326b9a1805146a53698, type: 3}
m_Data: {fileID: -570373757, guid: d6ca77f9c3a8f326b9a1805146a53698, type: 3}
- m_RefCount: 1
m_Data: {fileID: -418124667, guid: d6ca77f9c3a8f326b9a1805146a53698, type: 3}
m_Data: {fileID: -1332353450, guid: d6ca77f9c3a8f326b9a1805146a53698, type: 3}
- m_RefCount: 1
m_Data: {fileID: 1184939126, guid: d6ca77f9c3a8f326b9a1805146a53698, type: 3}
m_Data: {fileID: -738451075, guid: d6ca77f9c3a8f326b9a1805146a53698, type: 3}
- m_RefCount: 1
m_Data: {fileID: 2098902956, guid: d6ca77f9c3a8f326b9a1805146a53698, type: 3}
m_Data: {fileID: 424265632, guid: d6ca77f9c3a8f326b9a1805146a53698, type: 3}
m_TileMatrixArray:
- m_RefCount: 16
m_Data:
@ -411,38 +345,6 @@ Tilemap:
e32: 0
e33: 1
m_TileColorArray:
- m_RefCount: 0
m_Data: {r: 3.591e-41, g: 3.591e-41, b: 3.591e-41, a: 3.591e-41}
- m_RefCount: 0
m_Data: {r: NaN, g: NaN, b: NaN, a: NaN}
- m_RefCount: 0
m_Data: {r: NaN, g: NaN, b: NaN, a: NaN}
- m_RefCount: 0
m_Data: {r: NaN, g: NaN, b: NaN, a: NaN}
- m_RefCount: 0
m_Data: {r: NaN, g: NaN, b: NaN, a: NaN}
- m_RefCount: 0
m_Data: {r: NaN, g: NaN, b: NaN, a: NaN}
- m_RefCount: 0
m_Data: {r: NaN, g: NaN, b: NaN, a: NaN}
- m_RefCount: 0
m_Data: {r: NaN, g: NaN, b: NaN, a: NaN}
- m_RefCount: 0
m_Data: {r: NaN, g: NaN, b: NaN, a: NaN}
- m_RefCount: 0
m_Data: {r: NaN, g: NaN, b: NaN, a: NaN}
- m_RefCount: 0
m_Data: {r: NaN, g: NaN, b: NaN, a: NaN}
- m_RefCount: 0
m_Data: {r: NaN, g: NaN, b: NaN, a: NaN}
- m_RefCount: 0
m_Data: {r: NaN, g: NaN, b: NaN, a: NaN}
- m_RefCount: 0
m_Data: {r: NaN, g: NaN, b: NaN, a: NaN}
- m_RefCount: 0
m_Data: {r: NaN, g: NaN, b: NaN, a: NaN}
- m_RefCount: 0
m_Data: {r: NaN, g: NaN, b: NaN, a: NaN}
- m_RefCount: 16
m_Data: {r: 1, g: 1, b: 1, a: 1}
m_TileObjectToInstantiateArray: []
@ -511,7 +413,7 @@ TilemapRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_ChunkSize: {x: 32, y: 32, z: 32}
m_ChunkCullingBounds: {x: 0, y: 0, z: 0}
m_ChunkCullingBounds: {x: 3.5, y: 3.5, z: 0}
m_MaxChunkCount: 16
m_MaxFrameAge: 16
m_SortOrder: 0
@ -563,7 +465,7 @@ Grid:
m_CellGap: {x: 0, y: 0, z: 0}
m_CellLayout: 0
m_CellSwizzle: 0
--- !u!114 &1657102032647727796
--- !u!114 &2818604988050053659
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 211 B

@ -1,135 +0,0 @@
fileFormatVersion: 2
guid: 766057c84aebce3479dc14bd02b4d404
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: 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
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: Server
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: Windows Store Apps
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: []
nameFileIdTable: {}
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 13312, guid: 0000000000000000e000000000000000, type: 0}
m_Name: TilesFG_0
m_EditorClassIdentifier:
m_Sprite: {fileID: 1184939126, guid: d6ca77f9c3a8f326b9a1805146a53698, type: 3}
m_Sprite: {fileID: 1235324307072923947, guid: d6ca77f9c3a8f326b9a1805146a53698, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Transform:
e00: 1

@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 13312, guid: 0000000000000000e000000000000000, type: 0}
m_Name: TilesFG_1
m_EditorClassIdentifier:
m_Sprite: {fileID: 1646476331, guid: d6ca77f9c3a8f326b9a1805146a53698, type: 3}
m_Sprite: {fileID: -4040445917375253943, guid: d6ca77f9c3a8f326b9a1805146a53698, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Transform:
e00: 1

@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 13312, guid: 0000000000000000e000000000000000, type: 0}
m_Name: TilesFG_10
m_EditorClassIdentifier:
m_Sprite: {fileID: 1161249499, guid: d6ca77f9c3a8f326b9a1805146a53698, type: 3}
m_Sprite: {fileID: -1701756720340378004, guid: d6ca77f9c3a8f326b9a1805146a53698, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Transform:
e00: 1

@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 13312, guid: 0000000000000000e000000000000000, type: 0}
m_Name: TilesFG_11
m_EditorClassIdentifier:
m_Sprite: {fileID: 538011823, guid: d6ca77f9c3a8f326b9a1805146a53698, type: 3}
m_Sprite: {fileID: -2029879525978623307, guid: d6ca77f9c3a8f326b9a1805146a53698, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Transform:
e00: 1

@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 13312, guid: 0000000000000000e000000000000000, type: 0}
m_Name: TilesFG_12
m_EditorClassIdentifier:
m_Sprite: {fileID: 1923892557, guid: d6ca77f9c3a8f326b9a1805146a53698, type: 3}
m_Sprite: {fileID: -570373757, guid: d6ca77f9c3a8f326b9a1805146a53698, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Transform:
e00: 1

@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 13312, guid: 0000000000000000e000000000000000, type: 0}
m_Name: TilesFG_13
m_EditorClassIdentifier:
m_Sprite: {fileID: -1079252833, guid: d6ca77f9c3a8f326b9a1805146a53698, type: 3}
m_Sprite: {fileID: -1332353450, guid: d6ca77f9c3a8f326b9a1805146a53698, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Transform:
e00: 1

@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 13312, guid: 0000000000000000e000000000000000, type: 0}
m_Name: TilesFG_14
m_EditorClassIdentifier:
m_Sprite: {fileID: -815989235, guid: d6ca77f9c3a8f326b9a1805146a53698, type: 3}
m_Sprite: {fileID: -738451075, guid: d6ca77f9c3a8f326b9a1805146a53698, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Transform:
e00: 1

@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 13312, guid: 0000000000000000e000000000000000, type: 0}
m_Name: TilesFG_15
m_EditorClassIdentifier:
m_Sprite: {fileID: 1459631954, guid: d6ca77f9c3a8f326b9a1805146a53698, type: 3}
m_Sprite: {fileID: 424265632, guid: d6ca77f9c3a8f326b9a1805146a53698, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Transform:
e00: 1

@ -1,36 +0,0 @@
%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: 13312, guid: 0000000000000000e000000000000000, type: 0}
m_Name: TilesFG_16
m_EditorClassIdentifier:
m_Sprite: {fileID: -82304339, guid: d6ca77f9c3a8f326b9a1805146a53698, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Transform:
e00: 1
e01: 0
e02: 0
e03: 0
e10: 0
e11: 1
e12: 0
e13: 0
e20: 0
e21: 0
e22: 1
e23: 0
e30: 0
e31: 0
e32: 0
e33: 1
m_InstancedGameObject: {fileID: 0}
m_Flags: 1
m_ColliderType: 1

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 6da4a08fb9e881948a7b628049337699
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 13312, guid: 0000000000000000e000000000000000, type: 0}
m_Name: TilesFG_2
m_EditorClassIdentifier:
m_Sprite: {fileID: 1070215111, guid: d6ca77f9c3a8f326b9a1805146a53698, type: 3}
m_Sprite: {fileID: -2813370593516408627, guid: d6ca77f9c3a8f326b9a1805146a53698, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Transform:
e00: 1

@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 13312, guid: 0000000000000000e000000000000000, type: 0}
m_Name: TilesFG_3
m_EditorClassIdentifier:
m_Sprite: {fileID: -418124667, guid: d6ca77f9c3a8f326b9a1805146a53698, type: 3}
m_Sprite: {fileID: 3873790443560919348, guid: d6ca77f9c3a8f326b9a1805146a53698, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Transform:
e00: 1

@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 13312, guid: 0000000000000000e000000000000000, type: 0}
m_Name: TilesFG_4
m_EditorClassIdentifier:
m_Sprite: {fileID: -1271397342, guid: d6ca77f9c3a8f326b9a1805146a53698, type: 3}
m_Sprite: {fileID: -3514291349347476312, guid: d6ca77f9c3a8f326b9a1805146a53698, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Transform:
e00: 1

@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 13312, guid: 0000000000000000e000000000000000, type: 0}
m_Name: TilesFG_5
m_EditorClassIdentifier:
m_Sprite: {fileID: -1078546567, guid: d6ca77f9c3a8f326b9a1805146a53698, type: 3}
m_Sprite: {fileID: 6034416393271609779, guid: d6ca77f9c3a8f326b9a1805146a53698, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Transform:
e00: 1

@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 13312, guid: 0000000000000000e000000000000000, type: 0}
m_Name: TilesFG_6
m_EditorClassIdentifier:
m_Sprite: {fileID: 2010503647, guid: d6ca77f9c3a8f326b9a1805146a53698, type: 3}
m_Sprite: {fileID: -5881142417515879299, guid: d6ca77f9c3a8f326b9a1805146a53698, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Transform:
e00: 1

@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 13312, guid: 0000000000000000e000000000000000, type: 0}
m_Name: TilesFG_7
m_EditorClassIdentifier:
m_Sprite: {fileID: -43068007, guid: d6ca77f9c3a8f326b9a1805146a53698, type: 3}
m_Sprite: {fileID: 6692561882392913724, guid: d6ca77f9c3a8f326b9a1805146a53698, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Transform:
e00: 1

@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 13312, guid: 0000000000000000e000000000000000, type: 0}
m_Name: TilesFG_8
m_EditorClassIdentifier:
m_Sprite: {fileID: 2098902956, guid: d6ca77f9c3a8f326b9a1805146a53698, type: 3}
m_Sprite: {fileID: 2311780464020470984, guid: d6ca77f9c3a8f326b9a1805146a53698, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Transform:
e00: 1

@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 13312, guid: 0000000000000000e000000000000000, type: 0}
m_Name: TilesFG_9
m_EditorClassIdentifier:
m_Sprite: {fileID: -1977288218, guid: d6ca77f9c3a8f326b9a1805146a53698, type: 3}
m_Sprite: {fileID: -132663228765594847, guid: d6ca77f9c3a8f326b9a1805146a53698, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Transform:
e00: 1

@ -33,7 +33,7 @@ TextureImporter:
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
filterMode: 0
aniso: 1
mipBias: 0
wrapU: 1
@ -68,7 +68,7 @@ TextureImporter:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
resizeAlgorithm: 1
textureFormat: -1
textureCompression: 1
compressionQuality: 50
@ -113,6 +113,18 @@ TextureImporter:
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
spriteSheet:
serializedVersion: 2
sprites: []

File diff suppressed because it is too large Load Diff

@ -20,4 +20,17 @@ public class Interactable : MonoBehaviour
{
SceneManager.LoadScene(1);
}
public void M1()
{
gbs.Shop.SetActive(true);
}
}
public static class gbs
{
public static GameObject Shop;
public static void Start()
{
Shop = GameObject.Find("Shop");
Shop.SetActive(false);
}
}

@ -47,7 +47,7 @@ public class ItemColliector : MonoBehaviour
Mathf.Clamp(SpeedTime, 0, 100);
if(SpeedTime <= 0)
{
Player.speedBoost = 1;
//Player.speedBoost = 1;
}
}
private void Eating()
@ -58,7 +58,7 @@ public class ItemColliector : MonoBehaviour
Blue_Cheese--;
Debug.Log(Blue_Cheese);
BlueCheeseText.text = "" + Blue_Cheese;
Player.speedBoost = 1.5f;
//Player.speedBoost = 1.5f;
SpeedTime = 10;
}

@ -0,0 +1,11 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class Start_gbs : MonoBehaviour
{
void Start()
{
gbs.Start();
}
}

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: ae775971f427f8c4198dee2bb63a0994
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

@ -9,13 +9,13 @@ EditorUserSettings:
value: 515250075c0c595e5f5a5e71122159444e4e4a2f7a7d7f602f284d66b4b76661
flags: 0
RecentlyUsedSceneGuid-1:
value: 5602505007020f080f0b542740735e444e4e4973297a7667742c1f61b2e56668
value: 545004020704080b0b0a0d2048270c44124f1b782d2a24607c794f64e6e4646f
flags: 0
RecentlyUsedSceneGuid-2:
value: 545004020704080b0b0a0d2048270c44124f1b782d2a24607c794f64e6e4646f
value: 02095251535050595d5e0f2311735c44124f1c2e7b7077667f7e4560b7b3306b
flags: 0
RecentlyUsedSceneGuid-3:
value: 02095251535050595d5e0f2311735c44124f1c2e7b7077667f7e4560b7b3306b
value: 5602505007020f080f0b542740735e444e4e4973297a7667742c1f61b2e56668
flags: 0
vcSharedLogLevel:
value: 0d5e400f0650

@ -120,7 +120,7 @@ MonoBehaviour:
m_MinSize: {x: 300, y: 200}
m_MaxSize: {x: 24288, y: 16192}
vertical: 0
controlID: 23
controlID: 44
--- !u!114 &6
MonoBehaviour:
m_ObjectHideFlags: 52
@ -171,7 +171,7 @@ MonoBehaviour:
m_MinSize: {x: 100, y: 200}
m_MaxSize: {x: 8096, y: 16192}
vertical: 1
controlID: 67
controlID: 64
--- !u!114 &8
MonoBehaviour:
m_ObjectHideFlags: 52
@ -182,7 +182,7 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 1
m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
m_Name: SceneView
m_Name: GameView
m_EditorClassIdentifier:
m_Children: []
m_Position:
@ -193,13 +193,13 @@ MonoBehaviour:
height: 661
m_MinSize: {x: 202, y: 221}
m_MaxSize: {x: 4002, y: 4021}
m_ActualView: {fileID: 13}
m_ActualView: {fileID: 14}
m_Panes:
- {fileID: 13}
- {fileID: 17}
- {fileID: 14}
m_Selected: 0
m_LastSelected: 2
m_Selected: 2
m_LastSelected: 0
--- !u!114 &9
MonoBehaviour:
m_ObjectHideFlags: 52
@ -247,8 +247,8 @@ MonoBehaviour:
y: 0
width: 507
height: 947
m_MinSize: {x: 276, y: 71}
m_MaxSize: {x: 4001, y: 4021}
m_MinSize: {x: 275, y: 50}
m_MaxSize: {x: 4000, y: 4000}
m_ActualView: {fileID: 18}
m_Panes:
- {fileID: 18}
@ -314,9 +314,9 @@ MonoBehaviour:
m_SceneHierarchy:
m_TreeViewState:
scrollPos: {x: 0, y: 0}
m_SelectedIDs: 3c69ffff
m_LastClickedID: -38596
m_ExpandedIDs: 046affff4e6affffc26bffffaab7ffff7cb8ffff66b9fffff0bcffff56beffff9ec1ffffa2c4ffffa0c6ffffe0c6ffff28c7ffff76c7ffffd8c8ffff28fbffffb08c0000a28d0000
m_SelectedIDs: 22650000
m_LastClickedID: 0
m_ExpandedIDs: e0f3ffffeaf3ffff04f4ffff0ef4ffff76f7ffff8afaffffd46b0000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@ -620,9 +620,9 @@ MonoBehaviour:
m_PlayAudio: 0
m_AudioPlay: 0
m_Position:
m_Target: {x: -7.784211, y: 25.826696, z: -1.546725}
m_Target: {x: 790.7866, y: 68.00994, z: 13.217382}
speed: 2
m_Value: {x: -12.415346, y: 24.6718, z: -1.4758132}
m_Value: {x: 790.7866, y: 68.00994, z: 13.217382}
m_RenderMode: 0
m_CameraMode:
drawMode: 0
@ -673,9 +673,9 @@ MonoBehaviour:
speed: 2
m_Value: {x: 0, y: 0, z: 0, w: 1}
m_Size:
m_Target: 164.6702
m_Target: 751.53906
speed: 2
m_Value: 157.57913
m_Value: 751.53906
m_Ortho:
m_Target: 1
speed: 2
@ -835,36 +835,36 @@ MonoBehaviour:
m_SkipHidden: 0
m_SearchArea: 1
m_Folders:
- Assets/Scenes
- Assets/Materials/Grapic
m_Globs: []
m_OriginalText:
m_ViewMode: 1
m_StartGridSize: 64
m_LastFolders:
- Assets/Scenes
- Assets/Materials/Grapic
m_LastFoldersGridSize: -1
m_LastProjectPath: D:\repos\WIP\RatAttack2D
m_LockTracker:
m_IsLocked: 0
m_FolderTreeState:
scrollPos: {x: 0, y: 95}
m_SelectedIDs: e06a0000
m_LastClickedID: 27360
m_ExpandedIDs: 00000000c0650000c2650000c4650000c6650000c8650000ca650000cc650000ce650000d0650000d2650000d4650000d665000000ca9a3b
scrollPos: {x: 0, y: 0}
m_SelectedIDs: 02700000
m_LastClickedID: 28674
m_ExpandedIDs: 00000000b667000012680000027000001270000000ca9a3b
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name: Scripts
m_OriginalName: Scripts
m_Name:
m_OriginalName:
m_EditFieldRect:
serializedVersion: 2
x: 0
y: 0
width: 0
height: 0
m_UserData: 26936
m_UserData: 0
m_IsWaitingForDelay: 0
m_IsRenaming: 0
m_OriginalEventType: 0
m_OriginalEventType: 11
m_IsRenamingFilename: 1
m_ClientGUIView: {fileID: 9}
m_SearchString:
@ -878,7 +878,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
m_ExpandedIDs: 00000000c0650000c2650000c4650000c6650000c8650000ca650000cc650000ce650000d0650000d2650000d4650000d6650000
m_ExpandedIDs: 00000000b6670000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@ -964,7 +964,7 @@ MonoBehaviour:
m_SaveData: []
m_LockTracker:
m_IsLocked: 0
m_LastSelectedObjectID: -5638
m_LastSelectedObjectID: -3068
--- !u!114 &17
MonoBehaviour:
m_ObjectHideFlags: 52
@ -997,6 +997,7 @@ MonoBehaviour:
m_KeySerializationHelper:
- {fileID: -9079914194315318268, guid: 6b0aac9c28934ea58a29403562054c6a, type: 2}
- {fileID: -5831013718810815287, guid: f3eb707538699a142941bb606d702711, type: 2}
- {fileID: 1861266083243068592, guid: b8df2c9ce7bfeff4ca2bc9f380a52794, type: 2}
m_ValueSerializationHelper:
- e00: 0.1
e01: 0
@ -1030,10 +1031,26 @@ MonoBehaviour:
e31: 0
e32: 0
e33: 1
- e00: 1
e01: 0
e02: 0
e03: 0
e10: 0
e11: 1
e12: 0
e13: 0
e20: 0
e21: 0
e22: 1
e23: 0
e30: 0
e31: 0
e32: 0
e33: 1
m_PreviewAnimator: {fileID: 0}
m_AnimatorController: {fileID: 9100000, guid: f3eb707538699a142941bb606d702711, type: 2}
m_AnimatorController: {fileID: 9100000, guid: b8df2c9ce7bfeff4ca2bc9f380a52794, type: 2}
m_BreadCrumbs:
- m_Target: {fileID: -5831013718810815287, guid: f3eb707538699a142941bb606d702711, type: 2}
- m_Target: {fileID: 1861266083243068592, guid: b8df2c9ce7bfeff4ca2bc9f380a52794, type: 2}
m_ScrollPosition: {x: 0, y: 0}
stateMachineGraph: {fileID: 0}
stateMachineGraphGUI: {fileID: 0}
@ -1081,7 +1098,7 @@ MonoBehaviour:
m_ControlHash: -371814159
m_PrefName: Preview_InspectorPreview
m_LastInspectedObjectInstanceID: -1
m_LastVerticalScrollValue: 324
m_LastVerticalScrollValue: 0
m_GlobalObjectId:
m_InspectorMode: 0
m_LockTracker:

Loading…
Cancel
Save