zenayi/Scampz
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add airship level

Browse Source 
Fix default spawn issue
TODO: Fix issue with spawning when loading from other scenes
This commit is contained in:
Zenny
2022-08-30 01:48:01 -07:00
parent 82bf43452b
commit 7a891a45f1
22 changed files with 3856 additions and 316 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Assets/BGs/Airship/Airship A/AIRSHIP SCENE 2 GEOMETRY.fbx.meta
View File

@@ -35,7 +35,7 @@ ModelImporter:
isReadable: 0
meshes:
lODScreenPercentages: []
globalScale: 1
globalScale: 5
meshCompression: 0
addColliders: 0
useSRGBMaterialColor: 1
@@ -88,7 +88,7 @@ ModelImporter:
armStretch: 0.05
legStretch: 0.05
feetSpacing: 0
globalScale: 1
globalScale: 0.049999997
rootMotionBoneName:
hasTranslationDoF: 0
hasExtraRoot: 0

4
Assets/BGs/Airship/Airship B/AIRSHIP SCENE 3 GEOMETRY.fbx.meta
View File

@@ -35,7 +35,7 @@ ModelImporter:
isReadable: 0
meshes:
lODScreenPercentages: []
globalScale: 1
globalScale: 15
meshCompression: 0
addColliders: 0
useSRGBMaterialColor: 1
@@ -88,7 +88,7 @@ ModelImporter:
armStretch: 0.05
legStretch: 0.05
feetSpacing: 0
globalScale: 1
globalScale: 0.14999999
rootMotionBoneName:
hasTranslationDoF: 0
hasExtraRoot: 0

8
Assets/BGs/Airship/Airship B/Materials.meta Normal file
View File

@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 1c1832b0ed4a6f945ad6e42731471bd0
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

80
Assets/BGs/Airship/Airship B/Materials/AIRSHIP SCENE 3.mat Normal file
View File

@@ -0,0 +1,80 @@
%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: AIRSHIP SCENE 3
m_Shader: {fileID: 10750, guid: 0000000000000000f000000000000000, type: 0}
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
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: 2800000, guid: 618e8f8d2c47eca42957f4dac0b6f727, type: 3}
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: 0, g: 0, b: 0, a: 1}
m_BuildTextureStacks: []

8
Assets/BGs/Airship/Airship B/Materials/AIRSHIP SCENE 3.mat.meta Normal file
View File

@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 2b2fcbf017263e74ba10272a7c75a872
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:

2
Assets/BGs/Airship/Airship Interior/AIRSHIP INTERIOR - GEOMETRY.fbx.meta
View File

@@ -88,7 +88,7 @@ ModelImporter:
armStretch: 0.05
legStretch: 0.05
feetSpacing: 0
globalScale: 1
globalScale: 0.01
rootMotionBoneName:
hasTranslationDoF: 0
hasExtraRoot: 0

8
Assets/BGs/Airship/Airship Interior/Materials.meta Normal file
View File

@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 41b1c3498d400f3489bcce79787a5b68
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

30
Assets/BGs/Airship/Airship Interior/Materials/AIRSHIP INTERIOR.mat Normal file
View File

@@ -0,0 +1,30 @@
%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: AIRSHIP INTERIOR
m_Shader: {fileID: 10750, guid: 0000000000000000f000000000000000, type: 0}
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 2800000, guid: d0e74378488eaff4d9a4df78fee796fa, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats: []
m_Colors: []
m_BuildTextureStacks: []

8
Assets/BGs/Airship/Airship Interior/Materials/AIRSHIP INTERIOR.mat.meta Normal file
View File

@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 89bdc20753e0e244e8b09995f4f679e5
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:

3540
Assets/Scenes/Airship.unity
View File

File diff suppressed because it is too large Load Diff

292
Assets/Scenes/WorldMap.unity
View File

