UI fixes, add npc base class

Assets/Characters/Animations/CharacterAnimation.controller

@@ -88,7 +88,8 @@ AnimatorState:
   m_Name: Idle
   m_Speed: 1
   m_CycleOffset: 0
-  m_Transitions: []
+  m_Transitions:
+  - {fileID: 7553863546199271906}
   m_StateMachineBehaviours: []
   m_Position: {x: 50, y: 50, z: 0}
   m_IKOnFeet: 0
@@ -384,6 +385,28 @@ AnimatorState:
   m_MirrorParameter: 
   m_CycleOffsetParameter: 
   m_TimeParameter: 
+--- !u!1101 &7553863546199271906
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions: []
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 6072118102548043316}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.75
+  m_HasExitTime: 1
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
 --- !u!1102 &8580685621360077188
 AnimatorState:
   serializedVersion: 6

Assets/Scenes/City.unity

@@ -140,17 +140,17 @@ PrefabInstance:
     - target: {fileID: -8679921383154817045, guid: b0ee1e3722bb9474480ad9392cddebce,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: -84.45604
+      value: 128.68
       objectReference: {fileID: 0}
     - target: {fileID: -8679921383154817045, guid: b0ee1e3722bb9474480ad9392cddebce,
         type: 3}
       propertyPath: m_LocalPosition.y
-      value: 0.1800003
+      value: 6.9
       objectReference: {fileID: 0}
     - target: {fileID: -8679921383154817045, guid: b0ee1e3722bb9474480ad9392cddebce,
         type: 3}
       propertyPath: m_LocalPosition.z
-      value: 9.697983
+      value: 258.5
       objectReference: {fileID: 0}
     - target: {fileID: -8679921383154817045, guid: b0ee1e3722bb9474480ad9392cddebce,
         type: 3}
@@ -227,6 +227,11 @@ PrefabInstance:
       propertyPath: m_Layer
       value: 6
       objectReference: {fileID: 0}
+    - target: {fileID: 919132149155446097, guid: b0ee1e3722bb9474480ad9392cddebce,
+        type: 3}
+      propertyPath: m_TagString
+      value: Respawn
+      objectReference: {fileID: 0}
     - target: {fileID: 2063943832616289920, guid: b0ee1e3722bb9474480ad9392cddebce,
         type: 3}
       propertyPath: m_LocalPosition.x
@@ -439,7 +444,7 @@ Transform:
   m_GameObject: {fileID: 30952344}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 3, y: 5.25, z: -19.5}
+  m_LocalPosition: {x: 216.13603, y: 11.969999, z: 229.30203}
   m_LocalScale: {x: 15, y: 13, z: 10}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -485,7 +490,6 @@ MeshRenderer:
   m_RayTraceProcedural: 0
   m_RayTracingAccelStructBuildFlagsOverride: 0
   m_RayTracingAccelStructBuildFlags: 1
-  m_SmallMeshCulling: 1
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -578,7 +582,7 @@ Transform:
   m_GameObject: {fileID: 37693064}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -26.19, y: 15, z: -26}
+  m_LocalPosition: {x: 186.94603, y: 21.72, z: 222.80203}
   m_LocalScale: {x: 15, y: 15, z: 15}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -626,7 +630,6 @@ MeshRenderer:
   m_RayTraceProcedural: 0
   m_RayTracingAccelStructBuildFlagsOverride: 0
   m_RayTracingAccelStructBuildFlags: 1
-  m_SmallMeshCulling: 1
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -734,7 +737,6 @@ MeshRenderer:
   m_RayTraceProcedural: 0
   m_RayTracingAccelStructBuildFlagsOverride: 0
   m_RayTracingAccelStructBuildFlags: 1
-  m_SmallMeshCulling: 1
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -820,7 +822,6 @@ MeshRenderer:
   m_RayTraceProcedural: 0
   m_RayTracingAccelStructBuildFlagsOverride: 0
   m_RayTracingAccelStructBuildFlags: 1
-  m_SmallMeshCulling: 1
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -907,7 +908,6 @@ MeshRenderer:
   m_RayTraceProcedural: 0
   m_RayTracingAccelStructBuildFlagsOverride: 0
   m_RayTracingAccelStructBuildFlags: 1
