UUUUUUUUUUUUUUUUH

This commit is contained in:
ThomasCharester committed 2026-10-18 18:40:45 +03:00
1 parent e8393a28ad
commit f0bb83c869
110 files changed
+55065 -21232

No files matched your search

+21 -2
View File
@@ -12,6 +12,7 @@ using ObservableCollections;
using R3;
using Reflex.Core;
using UnityEngine;
using UnityEngine.InputSystem;
using UnityEngine.SceneManagement;
namespace Code.Game.TestingLevel
@@ -29,12 +30,21 @@ namespace Code.Game.TestingLevel
{
Cursor.lockState = CursorLockMode.Locked;
#if UNITY_EDITOR
Context.InputService.EnableMap(ActionMappings.Debug);
Context.InputService.BindActionPerformed((int)ActionMappings.Debug, (int)DebugActions.ToggleBattleMode, ToggleBattleMode);
#endif
Context.InputService.EnableMap(ActionMappings.OpenMovement);
Context.AudioService.SetAudioListener(Context.Camera.Camera.GetComponent<AudioListener>());
await Context.Camera.SwitchState(CameraMode.OpenMovement);
if (Context.StateMachine.CurrentState == AppStates.BattleState) return;
Context.AudioService.SetAudioListener(Context.Camera.Camera.GetComponent<AudioListener>());
var waitForContainer =
Context.SceneContainerManager.ScenesContainers
.ObserveDictionaryAdd()
@@ -94,8 +104,17 @@ namespace Code.Game.TestingLevel
playerMovementController.Freeze = false;
}
private void ToggleBattleMode(InputAction.CallbackContext obj)
{
Context.StateMachine.SwitchState(AppStates.BattleState).Forget();
}
public override async UniTask ExitState()
{
#if UNITY_EDITOR
Context.InputService.DisableMap(ActionMappings.Debug);
Context.InputService.UnbindActionPerformed((int)ActionMappings.Debug, (int)DebugActions.ToggleBattleMode, ToggleBattleMode);
#endif
Context.InputService.DisableMap(ActionMappings.OpenMovement);
if (Context.StateMachine.NextState == AppStates.BattleState) return;
@@ -8,7 +8,8 @@ namespace Code.Infrastructure.Camera
{
None,
OpenMovement,
LocationTransition
LocationTransition,
BattleMode
}
public class CameraStateMachineContext
@@ -2,6 +2,7 @@ using System;
using System.Collections.Generic;
using System.Threading;
using Cysharp.Threading.Tasks;
using UnityEngine;
namespace Code.Infrastructure.StateMachine
{
@@ -37,6 +38,8 @@ namespace Code.Infrastructure.StateMachine
var newState = States[nextState];
await newState.EnterState();
Debug.Log($"Switched from {CurrentState} to {nextState}");
CurrentBaseState = newState;
CurrentState = nextState;
NextState = default;
+3
View File
@@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: 76cd78321bad4dda82b99b79508d68a5
timeCreated: 1791907691
@@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: 9215926b015340c6a09a965a071a2134
timeCreated: 1791915045
@@ -0,0 +1,104 @@
using System;
using Code.Infrastructure.Camera;
using Code.Infrastructure.Camera.CameraStates;
using Code.Infrastructure.Input;
using Cysharp.Threading.Tasks;
using UnityEngine;
using UnityEngine.InputSystem;
namespace Code.Game.OfficeGame.BattleMode
{
[Infrastructure.Generators.State(typeof(CameraMode), typeof(CameraStateMachineContext), ManualInherit = true)]
public partial class CameraBattleModeState : BaseCameraState
{
private Vector3 _rotationOffset = new(30f, 0, 0);
private int _cameraZoneMask = LayerMask.GetMask("CameraZone");
public CameraBattleModeState(CameraStateMachineContext context) : base(context)
{
}
public override CameraMode MyState => CameraMode.BattleMode;
public override UniTask EnterState()
{
Context.InputService.BindActionPerformed(
(int)ActionMappings.BattleMode,
(int)BattleModeActions.Movement,
SetMovement);
Context.InputService.BindActionCancelled(
(int)ActionMappings.BattleMode,
(int)BattleModeActions.Movement,
ResetMovement);
return UniTask.CompletedTask;
}
public override UniTask ExitState()
{
Context.InputService.UnbindActionPerformed(
(int)ActionMappings.BattleMode,
(int)BattleModeActions.Movement,
SetMovement);
Context.InputService.UnbindActionCancelled(
(int)ActionMappings.BattleMode,
(int)BattleModeActions.Movement,
ResetMovement);
return UniTask.CompletedTask;
}
private Vector2 _movement;
private float _speed = 5f; // ToConf
private void SetMovement(InputAction.CallbackContext obj)
{
_movement = obj.ReadValue<Vector2>();
}
private void ResetMovement(InputAction.CallbackContext obj)
{
_movement = Vector2.zero;
}
public override void Update()
{
}
private const float ZoneSearchRadius = 3f;
private static readonly Collider[] _zoneBuffer = new Collider[8];
public override void LateUpdate()
{
var camTransform = Context.cameraLoadedData.Camera.transform;
var desired = camTransform.position
+ new Vector3(_movement.x, 0 , _movement.y) * (Time.deltaTime * _speed);
int count = Physics.OverlapSphereNonAlloc(
camTransform.position,
ZoneSearchRadius,
_zoneBuffer,
_cameraZoneMask,
QueryTriggerInteraction.Collide);
if (count == 0)
{
if (Physics.CheckSphere(desired, 0.01f, _cameraZoneMask, QueryTriggerInteraction.Collide))
camTransform.position = desired;
return;
}
var best = camTransform.position;
var bestSqr = float.MaxValue;
for (int i = 0; i < count; i++)
{
var p = _zoneBuffer[i].ClosestPoint(desired);
var sqr = (p - desired).sqrMagnitude;
if (sqr < bestSqr)
{
bestSqr = sqr;
best = p;
}
}
camTransform.position = best;
}
}
}
@@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: 9699d867118a45658bbd8cd5743cbf02
timeCreated: 1791907718
@@ -1,5 +1,11 @@
using Code.Infrastructure.App;
using Code.Infrastructure.Camera;
using Code.Infrastructure.Generators;
using Code.Infrastructure.Input;
using Code.Infrastructure.SceneLoader;
using Cysharp.Threading.Tasks;
using UnityEngine;
using UnityEngine.InputSystem;
namespace Code.Game.OfficeGame.GameStates
{
@@ -11,5 +17,39 @@ namespace Code.Game.OfficeGame.GameStates
}
public override AppStates MyState => AppStates.BattleState;
public override async UniTask EnterState()
{
Cursor.lockState = CursorLockMode.Confined;
#if UNITY_EDITOR
Context.InputService.EnableMap(ActionMappings.Debug);
Context.InputService.BindActionPerformed((int)ActionMappings.Debug, (int)DebugActions.ToggleBattleMode, ToggleBattleMode);
#endif
Context.InputService.EnableMap(ActionMappings.BattleMode);
await Context.Camera.SwitchState(CameraMode.BattleMode);
var container = Context.SceneContainerManager.ScenesContainers[SceneId.Testing];
(Context.Camera.CurrentBaseState).EnterState();
}
private void ToggleBattleMode(InputAction.CallbackContext obj)
{
Context.StateMachine.SwitchState(AppStates.Testing).Forget();
}
public override async UniTask ExitState()
{
#if UNITY_EDITOR
Context.InputService.DisableMap(ActionMappings.Debug);
Context.InputService.UnbindActionPerformed((int)ActionMappings.Debug, (int)DebugActions.ToggleBattleMode, ToggleBattleMode);
#endif
Context.InputService.DisableMap(ActionMappings.BattleMode);
}
}
}
@@ -0,0 +1,34 @@
using System;
using KinematicCharacterController;
using Reflex.Attributes;
using UnityEngine;
namespace Code.OfficeGame.Player
{
public class PlayerAnimator : MonoBehaviour
{
private static readonly int VelocityForward = Animator.StringToHash("VelocityForward");
private static readonly int VelocityRight = Animator.StringToHash("VelocityRight");
private KinematicCharacterMotor _motor;
private Animator _animator;
private void Awake()
{
_motor = GetComponent<KinematicCharacterMotor>();
_animator = GetComponentInChildren<Animator>();
}
private void Update()
{
var forwardVelocity =
Vector3.Project(_motor.Velocity, transform.right).magnitude;
_animator.SetFloat(VelocityForward, forwardVelocity);
var rightVelocity =
Vector3.Project(_motor.Velocity, transform.forward).magnitude;
_animator.SetFloat(VelocityRight, rightVelocity);
}
}
}
@@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: 05290340b907438c8fcb9d5f0e75624f
timeCreated: 1791910777
@@ -55,8 +55,6 @@ namespace Code.Game.Gameplay.Player
[TabGroup("Jumping")] public Vector3 Gravity = new Vector3(0, -30f, 0);
[TabGroup("Misc")] public List<Collider> IgnoredColliders = new List<Collider>();
public Vector3 CurrentVelocity => Motor.Velocity;
public Quaternion CurrentRotation => Motor.TransientRotation;
private Vector3 _moveInputVector;
private Vector3 _lookInputVector;
+13 -2
View File
@@ -2,8 +2,9 @@ namespace Code.Infrastructure.Input
{
public enum ActionMappings
{
UI,
OpenMovement
Debug,
OpenMovement,
BattleMode
}
// Написать, чтобы розлин сама писала этот енам
@@ -12,4 +13,14 @@ namespace Code.Infrastructure.Input
Movement,
Interact
}
// Написать, чтобы розлин сама писала этот енам
public enum BattleModeActions
{
Movement
}
// Написать, чтобы розлин сама писала этот енам
public enum DebugActions
{
ToggleBattleMode
}
}
@@ -3,10 +3,33 @@
"name": "ActionMap",
"maps": [
{
"name": "UI",
"name": "Debug",
"id": "45521ad3-b2df-4f35-9f02-85d906f367df",
"actions": [],
"bindings": []
"actions": [
{
"name": "ToggleBattleMode",
"type": "Button",
"id": "e9597d92-9c15-49ad-b832-97d5551588aa",
"expectedControlType": "",
"processors": "",
"interactions": "",
"initialStateCheck": false,
"priority": 0
}
],
"bindings": [
{
"name": "",
"id": "958b4a3b-9a11-4faa-a4d2-7204a8527c48",
"path": "<Keyboard>/b",
"interactions": "",
"processors": "",
"groups": ";Keyboard&Mouse",
"action": "ToggleBattleMode",
"isComposite": false,
"isPartOfComposite": false
}
]
},
{
"name": "OpenMovement",
@@ -156,6 +179,134 @@
"isPartOfComposite": false
}
]
},
{
"name": "BattleMode",
"id": "5c9c049b-2801-4e01-bc7f-a9815bebbeca",
"actions": [
{
"name": "Movement",
"type": "Value",
"id": "70c5d13d-e777-4b28-8573-ee2d32833b04",
"expectedControlType": "Vector2",
"processors": "",
"interactions": "",
"initialStateCheck": true,
"priority": 0
}
],
"bindings": [
{
"name": "2D Vector",
"id": "a44c2ee9-8fa3-4f6e-8055-f5271b16b9e2",
"path": "2DVector",
"interactions": "",
"processors": "",
"groups": "",
"action": "Movement",
"isComposite": true,
"isPartOfComposite": false
},
{
"name": "up",
"id": "1b46c58c-755a-4251-87c4-f77a2b143d45",
"path": "<Keyboard>/w",
"interactions": "",
"processors": "",
"groups": ";Keyboard&Mouse",
"action": "Movement",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "down",
"id": "2b0b86dc-3858-403c-8ad1-3616fd1a351d",
"path": "<Keyboard>/s",
"interactions": "",
"processors": "",
"groups": ";Keyboard&Mouse",
"action": "Movement",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "left",
"id": "d65e98f8-157d-41c1-a067-a23ac8a9207c",
"path": "<Keyboard>/a",
"interactions": "",
"processors": "",
"groups": ";Keyboard&Mouse",
"action": "Movement",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "right",
"id": "2979c778-9036-4138-880a-47a97f835560",
"path": "<Keyboard>/d",
"interactions": "",
"processors": "",
"groups": ";Keyboard&Mouse",
"action": "Movement",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "2D Vector",
"id": "fddd3501-97ed-4688-8c17-b7a896c33a2a",
"path": "2DVector",
"interactions": "",
"processors": "",
"groups": "",
"action": "Movement",
"isComposite": true,
"isPartOfComposite": false
},
{
"name": "up",
"id": "71d4fd33-274c-4e9a-b04d-dda97ea02277",
"path": "<Keyboard>/upArrow",
"interactions": "",
"processors": "",
"groups": ";Keyboard&Mouse",
"action": "Movement",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "down",
"id": "fa36fa9b-5164-43e5-b18d-255acf20b442",
"path": "<Keyboard>/downArrow",
"interactions": "",
"processors": "",
"groups": ";Keyboard&Mouse",
"action": "Movement",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "left",
"id": "d05518ae-c794-4354-abae-175e23ad9392",
"path": "<Keyboard>/leftArrow",
"interactions": "",
"processors": "",
"groups": ";Keyboard&Mouse",
"action": "Movement",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "right",
"id": "9512ebc8-7865-4135-8f00-015e606cbcbf",
"path": "<Keyboard>/rightArrow",
"interactions": "",
"processors": "",
"groups": ";Keyboard&Mouse",
"action": "Movement",
"isComposite": false,
"isPartOfComposite": true
}
]
}
],
"controlSchemes": [
File diff suppressed because it is too large. Load diff
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 84eeeb244dc88ef8ea5351429b74a76b
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:
File diff suppressed because it is too large. Load diff
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 64d3b955991e69aad96769fe04b482e2
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:
File diff suppressed because it is too large. Load diff
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: d3eab09540515480f90cc053f8cb680d
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:
+73 -335
View File
@@ -110,6 +110,7 @@ GameObject:
- component: {fileID: 382175622288203694}
- component: {fileID: 6013242802768923917}
- component: {fileID: 3159895984765548440}
- component: {fileID: 4790439060519472847}
m_Layer: 3
m_Name: Player
m_TagString: Player
@@ -130,8 +131,8 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 8288112677804220542}
- {fileID: 257380888280300741}
- {fileID: 9097188113646404779}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!136 &6939642111494274883
@@ -153,10 +154,10 @@ CapsuleCollider:
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 2
m_Radius: 0.25
m_Height: 1
m_Radius: 0.2
m_Height: 1.35
m_Direction: 1
m_Center: {x: 0, y: 0.5, z: 0}
m_Center: {x: 0, y: 0.675, z: 0}
--- !u!114 &2650801570508942627
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -170,9 +171,9 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::KinematicCharacterController.KinematicCharacterMotor
Capsule: {fileID: 6939642111494274883}
CapsuleRadius: 0.25
CapsuleHeight: 1
CapsuleYOffset: 0.5
CapsuleRadius: 0.2
CapsuleHeight: 1.35
CapsuleYOffset: 0.675
CapsulePhysicsMaterial: {fileID: 0}
GroundDetectionExtraDistance: 0
MaxStableSlopeAngle: 60
@@ -251,7 +252,19 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::Code.OfficeGame.Player.PlayerInteractor
_maxDistance: 2
--- !u!1001 &850921658224604945
--- !u!114 &4790439060519472847
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8373156178643037624}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 05290340b907438c8fcb9d5f0e75624f, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::Code.OfficeGame.Player.PlayerAnimator
--- !u!1001 &3260788586600530971
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
@@ -259,362 +272,87 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 4102848286648065809}
m_Modifications:
- target: {fileID: 8703872773187979205, guid: 64c9d96775079344fac674889078804c, type: 3}
propertyPath: 'm_Materials.Array.data[0]'
value:
objectReference: {fileID: 2100000, guid: a4ed31ac8857b954093ccf3805c7032f, type: 2}
- target: {fileID: 8703872773187979207, guid: 64c9d96775079344fac674889078804c, type: 3}
propertyPath: 'm_Materials.Array.data[0]'
value:
objectReference: {fileID: 2100000, guid: a4ed31ac8857b954093ccf3805c7032f, type: 2}
- target: {fileID: 8703872773187979209, guid: 64c9d96775079344fac674889078804c, type: 3}
propertyPath: 'm_Materials.Array.data[0]'
value:
objectReference: {fileID: 2100000, guid: a4ed31ac8857b954093ccf3805c7032f, type: 2}
- target: {fileID: 8703872773187979211, guid: 64c9d96775079344fac674889078804c, type: 3}
propertyPath: 'm_Materials.Array.data[0]'
value:
objectReference: {fileID: 2100000, guid: a4ed31ac8857b954093ccf3805c7032f, type: 2}
- target: {fileID: 8703872773187979213, guid: 64c9d96775079344fac674889078804c, type: 3}
propertyPath: 'm_Materials.Array.data[0]'
value:
objectReference: {fileID: 2100000, guid: a4ed31ac8857b954093ccf3805c7032f, type: 2}
- target: {fileID: 8703872773199547009, guid: 64c9d96775079344fac674889078804c, type: 3}
propertyPath: m_Layer
value: 3
objectReference: {fileID: 0}
- target: {fileID: 8703872773199547011, guid: 64c9d96775079344fac674889078804c, type: 3}
propertyPath: m_Layer
value: 3
objectReference: {fileID: 0}
- target: {fileID: 8703872773199547013, guid: 64c9d96775079344fac674889078804c, type: 3}
propertyPath: m_Layer
value: 3
objectReference: {fileID: 0}
- target: {fileID: 8703872773199547015, guid: 64c9d96775079344fac674889078804c, type: 3}
propertyPath: m_Layer
value: 3
objectReference: {fileID: 0}
- target: {fileID: 8703872773199547017, guid: 64c9d96775079344fac674889078804c, type: 3}
propertyPath: m_Layer
value: 3
objectReference: {fileID: 0}
- target: {fileID: 8703872773199547019, guid: 64c9d96775079344fac674889078804c, type: 3}
propertyPath: m_Layer
value: 3
objectReference: {fileID: 0}
- target: {fileID: 8703872773199547021, guid: 64c9d96775079344fac674889078804c, type: 3}
propertyPath: m_Layer
value: 3
objectReference: {fileID: 0}
- target: {fileID: 8703872773199547023, guid: 64c9d96775079344fac674889078804c, type: 3}
propertyPath: m_Layer
value: 3
objectReference: {fileID: 0}
- target: {fileID: 8703872773199547025, guid: 64c9d96775079344fac674889078804c, type: 3}
propertyPath: m_Layer
value: 3
objectReference: {fileID: 0}
- target: {fileID: 8703872773199547027, guid: 64c9d96775079344fac674889078804c, type: 3}
propertyPath: m_Layer
value: 3
objectReference: {fileID: 0}
- target: {fileID: 8703872773199547029, guid: 64c9d96775079344fac674889078804c, type: 3}
propertyPath: m_Layer
value: 3
objectReference: {fileID: 0}
- target: {fileID: 8703872773199547031, guid: 64c9d96775079344fac674889078804c, type: 3}
propertyPath: m_Layer
value: 3
objectReference: {fileID: 0}
- target: {fileID: 8703872773199547033, guid: 64c9d96775079344fac674889078804c, type: 3}
propertyPath: m_Layer
value: 3
objectReference: {fileID: 0}
- target: {fileID: 8703872773199547035, guid: 64c9d96775079344fac674889078804c, type: 3}
propertyPath: m_Layer
value: 3
objectReference: {fileID: 0}
- target: {fileID: 8703872773199547037, guid: 64c9d96775079344fac674889078804c, type: 3}
propertyPath: m_Layer
value: 3
objectReference: {fileID: 0}
- target: {fileID: 8703872773199547039, guid: 64c9d96775079344fac674889078804c, type: 3}
propertyPath: m_Layer
value: 3
objectReference: {fileID: 0}
- target: {fileID: 8703872773199547041, guid: 64c9d96775079344fac674889078804c, type: 3}
propertyPath: m_Layer
value: 3
objectReference: {fileID: 0}
- target: {fileID: 8703872773199547043, guid: 64c9d96775079344fac674889078804c, type: 3}
propertyPath: m_Layer
value: 3
objectReference: {fileID: 0}
- target: {fileID: 8703872773199547045, guid: 64c9d96775079344fac674889078804c, type: 3}
propertyPath: m_Layer
value: 3
objectReference: {fileID: 0}
- target: {fileID: 8703872773199547047, guid: 64c9d96775079344fac674889078804c, type: 3}
propertyPath: m_Layer
value: 3
objectReference: {fileID: 0}
- target: {fileID: 8703872773199547049, guid: 64c9d96775079344fac674889078804c, type: 3}
propertyPath: m_Layer
value: 3
objectReference: {fileID: 0}
- target: {fileID: 8703872773199547051, guid: 64c9d96775079344fac674889078804c, type: 3}
propertyPath: m_Layer
value: 3
objectReference: {fileID: 0}
- target: {fileID: 8703872773199547053, guid: 64c9d96775079344fac674889078804c, type: 3}
propertyPath: m_Layer
value: 3
objectReference: {fileID: 0}
- target: {fileID: 8703872773199547055, guid: 64c9d96775079344fac674889078804c, type: 3}
propertyPath: m_Layer
value: 3
objectReference: {fileID: 0}
- target: {fileID: 8703872773199547057, guid: 64c9d96775079344fac674889078804c, type: 3}
propertyPath: m_Layer
value: 3
objectReference: {fileID: 0}
- target: {fileID: 8703872773199547059, guid: 64c9d96775079344fac674889078804c, type: 3}
propertyPath: m_Layer
value: 3
objectReference: {fileID: 0}
- target: {fileID: 8703872773199547061, guid: 64c9d96775079344fac674889078804c, type: 3}
propertyPath: m_Layer
value: 3
objectReference: {fileID: 0}
- target: {fileID: 8703872773199547063, guid: 64c9d96775079344fac674889078804c, type: 3}
propertyPath: m_Layer
value: 3
objectReference: {fileID: 0}
- target: {fileID: 8703872773199547065, guid: 64c9d96775079344fac674889078804c, type: 3}
propertyPath: m_Layer
value: 3
objectReference: {fileID: 0}
- target: {fileID: 8703872773199547067, guid: 64c9d96775079344fac674889078804c, type: 3}
propertyPath: m_Layer
value: 3
objectReference: {fileID: 0}
- target: {fileID: 8703872773199547069, guid: 64c9d96775079344fac674889078804c, type: 3}
propertyPath: m_Layer
value: 3
objectReference: {fileID: 0}
- target: {fileID: 8703872773199547071, guid: 64c9d96775079344fac674889078804c, type: 3}
propertyPath: m_Layer
value: 3
objectReference: {fileID: 0}
- target: {fileID: 8703872773199547073, guid: 64c9d96775079344fac674889078804c, type: 3}
propertyPath: m_Layer
value: 3
objectReference: {fileID: 0}
- target: {fileID: 8703872773199547075, guid: 64c9d96775079344fac674889078804c, type: 3}
propertyPath: m_Layer
value: 3
objectReference: {fileID: 0}
- target: {fileID: 8703872773199547077, guid: 64c9d96775079344fac674889078804c, type: 3}
propertyPath: m_Layer
value: 3
objectReference: {fileID: 0}
- target: {fileID: 8703872773199547079, guid: 64c9d96775079344fac674889078804c, type: 3}
propertyPath: m_Layer
value: 3
objectReference: {fileID: 0}
- target: {fileID: 8703872773199547081, guid: 64c9d96775079344fac674889078804c, type: 3}
propertyPath: m_Layer
value: 3
objectReference: {fileID: 0}
- target: {fileID: 8703872773199547083, guid: 64c9d96775079344fac674889078804c, type: 3}
propertyPath: m_Layer
value: 3
objectReference: {fileID: 0}
- target: {fileID: 8703872773199547085, guid: 64c9d96775079344fac674889078804c, type: 3}
propertyPath: m_Layer
value: 3
objectReference: {fileID: 0}
- target: {fileID: 8703872773199547087, guid: 64c9d96775079344fac674889078804c, type: 3}
propertyPath: m_Layer
value: 3
objectReference: {fileID: 0}
- target: {fileID: 8703872773199547089, guid: 64c9d96775079344fac674889078804c, type: 3}
propertyPath: m_Layer
value: 3
objectReference: {fileID: 0}
- target: {fileID: 8703872773199547091, guid: 64c9d96775079344fac674889078804c, type: 3}
propertyPath: m_Layer
value: 3
objectReference: {fileID: 0}
- target: {fileID: 8703872773199547093, guid: 64c9d96775079344fac674889078804c, type: 3}
propertyPath: m_Layer
value: 3
objectReference: {fileID: 0}
- target: {fileID: 8703872773199547095, guid: 64c9d96775079344fac674889078804c, type: 3}
propertyPath: m_Layer
value: 3
objectReference: {fileID: 0}
- target: {fileID: 8703872773199547097, guid: 64c9d96775079344fac674889078804c, type: 3}
propertyPath: m_Layer
value: 3
objectReference: {fileID: 0}
- target: {fileID: 8703872773199547099, guid: 64c9d96775079344fac674889078804c, type: 3}
propertyPath: m_Layer
value: 3
objectReference: {fileID: 0}
- target: {fileID: 8703872773199547101, guid: 64c9d96775079344fac674889078804c, type: 3}
propertyPath: m_Layer
value: 3
objectReference: {fileID: 0}
- target: {fileID: 8703872773199547103, guid: 64c9d96775079344fac674889078804c, type: 3}
propertyPath: m_Layer
value: 3
objectReference: {fileID: 0}
- target: {fileID: 8703872773199547203, guid: 64c9d96775079344fac674889078804c, type: 3}
propertyPath: m_Layer
value: 3
objectReference: {fileID: 0}
- target: {fileID: 8703872773199547205, guid: 64c9d96775079344fac674889078804c, type: 3}
propertyPath: m_Layer
value: 3
objectReference: {fileID: 0}
- target: {fileID: 8703872773199547207, guid: 64c9d96775079344fac674889078804c, type: 3}
propertyPath: m_Layer
value: 3
objectReference: {fileID: 0}
- target: {fileID: 8703872773199547209, guid: 64c9d96775079344fac674889078804c, type: 3}
propertyPath: m_Layer
value: 3
objectReference: {fileID: 0}
- target: {fileID: 8703872773199547211, guid: 64c9d96775079344fac674889078804c, type: 3}
propertyPath: m_Layer
value: 3
objectReference: {fileID: 0}
- target: {fileID: 8703872773199547213, guid: 64c9d96775079344fac674889078804c, type: 3}
propertyPath: m_Layer
value: 3
objectReference: {fileID: 0}
- target: {fileID: 8703872773199547215, guid: 64c9d96775079344fac674889078804c, type: 3}
propertyPath: m_Name
value: Unity_Chan_generic
objectReference: {fileID: 0}
- target: {fileID: 8703872773199547215, guid: 64c9d96775079344fac674889078804c, type: 3}
propertyPath: m_Layer
value: 3
objectReference: {fileID: 0}
- target: {fileID: 8703872773199547233, guid: 64c9d96775079344fac674889078804c, type: 3}
propertyPath: m_Layer
value: 3
objectReference: {fileID: 0}
- target: {fileID: 8703872773199547235, guid: 64c9d96775079344fac674889078804c, type: 3}
propertyPath: m_Layer
value: 3
objectReference: {fileID: 0}
- target: {fileID: 8703872773199547237, guid: 64c9d96775079344fac674889078804c, type: 3}
propertyPath: m_Layer
value: 3
objectReference: {fileID: 0}
- target: {fileID: 8703872773199547239, guid: 64c9d96775079344fac674889078804c, type: 3}
propertyPath: m_Layer
value: 3
objectReference: {fileID: 0}
- target: {fileID: 8703872773199547241, guid: 64c9d96775079344fac674889078804c, type: 3}
propertyPath: m_Layer
value: 3
objectReference: {fileID: 0}
- target: {fileID: 8703872773199547243, guid: 64c9d96775079344fac674889078804c, type: 3}
propertyPath: m_Layer
value: 3
objectReference: {fileID: 0}
- target: {fileID: 8703872773199547245, guid: 64c9d96775079344fac674889078804c, type: 3}
propertyPath: m_Layer
value: 3
objectReference: {fileID: 0}
- target: {fileID: 8703872773199547247, guid: 64c9d96775079344fac674889078804c, type: 3}
propertyPath: m_Layer
value: 3
objectReference: {fileID: 0}
- target: {fileID: 8703872773199547249, guid: 64c9d96775079344fac674889078804c, type: 3}
propertyPath: m_Layer
value: 3
objectReference: {fileID: 0}
- target: {fileID: 8703872773199547251, guid: 64c9d96775079344fac674889078804c, type: 3}
propertyPath: m_Layer
value: 3
objectReference: {fileID: 0}
- target: {fileID: 8703872773199547253, guid: 64c9d96775079344fac674889078804c, type: 3}
propertyPath: m_Layer
value: 3
objectReference: {fileID: 0}
- target: {fileID: 8703872773199547255, guid: 64c9d96775079344fac674889078804c, type: 3}
propertyPath: m_Layer
value: 3
objectReference: {fileID: 0}
- target: {fileID: 8703872773199547257, guid: 64c9d96775079344fac674889078804c, type: 3}
propertyPath: m_Layer
value: 3
objectReference: {fileID: 0}
- target: {fileID: 8703872773199547259, guid: 64c9d96775079344fac674889078804c, type: 3}
propertyPath: m_Layer
value: 3
objectReference: {fileID: 0}
- target: {fileID: 8703872773199547261, guid: 64c9d96775079344fac674889078804c, type: 3}
propertyPath: m_Layer
value: 3
objectReference: {fileID: 0}
- target: {fileID: 8703872773199547263, guid: 64c9d96775079344fac674889078804c, type: 3}
propertyPath: m_Layer
value: 3
objectReference: {fileID: 0}
- target: {fileID: 8703872773199976303, guid: 64c9d96775079344fac674889078804c, type: 3}
- target: {fileID: 6016546948624269488, guid: 43e08ce9ad10abcf5b6fa0162c07956a, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8703872773199976303, guid: 64c9d96775079344fac674889078804c, type: 3}
- target: {fileID: 6016546948624269488, guid: 43e08ce9ad10abcf5b6fa0162c07956a, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8703872773199976303, guid: 64c9d96775079344fac674889078804c, type: 3}
- target: {fileID: 6016546948624269488, guid: 43e08ce9ad10abcf5b6fa0162c07956a, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8703872773199976303, guid: 64c9d96775079344fac674889078804c, type: 3}
- target: {fileID: 6016546948624269488, guid: 43e08ce9ad10abcf5b6fa0162c07956a, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8703872773199976303, guid: 64c9d96775079344fac674889078804c, type: 3}
- target: {fileID: 6016546948624269488, guid: 43e08ce9ad10abcf5b6fa0162c07956a, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8703872773199976303, guid: 64c9d96775079344fac674889078804c, type: 3}
- target: {fileID: 6016546948624269488, guid: 43e08ce9ad10abcf5b6fa0162c07956a, type: 3}
propertyPath: m_LocalRotation.y
value: 0
value: -0
objectReference: {fileID: 0}
- target: {fileID: 8703872773199976303, guid: 64c9d96775079344fac674889078804c, type: 3}
- target: {fileID: 6016546948624269488, guid: 43e08ce9ad10abcf5b6fa0162c07956a, type: 3}
propertyPath: m_LocalRotation.z
value: 0
value: -0
objectReference: {fileID: 0}
- target: {fileID: 8703872773199976303, guid: 64c9d96775079344fac674889078804c, type: 3}
- target: {fileID: 6016546948624269488, guid: 43e08ce9ad10abcf5b6fa0162c07956a, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8703872773199976303, guid: 64c9d96775079344fac674889078804c, type: 3}
- target: {fileID: 6016546948624269488, guid: 43e08ce9ad10abcf5b6fa0162c07956a, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8703872773199976303, guid: 64c9d96775079344fac674889078804c, type: 3}
- target: {fileID: 6016546948624269488, guid: 43e08ce9ad10abcf5b6fa0162c07956a, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents:
- {fileID: 2466548407522557452, guid: 64c9d96775079344fac674889078804c, type: 3}
- target: {fileID: 6850228883905936934, guid: 43e08ce9ad10abcf5b6fa0162c07956a, type: 3}
propertyPath: m_Name
value: 'Player '
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 64c9d96775079344fac674889078804c, type: 3}
--- !u!4 &8288112677804220542 stripped
m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 6850228883905936934, guid: 43e08ce9ad10abcf5b6fa0162c07956a, type: 3}
insertIndex: -1
addedObject: {fileID: 4090455171902986455}
m_SourcePrefab: {fileID: 100100000, guid: 43e08ce9ad10abcf5b6fa0162c07956a, type: 3}
--- !u!1 &8237157460241840701 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 6850228883905936934, guid: 43e08ce9ad10abcf5b6fa0162c07956a, type: 3}
m_PrefabInstance: {fileID: 3260788586600530971}
m_PrefabAsset: {fileID: 0}
--- !u!95 &4090455171902986455
Animator:
serializedVersion: 7
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8237157460241840701}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: 0a88085cbabf38ae084dd83fcdd5e566, type: 2}
m_CullingMode: 0
m_UpdateMode: 0
m_ApplyRootMotion: 0
m_LinearVelocityBlending: 0
m_StabilizeFeet: 0
m_AnimatePhysics: 0
m_WarningMessage:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorStateOnDisable: 0
m_WriteDefaultValuesOnDisable: 0
--- !u!4 &9097188113646404779 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 8703872773199976303, guid: 64c9d96775079344fac674889078804c, type: 3}
m_PrefabInstance: {fileID: 850921658224604945}
m_CorrespondingSourceObject: {fileID: 6016546948624269488, guid: 43e08ce9ad10abcf5b6fa0162c07956a, type: 3}
m_PrefabInstance: {fileID: 3260788586600530971}
m_PrefabAsset: {fileID: 0}
@@ -0,0 +1,124 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: PlayerAnimator
serializedVersion: 6
m_AnimatorParameters:
- m_Name: VelocityForward
m_Type: 1
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
- m_Name: VelocityRight
m_Type: 1
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
m_StateMachine: {fileID: 2559077494877389194}
m_Mask: {fileID: 0}
m_Motions: []
m_Behaviours: []
m_BlendingMode: 0
m_SyncedLayerIndex: -1
m_DefaultWeight: 0
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
m_EvaluateTransitionsOnStart: 1
--- !u!1107 &2559077494877389194
AnimatorStateMachine:
serializedVersion: 7
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Base Layer
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: 6745978634751617082}
m_Position: {x: 300, y: 130, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
m_StateMachineTransitions: {}
m_StateMachineBehaviours: []
m_AnyStatePosition: {x: 40, y: 200, z: 0}
m_EntryPosition: {x: 320, y: 50, z: 0}
m_ExitPosition: {x: 600, y: 200, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: 6745978634751617082}
--- !u!206 &5848294841321112178
BlendTree:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: WalkBlend
m_Childs:
- serializedVersion: 2
m_Motion: {fileID: 7400000, guid: 64d3b955991e69aad96769fe04b482e2, type: 2}
m_Threshold: -1
m_Position: {x: -1, y: 0}
m_TimeScale: 1
m_CycleOffset: 0
m_DirectBlendParameter: VelocityForward
m_Mirror: 0
- serializedVersion: 2
m_Motion: {fileID: 7400000, guid: 84eeeb244dc88ef8ea5351429b74a76b, type: 2}
m_Threshold: 0
m_Position: {x: 0, y: 0}
m_TimeScale: 1
m_CycleOffset: 0
m_DirectBlendParameter: VelocityForward
m_Mirror: 0
- serializedVersion: 2
m_Motion: {fileID: 7400000, guid: d3eab09540515480f90cc053f8cb680d, type: 2}
m_Threshold: 1
m_Position: {x: 1, y: 0}
m_TimeScale: 1
m_CycleOffset: 0
m_DirectBlendParameter: VelocityForward
m_Mirror: 0
m_BlendParameter: VelocityRight
m_BlendParameterY: VelocityRight
m_MinThreshold: -1
m_MaxThreshold: 1
m_UseAutomaticThresholds: 0
m_NormalizedBlendValues: 0
m_BlendType: 0
--- !u!1102 &6745978634751617082
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: WalkBlend
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 5848294841321112178}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 0a88085cbabf38ae084dd83fcdd5e566
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 9100000
userData:
assetBundleName:
assetBundleVariant:
@@ -285,7 +285,7 @@ Material:
- _StencilRef: 0
- _StencilWriteMask: 255
- _StencilZFail: 0
- _StylizeTab: 0
- _StylizeTab: 1
- _Surface: 0
- _ThresholdMapScale: 1
- _UVSec: 0
File diff suppressed because it is too large. Load diff
@@ -452,7 +452,7 @@ SkinnedMeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: -2996185865311229288, guid: 53d86f70086b13ff6a77389ba3416e09, type: 3}
- {fileID: 2100000, guid: c01726e7e63450229879861f18d6b2c8, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@@ -895,7 +895,7 @@ SkinnedMeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 8981097594920684624, guid: 53d86f70086b13ff6a77389ba3416e09, type: 3}
- {fileID: 2100000, guid: 1c03ceb3be3096db5b40a7cbb6a308a7, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@@ -1641,7 +1641,7 @@ SkinnedMeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: -6964990062510570161, guid: 53d86f70086b13ff6a77389ba3416e09, type: 3}
- {fileID: 2100000, guid: 210dbeeba7272c262a4e0f4c6f6bccc8, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@@ -2032,7 +2032,7 @@ SkinnedMeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 8017569697764601609, guid: 53d86f70086b13ff6a77389ba3416e09, type: 3}
- {fileID: 2100000, guid: e490157c3bcaf6a0396958e21736c905, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
+6
View File
@@ -103,6 +103,12 @@ MonoBehaviour:
m_ResolutionX: 2
m_ResolutionY: 2
m_Dirty: 0
- m_Material: {fileID: 2100000, guid: 1c03ceb3be3096db5b40a7cbb6a308a7, type: 2}
m_ExportMode: 0
m_IsResolutionOverridden: 0
m_ResolutionX: 2
m_ResolutionY: 2
m_Dirty: 0
m_PipelineSplitMesh: 1
m_PipelineSmoothMeshNormals: 1
m_PipelineSimplifyCollisionMeshes: 1