@@ -168,7 +168,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 7
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &7259270 stripped
GameObject:
@@ -402,7 +402,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 9
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &199953517
GameObject:
@@ -496,7 +496,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 2
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
--- !u!1 &345961373 stripped
GameObject:
@@ -869,7 +869,7 @@ PrefabInstance:
m_Modifications:
- target: {fileID: -8679921383154817045, guid: 0a9a3f5c4de4a4f47b63545c21814d72, type: 3}
propertyPath: m_RootOrder
value: 10
value: 9
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 0a9a3f5c4de4a4f47b63545c21814d72, type: 3}
propertyPath: m_LocalPosition.x
@@ -1457,7 +1457,6 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
_scene: Mountain
_spawnPoint: {fileID: 7454020933194369428, guid: 8f151ecd6d639324e8a4e426bc62c6d8, type: 3}
_promptToEnter: 1
_promptText: {fileID: 1245360439}
--- !u!1 &960119718 stripped
@@ -1495,11 +1494,6 @@ MeshCollider:
m_Convex: 0
m_CookingOptions: 30
m_Mesh: {fileID: -3089802480582621648, guid: 0a9a3f5c4de4a4f47b63545c21814d72, type: 3}
--- !u!4 &992755415 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 4255233373611660781, guid: 844f61aa5905adc408915b1af9c53fab, type: 3}
m_PrefabInstance: {fileID: 4255233374537296698}
m_PrefabAsset: {fileID: 0}
--- !u!1 &995585160 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: -2571958757387108284, guid: 0a9a3f5c4de4a4f47b63545c21814d72, type: 3}
@@ -1818,7 +1812,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 3584299649024768172, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3}
propertyPath: m_RootOrder
value: 5
value: 4
objectReference: {fileID: 0}
- target: {fileID: 3584299649024768172, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3}
propertyPath: m_LocalPosition.x
@@ -2036,40 +2030,6 @@ MeshCollider:
m_Convex: 0
m_CookingOptions: 30
m_Mesh: {fileID: -7387706064836869012, guid: 0a9a3f5c4de4a4f47b63545c21814d72, type: 3}
--- !u!1 &1286079014
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1286079015}
m_Layer: 0
m_Name: Spawn Points
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1286079015
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1286079014}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1593299991}
- {fileID: 992755415}
- {fileID: 2485690312226532338}
m_Father: {fileID: 0}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1321760809
GameObject:
m_ObjectHideFlags: 0
@@ -2119,7 +2079,6 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
_scene: Airship
_spawnPoint: {fileID: 4102339165664243601, guid: f9a0ded25c3cfb34ba4a1da1528edaa4, type: 3}
_promptToEnter: 1
_promptText: {fileID: 1245360439}
--- !u!135 &1321760812
@@ -2252,7 +2211,6 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
_scene: Temple
_spawnPoint: {fileID: 6152600544985070940, guid: 1e88dc36d4a2fa842ad84b5751907365, type: 3}
_promptToEnter: 1
_promptText: {fileID: 1245360439}
--- !u!135 &1350757413
@@ -2460,7 +2418,7 @@ RectTransform:
m_Children:
- {fileID: 1245360438}
m_Father: {fileID: 0}
m_RootOrder: 8
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
@@ -2642,11 +2600,6 @@ MeshCollider:
m_Convex: 0
m_CookingOptions: 30
m_Mesh: {fileID: 4579454407841743219, guid: 0a9a3f5c4de4a4f47b63545c21814d72, type: 3}
--- !u!4 &1593299991 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 6871527874556698278, guid: 0ca0511f2f28a4b438abd5c1f711bfbc, type: 3}
m_PrefabInstance: {fileID: 6871527873662044849}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1593513969 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: -7029948723529949830, guid: 0a9a3f5c4de4a4f47b63545c21814d72, type: 3}
@@ -2691,7 +2644,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 1617146419}
- component: {fileID: 1617146418}
- component: {fileID: 1617146420}
m_Layer: 0
m_Name: PlayerSpawnController
m_TagString: Untagged
@@ -2699,21 +2652,6 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &1617146418
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1617146417}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 743cce483f727904a87ef002d24ec8d6, type: 3}
m_Name:
m_EditorClassIdentifier:
Player: {fileID: 0}
_playerPrefab: {fileID: 6949365541298368387, guid: 6ebbe09c2673d744faf84db54d3d12ed, type: 3}
_spawnLocation: {fileID: 6871527873662044850}
--- !u!4 &1617146419
Transform:
m_ObjectHideFlags: 0
@@ -2729,6 +2667,27 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1617146420
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1617146417}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ab97fce054425504e9f8c78312d1081d, type: 3}
m_Name:
m_EditorClassIdentifier:
Player: {fileID: 0}
DefaultSpawnLocation: {fileID: 0}
SpawnLocations: []
_playerPrefab: {fileID: 6949365541298368387, guid: 6ebbe09c2673d744faf84db54d3d12ed, type: 3}
_spawnLocationsPrefabs:
- {fileID: 6871527874556698278, guid: 0ca0511f2f28a4b438abd5c1f711bfbc, type: 3}
- {fileID: 4255233373611660781, guid: 844f61aa5905adc408915b1af9c53fab, type: 3}
- {fileID: 454201991289137308, guid: 4d393c77fe6c75642a65470bac7c05f4, type: 3}
_defaultSpawnLocationPrefab: {fileID: 7640922523355508479, guid: 0b2cd53a1c2368d45adffa0651efba3d, type: 3}
--- !u!1 &1642383702 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 8416272007918961125, guid: 0a9a3f5c4de4a4f47b63545c21814d72, type: 3}
@@ -3032,7 +2991,7 @@ Transform:
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 6
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1775691383
MonoBehaviour:
@@ -3184,7 +3143,7 @@ Transform:
- {fileID: 954622453}
- {fileID: 1321760810}
m_Father: {fileID: 0}
m_RootOrder: 4
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &549891546759081644
GameObject:
@@ -3204,129 +3163,6 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1001 &2485690312226532337
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 1286079015}
m_Modifications:
- target: {fileID: 454201991289137308, guid: 4d393c77fe6c75642a65470bac7c05f4, type: 3}
propertyPath: m_RootOrder
value: 2
objectReference: {fileID: 0}
- target: {fileID: 454201991289137308, guid: 4d393c77fe6c75642a65470bac7c05f4, type: 3}
propertyPath: m_LocalPosition.x
value: 49.23
objectReference: {fileID: 0}
- target: {fileID: 454201991289137308, guid: 4d393c77fe6c75642a65470bac7c05f4, type: 3}
propertyPath: m_LocalPosition.y
value: 35.56
objectReference: {fileID: 0}
- target: {fileID: 454201991289137308, guid: 4d393c77fe6c75642a65470bac7c05f4, type: 3}
propertyPath: m_LocalPosition.z
value: -29.84
objectReference: {fileID: 0}
- target: {fileID: 454201991289137308, guid: 4d393c77fe6c75642a65470bac7c05f4, type: 3}
propertyPath: m_LocalRotation.w
value: 0.91595936
objectReference: {fileID: 0}
- target: {fileID: 454201991289137308, guid: 4d393c77fe6c75642a65470bac7c05f4, type: 3}
propertyPath: m_LocalRotation.x
value: -0.0801361
objectReference: {fileID: 0}
- target: {fileID: 454201991289137308, guid: 4d393c77fe6c75642a65470bac7c05f4, type: 3}
propertyPath: m_LocalRotation.y
value: -0.3916916
objectReference: {fileID: 0}
- target: {fileID: 454201991289137308, guid: 4d393c77fe6c75642a65470bac7c05f4, type: 3}
propertyPath: m_LocalRotation.z
value: -0.03426859
objectReference: {fileID: 0}
- target: {fileID: 454201991289137308, guid: 4d393c77fe6c75642a65470bac7c05f4, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: -10
objectReference: {fileID: 0}
- target: {fileID: 454201991289137308, guid: 4d393c77fe6c75642a65470bac7c05f4, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: -46.306
objectReference: {fileID: 0}
- target: {fileID: 454201991289137308, guid: 4d393c77fe6c75642a65470bac7c05f4, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4485874007059686765, guid: 4d393c77fe6c75642a65470bac7c05f4, type: 3}
propertyPath: m_Name
value: Airship A To World Map
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 4d393c77fe6c75642a65470bac7c05f4, type: 3}
--- !u!4 &2485690312226532338 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 454201991289137308, guid: 4d393c77fe6c75642a65470bac7c05f4, type: 3}
m_PrefabInstance: {fileID: 2485690312226532337}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &4255233374537296698
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 1286079015}
m_Modifications:
- target: {fileID: 4255233373611660771, guid: 844f61aa5905adc408915b1af9c53fab, type: 3}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4255233373611660780, guid: 844f61aa5905adc408915b1af9c53fab, type: 3}
propertyPath: m_Name
value: Mountain A To World Map
objectReference: {fileID: 0}
- target: {fileID: 4255233373611660781, guid: 844f61aa5905adc408915b1af9c53fab, type: 3}
propertyPath: m_RootOrder
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4255233373611660781, guid: 844f61aa5905adc408915b1af9c53fab, type: 3}
propertyPath: m_LocalPosition.x
value: 16.57
objectReference: {fileID: 0}
- target: {fileID: 4255233373611660781, guid: 844f61aa5905adc408915b1af9c53fab, type: 3}
propertyPath: m_LocalPosition.y
value: 35.82
objectReference: {fileID: 0}
- target: {fileID: 4255233373611660781, guid: 844f61aa5905adc408915b1af9c53fab, type: 3}
propertyPath: m_LocalPosition.z
value: -26.96
objectReference: {fileID: 0}
- target: {fileID: 4255233373611660781, guid: 844f61aa5905adc408915b1af9c53fab, type: 3}
propertyPath: m_LocalRotation.w
value: 0.9534866
objectReference: {fileID: 0}
- target: {fileID: 4255233373611660781, guid: 844f61aa5905adc408915b1af9c53fab, type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 4255233373611660781, guid: 844f61aa5905adc408915b1af9c53fab, type: 3}
propertyPath: m_LocalRotation.y
value: 0.3014355
objectReference: {fileID: 0}
- target: {fileID: 4255233373611660781, guid: 844f61aa5905adc408915b1af9c53fab, type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 4255233373611660781, guid: 844f61aa5905adc408915b1af9c53fab, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4255233373611660781, guid: 844f61aa5905adc408915b1af9c53fab, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 35.088
objectReference: {fileID: 0}
- target: {fileID: 4255233373611660781, guid: 844f61aa5905adc408915b1af9c53fab, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 844f61aa5905adc408915b1af9c53fab, type: 3}
--- !u!4 &5226704616502216479
Transform:
m_ObjectHideFlags: 0
@@ -3340,74 +3176,8 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 3
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: -1.383, z: 0}
--- !u!1001 &6871527873662044849
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 1286079015}
m_Modifications:
- target: {fileID: 6871527874556698274, guid: 0ca0511f2f28a4b438abd5c1f711bfbc, type: 3}
propertyPath: m_Name
value: Temple A To World Map
objectReference: {fileID: 0}
- target: {fileID: 6871527874556698276, guid: 0ca0511f2f28a4b438abd5c1f711bfbc, type: 3}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6871527874556698278, guid: 0ca0511f2f28a4b438abd5c1f711bfbc, type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6871527874556698278, guid: 0ca0511f2f28a4b438abd5c1f711bfbc, type: 3}
propertyPath: m_LocalPosition.x
value: 37.94
objectReference: {fileID: 0}
- target: {fileID: 6871527874556698278, guid: 0ca0511f2f28a4b438abd5c1f711bfbc, type: 3}
propertyPath: m_LocalPosition.y
value: 34.65
objectReference: {fileID: 0}
- target: {fileID: 6871527874556698278, guid: 0ca0511f2f28a4b438abd5c1f711bfbc, type: 3}
propertyPath: m_LocalPosition.z
value: -8.22
objectReference: {fileID: 0}
- target: {fileID: 6871527874556698278, guid: 0ca0511f2f28a4b438abd5c1f711bfbc, type: 3}
propertyPath: m_LocalRotation.w
value: 0.96815914
objectReference: {fileID: 0}
- target: {fileID: 6871527874556698278, guid: 0ca0511f2f28a4b438abd5c1f711bfbc, type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 6871527874556698278, guid: 0ca0511f2f28a4b438abd5c1f711bfbc, type: 3}
propertyPath: m_LocalRotation.y
value: 0.25033554
objectReference: {fileID: 0}
- target: {fileID: 6871527874556698278, guid: 0ca0511f2f28a4b438abd5c1f711bfbc, type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 6871527874556698278, guid: 0ca0511f2f28a4b438abd5c1f711bfbc, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6871527874556698278, guid: 0ca0511f2f28a4b438abd5c1f711bfbc, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 28.995
objectReference: {fileID: 0}
- target: {fileID: 6871527874556698278, guid: 0ca0511f2f28a4b438abd5c1f711bfbc, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 0ca0511f2f28a4b438abd5c1f711bfbc, type: 3}
--- !u!1 &6871527873662044850 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 6871527874556698274, guid: 0ca0511f2f28a4b438abd5c1f711bfbc, type: 3}
m_PrefabInstance: {fileID: 6871527873662044849}
m_PrefabAsset: {fileID: 0}
--- !u!20 &7471959759673995188
Camera:
m_ObjectHideFlags: 0