-  m_SmallMeshCulling: 1
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -969,7 +969,7 @@ Transform:
   m_GameObject: {fileID: 93020046}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -0.5, y: 8, z: 5.5}
+  m_LocalPosition: {x: 212.63603, y: 14.719999, z: 254.30203}
   m_LocalScale: {x: 20, y: 15, z: 10}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -1015,7 +1015,6 @@ MeshRenderer:
   m_RayTraceProcedural: 0
   m_RayTracingAccelStructBuildFlagsOverride: 0
   m_RayTracingAccelStructBuildFlags: 1
-  m_SmallMeshCulling: 1
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -1123,7 +1122,6 @@ MeshRenderer:
   m_RayTraceProcedural: 0
   m_RayTracingAccelStructBuildFlagsOverride: 0
   m_RayTracingAccelStructBuildFlags: 1
-  m_SmallMeshCulling: 1
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -1440,7 +1438,6 @@ MeshRenderer:
   m_RayTraceProcedural: 0
   m_RayTracingAccelStructBuildFlagsOverride: 0
   m_RayTracingAccelStructBuildFlags: 1
-  m_SmallMeshCulling: 1
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -1502,7 +1499,7 @@ Transform:
   m_GameObject: {fileID: 170365827}
   serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -84.0271, y: 0.18, z: 7.9069}
+  m_LocalPosition: {x: 129.10893, y: 6.9, z: 256.70892}
   m_LocalScale: {x: 1.1345428, y: 0.1, z: 1.9996814}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -1549,7 +1546,6 @@ MeshRenderer:
   m_RayTraceProcedural: 0
   m_RayTracingAccelStructBuildFlagsOverride: 0
   m_RayTracingAccelStructBuildFlags: 1
-  m_SmallMeshCulling: 1
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -2038,12 +2034,8 @@ Light:
   m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
   m_UseBoundingSphereOverride: 0
   m_UseViewFrustumForShadowCasterCull: 1
-  m_ForceVisible: 0
   m_ShadowRadius: 0
   m_ShadowAngle: 0
-  m_LightUnit: 1
-  m_LuxAtDistance: 1
-  m_EnableSpotReflector: 1
 --- !u!4 &326064396
 Transform:
   m_ObjectHideFlags: 0
@@ -2840,7 +2832,6 @@ MeshRenderer:
   m_RayTraceProcedural: 0
   m_RayTracingAccelStructBuildFlagsOverride: 0
   m_RayTracingAccelStructBuildFlags: 1
-  m_SmallMeshCulling: 1
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -3303,7 +3294,6 @@ MeshRenderer:
   m_RayTraceProcedural: 0
   m_RayTracingAccelStructBuildFlagsOverride: 0
   m_RayTracingAccelStructBuildFlags: 1
-  m_SmallMeshCulling: 1
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -3497,7 +3487,6 @@ MeshRenderer:
   m_RayTraceProcedural: 0
   m_RayTracingAccelStructBuildFlagsOverride: 0
   m_RayTracingAccelStructBuildFlags: 1
-  m_SmallMeshCulling: 1
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -3825,7 +3814,7 @@ Transform:
   m_GameObject: {fileID: 705618095}
   serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: -6.299999, z: 0}
+  m_LocalPosition: {x: 213.13603, y: 0.42000055, z: 248.80203}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -3861,7 +3850,7 @@ Transform:
   m_GameObject: {fileID: 731562721}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -44.3, y: 5.25, z: -19.5}
+  m_LocalPosition: {x: 168.83603, y: 11.969999, z: 229.30203}
   m_LocalScale: {x: 15, y: 10, z: 10}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -3907,7 +3896,6 @@ MeshRenderer:
   m_RayTraceProcedural: 0
   m_RayTracingAccelStructBuildFlagsOverride: 0
   m_RayTracingAccelStructBuildFlags: 1
-  m_SmallMeshCulling: 1
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -4466,7 +4454,6 @@ MeshRenderer:
   m_RayTraceProcedural: 0
   m_RayTracingAccelStructBuildFlagsOverride: 0
   m_RayTracingAccelStructBuildFlags: 1
