fixes around identification (entities and general)
This commit is contained in:
parent
2e953f858a
commit
453aa2a7c4
@ -157,6 +157,7 @@ MonoBehaviour:
|
|||||||
m_Script: {fileID: 11500000, guid: bdd4ad30e2d149b58a2f84fa9a5b5fbc, type: 3}
|
m_Script: {fileID: 11500000, guid: bdd4ad30e2d149b58a2f84fa9a5b5fbc, type: 3}
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier: Assembly-CSharp::Intrepid.Core.Grounding.GroundProfileMovementBehaviour
|
m_EditorClassIdentifier: Assembly-CSharp::Intrepid.Core.Grounding.GroundProfileMovementBehaviour
|
||||||
|
generateRandomId: 0
|
||||||
id: 9d7dfeaecb7e4204ba7dd29dede5075d
|
id: 9d7dfeaecb7e4204ba7dd29dede5075d
|
||||||
groundProfileMovement:
|
groundProfileMovement:
|
||||||
speedMultiplier: 1
|
speedMultiplier: 1
|
||||||
|
|||||||
@ -161,6 +161,7 @@ MonoBehaviour:
|
|||||||
m_Script: {fileID: 11500000, guid: bdd4ad30e2d149b58a2f84fa9a5b5fbc, type: 3}
|
m_Script: {fileID: 11500000, guid: bdd4ad30e2d149b58a2f84fa9a5b5fbc, type: 3}
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier: Assembly-CSharp::Intrepid.Core.Grounding.GroundProfileMovementBehaviour
|
m_EditorClassIdentifier: Assembly-CSharp::Intrepid.Core.Grounding.GroundProfileMovementBehaviour
|
||||||
|
generateRandomId: 0
|
||||||
id: afbca706aa91413387e401bb77925f70
|
id: afbca706aa91413387e401bb77925f70
|
||||||
groundProfileMovement:
|
groundProfileMovement:
|
||||||
speedMultiplier: 1
|
speedMultiplier: 1
|
||||||
|
|||||||
@ -207,6 +207,7 @@ MonoBehaviour:
|
|||||||
m_Script: {fileID: 11500000, guid: a682f23a07cd4cfcaca3f2b5bfed2ab5, type: 3}
|
m_Script: {fileID: 11500000, guid: a682f23a07cd4cfcaca3f2b5bfed2ab5, type: 3}
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier: Assembly-CSharp::Intrepid.Core.Camera.CameraProximityTrigger
|
m_EditorClassIdentifier: Assembly-CSharp::Intrepid.Core.Camera.CameraProximityTrigger
|
||||||
|
generateRandomId: 1
|
||||||
id: 482e7da005c842288bffaa2d9881a138
|
id: 482e7da005c842288bffaa2d9881a138
|
||||||
mainCollider: {fileID: 1057674590058204725}
|
mainCollider: {fileID: 1057674590058204725}
|
||||||
entitySensors:
|
entitySensors:
|
||||||
@ -228,6 +229,7 @@ MonoBehaviour:
|
|||||||
m_Script: {fileID: 11500000, guid: e130b3fcd6214681a03612fda0e57a75, type: 3}
|
m_Script: {fileID: 11500000, guid: e130b3fcd6214681a03612fda0e57a75, type: 3}
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier: Assembly-CSharp::Intrepid.Gameplay.Entities.Player.ActionBelt.ActionBeltTrigger
|
m_EditorClassIdentifier: Assembly-CSharp::Intrepid.Gameplay.Entities.Player.ActionBelt.ActionBeltTrigger
|
||||||
|
generateRandomId: 1
|
||||||
id: fd08079e886143048321d7986caaaaf0
|
id: fd08079e886143048321d7986caaaaf0
|
||||||
mainCollider: {fileID: 1057674590058204725}
|
mainCollider: {fileID: 1057674590058204725}
|
||||||
entitySensors:
|
entitySensors:
|
||||||
@ -249,6 +251,7 @@ MonoBehaviour:
|
|||||||
m_Script: {fileID: 11500000, guid: 92dcb8e12dd44504bb3e2ed409f544c0, type: 3}
|
m_Script: {fileID: 11500000, guid: 92dcb8e12dd44504bb3e2ed409f544c0, type: 3}
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier: Assembly-CSharp::Intrepid.Gameplay.Prototyping.SaveStations.SaveStageActionCallable
|
m_EditorClassIdentifier: Assembly-CSharp::Intrepid.Gameplay.Prototyping.SaveStations.SaveStageActionCallable
|
||||||
|
generateRandomId: 1
|
||||||
id: a2bcfde700d74b6397798ea30791316a
|
id: a2bcfde700d74b6397798ea30791316a
|
||||||
actionCategory: 0
|
actionCategory: 0
|
||||||
canBeDropped: 0
|
canBeDropped: 0
|
||||||
|
|||||||
@ -204,6 +204,7 @@ MonoBehaviour:
|
|||||||
m_Script: {fileID: 11500000, guid: 3c11245659b8459cbfa73b4a882f63f8, type: 3}
|
m_Script: {fileID: 11500000, guid: 3c11245659b8459cbfa73b4a882f63f8, type: 3}
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier: Assembly-CSharp::Intrepid.Gameplay.Journey.Stages.Sockets.StageSocketChangeTrigger
|
m_EditorClassIdentifier: Assembly-CSharp::Intrepid.Gameplay.Journey.Stages.Sockets.StageSocketChangeTrigger
|
||||||
|
generateRandomId: 0
|
||||||
id: 4cae5246169b4ae2b201a1e53921e2a5
|
id: 4cae5246169b4ae2b201a1e53921e2a5
|
||||||
mainCollider: {fileID: 193881357238892176}
|
mainCollider: {fileID: 193881357238892176}
|
||||||
entitySensors:
|
entitySensors:
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
@ -1,4 +1,3 @@
|
|||||||
using System;
|
|
||||||
using Intrepid.Utilities;
|
using Intrepid.Utilities;
|
||||||
using Unity.Cinemachine;
|
using Unity.Cinemachine;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
@ -15,8 +14,9 @@ namespace Intrepid.Core.Camera
|
|||||||
public CinemachinePositionComposer PositionComposer { get; private set; }
|
public CinemachinePositionComposer PositionComposer { get; private set; }
|
||||||
public CameraStreamUpdate CameraUpdate { get; private set; }
|
public CameraStreamUpdate CameraUpdate { get; private set; }
|
||||||
|
|
||||||
private void Awake()
|
protected override void Awake()
|
||||||
{
|
{
|
||||||
|
base.Awake();
|
||||||
PositionComposer = VCamera.GetComponentInChildren<CinemachinePositionComposer>();
|
PositionComposer = VCamera.GetComponentInChildren<CinemachinePositionComposer>();
|
||||||
CameraUpdate = DefaultCameraUpdate;
|
CameraUpdate = DefaultCameraUpdate;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -13,17 +13,19 @@ namespace Intrepid.Core.Entities
|
|||||||
{
|
{
|
||||||
[GroupInjections, SerializeField] private EntityBrain brain;
|
[GroupInjections, SerializeField] private EntityBrain brain;
|
||||||
[GroupInjections, SerializeField] private EntitySensor entitySensor;
|
[GroupInjections, SerializeField] private EntitySensor entitySensor;
|
||||||
[GroupIdentification, ReadOnly, SerializeField] private string id = Functions.GenerateUuid();
|
[GroupIdentification, SerializeField, ToggleLeft] private bool generateRandomId;
|
||||||
|
[GroupIdentification, ReadOnly, SerializeField, ShowIf("ShouldDisplayId")] private string id = Functions.GenerateUuid();
|
||||||
|
|
||||||
|
private bool ShouldDisplayId => !generateRandomId;
|
||||||
public string Id => id;
|
public string Id => id;
|
||||||
|
|
||||||
[GroupIdentification, Button(ButtonStyle.FoldoutButton, Icon = SdfIconType.Send)]
|
[GroupIdentification, ShowIf("ShouldDisplayId"), Button(ButtonStyle.FoldoutButton, Icon = SdfIconType.Send)]
|
||||||
public void SetId(string myId)
|
public void SetId(string myId)
|
||||||
{
|
{
|
||||||
id = myId;
|
id = myId;
|
||||||
}
|
}
|
||||||
|
|
||||||
[GroupIdentification, Button(ButtonStyle.FoldoutButton, Icon = SdfIconType.Rainbow)]
|
[GroupIdentification, ShowIf("ShouldDisplayId"), Button(ButtonStyle.FoldoutButton, Icon = SdfIconType.Rainbow)]
|
||||||
public void GenerateRandomId()
|
public void GenerateRandomId()
|
||||||
{
|
{
|
||||||
id = Functions.GenerateUuid();
|
id = Functions.GenerateUuid();
|
||||||
|
|||||||
@ -17,8 +17,9 @@ namespace Intrepid.Core.Entities
|
|||||||
protected Collider MainCollider => mainCollider;
|
protected Collider MainCollider => mainCollider;
|
||||||
protected bool IsEnabled { get; private set; }
|
protected bool IsEnabled { get; private set; }
|
||||||
|
|
||||||
private void Awake()
|
protected override void Awake()
|
||||||
{
|
{
|
||||||
|
base.Awake();
|
||||||
Enable();
|
Enable();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -17,8 +17,9 @@ namespace Intrepid.Core.Entities
|
|||||||
protected Collider MainCollider => mainCollider;
|
protected Collider MainCollider => mainCollider;
|
||||||
protected bool IsEnabled { get; private set; }
|
protected bool IsEnabled { get; private set; }
|
||||||
|
|
||||||
protected virtual void Awake()
|
protected override void Awake()
|
||||||
{
|
{
|
||||||
|
base.Awake();
|
||||||
MainCollider.isTrigger = true;
|
MainCollider.isTrigger = true;
|
||||||
IsEnabled = true;
|
IsEnabled = true;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -17,8 +17,9 @@ namespace Intrepid.Core.GameState
|
|||||||
private BackStageService BackStageService => backStageService;
|
private BackStageService BackStageService => backStageService;
|
||||||
private BackStageProcessorAggregator BackStageProcessorAggregator { get; set; }
|
private BackStageProcessorAggregator BackStageProcessorAggregator { get; set; }
|
||||||
|
|
||||||
private void Awake()
|
protected override void Awake()
|
||||||
{
|
{
|
||||||
|
base.Awake();
|
||||||
foreach (var gameStateObject in gameObject.GetComponentsInChildren<GameStateObject>())
|
foreach (var gameStateObject in gameObject.GetComponentsInChildren<GameStateObject>())
|
||||||
{
|
{
|
||||||
StateMachine.AddState(gameStateObject);
|
StateMachine.AddState(gameStateObject);
|
||||||
|
|||||||
@ -20,8 +20,9 @@ namespace Temporary
|
|||||||
protected override LocalizationTag DescriptionLocalization => descriptionLocalization;
|
protected override LocalizationTag DescriptionLocalization => descriptionLocalization;
|
||||||
protected override List<string> Parameters => new();
|
protected override List<string> Parameters => new();
|
||||||
|
|
||||||
private void Awake()
|
protected override void Awake()
|
||||||
{
|
{
|
||||||
|
base.Awake();
|
||||||
Setter = GetComponent<MeshColorSetter>();
|
Setter = GetComponent<MeshColorSetter>();
|
||||||
IsSwitchOn = true;
|
IsSwitchOn = true;
|
||||||
Setter.Color = Color.yellow;
|
Setter.Color = Color.yellow;
|
||||||
|
|||||||
@ -5,7 +5,7 @@ using UnityEngine;
|
|||||||
|
|
||||||
namespace Temporary
|
namespace Temporary
|
||||||
{
|
{
|
||||||
public class TestGroundMorion : GroundProfileMotionBehaviour
|
public class TestGroundMotion : GroundProfileMotionBehaviour
|
||||||
{
|
{
|
||||||
[GroupConfigurations, SerializeField] private Vector3 localDirection = Vector3.right;
|
[GroupConfigurations, SerializeField] private Vector3 localDirection = Vector3.right;
|
||||||
[GroupConfigurations, SerializeField] private float speed = 2f;
|
[GroupConfigurations, SerializeField] private float speed = 2f;
|
||||||
@ -39,8 +39,10 @@ namespace Temporary
|
|||||||
private int _directionSign = 1;
|
private int _directionSign = 1;
|
||||||
private bool _initialized;
|
private bool _initialized;
|
||||||
|
|
||||||
private void Awake()
|
protected override void Awake()
|
||||||
{
|
{
|
||||||
|
base.Awake();
|
||||||
|
|
||||||
Snap();
|
Snap();
|
||||||
|
|
||||||
if (moveOnStart)
|
if (moveOnStart)
|
||||||
@ -5,7 +5,7 @@
|
|||||||
"depth": 0,
|
"depth": 0,
|
||||||
"source": "git",
|
"source": "git",
|
||||||
"dependencies": {},
|
"dependencies": {},
|
||||||
"hash": "6f1ee5036dced65524bd7cc8af9f244d52f15491"
|
"hash": "0b8c3eecdc8fb556cbdf02408f7920350aeaff9c"
|
||||||
},
|
},
|
||||||
"com.unity.2d.animation": {
|
"com.unity.2d.animation": {
|
||||||
"version": "13.0.5",
|
"version": "13.0.5",
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user