13
Assets/Scripts/GameManager/GameManager.cs
View File

@@ -19,17 +19,12 @@ namespace Scampz.GameJam
}
public void LoadScene(string sceneName, Transform spawnPoint, LoadSceneMode loadSceneMode)
public void LoadScene(string sceneName, LoadSceneMode loadSceneMode)
{
StartCoroutine(LoadSceneAsync(sceneName, spawnPoint, loadSceneMode));
StartCoroutine(LoadSceneAsync(sceneName, loadSceneMode));
}
public void LoadFromWorldMap(LoadSceneMode loadSceneMode)
{
SceneManager.LoadScene("WorldMap", loadSceneMode);
}
private IEnumerator LoadSceneAsync(string sceneName, Transform spawnPoint, LoadSceneMode loadSceneMode)
private IEnumerator LoadSceneAsync(string sceneName, LoadSceneMode loadSceneMode)
{
yield return null;
var player = GameObject.FindGameObjectWithTag("Player");
@@ -51,8 +46,6 @@ namespace Scampz.GameJam
yield return loadSceneOperation;
var cc = player.GetComponent<CharacterController>();
cc.enabled = false;
player.transform.position = spawnPoint.position;
player.transform.rotation = spawnPoint.rotation;
yield return null;
}
}

3
Assets/Scripts/GameManager/PlayerSpawnController.cs
View File