-  m_SmallMeshCulling: 1
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -4656,7 +4643,6 @@ MeshRenderer:
   m_RayTraceProcedural: 0
   m_RayTracingAccelStructBuildFlagsOverride: 0
   m_RayTracingAccelStructBuildFlags: 1
-  m_SmallMeshCulling: 1
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -5229,7 +5215,6 @@ MeshRenderer:
   m_RayTraceProcedural: 0
   m_RayTracingAccelStructBuildFlagsOverride: 0
   m_RayTracingAccelStructBuildFlags: 1
-  m_SmallMeshCulling: 1
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -5335,7 +5320,6 @@ MeshRenderer:
   m_RayTraceProcedural: 0
   m_RayTracingAccelStructBuildFlagsOverride: 0
   m_RayTracingAccelStructBuildFlags: 1
-  m_SmallMeshCulling: 1
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -5952,7 +5936,6 @@ MeshRenderer:
   m_RayTraceProcedural: 0
   m_RayTracingAccelStructBuildFlagsOverride: 0
   m_RayTracingAccelStructBuildFlags: 1
-  m_SmallMeshCulling: 1
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -6142,7 +6125,6 @@ MeshRenderer:
   m_RayTraceProcedural: 0
   m_RayTracingAccelStructBuildFlagsOverride: 0
   m_RayTracingAccelStructBuildFlags: 1
-  m_SmallMeshCulling: 1
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -6306,7 +6288,7 @@ Transform:
   m_GameObject: {fileID: 1198886760}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -59, y: 5.09, z: 5.5}
+  m_LocalPosition: {x: 154.13603, y: 11.809999, z: 254.30203}
   m_LocalScale: {x: 15, y: 10, z: 10}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -6352,7 +6334,6 @@ MeshRenderer:
   m_RayTraceProcedural: 0
   m_RayTracingAccelStructBuildFlagsOverride: 0
   m_RayTracingAccelStructBuildFlags: 1
-  m_SmallMeshCulling: 1
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -6610,7 +6591,6 @@ MeshRenderer:
   m_RayTraceProcedural: 0
   m_RayTracingAccelStructBuildFlagsOverride: 0
   m_RayTracingAccelStructBuildFlags: 1
-  m_SmallMeshCulling: 1
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -6669,7 +6649,7 @@ Transform:
   m_GameObject: {fileID: 1381062365}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 212.7, y: 6.299999, z: 243.9}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -6761,7 +6741,6 @@ MeshRenderer:
   m_RayTraceProcedural: 0
   m_RayTracingAccelStructBuildFlagsOverride: 0
   m_RayTracingAccelStructBuildFlags: 1
-  m_SmallMeshCulling: 1
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -6991,7 +6970,6 @@ MeshRenderer:
   m_RayTraceProcedural: 0
   m_RayTracingAccelStructBuildFlagsOverride: 0
   m_RayTracingAccelStructBuildFlags: 1
-  m_SmallMeshCulling: 1
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -7053,7 +7031,7 @@ Transform:
   m_GameObject: {fileID: 1508317639}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -9.75, y: 8, z: -19.5}
+  m_LocalPosition: {x: 203.38603, y: 14.719999, z: 229.30203}
   m_LocalScale: {x: 10, y: 15, z: 10}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -7099,7 +7077,6 @@ MeshRenderer:
   m_RayTraceProcedural: 0
   m_RayTracingAccelStructBuildFlagsOverride: 0
   m_RayTracingAccelStructBuildFlags: 1
-  m_SmallMeshCulling: 1
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -7364,7 +7341,6 @@ MeshRenderer:
   m_RayTraceProcedural: 0
   m_RayTracingAccelStructBuildFlagsOverride: 0
   m_RayTracingAccelStructBuildFlags: 1
-  m_SmallMeshCulling: 1
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -7472,7 +7448,6 @@ MeshRenderer:
   m_RayTraceProcedural: 0
   m_RayTracingAccelStructBuildFlagsOverride: 0
   m_RayTracingAccelStructBuildFlags: 1
-  m_SmallMeshCulling: 1
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -7699,7 +7674,6 @@ MeshRenderer:
   m_RayTraceProcedural: 0
   m_RayTracingAccelStructBuildFlagsOverride: 0
   m_RayTracingAccelStructBuildFlags: 1
