diff --git a/Assets/Resources/HexSpriteTiles_Setup/Palettes/HexPalette_Blank.prefab b/Assets/Resources/HexSpriteTiles_Setup/Palettes/HexPalette_Blank.prefab
index 7750c3b8ceaab560003927511f43af2ede2d1a93..1e68fed13470002edad59f651dbbf9c392ef8db5 100644
--- a/Assets/Resources/HexSpriteTiles_Setup/Palettes/HexPalette_Blank.prefab
+++ b/Assets/Resources/HexSpriteTiles_Setup/Palettes/HexPalette_Blank.prefab
@@ -911,7 +911,7 @@ Tilemap:
- m_RefCount: 56
m_Data: {r: 1, g: 1, b: 1, a: 1}
- m_RefCount: 1
- m_Data: {r: 0.7707329, g: 0.45404968, b: 0.5410778, a: 1}
+ m_Data: {r: 0.8153607, g: 0.4798945, b: 0.5869481, a: 1}
m_TileObjectToInstantiateArray: []
m_AnimationFrameRate: 1
m_Color: {r: 1, g: 1, b: 1, a: 1}
diff --git a/Assets/Scenes/level 1.unity b/Assets/Scenes/level 1.unity
index 497c1150d05a7bdc42cc1edc959d827774574d61..daf0fba63faff8dbef3fcc289d041c74eb3a83f0 100644
--- a/Assets/Scenes/level 1.unity
+++ b/Assets/Scenes/level 1.unity
@@ -1096,7 +1096,7 @@ Transform:
- {fileID: 2026297123}
- {fileID: 320306329}
m_Father: {fileID: 0}
- m_RootOrder: 4
+ m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &428351509
GameObject:
@@ -1264,7 +1264,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 9
+ m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &770608211
GameObject:
@@ -1297,7 +1297,7 @@ Transform:
- {fileID: 1417060920}
- {fileID: 1951991672}
m_Father: {fileID: 0}
- m_RootOrder: 7
+ m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &807328073
GameObject:
@@ -1392,7 +1392,7 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 3171483926963243644, guid: 579f1ddab810a25418b180b6a13e388b, type: 3}
propertyPath: m_RootOrder
- value: 1
+ value: 3
objectReference: {fileID: 0}
- target: {fileID: 3171483926963243644, guid: 579f1ddab810a25418b180b6a13e388b, type: 3}
propertyPath: m_LocalScale.x
@@ -1587,7 +1587,7 @@ Transform:
- {fileID: 1172869572}
- {fileID: 276272513}
m_Father: {fileID: 0}
- m_RootOrder: 5
+ m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1156647368 stripped
MonoBehaviour:
@@ -342529,7 +342529,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 8
+ m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1548248993
GameObject:
@@ -342857,7 +342857,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 3
+ m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &1601698468
SpriteRenderer:
@@ -342949,7 +342949,7 @@ Transform:
- {fileID: 25769492}
- {fileID: 1895512224}
m_Father: {fileID: 0}
- m_RootOrder: 10
+ m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &1634898082
SpriteRenderer:
@@ -343546,7 +343546,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2481118359704612513, guid: ac9ade58d5807c343af64401f3798e03, type: 3}
propertyPath: m_RootOrder
- value: 6
+ value: 5
objectReference: {fileID: 0}
- target: {fileID: 2481118359704612513, guid: ac9ade58d5807c343af64401f3798e03, type: 3}
propertyPath: m_AnchorMax.x
@@ -343624,6 +343624,18 @@ PrefabInstance:
propertyPath: m_Name
value: UI
objectReference: {fileID: 0}
+ - target: {fileID: 2481118359704612519, guid: ac9ade58d5807c343af64401f3798e03, type: 3}
+ propertyPath: m_UiScaleMode
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2481118359704612519, guid: ac9ade58d5807c343af64401f3798e03, type: 3}
+ propertyPath: m_ReferenceResolution.x
+ value: 1920
+ objectReference: {fileID: 0}
+ - target: {fileID: 2481118359704612519, guid: ac9ade58d5807c343af64401f3798e03, type: 3}
+ propertyPath: m_ReferenceResolution.y
+ value: 1080
+ objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: ac9ade58d5807c343af64401f3798e03, type: 3}
--- !u!1001 &9180196783916691511
@@ -343647,7 +343659,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 9180196784139049605, guid: 998458962388c3045a5be978c30db22f, type: 3}
propertyPath: m_RootOrder
- value: 2
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 9180196784139049605, guid: 998458962388c3045a5be978c30db22f, type: 3}
propertyPath: m_LocalPosition.x
diff --git a/Assets/Scenes/level 8.unity b/Assets/Scenes/level 8.unity
index 9838e5343e74123f8314fde58bb9f1214e6eaa78..a89e2af29ce8c3e42cb3d656c4ccc78c1a201a63 100644
--- a/Assets/Scenes/level 8.unity
+++ b/Assets/Scenes/level 8.unity
@@ -5853,6 +5853,10 @@ PrefabInstance:
propertyPath: m_Layer
value: 6
objectReference: {fileID: 0}
+ - target: {fileID: 4084087203139505357, guid: 579f1ddab810a25418b180b6a13e388b, type: 3}
+ propertyPath: Loop
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 4084087203139505357, guid: 579f1ddab810a25418b180b6a13e388b, type: 3}
propertyPath: OutputAudioMixerGroup
value:
@@ -108938,63 +108942,6 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: a807fdbe45144824b8d937619a2b7228, type: 3}
---- !u!1 &1717379883 stripped
-GameObject:
- m_CorrespondingSourceObject: {fileID: 9180196784139049624, guid: a807fdbe45144824b8d937619a2b7228, type: 3}
- m_PrefabInstance: {fileID: 1717379882}
- m_PrefabAsset: {fileID: 0}
---- !u!212 &1717379884
-SpriteRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1717379883}
- m_Enabled: 1
- m_CastShadows: 0
- m_ReceiveShadows: 0
- m_DynamicOccludee: 1
- m_StaticShadowCaster: 0
- m_MotionVectors: 1
- m_LightProbeUsage: 1
- m_ReflectionProbeUsage: 1
- m_RayTracingMode: 0
- m_RayTraceProcedural: 0
- m_RenderingLayerMask: 1
- m_RendererPriority: 0
- m_Materials:
- - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
- m_StaticBatchInfo:
- firstSubMesh: 0
- subMeshCount: 0
- m_StaticBatchRoot: {fileID: 0}
- m_ProbeAnchor: {fileID: 0}
- m_LightProbeVolumeOverride: {fileID: 0}
- m_ScaleInLightmap: 1
- m_ReceiveGI: 1
- m_PreserveUVs: 0
- m_IgnoreNormalsForChartDetection: 0
- m_ImportantGI: 0
- m_StitchLightmapSeams: 1
- m_SelectedEditorRenderState: 0
- m_MinimumChartSize: 4
- m_AutoUVMaxDistance: 0.5
- m_AutoUVMaxAngle: 89
- m_LightmapParameters: {fileID: 0}
- m_SortingLayerID: 0
- m_SortingLayer: 0
- m_SortingOrder: 0
- m_Sprite: {fileID: 21300016, guid: 14aefffd3622c7347aad64f2bed35801, type: 3}
- m_Color: {r: 1, g: 1, b: 1, a: 1}
- m_FlipX: 0
- m_FlipY: 0
- m_DrawMode: 0
- m_Size: {x: 0.3, y: 0.34}
- m_AdaptiveModeThreshold: 0.5
- m_SpriteTileMode: 0
- m_WasSpriteAssigned: 1
- m_MaskInteraction: 0
- m_SpriteSortPoint: 0
--- !u!1 &1737177625
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/Scenes/preload.unity b/Assets/Scenes/preload.unity
index a1983fc43c47dfec2d785a1dc8bfd02d2f19b36b..5f25b56027cd7bc3eae035b38017600d448848d7 100644
--- a/Assets/Scenes/preload.unity
+++ b/Assets/Scenes/preload.unity
@@ -174,6 +174,10 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
+ - target: {fileID: 1908005491885581402, guid: f42c3b7f0c8472a4f89a4a46f47126dd, type: 3}
+ propertyPath: Loop
+ value: 1
+ objectReference: {fileID: 0}
- target: {fileID: 1908005491885581402, guid: f42c3b7f0c8472a4f89a4a46f47126dd, type: 3}
propertyPath: OutputAudioMixerGroup
value:
diff --git a/Assets/prefabs/jukebox.prefab b/Assets/prefabs/jukebox.prefab
index 4981cfe6bf39e6cfd3f2253dbe293987125b90f3..c4068e1485113a3db553143bba84ac01ff184b96 100644
--- a/Assets/prefabs/jukebox.prefab
+++ b/Assets/prefabs/jukebox.prefab
@@ -65,7 +65,7 @@ AudioSource:
m_PlayOnAwake: 1
m_Volume: 1
m_Pitch: 1
- Loop: 0
+ Loop: 1
Mute: 0
Spatialize: 0
SpatializePostEffects: 0
diff --git a/Assets/scripts/gridclick.cs b/Assets/scripts/gridclick.cs
index dda08f20a3081c7900cc1f778e06d2aa4c2ae59b..f0d0aab4cdfe937578f3bce932660b32dd990b42 100644
--- a/Assets/scripts/gridclick.cs
+++ b/Assets/scripts/gridclick.cs
@@ -19,7 +19,7 @@ public class gridclick : MonoBehaviour
//camera vars
private static float MaxToClamp = 4f;
- private static float MinToClamp = -7f;
+ private static float MinToClamp = -72f;
private static float DefaultCameraZoom = 7f;
private static float ZoomAmount = 0f;
@@ -40,7 +40,7 @@ public class gridclick : MonoBehaviour
enemies.agressive(player);
enemies.movement(player);
}
-
+
//moves movable entity to closest tile to point
void tileMoveEntity(Vector3 pos, GameObject entity)
{
diff --git a/GAME/Chaos Pathfinder_Data/Plugins/x86_64/lib_burst_generated.dll b/GAME/Chaos Pathfinder_Data/Plugins/x86_64/lib_burst_generated.dll
index 14a5d35678dd81affd389f3276017dddc868c143..d743cc0b9ee98ec4643830edb1fb547f52d1a7d9 100644
Binary files a/GAME/Chaos Pathfinder_Data/Plugins/x86_64/lib_burst_generated.dll and b/GAME/Chaos Pathfinder_Data/Plugins/x86_64/lib_burst_generated.dll differ
diff --git a/GAME/Chaos Pathfinder_Data/globalgamemanagers b/GAME/Chaos Pathfinder_Data/globalgamemanagers
index d664304e5aca8d14c02a8fb1116afcbd10d70d4f..2025e430200435d58f362764a2a8380c083fa082 100644
Binary files a/GAME/Chaos Pathfinder_Data/globalgamemanagers and b/GAME/Chaos Pathfinder_Data/globalgamemanagers differ
diff --git a/GAME/Chaos Pathfinder_Data/level0 b/GAME/Chaos Pathfinder_Data/level0
index 42f62cbb2f383c75fe963f2a88f737c6a0edd454..81555ae122395262064c840b989fa68439406748 100644
Binary files a/GAME/Chaos Pathfinder_Data/level0 and b/GAME/Chaos Pathfinder_Data/level0 differ
diff --git a/GAME/Chaos Pathfinder_Data/level9 b/GAME/Chaos Pathfinder_Data/level9
index 38828c2f506b77b60286836f9ba92bd2b13fe38b..efb7e4776acbfa2dd299b43880e64e4ce787b106 100644
Binary files a/GAME/Chaos Pathfinder_Data/level9 and b/GAME/Chaos Pathfinder_Data/level9 differ
diff --git a/GAME/Chaos Pathfinder_Data/resources.assets b/GAME/Chaos Pathfinder_Data/resources.assets
index d0dacabf3b9379b9de78b8c7f78416139aa7db48..28079a75323e49b04830b282f470d3ecf5bdf2fb 100644
Binary files a/GAME/Chaos Pathfinder_Data/resources.assets and b/GAME/Chaos Pathfinder_Data/resources.assets differ