@@ -1,6 +1,6 @@
using UnityEngine;
public class PlayerSpawnController : MonoBehaviour
public partial class PlayerSpawnController : MonoBehaviour
{
public GameObject Player;
[SerializeField]
@@ -14,5 +14,4 @@ public class PlayerSpawnController : MonoBehaviour
Player.transform.position = _spawnLocation.transform.position;
Player.transform.rotation = _spawnLocation.transform.rotation;
}
}

31
Assets/Scripts/GameManager/WorldMapSpawnController.cs Normal file
View File

@@ -0,0 +1,31 @@
using System.Collections.Generic;
using UnityEngine;
public class WorldMapSpawnController : MonoBehaviour
{
[HideInInspector]
public GameObject Player;
[HideInInspector]
public Transform DefaultSpawnLocation;
[HideInInspector]
public List<Transform> SpawnLocations;
[SerializeField]
private GameObject _playerPrefab;
[SerializeField]
private Transform[] _spawnLocationsPrefabs;
[SerializeField]
private Transform _defaultSpawnLocationPrefab;
private void OnEnable()
{
Player = Instantiate(_playerPrefab);
DefaultSpawnLocation = Instantiate(_defaultSpawnLocationPrefab);
foreach (var spawnLocationPrefab in _spawnLocationsPrefabs)
SpawnLocations.Add(Instantiate(spawnLocationPrefab));
var cc = Player.GetComponent<CharacterController>();
cc.enabled = false;
Player.transform.position = DefaultSpawnLocation.position;
Player.transform.rotation = DefaultSpawnLocation.rotation;
cc.enabled = true;
}
}