-  m_SmallMeshCulling: 1
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -7786,7 +7760,6 @@ MeshRenderer:
   m_RayTraceProcedural: 0
   m_RayTracingAccelStructBuildFlagsOverride: 0
   m_RayTracingAccelStructBuildFlags: 1
-  m_SmallMeshCulling: 1
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -7872,7 +7845,6 @@ MeshRenderer:
   m_RayTraceProcedural: 0
   m_RayTracingAccelStructBuildFlagsOverride: 0
   m_RayTracingAccelStructBuildFlags: 1
-  m_SmallMeshCulling: 1
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -7981,7 +7953,6 @@ MeshRenderer:
   m_RayTraceProcedural: 0
   m_RayTracingAccelStructBuildFlagsOverride: 0
   m_RayTracingAccelStructBuildFlags: 1
-  m_SmallMeshCulling: 1
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -8067,7 +8038,6 @@ MeshRenderer:
   m_RayTraceProcedural: 0
   m_RayTracingAccelStructBuildFlagsOverride: 0
   m_RayTracingAccelStructBuildFlags: 1
-  m_SmallMeshCulling: 1
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -8423,7 +8393,7 @@ Transform:
   m_GameObject: {fileID: 1861131928}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -61.05, y: 6.5, z: -19.5}
+  m_LocalPosition: {x: 152.08603, y: 13.219999, z: 229.30203}
   m_LocalScale: {x: 15, y: 12, z: 10}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -8469,7 +8439,6 @@ MeshRenderer:
   m_RayTraceProcedural: 0
   m_RayTracingAccelStructBuildFlagsOverride: 0
   m_RayTracingAccelStructBuildFlags: 1
-  m_SmallMeshCulling: 1
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -8913,7 +8882,7 @@ Transform:
   m_GameObject: {fileID: 2057527360}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -21.55, y: 5.25, z: 5.5}
+  m_LocalPosition: {x: 191.58603, y: 11.969999, z: 254.30203}
   m_LocalScale: {x: 15, y: 10, z: 10}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -8959,7 +8928,6 @@ MeshRenderer:
   m_RayTraceProcedural: 0
   m_RayTracingAccelStructBuildFlagsOverride: 0
   m_RayTracingAccelStructBuildFlags: 1
-  m_SmallMeshCulling: 1
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -9067,7 +9035,6 @@ MeshRenderer:
   m_RayTraceProcedural: 0
   m_RayTracingAccelStructBuildFlagsOverride: 0
   m_RayTracingAccelStructBuildFlags: 1
-  m_SmallMeshCulling: 1
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -9153,7 +9120,6 @@ MeshRenderer:
   m_RayTraceProcedural: 0
   m_RayTracingAccelStructBuildFlagsOverride: 0
   m_RayTracingAccelStructBuildFlags: 1
-  m_SmallMeshCulling: 1
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -9215,7 +9181,7 @@ Transform:
   m_GameObject: {fileID: 2134327492}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -37.55, y: 7, z: 5.5}
+  m_LocalPosition: {x: 175.58603, y: 13.719999, z: 254.30203}
   m_LocalScale: {x: 15, y: 13, z: 10}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -9261,7 +9227,6 @@ MeshRenderer:
   m_RayTraceProcedural: 0
   m_RayTracingAccelStructBuildFlagsOverride: 0
   m_RayTracingAccelStructBuildFlags: 1
-  m_SmallMeshCulling: 1
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:

Assets/Scenes/MiniMarket.unity

@@ -119,6 +119,104 @@ NavMeshSettings:
     debug:
       m_Flags: 0
   m_NavMeshData: {fileID: 0}
