lionfish/SimUL
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

transfer between scenes

Browse Source
This commit is contained in:
Vova
2023-12-11 19:35:11 +02:00
parent e7f082a774
commit 0c4d9b2481
9 changed files with 154 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Scenes/City_new.unity
+26 -74
View File
@@ -1482,9 +1482,9 @@ RectTransform:
m_Children: []
m_Father: {fileID: 349281313}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 250, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 250, y: -90}
m_SizeDelta: {x: 480, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &249161732
@@ -3961,6 +3961,11 @@ PrefabInstance:
propertyPath: 'visualGameObjectArray.Array.data[0]'
value:
objectReference: {fileID: 416748196}
- target: {fileID: 4333559281551512614, guid: bb469c3bf9d2c0f45be39b5b5a6ecfad,
type: 3}
propertyPath: m_TagString
value: Untagged
objectReference: {fileID: 0}
- target: {fileID: 5577632863133830020, guid: bb469c3bf9d2c0f45be39b5b5a6ecfad,
type: 3}
propertyPath: m_Name
@@ -4131,6 +4136,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
_interactionPoint: {fileID: 741277610}
_scene: MiniMarket
_spawnPointInSceneName: Door
_exitName: MiniMarket
--- !u!65 &741277614
BoxCollider:
@@ -4181,7 +4187,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 749553635}
serializedVersion: 2
m_LocalRotation: {x: 0.38268346, y: 0.000000022481224, z: -0.0000000093120285, w: 0.92387956}
m_LocalRotation: {x: 0.38268346, y: -0.000000022481213, z: 0.000000009312023, w: 0.92387956}
m_LocalPosition: {x: 29.11, y: 5, z: -5}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
@@ -4798,7 +4804,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 835327588}
serializedVersion: 2
m_LocalRotation: {x: 0.38268346, y: 0.000000022481224, z: -0.0000000093120285, w: 0.92387956}
m_LocalRotation: {x: 0.38268346, y: -0.000000022481213, z: 0.000000009312023, w: 0.92387956}
m_LocalPosition: {x: 29.11, y: 5, z: -5}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
@@ -6736,74 +6742,6 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
_areaName: Central ave.
--- !u!1001 &1492983807
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 601545095124417014, guid: 0fafbaeeaa5eb474f92520556cd36c7a,
type: 3}
propertyPath: m_LocalPosition.x
value: 152.2527
objectReference: {fileID: 0}
- target: {fileID: 601545095124417014, guid: 0fafbaeeaa5eb474f92520556cd36c7a,
type: 3}
propertyPath: m_LocalPosition.y
value: 6.4799995
objectReference: {fileID: 0}
- target: {fileID: 601545095124417014, guid: 0fafbaeeaa5eb474f92520556cd36c7a,
type: 3}
propertyPath: m_LocalPosition.z
value: 243.27562
objectReference: {fileID: 0}
- target: {fileID: 601545095124417014, guid: 0fafbaeeaa5eb474f92520556cd36c7a,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 601545095124417014, guid: 0fafbaeeaa5eb474f92520556cd36c7a,
type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 601545095124417014, guid: 0fafbaeeaa5eb474f92520556cd36c7a,
type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 601545095124417014, guid: 0fafbaeeaa5eb474f92520556cd36c7a,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 601545095124417014, guid: 0fafbaeeaa5eb474f92520556cd36c7a,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 601545095124417014, guid: 0fafbaeeaa5eb474f92520556cd36c7a,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 601545095124417014, guid: 0fafbaeeaa5eb474f92520556cd36c7a,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2472413404894134240, guid: 0fafbaeeaa5eb474f92520556cd36c7a,
type: 3}
propertyPath: m_Name
value: StoreFrizer
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 0fafbaeeaa5eb474f92520556cd36c7a, type: 3}
--- !u!1 &1498687847
GameObject:
m_ObjectHideFlags: 0
@@ -8419,6 +8357,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 1880854723}
- component: {fileID: 1880854724}
m_Layer: 0
m_Name: DefaultStartPoint
m_TagString: Respawn
@@ -8441,6 +8380,20 @@ Transform:
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1880854724
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1880854722}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a49cd67cb3095a74d9b654426bc046b6, type: 3}
m_Name:
m_EditorClassIdentifier:
_interactionPoint: {fileID: 1880854723}
_particleSystem: {fileID: 0}
--- !u!1 &1887517973
GameObject:
m_ObjectHideFlags: 0
@@ -9166,4 +9119,3 @@ SceneRoots:
- {fileID: 1880854723}
- {fileID: 495189437}
- {fileID: 1291994925}
- {fileID: 1492983807}
Assets/Scenes/MiniMarket.unity
+80 -152
View File
@@ -119,51 +119,6 @@ NavMeshSettings:
debug:
m_Flags: 0
m_NavMeshData: {fileID: 0}
--- !u!1 &6974610 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 5577632863133830020, guid: 88fcb1c95eeeabc479f95a580dea8152,
type: 3}
m_PrefabInstance: {fileID: 345981746231327724}
m_PrefabAsset: {fileID: 0}
--- !u!4 &6974611 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 7908616180235619651, guid: 88fcb1c95eeeabc479f95a580dea8152,
type: 3}
m_PrefabInstance: {fileID: 345981746231327724}
m_PrefabAsset: {fileID: 0}
--- !u!65 &6974613
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6974610}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 0
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 3
m_Size: {x: 2.5, y: 1, z: 1}
m_Center: {x: 0, y: 0.5, z: -0.2}
--- !u!114 &6974615 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 738253190946143797, guid: 88fcb1c95eeeabc479f95a580dea8152,
type: 3}
m_PrefabInstance: {fileID: 345981746231327724}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2b3df7729a1cd4e479add673fa0f9b76, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &7095968
GameObject:
m_ObjectHideFlags: 0
@@ -634,7 +589,6 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1322861160939933662}
- {fileID: 6974611}
- {fileID: 681272906}
- {fileID: 393669801}
m_Father: {fileID: 0}
@@ -1734,6 +1688,74 @@ MeshFilter:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 801264807}
m_Mesh: {fileID: 3181945431582109686, guid: 0d817475ce7adaa4f81fbdb111b8599c, type: 3}
--- !u!1001 &849312077
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 5091233431665616032, guid: 9b71b0a8f71c7b04fb23f0c7662a5800,
type: 3}
propertyPath: m_LocalPosition.x
value: -1.89
objectReference: {fileID: 0}
- target: {fileID: 5091233431665616032, guid: 9b71b0a8f71c7b04fb23f0c7662a5800,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5091233431665616032, guid: 9b71b0a8f71c7b04fb23f0c7662a5800,
type: 3}
propertyPath: m_LocalPosition.z
value: 1.04
objectReference: {fileID: 0}
- target: {fileID: 5091233431665616032, guid: 9b71b0a8f71c7b04fb23f0c7662a5800,
type: 3}
propertyPath: m_LocalRotation.w
value: 0.7071068
objectReference: {fileID: 0}
- target: {fileID: 5091233431665616032, guid: 9b71b0a8f71c7b04fb23f0c7662a5800,
type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 5091233431665616032, guid: 9b71b0a8f71c7b04fb23f0c7662a5800,
type: 3}
propertyPath: m_LocalRotation.y
value: 0.7071068
objectReference: {fileID: 0}
- target: {fileID: 5091233431665616032, guid: 9b71b0a8f71c7b04fb23f0c7662a5800,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 5091233431665616032, guid: 9b71b0a8f71c7b04fb23f0c7662a5800,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5091233431665616032, guid: 9b71b0a8f71c7b04fb23f0c7662a5800,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 90
objectReference: {fileID: 0}
- target: {fileID: 5091233431665616032, guid: 9b71b0a8f71c7b04fb23f0c7662a5800,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5906696617992380095, guid: 9b71b0a8f71c7b04fb23f0c7662a5800,
type: 3}
propertyPath: m_Name
value: CashierDesk
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 9b71b0a8f71c7b04fb23f0c7662a5800, type: 3}
--- !u!1 &943544625
GameObject:
m_ObjectHideFlags: 0
@@ -4841,111 +4863,6 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1001 &345981746231327724
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 274182514}
m_Modifications:
- target: {fileID: 2369538501029799684, guid: 88fcb1c95eeeabc479f95a580dea8152,
type: 3}
propertyPath: _selectedObject
value:
objectReference: {fileID: 6974615}
- target: {fileID: 2369538501029799684, guid: 88fcb1c95eeeabc479f95a580dea8152,
type: 3}
propertyPath: visualGameObjectArray.Array.size
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2369538501029799684, guid: 88fcb1c95eeeabc479f95a580dea8152,
type: 3}
propertyPath: 'visualGameObjectArray.Array.data[0]'
value:
objectReference: {fileID: 345981746231327725}
- target: {fileID: 3240935378234643255, guid: 88fcb1c95eeeabc479f95a580dea8152,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5577632863133830020, guid: 88fcb1c95eeeabc479f95a580dea8152,
type: 3}
propertyPath: m_Name
value: CashierDesk
objectReference: {fileID: 0}
- target: {fileID: 7908616180235619651, guid: 88fcb1c95eeeabc479f95a580dea8152,
type: 3}
propertyPath: m_RootOrder
value: -1
objectReference: {fileID: 0}
- target: {fileID: 7908616180235619651, guid: 88fcb1c95eeeabc479f95a580dea8152,
type: 3}
propertyPath: m_LocalPosition.x
value: -1.95
objectReference: {fileID: 0}
- target: {fileID: 7908616180235619651, guid: 88fcb1c95eeeabc479f95a580dea8152,
type: 3}
propertyPath: m_LocalPosition.y
value: 0.064
objectReference: {fileID: 0}
- target: {fileID: 7908616180235619651, guid: 88fcb1c95eeeabc479f95a580dea8152,
type: 3}
propertyPath: m_LocalPosition.z
value: 0.99
objectReference: {fileID: 0}
- target: {fileID: 7908616180235619651, guid: 88fcb1c95eeeabc479f95a580dea8152,
type: 3}
propertyPath: m_LocalRotation.w
value: 0.7071068
objectReference: {fileID: 0}
- target: {fileID: 7908616180235619651, guid: 88fcb1c95eeeabc479f95a580dea8152,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7908616180235619651, guid: 88fcb1c95eeeabc479f95a580dea8152,
type: 3}
propertyPath: m_LocalRotation.y
value: 0.7071068
objectReference: {fileID: 0}
- target: {fileID: 7908616180235619651, guid: 88fcb1c95eeeabc479f95a580dea8152,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7908616180235619651, guid: 88fcb1c95eeeabc479f95a580dea8152,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7908616180235619651, guid: 88fcb1c95eeeabc479f95a580dea8152,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 90
objectReference: {fileID: 0}
- target: {fileID: 7908616180235619651, guid: 88fcb1c95eeeabc479f95a580dea8152,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents:
- {fileID: 5281299890643327518, guid: 88fcb1c95eeeabc479f95a580dea8152, type: 3}
- {fileID: 6310266293964722079, guid: 88fcb1c95eeeabc479f95a580dea8152, type: 3}
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 5577632863133830020, guid: 88fcb1c95eeeabc479f95a580dea8152,
type: 3}
insertIndex: -1
addedObject: {fileID: 6974613}
m_SourcePrefab: {fileID: 100100000, guid: 88fcb1c95eeeabc479f95a580dea8152, type: 3}
--- !u!1 &345981746231327725 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 3240935378234643255, guid: 88fcb1c95eeeabc479f95a580dea8152,
type: 3}
m_PrefabInstance: {fileID: 345981746231327724}
m_PrefabAsset: {fileID: 0}
--- !u!1 &373119079977234910
GameObject:
m_ObjectHideFlags: 0
@@ -20873,6 +20790,11 @@ PrefabInstance:
propertyPath: m_Name
value: Door
objectReference: {fileID: 0}
- target: {fileID: 3459758009917044464, guid: 8dfe1ac2e5f005b4f96bfab77c1b187f,
type: 3}
propertyPath: m_TagString
value: Respawn
objectReference: {fileID: 0}
- target: {fileID: 5859579064733375357, guid: 8dfe1ac2e5f005b4f96bfab77c1b187f,
type: 3}
propertyPath: m_IsActive
@@ -20971,7 +20893,12 @@ PrefabInstance:
- target: {fileID: 8460308244935545385, guid: 8dfe1ac2e5f005b4f96bfab77c1b187f,
type: 3}
propertyPath: _exitName
value: minimarket
value: Door
objectReference: {fileID: 0}
- target: {fileID: 8460308244935545385, guid: 8dfe1ac2e5f005b4f96bfab77c1b187f,
type: 3}
propertyPath: _spawnPointInSceneName
value: MiniMarket
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
@@ -21520,3 +21447,4 @@ SceneRoots:
- {fileID: 1504187455}
- {fileID: 274182514}
- {fileID: 1708622716}
- {fileID: 849312077}
Assets/Scripts/Helpers/Enums.cs
+2 -1
View File
@@ -32,5 +32,6 @@ public enum RadialMenuActions {
Work,
Talk,
Buy ,
Open
Open,
Enter
}
Assets/Scripts/InteractableObjects/BaseInteractableObject.cs
+1
View File
@@ -25,6 +25,7 @@ public abstract class BaseInteractableObject : MonoBehaviour
{ RadialMenuActions.Work, new RadialMenuActionDescription() { Description = "Work", IsEnabled = false } },
{ RadialMenuActions.Eat, new RadialMenuActionDescription() { Description = "Eat", IsEnabled = false } },
{ RadialMenuActions.Open, new RadialMenuActionDescription() { Description = "Open", IsEnabled = false } },
{ RadialMenuActions.Enter, new RadialMenuActionDescription() { Description = "Enter", IsEnabled = false } },
{ RadialMenuActions.Cancel, new RadialMenuActionDescription() { Description = "Cancel", IsEnabled = true } },
};
}
Assets/Scripts/InteractableObjects/Door.cs
+4 -2
View File
@@ -5,6 +5,8 @@ public class Door : BaseInteractableObject
[SerializeField]
private string _scene;
[SerializeField]
private string _spawnPointInSceneName;
[SerializeField]
private string _exitName;
protected override void PrepareMenuActions()
@@ -15,7 +17,7 @@ public class Door : BaseInteractableObject
Player.Instance.SetPosition(_interactionPoint.position);
}
_menuActions[RadialMenuActions.Open].IsEnabled = true;
_menuActions[RadialMenuActions.Enter].IsEnabled = true;
}
protected override void InteractAction(RadialMenuActions interactAction)
@@ -25,7 +27,7 @@ public class Door : BaseInteractableObject
PlayerPrefs.SetString("lastExitName", _exitName.ToLower());
}
GameManager.Instance.Scene.Change(_scene);
GameManager.Instance.Scene.Change(_scene, _spawnPointInSceneName);
}
}
Assets/Scripts/Managers/CameraSystem.cs
+5
View File
@@ -50,6 +50,11 @@ public class CameraSystem : MonoBehaviour
}
private void Start()
{
ResetToPlayerPosition();
}
public void ResetToPlayerPosition()
{
transform.position = Player.Instance.transform.position;
}
Assets/Scripts/Managers/GameManager.cs
+2
View File
@@ -19,6 +19,8 @@ public class GameManager : MonoBehaviour
public TimeSystem Time => _timeSystem;
public UISystem UI => _uiSystem;
public CameraSystem Camera =>_cameraSystem;
public static GameManager Instance { get; private set; }
private void Awake()
Assets/Scripts/Managers/SceneManager.cs
+33 -1
View File
@@ -2,8 +2,40 @@ using UnityEngine;
public class SceneManager
{
public void Change(string sceneName)
private string _spawnLocationName= "DefaultStartPoint";
public SceneManager()
{
UnityEngine.SceneManagement.SceneManager.sceneLoaded += SceneManager_sceneLoaded;
}
public void Change(string sceneName,string spawnLocationName)
{
_spawnLocationName = spawnLocationName;
UnityEngine.SceneManagement.SceneManager.LoadScene(sceneName);
}
private void SceneManager_sceneLoaded(UnityEngine.SceneManagement.Scene arg0, UnityEngine.SceneManagement.LoadSceneMode arg1)
{
var spawnPoints = GameObject.FindGameObjectsWithTag("Respawn");
if (spawnPoints != null)
{
foreach (var spawn in spawnPoints)
{
if (spawn.name == _spawnLocationName)
{
var interactable = spawn.GetComponent<BaseInteractableObject>();
Player.Instance.SetPosition(interactable._interactionPoint.position);
}
}
}
else
{
Player.Instance.SetPosition(Vector3.zero);
}
GameManager.Instance.Camera.ResetToPlayerPosition();
}
}
Assets/WaterWorks/Resources/Water_Volume.mat
+1 -1
View File
@@ -43,6 +43,6 @@ Material:
m_Colors:
- Albedo: {r: 0.056247775, g: 0.1509434, b: 0.15094337, a: 1}
- bounds: {r: 10000, g: 500, b: 10000, a: 0}
- pos: {r: 0, g: -250, b: 0, a: 0}
- pos: {r: 0, g: -249.93333, b: 0, a: 0}
m_BuildTextureStacks: []
m_AllowLocking: 1