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

issue with fridge and OnContainerChanged

Browse Source
This commit is contained in:
Valdimir
2024-03-24 22:54:51 +02:00
parent df72d1bf46
commit 567fc7a1c2
5 changed files with 24 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Scenes/House.unity
+9 -9
View File
@@ -868,7 +868,7 @@ Transform:
m_GameObject: {fileID: 222033746} m_GameObject: {fileID: 222033746}
serializedVersion: 2 serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0.629, y: 2.599, z: 0.52} m_LocalPosition: {x: -0.629, y: 2.25, z: 0.52}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
@@ -908,8 +908,8 @@ Light:
serializedVersion: 11 serializedVersion: 11
m_Type: 2 m_Type: 2
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Intensity: 15 m_Intensity: 3
m_Range: 5 m_Range: 3
m_SpotAngle: 30 m_SpotAngle: 30
m_InnerSpotAngle: 21.80208 m_InnerSpotAngle: 21.80208
m_CookieSize: 10 m_CookieSize: 10
@@ -4429,7 +4429,7 @@ Transform:
m_GameObject: {fileID: 1743375285} m_GameObject: {fileID: 1743375285}
serializedVersion: 2 serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0.57, y: 2.599, z: 2.97} m_LocalPosition: {x: -0.57, y: 2.26, z: 2.97}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
@@ -4469,8 +4469,8 @@ Light:
serializedVersion: 11 serializedVersion: 11
m_Type: 2 m_Type: 2
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Intensity: 10 m_Intensity: 2
m_Range: 5 m_Range: 2
m_SpotAngle: 30 m_SpotAngle: 30
m_InnerSpotAngle: 21.80208 m_InnerSpotAngle: 21.80208
m_CookieSize: 10 m_CookieSize: 10
@@ -5270,7 +5270,7 @@ Transform:
m_GameObject: {fileID: 1994430549} m_GameObject: {fileID: 1994430549}
serializedVersion: 2 serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0.371, y: 2.599, z: -2.48} m_LocalPosition: {x: 0.371, y: 1.05, z: -2.48}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
@@ -5310,8 +5310,8 @@ Light:
serializedVersion: 11 serializedVersion: 11
m_Type: 2 m_Type: 2
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Intensity: 15 m_Intensity: 5
m_Range: 5 m_Range: 4
m_SpotAngle: 30 m_SpotAngle: 30
m_InnerSpotAngle: 21.80208 m_InnerSpotAngle: 21.80208
m_CookieSize: 10 m_CookieSize: 10
Assets/Scenes/MiniMarket.unity
+5
View File
@@ -17674,6 +17674,11 @@ PrefabInstance:
serializedVersion: 3 serializedVersion: 3
m_TransformParent: {fileID: 1322861160939933662} m_TransformParent: {fileID: 1322861160939933662}
m_Modifications: m_Modifications:
- target: {fileID: 551020291880888998, guid: 1a6eb89c878bfd64babad29d36df197b,
type: 3}
propertyPath: _spawnPointInSceneName
value: MiniMarket
objectReference: {fileID: 0}
- target: {fileID: 6206602907352978179, guid: 1a6eb89c878bfd64babad29d36df197b, - target: {fileID: 6206602907352978179, guid: 1a6eb89c878bfd64babad29d36df197b,
type: 3} type: 3}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x
Assets/Scripts/Managers/CameraPlayerFollow.cs
+6 -6
View File
@@ -2,11 +2,11 @@ using UnityEngine;
public class CameraPlayerFollow : MonoBehaviour public class CameraPlayerFollow : MonoBehaviour
{ {
private Vector3 _cameraOffset = new(0, 40, 0); //private Vector3 _cameraOffset = new(0, 40, 0);
void LateUpdate() //void LateUpdate()
{ //{
Vector3 newPosition = // Vector3 newPosition =
transform.position = Player.Instance.transform.position + _cameraOffset; // transform.position = Player.Instance.transform.position + _cameraOffset;
} //}
} }
Assets/Scripts/Player/Player.cs
+2 -1
View File
@@ -66,6 +66,7 @@ public class Player : BaseCharacter
{ {
AddTask(new PlayerTasks(Tasks.Move, point)); AddTask(new PlayerTasks(Tasks.Move, point));
} }
public async void Interact(BaseInteractableObject interactionItem) public async void Interact(BaseInteractableObject interactionItem)
{ {
var result = await interactionItem.ShowPopupMenu(this); var result = await interactionItem.ShowPopupMenu(this);
@@ -127,9 +128,9 @@ public class Player : BaseCharacter
public void ClearContainerItem() public void ClearContainerItem()
{ {
OnContainerChanged.Invoke(this, false);
Destroy(_containerItem.gameObject); Destroy(_containerItem.gameObject);
_containerItem = null; _containerItem = null;
//OnContainerChanged.Invoke(this, false);
} }
public ContainerItem GetContainerItem() public ContainerItem GetContainerItem()
ProjectSettings/ProjectVersion.txt
+2 -2
View File
@@ -1,2 +1,2 @@
m_EditorVersion: 2023.2.10f1 m_EditorVersion: 2023.2.13f1
m_EditorVersionWithRevision: 2023.2.10f1 (316c1fd686f6) m_EditorVersionWithRevision: 2023.2.13f1 (70197a359f36)