+--- !u!1 &52885315
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 52885318}
+  - component: {fileID: 52885317}
+  - component: {fileID: 52885316}
+  - component: {fileID: 52885319}
+  m_Layer: 0
+  m_Name: Cashier
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!54 &52885316
+Rigidbody:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 52885315}
+  serializedVersion: 4
+  m_Mass: 1
+  m_Drag: 0
+  m_AngularDrag: 0.05
+  m_CenterOfMass: {x: 0, y: 0, z: 0}
+  m_InertiaTensor: {x: 1, y: 1, z: 1}
+  m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ImplicitCom: 1
+  m_ImplicitTensor: 1
+  m_UseGravity: 1
+  m_IsKinematic: 0
+  m_Interpolate: 0
+  m_Constraints: 0
+  m_CollisionDetection: 0
+--- !u!136 &52885317
+CapsuleCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 52885315}
+  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: 2
+  m_Radius: 0.3
+  m_Height: 1.7
+  m_Direction: 1
+  m_Center: {x: 0, y: 0.84, z: 0}
+--- !u!4 &52885318
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 52885315}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -4.06, y: 0.052, z: -1.754}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 456606827}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &52885319
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 52885315}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 57bc7fa5d71cfbf4685a51d4fd4be2ab, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  _navAgent: {fileID: 0}
 --- !u!1001 &130749353
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -352,7 +450,7 @@ PrefabInstance:
   serializedVersion: 2
   m_Modification:
     serializedVersion: 3
-    m_TransformParent: {fileID: 0}
+    m_TransformParent: {fileID: 52885318}
     m_Modifications:
     - target: {fileID: -8679921383154817045, guid: 094143b068357224fabf0fa92fee31cb,
         type: 3}
@@ -362,7 +460,7 @@ PrefabInstance:
     - target: {fileID: -8679921383154817045, guid: 094143b068357224fabf0fa92fee31cb,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: -3.99
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: -8679921383154817045, guid: 094143b068357224fabf0fa92fee31cb,
         type: 3}
@@ -372,7 +470,7 @@ PrefabInstance:
     - target: {fileID: -8679921383154817045, guid: 094143b068357224fabf0fa92fee31cb,
         type: 3}
       propertyPath: m_LocalPosition.z
-      value: -1.62
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: -8679921383154817045, guid: 094143b068357224fabf0fa92fee31cb,
         type: 3}
@@ -382,7 +480,7 @@ PrefabInstance:
     - target: {fileID: -8679921383154817045, guid: 094143b068357224fabf0fa92fee31cb,
         type: 3}
       propertyPath: m_LocalRotation.x
-      value: 0
+      value: -0
       objectReference: {fileID: 0}
     - target: {fileID: -8679921383154817045, guid: 094143b068357224fabf0fa92fee31cb,
         type: 3}
@@ -392,7 +490,7 @@ PrefabInstance:
     - target: {fileID: -8679921383154817045, guid: 094143b068357224fabf0fa92fee31cb,
         type: 3}
       propertyPath: m_LocalRotation.z
-      value: 0
+      value: -0
       objectReference: {fileID: 0}
     - target: {fileID: -8679921383154817045, guid: 094143b068357224fabf0fa92fee31cb,
         type: 3}
@@ -451,6 +549,12 @@ Animator:
   m_AllowConstantClipSamplingOptimization: 1
   m_KeepAnimatorStateOnDisable: 0
   m_WriteDefaultValuesOnDisable: 0
+--- !u!4 &456606827 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 094143b068357224fabf0fa92fee31cb,
+    type: 3}
+  m_PrefabInstance: {fileID: 456606824}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &456771679
 GameObject:
   m_ObjectHideFlags: 0
@@ -18266,7 +18370,7 @@ SceneRoots:
   m_ObjectHideFlags: 0
   m_Roots:
   - {fileID: 819075070}
-  - {fileID: 456606824}
+  - {fileID: 52885318}
   - {fileID: 681272906}
   - {fileID: 1216423541}
   - {fileID: 1367009072}

Assets/Scripts/Characters/Npc.cs

@@ -0,0 +1,10 @@
+namespace Assets.Scripts.Characters
+{
+    public class Npc : BaseCharacter
+    {
+        private void Awake()
+        {
+            base.IntCharacter();
+        }
+    }
+}

Assets/Scripts/Characters/Npc.cs.meta

@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 57bc7fa5d71cfbf4685a51d4fd4be2ab

Assets/Scripts/Characters/Player.cs