11
Assets/Scripts/GameManager/WorldMapSpawnController.cs.meta Normal file
View File

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

4
Assets/Scripts/Player/PlayerState.cs
View File

@@ -9,6 +9,7 @@ namespace Scampz.GameJam.Assets.Scripts.Player
private bool _canMove;
private GameObject _player;
private CharacterController _characterController;
public string SceneName;
private void Start()
{
@@ -24,6 +25,9 @@ namespace Scampz.GameJam.Assets.Scripts.Player
var rayCasterExists = TryGetComponent<RayCaster>(out var rayCaster);
if (SceneManager.GetActiveScene().name.Equals("WorldMap") && rayCasterExists)
_canMove = rayCaster.IsWithinBoundsWithRay();
if (SceneName != string.Empty && SceneName != "WorldMap")
SceneName = SceneManager.GetActiveScene().name;
}
public bool CanMove => _canMove;

6
Assets/Scripts/SceneManagement/LoadScene.cs
View File

@@ -11,8 +11,6 @@ namespace Scampz.GameJam
[SerializeField]
private string _scene;
[SerializeField]
private Transform _spawnPoint;
[SerializeField]
private bool _promptToEnter;
[SerializeField]
private TextMeshProUGUI _promptText;
@@ -31,7 +29,7 @@ namespace Scampz.GameJam
private void OnTriggerStay(Collider collider)
{
if (!_loaded && collider.CompareTag("Player") && _promptText != null && _promptText.enabled && Input.GetButtonDown(InputOptions.Submit))
if (!_loaded && collider.CompareTag("Player") && _promptText != null && _promptText.enabled && Input.GetButton(InputOptions.Submit))
LoadNextLevel();
}
@@ -44,7 +42,7 @@ namespace Scampz.GameJam
private void LoadNextLevel()
{
_loaded = true;
GameManager.Instance.LoadScene(_scene, _spawnPoint, LoadSceneMode.Single);
GameManager.Instance.LoadScene(_scene, LoadSceneMode.Single);
}
}
}

