Fix display area names

This commit is contained in:
Vova
2024-04-30 17:58:26 +03:00
parent a0b031133a
commit 1584d904df
6 changed files with 2492 additions and 117 deletions
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
+75 -103
View File
@@ -336,108 +336,6 @@ MonoBehaviour:
m_ChildScaleWidth: 0 m_ChildScaleWidth: 0
m_ChildScaleHeight: 0 m_ChildScaleHeight: 0
m_ReverseArrangement: 0 m_ReverseArrangement: 0
--- !u!1001 &22664601
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 959365028}
m_Modifications:
- target: {fileID: -8679921383154817045, guid: 97466f1da416f094e9e81beaab7c4853,
type: 3}
propertyPath: m_LocalPosition.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 97466f1da416f094e9e81beaab7c4853,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 97466f1da416f094e9e81beaab7c4853,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 97466f1da416f094e9e81beaab7c4853,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 97466f1da416f094e9e81beaab7c4853,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 97466f1da416f094e9e81beaab7c4853,
type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 97466f1da416f094e9e81beaab7c4853,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 97466f1da416f094e9e81beaab7c4853,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 97466f1da416f094e9e81beaab7c4853,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 97466f1da416f094e9e81beaab7c4853,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 919132149155446097, guid: 97466f1da416f094e9e81beaab7c4853,
type: 3}
propertyPath: m_Name
value: Eric
objectReference: {fileID: 0}
- target: {fileID: 5866666021909216657, guid: 97466f1da416f094e9e81beaab7c4853,
type: 3}
propertyPath: m_Controller
value:
objectReference: {fileID: 9100000, guid: 6abd17ae3669e8d448186fd24a2aadb7, type: 2}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 97466f1da416f094e9e81beaab7c4853,
type: 3}
insertIndex: -1
addedObject: {fileID: 22664604}
m_SourcePrefab: {fileID: 100100000, guid: 97466f1da416f094e9e81beaab7c4853, type: 3}
--- !u!4 &22664602 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 97466f1da416f094e9e81beaab7c4853,
type: 3}
m_PrefabInstance: {fileID: 22664601}
m_PrefabAsset: {fileID: 0}
--- !u!1 &22664603 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 97466f1da416f094e9e81beaab7c4853,
type: 3}
m_PrefabInstance: {fileID: 22664601}
m_PrefabAsset: {fileID: 0}
--- !u!114 &22664604
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 22664603}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: cf9ddd6d77ff9a7479edaeb2c8ae1078, type: 3}
m_Name:
m_EditorClassIdentifier:
Sex: 1
--- !u!1 &24176858 --- !u!1 &24176858
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -4800,6 +4698,74 @@ BoxCollider:
serializedVersion: 3 serializedVersion: 3
m_Size: {x: 0.089999996, y: 0.089999996, z: 0.0016000008} m_Size: {x: 0.089999996, y: 0.089999996, z: 0.0016000008}
m_Center: {x: 0.00000023841858, y: 0, z: 0.0008000004} m_Center: {x: 0.00000023841858, y: 0, z: 0.0008000004}
--- !u!1001 &833824185
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 959365028}
m_Modifications:
- target: {fileID: 2494162510804697682, guid: b64ae4c0433f8c44eada97d1cf57b92d,
type: 3}
propertyPath: m_Name
value: Sophie
objectReference: {fileID: 0}
- target: {fileID: 3014838044305660136, guid: b64ae4c0433f8c44eada97d1cf57b92d,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3014838044305660136, guid: b64ae4c0433f8c44eada97d1cf57b92d,
type: 3}
propertyPath: m_LocalPosition.y
value: 0.1
objectReference: {fileID: 0}
- target: {fileID: 3014838044305660136, guid: b64ae4c0433f8c44eada97d1cf57b92d,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3014838044305660136, guid: b64ae4c0433f8c44eada97d1cf57b92d,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3014838044305660136, guid: b64ae4c0433f8c44eada97d1cf57b92d,
type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 3014838044305660136, guid: b64ae4c0433f8c44eada97d1cf57b92d,
type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 3014838044305660136, guid: b64ae4c0433f8c44eada97d1cf57b92d,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 3014838044305660136, guid: b64ae4c0433f8c44eada97d1cf57b92d,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3014838044305660136, guid: b64ae4c0433f8c44eada97d1cf57b92d,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3014838044305660136, guid: b64ae4c0433f8c44eada97d1cf57b92d,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: b64ae4c0433f8c44eada97d1cf57b92d, type: 3}
--- !u!1 &835327588 --- !u!1 &835327588
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -5395,7 +5361,7 @@ Transform:
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:
- {fileID: 22664602} - {fileID: 1475504624}
- {fileID: 1112075239} - {fileID: 1112075239}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
@@ -6913,6 +6879,12 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
_areaName: Central ave. _areaName: Central ave.
--- !u!4 &1475504624 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 3014838044305660136, guid: b64ae4c0433f8c44eada97d1cf57b92d,
type: 3}
m_PrefabInstance: {fileID: 833824185}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1498687847 --- !u!1 &1498687847
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -8,7 +8,7 @@ public class AreaName : MonoBehaviour
private void OnTriggerEnter(Collider other) private void OnTriggerEnter(Collider other)
{ {
if(other.gameObject.tag.ToLower()=="player") if(other.gameObject.GetComponentInChildren<Player>() is Player)
{ {
(Player.Instance.Stats[StatsId.LocationName] as IStringStat).SetValue(_areaName); (Player.Instance.Stats[StatsId.LocationName] as IStringStat).SetValue(_areaName);
} }
+1 -1
View File
@@ -73,6 +73,7 @@ public abstract class BaseCharacter : MonoBehaviour
} }
} }
} }
private TaskStatus MoveToPoint() private TaskStatus MoveToPoint()
{ {
_navAgent.isStopped = false; _navAgent.isStopped = false;
@@ -97,7 +98,6 @@ public abstract class BaseCharacter : MonoBehaviour
return true; return true;
} }
} }
return false; return false;
} }
+8 -8
View File
@@ -3,10 +3,11 @@
--- !u!55 &1 --- !u!55 &1
PhysicsManager: PhysicsManager:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
serializedVersion: 13 serializedVersion: 16
m_Gravity: {x: 0, y: -9.81, z: 0} m_Gravity: {x: 0, y: -9.81, z: 0}
m_DefaultMaterial: {fileID: 0} m_DefaultMaterial: {fileID: 0}
m_BounceThreshold: 2 m_BounceThreshold: 2
m_DefaultMaxDepenetrationVelocity: 10
m_SleepThreshold: 0.005 m_SleepThreshold: 0.005
m_DefaultContactOffset: 0.01 m_DefaultContactOffset: 0.01
m_DefaultSolverIterations: 6 m_DefaultSolverIterations: 6
@@ -16,21 +17,20 @@ PhysicsManager:
m_EnableAdaptiveForce: 0 m_EnableAdaptiveForce: 0
m_ClothInterCollisionDistance: 0.1 m_ClothInterCollisionDistance: 0.1
m_ClothInterCollisionStiffness: 0.2 m_ClothInterCollisionStiffness: 0.2
m_ContactsGeneration: 1
m_LayerCollisionMatrix: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff m_LayerCollisionMatrix: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
m_AutoSimulation: 1 m_SimulationMode: 0
m_AutoSyncTransforms: 0 m_AutoSyncTransforms: 1
m_ReuseCollisionCallbacks: 0 m_ReuseCollisionCallbacks: 0
m_InvokeCollisionCallbacks: 1
m_ClothInterCollisionSettingsToggle: 0 m_ClothInterCollisionSettingsToggle: 0
m_ClothGravity: {x: 0, y: -9.81, z: 0} m_ClothGravity: {x: 0, y: -9.81, z: 0}
m_ContactPairsMode: 0 m_ContactPairsMode: 0
m_BroadphaseType: 0 m_BroadphaseType: 0
m_WorldBounds:
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 250, y: 250, z: 250}
m_WorldSubdivisions: 8
m_FrictionType: 0 m_FrictionType: 0
m_EnableEnhancedDeterminism: 0 m_EnableEnhancedDeterminism: 0
m_EnableUnifiedHeightmaps: 1 m_EnableUnifiedHeightmaps: 1
m_ImprovedPatchFriction: 0
m_SolverType: 0 m_SolverType: 0
m_DefaultMaxAngularSpeed: 50 m_DefaultMaxAngularSpeed: 50
m_ScratchBufferChunkCount: 4
m_FastMotionThreshold: 3.4028235e+38