@@ -5,9 +5,9 @@ using UnityEngine;
 
 public class Player : BaseCharacter
 {
-    public  event EventHandler<bool> OnContainerChanged;
+    public event EventHandler<bool> OnContainerChanged;
     public static Player Instance { get; private set; }
-    
+
     private HoldPoint _holdPoint;
 
     private PlayerStates _currentActing;
@@ -15,12 +15,12 @@ public class Player : BaseCharacter
     public Dictionary<StatsId, object> Stats;
     public JobPositions JobPosition { get; set; }
 
-    private List<EducationInfoSO> _completedCourses=new();
+    private List<EducationInfoSO> _completedCourses = new();
     public EducationInfoSO ActiveCourse { get; set; }
     public EducationSkill Education { get; set; }
 
     private ContainerItem _containerItem;
-    
+
     private string _locationName;
 
     private void Awake()
@@ -43,7 +43,7 @@ public class Player : BaseCharacter
     private void Start()
     {
         base.IntCharacter();
-        _holdPoint= GetComponentInChildren<HoldPoint>();
+        _holdPoint = GetComponentInChildren<HoldPoint>();
         GameManager.Instance.Time.OnMinuteChanged += UpdateStatsByClock;
         _animator.applyRootMotion = true;
         _navAgent.updatePosition = false;
@@ -84,7 +84,7 @@ public class Player : BaseCharacter
                 AddTask(new PlayerTasks(Tasks.Interact, interactionItem));
             }
         }
-    }   
+    }
 
     public void SetPlayerActing(PlayerStates state)
     {
@@ -124,14 +124,16 @@ public class Player : BaseCharacter
         containerItem.transform.parent = _holdPoint.transform;
         containerItem.transform.localPosition = Vector3.zero;
         _containerItem = containerItem;
-        OnContainerChanged.Invoke(this,true);
+        OnContainerChanged.Invoke(this, true);
     }
-   
+
     public void ClearContainerItem()
     {
+        if (_containerItem == null) 
+            return;
         Destroy(_containerItem.gameObject);
-        _containerItem = null;
         OnContainerChanged.Invoke(this, false);
+        _containerItem = null;
     }
 
     public ContainerItem GetContainerItem()
@@ -155,12 +157,12 @@ public class Player : BaseCharacter
 
     internal void Learn(TimeSpan time)
     {
-        ActiveCourse.PlayerProgress+= time.Hours;
-        if(ActiveCourse.PlayerProgress>=ActiveCourse.Duration)
+        ActiveCourse.PlayerProgress += time.Hours;
+        if (ActiveCourse.PlayerProgress >= ActiveCourse.Duration)
         {
             Education++;
             print($"Congratulation player finish curse {ActiveCourse.Description} and his education now {Education.ToString()}");
-            ActiveCourse =null;
+            ActiveCourse = null;
         }
     }
 }

Assets/Scripts/Managers/CameraSystem.cs

@@ -57,7 +57,7 @@ public class CameraSystem : MonoBehaviour
 
     public void ResetToPlayerPosition()
     {
-        Renderer[] renderers = FindObjectsOfType<Renderer>();
+        Renderer[] renderers = FindObjectsByType<Renderer>(FindObjectsSortMode.InstanceID);
 
         _worldBounds = renderers[0].bounds;
 

Assets/Scripts/UIElements/RadialMenuItem.cs

@@ -11,11 +11,11 @@ public class RadialMenuItem : MonoBehaviour
     private Button _radialMenuItemPrefab;
     private Dictionary<RadialMenuActions, RadialMenuActionDescription> _actions;
     private UniTaskCompletionSource<RadialMenuActions> tcs = new UniTaskCompletionSource<RadialMenuActions>();
-    private float _buttonWidth;
+    //private float _buttonWidth;
 
     private void Start()
     {
-        _buttonWidth = _radialMenuItemPrefab.GetComponent<RectTransform>().rect.width;
+     //   _buttonWidth = _radialMenuItemPrefab.GetComponent<RectTransform>().rect.width;
     }
 
     public UniTask<RadialMenuActions> ShowButtons(Dictionary<RadialMenuActions, RadialMenuActionDescription> actions)

Assets/Scripts/UIElements/UIContainer.cs

@@ -33,9 +33,7 @@ public class UIContainer : MonoBehaviour
         else
         {
             _container.gameObject.SetActive(false);
-            Destroy(_playerContainer);
-            //_playerContainer.OnItemsChange -= OnItemsChange;
-            //_playerContainer = null;
+            _playerContainer.OnItemsChange -= OnItemsChange;
         }
     }