diff --git a/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml b/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml
index 910f2d9..59dea69 100644
--- a/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml
+++ b/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml
@@ -27,22 +27,22 @@
- {
+ "keyToString": {
+ "Discover.Launch.Via.Unity": "true",
+ "RunOnceActivity.OpenProjectViewOnStart": "true",
+ "RunOnceActivity.ShowReadmeOnStart": "true",
+ "WebServerToolWindowFactoryState": "false",
+ "vue.rearranger.settings.migration": "true"
},
- "keyToStringList": {
- "rider.external.source.directories": [
- "C:\\Users\\braus\\AppData\\Roaming\\JetBrains\\Rider2022.3\\resharper-host\\DecompilerCache",
- "C:\\Users\\braus\\AppData\\Roaming\\JetBrains\\Rider2022.3\\resharper-host\\SourcesCache",
- "C:\\Users\\braus\\AppData\\Local\\Symbols\\src"
+ "keyToStringList": {
+ "rider.external.source.directories": [
+ "C:\\Users\\braus\\AppData\\Roaming\\JetBrains\\Rider2022.3\\resharper-host\\DecompilerCache",
+ "C:\\Users\\braus\\AppData\\Roaming\\JetBrains\\Rider2022.3\\resharper-host\\SourcesCache",
+ "C:\\Users\\braus\\AppData\\Local\\Symbols\\src"
]
}
-}]]>
+}
@@ -99,6 +99,7 @@
1674498502961
+
diff --git a/FlufflParty/Assets/BlenderFiles/Cactus_2_Var.blend1.meta b/FlufflParty/Assets/BlenderFiles/Animation.meta
similarity index 67%
rename from FlufflParty/Assets/BlenderFiles/Cactus_2_Var.blend1.meta
rename to FlufflParty/Assets/BlenderFiles/Animation.meta
index b7680a5..4f35bc6 100644
--- a/FlufflParty/Assets/BlenderFiles/Cactus_2_Var.blend1.meta
+++ b/FlufflParty/Assets/BlenderFiles/Animation.meta
@@ -1,5 +1,6 @@
fileFormatVersion: 2
-guid: 42fa5211ab3e6f047a9cdd3f6111c430
+guid: 35bdcd81586a5eb4c8bb5b7071205f6c
+folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
diff --git a/FlufflParty/Assets/BlenderFiles/Animation/Arrow_Floor.controller b/FlufflParty/Assets/BlenderFiles/Animation/Arrow_Floor.controller
new file mode 100644
index 0000000..11c25f1
--- /dev/null
+++ b/FlufflParty/Assets/BlenderFiles/Animation/Arrow_Floor.controller
@@ -0,0 +1,72 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1102 &-6792103419145391049
+AnimatorState:
+ serializedVersion: 6
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: Scene
+ m_Speed: 2
+ m_CycleOffset: 0
+ m_Transitions: []
+ m_StateMachineBehaviours: []
+ m_Position: {x: 50, y: 50, z: 0}
+ m_IKOnFeet: 0
+ m_WriteDefaultValues: 1
+ m_Mirror: 0
+ m_SpeedParameterActive: 0
+ m_MirrorParameterActive: 0
+ m_CycleOffsetParameterActive: 0
+ m_TimeParameterActive: 0
+ m_Motion: {fileID: -623603649343465320, guid: 19a595f4f07b1af4c977e23dbea01c74, type: 3}
+ m_Tag:
+ m_SpeedParameter:
+ m_MirrorParameter:
+ m_CycleOffsetParameter:
+ m_TimeParameter:
+--- !u!91 &9100000
+AnimatorController:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: Arrow_Floor
+ serializedVersion: 5
+ m_AnimatorParameters: []
+ m_AnimatorLayers:
+ - serializedVersion: 5
+ m_Name: Base Layer
+ m_StateMachine: {fileID: 575121510650230631}
+ m_Mask: {fileID: 0}
+ m_Motions: []
+ m_Behaviours: []
+ m_BlendingMode: 0
+ m_SyncedLayerIndex: -1
+ m_DefaultWeight: 0
+ m_IKPass: 0
+ m_SyncedLayerAffectsTiming: 0
+ m_Controller: {fileID: 9100000}
+--- !u!1107 &575121510650230631
+AnimatorStateMachine:
+ serializedVersion: 6
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: Base Layer
+ m_ChildStates:
+ - serializedVersion: 1
+ m_State: {fileID: -6792103419145391049}
+ m_Position: {x: 200, y: 0, z: 0}
+ m_ChildStateMachines: []
+ m_AnyStateTransitions: []
+ m_EntryTransitions: []
+ m_StateMachineTransitions: {}
+ m_StateMachineBehaviours: []
+ m_AnyStatePosition: {x: 50, y: 20, z: 0}
+ m_EntryPosition: {x: 50, y: 120, z: 0}
+ m_ExitPosition: {x: 800, y: 120, z: 0}
+ m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
+ m_DefaultState: {fileID: -6792103419145391049}
diff --git a/FlufflParty/Assets/BlenderFiles/Animation/Arrow_Floor.controller.meta b/FlufflParty/Assets/BlenderFiles/Animation/Arrow_Floor.controller.meta
new file mode 100644
index 0000000..07674bb
--- /dev/null
+++ b/FlufflParty/Assets/BlenderFiles/Animation/Arrow_Floor.controller.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 32f1ccb535c04d5499bee46726dc7754
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 9100000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/FlufflParty/Assets/BlenderFiles/CoinAnimated.controller b/FlufflParty/Assets/BlenderFiles/Animation/CoinAnimated.controller
similarity index 100%
rename from FlufflParty/Assets/BlenderFiles/CoinAnimated.controller
rename to FlufflParty/Assets/BlenderFiles/Animation/CoinAnimated.controller
diff --git a/FlufflParty/Assets/BlenderFiles/CoinAnimated.controller.meta b/FlufflParty/Assets/BlenderFiles/Animation/CoinAnimated.controller.meta
similarity index 100%
rename from FlufflParty/Assets/BlenderFiles/CoinAnimated.controller.meta
rename to FlufflParty/Assets/BlenderFiles/Animation/CoinAnimated.controller.meta
diff --git a/FlufflParty/Assets/BlenderFiles/Plane.blend1 b/FlufflParty/Assets/BlenderFiles/Arrow_Floor.blend
similarity index 60%
rename from FlufflParty/Assets/BlenderFiles/Plane.blend1
rename to FlufflParty/Assets/BlenderFiles/Arrow_Floor.blend
index 1b47710..9996d0a 100644
Binary files a/FlufflParty/Assets/BlenderFiles/Plane.blend1 and b/FlufflParty/Assets/BlenderFiles/Arrow_Floor.blend differ
diff --git a/FlufflParty/Assets/BlenderFiles/Arrow_Floor.blend.meta b/FlufflParty/Assets/BlenderFiles/Arrow_Floor.blend.meta
new file mode 100644
index 0000000..ec394be
--- /dev/null
+++ b/FlufflParty/Assets/BlenderFiles/Arrow_Floor.blend.meta
@@ -0,0 +1,135 @@
+fileFormatVersion: 2
+guid: 19a595f4f07b1af4c977e23dbea01c74
+ModelImporter:
+ serializedVersion: 21300
+ internalIDToNameTable: []
+ externalObjects: {}
+ materials:
+ materialImportMode: 2
+ materialName: 0
+ materialSearch: 1
+ materialLocation: 1
+ animations:
+ legacyGenerateAnimations: 4
+ bakeSimulation: 0
+ resampleCurves: 1
+ optimizeGameObjects: 0
+ removeConstantScaleCurves: 1
+ motionNodeName:
+ rigImportErrors:
+ rigImportWarnings:
+ animationImportErrors:
+ animationImportWarnings:
+ animationRetargetingWarnings:
+ animationDoRetargetingWarnings: 0
+ importAnimatedCustomProperties: 0
+ importConstraints: 0
+ animationCompression: 1
+ animationRotationError: 0.5
+ animationPositionError: 0.5
+ animationScaleError: 0.5
+ animationWrapMode: 0
+ extraExposedTransformPaths: []
+ extraUserProperties: []
+ clipAnimations:
+ - serializedVersion: 16
+ name: Scene
+ takeName: Scene
+ internalID: -623603649343465320
+ firstFrame: 1
+ lastFrame: 80
+ wrapMode: 0
+ orientationOffsetY: 0
+ level: 0
+ cycleOffset: 0
+ loop: 0
+ hasAdditiveReferencePose: 0
+ loopTime: 1
+ loopBlend: 0
+ loopBlendOrientation: 0
+ loopBlendPositionY: 0
+ loopBlendPositionXZ: 0
+ keepOriginalOrientation: 0
+ keepOriginalPositionY: 1
+ keepOriginalPositionXZ: 0
+ heightFromFeet: 0
+ mirror: 0
+ bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
+ curves: []
+ events: []
+ transformMask: []
+ maskType: 3
+ maskSource: {instanceID: 0}
+ additiveReferencePoseFrame: 1
+ isReadable: 0
+ meshes:
+ lODScreenPercentages: []
+ globalScale: 1
+ meshCompression: 0
+ addColliders: 0
+ useSRGBMaterialColor: 1
+ sortHierarchyByName: 1
+ importVisibility: 1
+ importBlendShapes: 1
+ importCameras: 1
+ importLights: 1
+ nodeNameCollisionStrategy: 1
+ fileIdsGeneration: 2
+ swapUVChannels: 0
+ generateSecondaryUV: 0
+ useFileUnits: 1
+ keepQuads: 0
+ weldVertices: 1
+ bakeAxisConversion: 0
+ preserveHierarchy: 0
+ skinWeightsMode: 0
+ maxBonesPerVertex: 4
+ minBoneWeight: 0.001
+ optimizeBones: 1
+ meshOptimizationFlags: -1
+ indexFormat: 0
+ secondaryUVAngleDistortion: 8
+ secondaryUVAreaDistortion: 15.000001
+ secondaryUVHardAngle: 88
+ secondaryUVMarginMethod: 1
+ secondaryUVMinLightmapResolution: 40
+ secondaryUVMinObjectScale: 1
+ secondaryUVPackMargin: 4
+ useFileScale: 1
+ tangentSpace:
+ normalSmoothAngle: 60
+ normalImportMode: 0
+ tangentImportMode: 3
+ normalCalculationMode: 4
+ legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
+ blendShapeNormalImportMode: 1
+ normalSmoothingSource: 0
+ referencedClips: []
+ importAnimation: 1
+ humanDescription:
+ serializedVersion: 3
+ human: []
+ skeleton: []
+ armTwist: 0.5
+ foreArmTwist: 0.5
+ upperLegTwist: 0.5
+ legTwist: 0.5
+ armStretch: 0.05
+ legStretch: 0.05
+ feetSpacing: 0
+ globalScale: 1
+ rootMotionBoneName:
+ hasTranslationDoF: 0
+ hasExtraRoot: 0
+ skeletonHasParents: 1
+ lastHumanDescriptionAvatarSource: {instanceID: 0}
+ autoGenerateAvatarMappingIfUnspecified: 1
+ animationType: 2
+ humanoidOversampling: 1
+ avatarSetup: 0
+ addHumanoidExtraRootOnlyWhenUsingAvatar: 1
+ remapMaterialsIfMaterialImportModeIsNone: 0
+ additionalBone: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/FlufflParty/Assets/BlenderFiles/SandPlump.blend1 b/FlufflParty/Assets/BlenderFiles/Arrow_Floor.blend1
similarity index 55%
rename from FlufflParty/Assets/BlenderFiles/SandPlump.blend1
rename to FlufflParty/Assets/BlenderFiles/Arrow_Floor.blend1
index 00315c3..686f338 100644
Binary files a/FlufflParty/Assets/BlenderFiles/SandPlump.blend1 and b/FlufflParty/Assets/BlenderFiles/Arrow_Floor.blend1 differ
diff --git a/FlufflParty/Assets/BlenderFiles/DriedGrass.blend1.meta b/FlufflParty/Assets/BlenderFiles/Arrow_Floor.blend1.meta
similarity index 74%
rename from FlufflParty/Assets/BlenderFiles/DriedGrass.blend1.meta
rename to FlufflParty/Assets/BlenderFiles/Arrow_Floor.blend1.meta
index 36ab2ee..fc85aa3 100644
--- a/FlufflParty/Assets/BlenderFiles/DriedGrass.blend1.meta
+++ b/FlufflParty/Assets/BlenderFiles/Arrow_Floor.blend1.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 7301eac121e45914580f2fbfbaebfd64
+guid: 10c0b02d3c316f64ea20c50005ad497d
DefaultImporter:
externalObjects: {}
userData:
diff --git a/FlufflParty/Assets/BlenderFiles/Cactus_2_Var.blend1 b/FlufflParty/Assets/BlenderFiles/Cactus_2_Var.blend1
deleted file mode 100644
index 25c5923..0000000
Binary files a/FlufflParty/Assets/BlenderFiles/Cactus_2_Var.blend1 and /dev/null differ
diff --git a/FlufflParty/Assets/BlenderFiles/Cactus_Var.blend1 b/FlufflParty/Assets/BlenderFiles/Cactus_Var.blend1
deleted file mode 100644
index 32e6e20..0000000
Binary files a/FlufflParty/Assets/BlenderFiles/Cactus_Var.blend1 and /dev/null differ
diff --git a/FlufflParty/Assets/BlenderFiles/DriedGrass.blend1 b/FlufflParty/Assets/BlenderFiles/DriedGrass.blend1
deleted file mode 100644
index bda5829..0000000
Binary files a/FlufflParty/Assets/BlenderFiles/DriedGrass.blend1 and /dev/null differ
diff --git a/FlufflParty/Assets/BlenderFiles/DriedTree.blend1 b/FlufflParty/Assets/BlenderFiles/DriedTree.blend1
deleted file mode 100644
index 8fce5a7..0000000
Binary files a/FlufflParty/Assets/BlenderFiles/DriedTree.blend1 and /dev/null differ
diff --git a/FlufflParty/Assets/BlenderFiles/DriedTree2.blend1 b/FlufflParty/Assets/BlenderFiles/DriedTree2.blend1
deleted file mode 100644
index 532a2ba..0000000
Binary files a/FlufflParty/Assets/BlenderFiles/DriedTree2.blend1 and /dev/null differ
diff --git a/FlufflParty/Assets/BlenderFiles/DriedTree2.blend1.meta b/FlufflParty/Assets/BlenderFiles/DriedTree2.blend1.meta
deleted file mode 100644
index 11bb2cd..0000000
--- a/FlufflParty/Assets/BlenderFiles/DriedTree2.blend1.meta
+++ /dev/null
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 67661e81a3894414e8100c7ba8aa5d17
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/FlufflParty/Assets/BlenderFiles/Mushroom.blend1 b/FlufflParty/Assets/BlenderFiles/Mushroom.blend1
deleted file mode 100644
index 3bc74a1..0000000
Binary files a/FlufflParty/Assets/BlenderFiles/Mushroom.blend1 and /dev/null differ
diff --git a/FlufflParty/Assets/BlenderFiles/Mushroom.blend1.meta b/FlufflParty/Assets/BlenderFiles/Mushroom.blend1.meta
deleted file mode 100644
index 9e99a9c..0000000
--- a/FlufflParty/Assets/BlenderFiles/Mushroom.blend1.meta
+++ /dev/null
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 3e77ecfe144111444b7a6837a089680f
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/FlufflParty/Assets/BlenderFiles/PalmTree.blend1 b/FlufflParty/Assets/BlenderFiles/PalmTree.blend1
deleted file mode 100644
index 2a16bea..0000000
Binary files a/FlufflParty/Assets/BlenderFiles/PalmTree.blend1 and /dev/null differ
diff --git a/FlufflParty/Assets/BlenderFiles/PalmTree.blend1.meta b/FlufflParty/Assets/BlenderFiles/PalmTree.blend1.meta
deleted file mode 100644
index c6311db..0000000
--- a/FlufflParty/Assets/BlenderFiles/PalmTree.blend1.meta
+++ /dev/null
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 77da143ed5b15cd4b9792ab846e4d2df
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/FlufflParty/Assets/BlenderFiles/PalmTree_2.blend1 b/FlufflParty/Assets/BlenderFiles/PalmTree_2.blend1
deleted file mode 100644
index 48d047d..0000000
Binary files a/FlufflParty/Assets/BlenderFiles/PalmTree_2.blend1 and /dev/null differ
diff --git a/FlufflParty/Assets/BlenderFiles/PalmTree_2.blend1.meta b/FlufflParty/Assets/BlenderFiles/PalmTree_2.blend1.meta
deleted file mode 100644
index e96cafb..0000000
--- a/FlufflParty/Assets/BlenderFiles/PalmTree_2.blend1.meta
+++ /dev/null
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 852dc0631260ded4f83daacb2d2c03fc
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/FlufflParty/Assets/BlenderFiles/Plane.blend1.meta b/FlufflParty/Assets/BlenderFiles/Plane.blend1.meta
deleted file mode 100644
index 2b9c95c..0000000
--- a/FlufflParty/Assets/BlenderFiles/Plane.blend1.meta
+++ /dev/null
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: b0d6a02e63058b644b9f62fa486958df
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/FlufflParty/Assets/BlenderFiles/PlayerField.blend1 b/FlufflParty/Assets/BlenderFiles/PlayerField.blend1
deleted file mode 100644
index eac4aba..0000000
Binary files a/FlufflParty/Assets/BlenderFiles/PlayerField.blend1 and /dev/null differ
diff --git a/FlufflParty/Assets/BlenderFiles/PlayerField.blend1.meta b/FlufflParty/Assets/BlenderFiles/PlayerField.blend1.meta
deleted file mode 100644
index 159e680..0000000
--- a/FlufflParty/Assets/BlenderFiles/PlayerField.blend1.meta
+++ /dev/null
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 979abee8e42798041a9a7b6834d36711
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/FlufflParty/Assets/BlenderFiles/SandPlump.blend1.meta b/FlufflParty/Assets/BlenderFiles/SandPlump.blend1.meta
deleted file mode 100644
index fa81168..0000000
--- a/FlufflParty/Assets/BlenderFiles/SandPlump.blend1.meta
+++ /dev/null
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 081b5a156438b8d438875d76715fc1bb
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/FlufflParty/Assets/BlenderFiles/Water.blend1 b/FlufflParty/Assets/BlenderFiles/Water.blend1
deleted file mode 100644
index 5b8f3c2..0000000
Binary files a/FlufflParty/Assets/BlenderFiles/Water.blend1 and /dev/null differ
diff --git a/FlufflParty/Assets/BlenderFiles/Water.blend1.meta b/FlufflParty/Assets/BlenderFiles/Water.blend1.meta
deleted file mode 100644
index ba9f73b..0000000
--- a/FlufflParty/Assets/BlenderFiles/Water.blend1.meta
+++ /dev/null
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: e3c8339b802fa0f479e75631bdc719c7
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/FlufflParty/Assets/BlenderFiles/DriedTree.blend1.meta b/FlufflParty/Assets/Materials/Arrows.meta
similarity index 67%
rename from FlufflParty/Assets/BlenderFiles/DriedTree.blend1.meta
rename to FlufflParty/Assets/Materials/Arrows.meta
index 70c5949..b4d1497 100644
--- a/FlufflParty/Assets/BlenderFiles/DriedTree.blend1.meta
+++ b/FlufflParty/Assets/Materials/Arrows.meta
@@ -1,5 +1,6 @@
fileFormatVersion: 2
-guid: ebf46c5320be7e841bbe2663f1dff171
+guid: 58c1185e4ca638e4c9fb23dadb796258
+folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
diff --git a/FlufflParty/Assets/Materials/Arrows/GlowingArrow.mat b/FlufflParty/Assets/Materials/Arrows/GlowingArrow.mat
new file mode 100644
index 0000000..f2a6ccf
--- /dev/null
+++ b/FlufflParty/Assets/Materials/Arrows/GlowingArrow.mat
@@ -0,0 +1,81 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+ serializedVersion: 8
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: GlowingArrow
+ m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+ m_ValidKeywords:
+ - _EMISSION
+ m_InvalidKeywords: []
+ m_LightmapFlags: 2
+ m_EnableInstancingVariants: 0
+ m_DoubleSidedGI: 0
+ m_CustomRenderQueue: -1
+ stringTagMap: {}
+ disabledShaderPasses: []
+ m_SavedProperties:
+ serializedVersion: 3
+ m_TexEnvs:
+ - _BumpMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailAlbedoMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailMask:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailNormalMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _EmissionMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MainTex:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MetallicGlossMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _OcclusionMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _ParallaxMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ m_Ints: []
+ m_Floats:
+ - _BumpScale: 1
+ - _Cutoff: 0.5
+ - _DetailNormalMapScale: 1
+ - _DstBlend: 0
+ - _GlossMapScale: 1
+ - _Glossiness: 0.5
+ - _GlossyReflections: 1
+ - _Metallic: 0
+ - _Mode: 0
+ - _OcclusionStrength: 1
+ - _Parallax: 0.02
+ - _SmoothnessTextureChannel: 0
+ - _SpecularHighlights: 1
+ - _SrcBlend: 1
+ - _UVSec: 0
+ - _ZWrite: 1
+ m_Colors:
+ - _Color: {r: 1, g: 1, b: 1, a: 1}
+ - _EmissionColor: {r: 1, g: 0.23750035, b: 0, a: 1}
+ m_BuildTextureStacks: []
diff --git a/FlufflParty/Assets/Materials/Arrows/GlowingArrow.mat.meta b/FlufflParty/Assets/Materials/Arrows/GlowingArrow.mat.meta
new file mode 100644
index 0000000..4d244cd
--- /dev/null
+++ b/FlufflParty/Assets/Materials/Arrows/GlowingArrow.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 4c45cd4560dbbdc4b95dd93b00825eca
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 2100000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/FlufflParty/Assets/Prefabs/ArrowAnimated.prefab b/FlufflParty/Assets/Prefabs/ArrowAnimated.prefab
new file mode 100644
index 0000000..98dd891
--- /dev/null
+++ b/FlufflParty/Assets/Prefabs/ArrowAnimated.prefab
@@ -0,0 +1,165 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &8190368079434274263
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 8854596881260515181}
+ - component: {fileID: 5570393527585571016}
+ - component: {fileID: 7686224198990001154}
+ - component: {fileID: 5570393527585571015}
+ - component: {fileID: 2116655309375350638}
+ - component: {fileID: 3079797610830793084}
+ m_Layer: 0
+ m_Name: Arrow_Floor
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &8854596881260515181
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8190368079434274263}
+ m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 9037424340668235006}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
+--- !u!33 &5570393527585571016
+MeshFilter:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8190368079434274263}
+ m_Mesh: {fileID: -462981019419857548, guid: 19a595f4f07b1af4c977e23dbea01c74, type: 3}
+--- !u!23 &7686224198990001154
+MeshRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8190368079434274263}
+ m_Enabled: 1
+ m_CastShadows: 1
+ m_ReceiveShadows: 1
+ m_DynamicOccludee: 1
+ m_StaticShadowCaster: 0
+ m_MotionVectors: 1
+ m_LightProbeUsage: 1
+ m_ReflectionProbeUsage: 1
+ m_RayTracingMode: 2
+ m_RayTraceProcedural: 0
+ m_RenderingLayerMask: 1
+ m_RendererPriority: 0
+ m_Materials:
+ - {fileID: 2100000, guid: 4c45cd4560dbbdc4b95dd93b00825eca, type: 2}
+ 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: 3
+ m_MinimumChartSize: 4
+ m_AutoUVMaxDistance: 0.5
+ m_AutoUVMaxAngle: 89
+ m_LightmapParameters: {fileID: 0}
+ m_SortingLayerID: 0
+ m_SortingLayer: 0
+ m_SortingOrder: 0
+ m_AdditionalVertexStreams: {fileID: 0}
+--- !u!95 &5570393527585571015
+Animator:
+ serializedVersion: 5
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8190368079434274263}
+ m_Enabled: 1
+ m_Avatar: {fileID: 0}
+ m_Controller: {fileID: 9100000, guid: 32f1ccb535c04d5499bee46726dc7754, type: 2}
+ m_CullingMode: 0
+ m_UpdateMode: 0
+ m_ApplyRootMotion: 0
+ m_LinearVelocityBlending: 0
+ m_StabilizeFeet: 0
+ m_WarningMessage:
+ m_HasTransformHierarchy: 1
+ m_AllowConstantClipSamplingOptimization: 1
+ m_KeepAnimatorStateOnDisable: 0
+--- !u!65 &2116655309375350638
+BoxCollider:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8190368079434274263}
+ m_Material: {fileID: 0}
+ m_IsTrigger: 0
+ m_Enabled: 1
+ serializedVersion: 2
+ m_Size: {x: 2.5429811, y: 0.8723528, z: 1.7567946}
+ m_Center: {x: 0.59589607, y: 0.02311985, z: 0.31735736}
+--- !u!114 &3079797610830793084
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8190368079434274263}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 62ea731c79e81374aa55c0f0bf8183c2, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+--- !u!1 &9037424340668235007
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 9037424340668235006}
+ m_Layer: 0
+ m_Name: ArrowAnimated
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &9037424340668235006
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 9037424340668235007}
+ m_LocalRotation: {x: -0, y: 0.30752537, z: -0, w: 0.9515399}
+ m_LocalPosition: {x: 86.533, y: 1.274, z: 115.164}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children:
+ - {fileID: 8854596881260515181}
+ m_Father: {fileID: 0}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 35.82, z: 0}
diff --git a/FlufflParty/Assets/BlenderFiles/Cactus_Var.blend1.meta b/FlufflParty/Assets/Prefabs/ArrowAnimated.prefab.meta
similarity index 63%
rename from FlufflParty/Assets/BlenderFiles/Cactus_Var.blend1.meta
rename to FlufflParty/Assets/Prefabs/ArrowAnimated.prefab.meta
index 6de0569..68cfb54 100644
--- a/FlufflParty/Assets/BlenderFiles/Cactus_Var.blend1.meta
+++ b/FlufflParty/Assets/Prefabs/ArrowAnimated.prefab.meta
@@ -1,6 +1,6 @@
fileFormatVersion: 2
-guid: 460b7be4ca1980d4699f3a836874f142
-DefaultImporter:
+guid: 861b6727bc59f91408a0258270bb036e
+PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
diff --git a/FlufflParty/Assets/Scenes/WesternMap.unity b/FlufflParty/Assets/Scenes/WesternMap.unity
index 5dd35c5..c7b7b6d 100644
--- a/FlufflParty/Assets/Scenes/WesternMap.unity
+++ b/FlufflParty/Assets/Scenes/WesternMap.unity
@@ -1175,7 +1175,7 @@ Transform:
- {fileID: 1736008288}
- {fileID: 1406090858}
m_Father: {fileID: 0}
- m_RootOrder: 5
+ m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &178661108
PrefabInstance:
@@ -1821,6 +1821,85 @@ Transform:
m_CorrespondingSourceObject: {fileID: 6264285776840265041, guid: 8a4c1f56cdf3b264b9f27207969fdf01, type: 3}
m_PrefabInstance: {fileID: 250720146}
m_PrefabAsset: {fileID: 0}
+--- !u!1001 &253183256
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 1107924851}
+ m_Modifications:
+ - target: {fileID: 3079797610830793084, guid: 861b6727bc59f91408a0258270bb036e, type: 3}
+ propertyPath: cam
+ value:
+ objectReference: {fileID: 1328561026}
+ - target: {fileID: 9037424340668235006, guid: 861b6727bc59f91408a0258270bb036e, type: 3}
+ propertyPath: m_RootOrder
+ value: 3
+ objectReference: {fileID: 0}
+ - target: {fileID: 9037424340668235006, guid: 861b6727bc59f91408a0258270bb036e, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 9.9
+ objectReference: {fileID: 0}
+ - target: {fileID: 9037424340668235006, guid: 861b6727bc59f91408a0258270bb036e, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: -4.2684245
+ objectReference: {fileID: 0}
+ - target: {fileID: 9037424340668235006, guid: 861b6727bc59f91408a0258270bb036e, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: -21.23
+ objectReference: {fileID: 0}
+ - target: {fileID: 9037424340668235006, guid: 861b6727bc59f91408a0258270bb036e, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 0.9988433
+ objectReference: {fileID: 0}
+ - target: {fileID: 9037424340668235006, guid: 861b6727bc59f91408a0258270bb036e, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 9037424340668235006, guid: 861b6727bc59f91408a0258270bb036e, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0.04808407
+ objectReference: {fileID: 0}
+ - target: {fileID: 9037424340668235006, guid: 861b6727bc59f91408a0258270bb036e, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 9037424340668235006, guid: 861b6727bc59f91408a0258270bb036e, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 9037424340668235006, guid: 861b6727bc59f91408a0258270bb036e, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: -5.512
+ objectReference: {fileID: 0}
+ - target: {fileID: 9037424340668235006, guid: 861b6727bc59f91408a0258270bb036e, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 9037424340668235007, guid: 861b6727bc59f91408a0258270bb036e, type: 3}
+ propertyPath: m_Name
+ value: ArrowField14|Alternative
+ objectReference: {fileID: 0}
+ m_RemovedComponents:
+ - {fileID: 0}
+ - {fileID: 0}
+ m_SourcePrefab: {fileID: 100100000, guid: 861b6727bc59f91408a0258270bb036e, type: 3}
+--- !u!4 &253183257 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 9037424340668235006, guid: 861b6727bc59f91408a0258270bb036e, type: 3}
+ m_PrefabInstance: {fileID: 253183256}
+ m_PrefabAsset: {fileID: 0}
+--- !u!114 &253183258 stripped
+MonoBehaviour:
+ m_CorrespondingSourceObject: {fileID: 3079797610830793084, guid: 861b6727bc59f91408a0258270bb036e, type: 3}
+ m_PrefabInstance: {fileID: 253183256}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 0}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 62ea731c79e81374aa55c0f0bf8183c2, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
--- !u!1001 &263080611
PrefabInstance:
m_ObjectHideFlags: 0
@@ -3670,6 +3749,83 @@ Transform:
m_CorrespondingSourceObject: {fileID: 6264285776840265041, guid: 8a4c1f56cdf3b264b9f27207969fdf01, type: 3}
m_PrefabInstance: {fileID: 446643741}
m_PrefabAsset: {fileID: 0}
+--- !u!1001 &468336198
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 1107924851}
+ m_Modifications:
+ - target: {fileID: 3079797610830793084, guid: 861b6727bc59f91408a0258270bb036e, type: 3}
+ propertyPath: cam
+ value:
+ objectReference: {fileID: 1328561026}
+ - target: {fileID: 9037424340668235006, guid: 861b6727bc59f91408a0258270bb036e, type: 3}
+ propertyPath: m_RootOrder
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 9037424340668235006, guid: 861b6727bc59f91408a0258270bb036e, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: -0.9609604
+ objectReference: {fileID: 0}
+ - target: {fileID: 9037424340668235006, guid: 861b6727bc59f91408a0258270bb036e, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: -4.272
+ objectReference: {fileID: 0}
+ - target: {fileID: 9037424340668235006, guid: 861b6727bc59f91408a0258270bb036e, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: -2.5154114
+ objectReference: {fileID: 0}
+ - target: {fileID: 9037424340668235006, guid: 861b6727bc59f91408a0258270bb036e, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 0.5517919
+ objectReference: {fileID: 0}
+ - target: {fileID: 9037424340668235006, guid: 861b6727bc59f91408a0258270bb036e, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 9037424340668235006, guid: 861b6727bc59f91408a0258270bb036e, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0.8339819
+ objectReference: {fileID: 0}
+ - target: {fileID: 9037424340668235006, guid: 861b6727bc59f91408a0258270bb036e, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 9037424340668235006, guid: 861b6727bc59f91408a0258270bb036e, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 9037424340668235006, guid: 861b6727bc59f91408a0258270bb036e, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 113.02
+ objectReference: {fileID: 0}
+ - target: {fileID: 9037424340668235006, guid: 861b6727bc59f91408a0258270bb036e, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 9037424340668235007, guid: 861b6727bc59f91408a0258270bb036e, type: 3}
+ propertyPath: m_Name
+ value: ArrowField6|Normal
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 861b6727bc59f91408a0258270bb036e, type: 3}
+--- !u!4 &468336199 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 9037424340668235006, guid: 861b6727bc59f91408a0258270bb036e, type: 3}
+ m_PrefabInstance: {fileID: 468336198}
+ m_PrefabAsset: {fileID: 0}
+--- !u!114 &468336200 stripped
+MonoBehaviour:
+ m_CorrespondingSourceObject: {fileID: 3079797610830793084, guid: 861b6727bc59f91408a0258270bb036e, type: 3}
+ m_PrefabInstance: {fileID: 468336198}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 0}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 62ea731c79e81374aa55c0f0bf8183c2, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
--- !u!1001 &470891556
PrefabInstance:
m_ObjectHideFlags: 0
@@ -4840,6 +4996,83 @@ Transform:
m_CorrespondingSourceObject: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3}
m_PrefabInstance: {fileID: 654996847}
m_PrefabAsset: {fileID: 0}
+--- !u!1001 &657595551
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 1107924851}
+ m_Modifications:
+ - target: {fileID: 3079797610830793084, guid: 861b6727bc59f91408a0258270bb036e, type: 3}
+ propertyPath: cam
+ value:
+ objectReference: {fileID: 1328561026}
+ - target: {fileID: 9037424340668235006, guid: 861b6727bc59f91408a0258270bb036e, type: 3}
+ propertyPath: m_RootOrder
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 9037424340668235006, guid: 861b6727bc59f91408a0258270bb036e, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 9.265244
+ objectReference: {fileID: 0}
+ - target: {fileID: 9037424340668235006, guid: 861b6727bc59f91408a0258270bb036e, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: -4.272
+ objectReference: {fileID: 0}
+ - target: {fileID: 9037424340668235006, guid: 861b6727bc59f91408a0258270bb036e, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: -23.286606
+ objectReference: {fileID: 0}
+ - target: {fileID: 9037424340668235006, guid: 861b6727bc59f91408a0258270bb036e, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 0.88828033
+ objectReference: {fileID: 0}
+ - target: {fileID: 9037424340668235006, guid: 861b6727bc59f91408a0258270bb036e, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 9037424340668235006, guid: 861b6727bc59f91408a0258270bb036e, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0.4593018
+ objectReference: {fileID: 0}
+ - target: {fileID: 9037424340668235006, guid: 861b6727bc59f91408a0258270bb036e, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 9037424340668235006, guid: 861b6727bc59f91408a0258270bb036e, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 9037424340668235006, guid: 861b6727bc59f91408a0258270bb036e, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 54.684
+ objectReference: {fileID: 0}
+ - target: {fileID: 9037424340668235006, guid: 861b6727bc59f91408a0258270bb036e, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 9037424340668235007, guid: 861b6727bc59f91408a0258270bb036e, type: 3}
+ propertyPath: m_Name
+ value: ArrowField14|Normal
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 861b6727bc59f91408a0258270bb036e, type: 3}
+--- !u!4 &657595552 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 9037424340668235006, guid: 861b6727bc59f91408a0258270bb036e, type: 3}
+ m_PrefabInstance: {fileID: 657595551}
+ m_PrefabAsset: {fileID: 0}
+--- !u!114 &657595553 stripped
+MonoBehaviour:
+ m_CorrespondingSourceObject: {fileID: 3079797610830793084, guid: 861b6727bc59f91408a0258270bb036e, type: 3}
+ m_PrefabInstance: {fileID: 657595551}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 0}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 62ea731c79e81374aa55c0f0bf8183c2, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
--- !u!1001 &663714833
PrefabInstance:
m_ObjectHideFlags: 0
@@ -6443,6 +6676,18 @@ PrefabInstance:
propertyPath: target.Array.data[1]
value:
objectReference: {fileID: 1775201218}
+ - target: {fileID: 837174307579407041, guid: 1421fa765e4ed524a918035e56557fb9, type: 3}
+ propertyPath: directionalArrows.Array.size
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 837174307579407041, guid: 1421fa765e4ed524a918035e56557fb9, type: 3}
+ propertyPath: directionalArrows.Array.data[0]
+ value:
+ objectReference: {fileID: 468336200}
+ - target: {fileID: 837174307579407041, guid: 1421fa765e4ed524a918035e56557fb9, type: 3}
+ propertyPath: directionalArrows.Array.data[1]
+ value:
+ objectReference: {fileID: 3469287837357952681}
- target: {fileID: 1273982785473882937, guid: 1421fa765e4ed524a918035e56557fb9, type: 3}
propertyPath: m_Name
value: Field6
@@ -7234,6 +7479,18 @@ PrefabInstance:
propertyPath: target.Array.data[1]
value:
objectReference: {fileID: 1073906643}
+ - target: {fileID: -1196622610362675059, guid: e5d471764a8bab74991ce859cf7a9108, type: 3}
+ propertyPath: directionalArrows.Array.size
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: -1196622610362675059, guid: e5d471764a8bab74991ce859cf7a9108, type: 3}
+ propertyPath: directionalArrows.Array.data[0]
+ value:
+ objectReference: {fileID: 253183258}
+ - target: {fileID: -1196622610362675059, guid: e5d471764a8bab74991ce859cf7a9108, type: 3}
+ propertyPath: directionalArrows.Array.data[1]
+ value:
+ objectReference: {fileID: 657595553}
- target: {fileID: 8376330369100222945, guid: e5d471764a8bab74991ce859cf7a9108, type: 3}
propertyPath: m_RootOrder
value: 26
@@ -7521,6 +7778,41 @@ Transform:
m_CorrespondingSourceObject: {fileID: 2008249026352490839, guid: 7d773f4891db8a049a62818a17512bd5, type: 3}
m_PrefabInstance: {fileID: 1100685221}
m_PrefabAsset: {fileID: 0}
+--- !u!1 &1107924850
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1107924851}
+ m_Layer: 0
+ m_Name: Arrows
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &1107924851
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1107924850}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 85.41311, y: 5.9085755, z: 116.9312}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children:
+ - {fileID: 468336199}
+ - {fileID: 1785590417}
+ - {fileID: 657595552}
+ - {fileID: 253183257}
+ m_Father: {fileID: 0}
+ m_RootOrder: 5
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1122446306
PrefabInstance:
m_ObjectHideFlags: 0
@@ -9167,12 +9459,12 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1328561024}
m_LocalRotation: {x: 0.1261387, y: 0.8740232, z: -0.4089002, w: 0.23015887}
- m_LocalPosition: {x: 89.11, y: 9.63, z: 132.33}
+ m_LocalPosition: {x: 90.193, y: 9.63, z: 133.6}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 9
+ m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 50.61, y: 151.873, z: 2.915}
--- !u!114 &1328561028
MonoBehaviour:
@@ -9737,7 +10029,7 @@ Transform:
- {fileID: 845942382}
- {fileID: 1250635224}
m_Father: {fileID: 0}
- m_RootOrder: 6
+ m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1431685604
PrefabInstance:
@@ -10888,7 +11180,7 @@ Transform:
- {fileID: 844904659}
- {fileID: 654996848}
m_Father: {fileID: 0}
- m_RootOrder: 8
+ m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1585901470
PrefabInstance:
@@ -12396,7 +12688,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 10
+ m_RootOrder: 11
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1704083921
MonoBehaviour:
@@ -13051,6 +13343,11 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c29627ef6f4e70e4b98cf9075b20afe3, type: 3}
m_Name:
m_EditorClassIdentifier:
+--- !u!4 &1785590417 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 9037424340668235006, guid: 861b6727bc59f91408a0258270bb036e, type: 3}
+ m_PrefabInstance: {fileID: 9037424341365706351}
+ m_PrefabAsset: {fileID: 0}
--- !u!1001 &1812332222
PrefabInstance:
m_ObjectHideFlags: 0
@@ -14912,7 +15209,7 @@ Transform:
- {fileID: 1959329952}
- {fileID: 1067583203}
m_Father: {fileID: 0}
- m_RootOrder: 7
+ m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &2116652835
PrefabInstance:
@@ -15251,3 +15548,77 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e98484d0aabc85c46a15d1bf861baa5b, type: 3}
+--- !u!114 &3469287837357952681 stripped
+MonoBehaviour:
+ m_CorrespondingSourceObject: {fileID: 3079797610830793084, guid: 861b6727bc59f91408a0258270bb036e, type: 3}
+ m_PrefabInstance: {fileID: 9037424341365706351}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 0}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 62ea731c79e81374aa55c0f0bf8183c2, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+--- !u!1001 &9037424341365706351
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 1107924851}
+ m_Modifications:
+ - target: {fileID: 3079797610830793084, guid: 861b6727bc59f91408a0258270bb036e, type: 3}
+ propertyPath: cam
+ value:
+ objectReference: {fileID: 1328561026}
+ - target: {fileID: 9037424340668235006, guid: 861b6727bc59f91408a0258270bb036e, type: 3}
+ propertyPath: m_RootOrder
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 9037424340668235006, guid: 861b6727bc59f91408a0258270bb036e, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 1.361
+ objectReference: {fileID: 0}
+ - target: {fileID: 9037424340668235006, guid: 861b6727bc59f91408a0258270bb036e, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: -4.2684245
+ objectReference: {fileID: 0}
+ - target: {fileID: 9037424340668235006, guid: 861b6727bc59f91408a0258270bb036e, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: -1.908
+ objectReference: {fileID: 0}
+ - target: {fileID: 9037424340668235006, guid: 861b6727bc59f91408a0258270bb036e, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 0.9575154
+ objectReference: {fileID: 0}
+ - target: {fileID: 9037424340668235006, guid: 861b6727bc59f91408a0258270bb036e, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 9037424340668235006, guid: 861b6727bc59f91408a0258270bb036e, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0.288382
+ objectReference: {fileID: 0}
+ - target: {fileID: 9037424340668235006, guid: 861b6727bc59f91408a0258270bb036e, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 9037424340668235006, guid: 861b6727bc59f91408a0258270bb036e, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 9037424340668235006, guid: 861b6727bc59f91408a0258270bb036e, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 33.522
+ objectReference: {fileID: 0}
+ - target: {fileID: 9037424340668235006, guid: 861b6727bc59f91408a0258270bb036e, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 9037424340668235007, guid: 861b6727bc59f91408a0258270bb036e, type: 3}
+ propertyPath: m_Name
+ value: ArrowField6|Alternative
+ objectReference: {fileID: 0}
+ m_RemovedComponents:
+ - {fileID: 0}
+ - {fileID: 0}
+ m_SourcePrefab: {fileID: 100100000, guid: 861b6727bc59f91408a0258270bb036e, type: 3}
diff --git a/FlufflParty/Assets/Scripts/Camera/Camera.cs b/FlufflParty/Assets/Scripts/Camera/Camera.cs
index 57c15ef..71c7da2 100644
--- a/FlufflParty/Assets/Scripts/Camera/Camera.cs
+++ b/FlufflParty/Assets/Scripts/Camera/Camera.cs
@@ -18,6 +18,6 @@ public class Camera : MonoBehaviour
private void FixedUpdate()
{
- transform.position = Vector3.SmoothDamp(transform.position, followUp.transform.position - offset, ref velocity, 0.6f);
+ transform.position = Vector3.SmoothDamp(transform.position, followUp.transform.position - offset, ref velocity, 0.2f);
}
}
diff --git a/FlufflParty/Assets/Scripts/Fields/Arrow.cs b/FlufflParty/Assets/Scripts/Fields/Arrow.cs
new file mode 100644
index 0000000..caf4b2a
--- /dev/null
+++ b/FlufflParty/Assets/Scripts/Fields/Arrow.cs
@@ -0,0 +1,35 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class Arrow : MonoBehaviour
+{
+ private bool clicked = false;
+
+ private void Start()
+ {
+ Deactivate();
+ }
+
+ public bool IsClicked()
+ {
+ return clicked;
+ }
+
+ public void Activate()
+ {
+ gameObject.SetActive(true);
+ }
+
+ public void Deactivate()
+ {
+ clicked = false;
+ gameObject.SetActive(false);
+ }
+
+ private void OnMouseDown()
+ {
+ clicked = true;
+ }
+}
diff --git a/FlufflParty/Assets/Scripts/Fields/Arrow.cs.meta b/FlufflParty/Assets/Scripts/Fields/Arrow.cs.meta
new file mode 100644
index 0000000..37bfca7
--- /dev/null
+++ b/FlufflParty/Assets/Scripts/Fields/Arrow.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 62ea731c79e81374aa55c0f0bf8183c2
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/FlufflParty/Assets/Scripts/Fields/Field.cs b/FlufflParty/Assets/Scripts/Fields/Field.cs
index 8193dc0..681ad3c 100644
--- a/FlufflParty/Assets/Scripts/Fields/Field.cs
+++ b/FlufflParty/Assets/Scripts/Fields/Field.cs
@@ -6,6 +6,7 @@ public abstract class Field : MonoBehaviour
{
//Liste der nächsten Feld, die auf das diesige Feld folgen
[SerializeField] private Field[] target;
+ [SerializeField] private Arrow[] directionalArrows;
public Field[] Target
{
@@ -15,6 +16,14 @@ public abstract class Field : MonoBehaviour
}
}
+ public Arrow[] DirectionalArrow
+ {
+ get
+ {
+ return directionalArrows;
+ }
+ }
+
//Feld aktion (Münzen etc..)
public abstract void Action();
}
diff --git a/FlufflParty/Assets/Scripts/Players/Player.cs b/FlufflParty/Assets/Scripts/Players/Player.cs
index db71118..1086f1a 100644
--- a/FlufflParty/Assets/Scripts/Players/Player.cs
+++ b/FlufflParty/Assets/Scripts/Players/Player.cs
@@ -20,7 +20,7 @@ public class Player : MonoBehaviour
private void Start()
{
- Debug.Log("Test: zum Würfeln Leertaste drücken!");
+
}
private void Update()
@@ -68,16 +68,27 @@ public class Player : MonoBehaviour
}
else
{
- //TEST!!!!!!!!!!!!!!!
- //TODO: Replace with selection arrows
- if (Input.GetKeyDown(KeyCode.N))
+ foreach(Arrow a in nextField.DirectionalArrow)
{
+ a.Activate();
+ }
+
+ if (nextField.DirectionalArrow[0].IsClicked())
+ {
+ foreach(Arrow a in nextField.DirectionalArrow)
+ {
+ a.Deactivate();
+ }
nextField = nextField = nextField.Target[0];
moveTo = nextField.transform.position;
wait = false;
}
- else if (Input.GetKeyDown(KeyCode.A))
+ else if (nextField.DirectionalArrow[1].IsClicked())
{
+ foreach(Arrow a in nextField.DirectionalArrow)
+ {
+ a.Deactivate();
+ }
nextField = nextField = nextField.Target[1];
moveTo = nextField.transform.position;
wait = false;
@@ -100,7 +111,6 @@ public class Player : MonoBehaviour
else
{
wait = true;
- Debug.Log("Test: AlternativWeg = A NormalerWeg = N");
}
}