6
Assets/Scripts/TitleScreen/TitleScreen.cs
View File

@@ -8,10 +8,8 @@ namespace Scampz.GameJam
{
void Update()
{
if (Input.GetButtonDown(InputOptions.Submit))
{
GameManager.Instance.LoadFromWorldMap(LoadSceneMode.Single);
}
if (Input.GetButton(InputOptions.Submit))
GameManager.Instance.LoadScene(SceneNames.WorldMap, LoadSceneMode.Single);
}
}
}

6
Assets/SpawnPoints/Airship A To World Map.prefab
View File

@@ -27,9 +27,9 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4485874007059686765}
m_LocalRotation: {x: -0.0801361, y: -0.3916916, z: -0.03426859, w: 0.91595936}
m_LocalPosition: {x: 49.23, y: 35.96, z: -29.84}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_LocalPosition: {x: 49.52, y: 35.56, z: -29.53}
m_LocalScale: {x: 4.9663115, y: 0.49663115, z: 4.9663115}
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0

99
Assets/SpawnPoints/Default Spawn.prefab Normal file
View File

@@ -0,0 +1,99 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &7640922523355508451
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7640922523355508479}
- component: {fileID: 7640922523355508476}
- component: {fileID: 7640922523355508477}
- component: {fileID: 7640922523355508450}
m_Layer: 0
m_Name: Default Spawn
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &7640922523355508479
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7640922523355508451}
m_LocalRotation: {x: -0, y: 0.9992548, z: -0, w: -0.038600136}
m_LocalPosition: {x: 33.93, y: 37.25, z: 2.52}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 184.424, z: 0}
--- !u!33 &7640922523355508476
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7640922523355508451}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!23 &7640922523355508477
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7640922523355508451}
m_Enabled: 0
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: 10303, 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: 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!65 &7640922523355508450
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7640922523355508451}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 0
serializedVersion: 2
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}

7
Assets/SpawnPoints/Default Spawn.prefab.meta Normal file
View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 0b2cd53a1c2368d45adffa0651efba3d
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

2
Assets/SpawnPoints/Snow A To World Map.prefab
View File

@@ -28,7 +28,7 @@ Transform:
m_GameObject: {fileID: 4255233373611660780}
m_LocalRotation: {x: 0, y: 0.3014381, z: 0, w: 0.9534858}
m_LocalPosition: {x: 15.6, y: 35.33, z: -27.64}
m_LocalScale: {x: 0.6051534, y: 0.6051534, z: 0.6051534}
m_LocalScale: {x: 4.9663115, y: 0.49663115, z: 4.9663115}
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 0}