ThomasCharester/Hasebe
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Progressing fixes

Browse Source
This commit is contained in:
ThomasCharester committed 2026-11-01 20:52:59 +03:00
1 parent d00ce7bb0e
commit 0619ada74f
62 files changed
+81418 -72853
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Assets/Code/OfficeGame/BattleMode/Actions/Attacks/AttackActionParameters.cs
+2
View File
@@ -11,6 +11,8 @@ namespace Code.OfficeGame.BattleMode.Actions.Attacks
public int HitboxEndFrame;
public HitBoxPartType AttackingBodyPart;
public int StuggerFrames;
public int Damage;
}
Assets/Code/OfficeGame/BattleMode/Actions/Attacks/BattleActionPlayerAttackMMA.cs
+8 -2
View File
@@ -2,6 +2,7 @@ using System.Linq;
using Code.Infrastructure.Utils;
using Code.OfficeGame.BattleMode.Actions.Deciders;
using Code.OfficeGame.BattleMode.HitBoxes;
using Code.OfficeGame.BattleMode.Timeline;
using UnityEngine;
namespace Code.OfficeGame.BattleMode.Actions.Attacks
@@ -46,7 +47,7 @@ namespace Code.OfficeGame.BattleMode.Actions.Attacks
if (actionData.CurrentFrame >= _attackData.HitboxStartFrame
&& actionData.CurrentFrame <= _attackData.HitboxEndFrame)
{
entity.EntityHitBoxes.CheckHitsForCurrentFrame(OnEnemyHit, HitBoxPartType.LArm);
entity.EntityHitBoxes.CheckHitsForCurrentFrame(OnEnemyHit, _attackData.AttackingBodyPart);
}
if (actionData.CurrentFrame >= _attackData.TotalFrames)
@@ -75,7 +76,12 @@ namespace Code.OfficeGame.BattleMode.Actions.Attacks
private void OnEnemyHit(Collider enemyCollider)
{
Debug.Log($"Попадание в {enemyCollider.name}! Урон: {_attackData.Damage}");
var originEntityId = enemyCollider.GetComponentInParent<EntityProperties>().GetEntityId();
var actionData = new StuggerActionData { TotalFrames = _attackData.StuggerFrames};
var decisionResult = new AsIsBattleActionDeciderResult {ActionType = BattleActionType.Stugger};
BattleTimeline.ForceDecideAction(originEntityId, actionData, decisionResult);
}
}
}
Assets/Code/OfficeGame/BattleMode/Actions/BattleAction.cs
+4 -1
View File
@@ -1,5 +1,5 @@
using Code.OfficeGame.BattleMode.Actions.Deciders;
using UnityEngine;
using Code.OfficeGame.BattleMode.Timeline;
namespace Code.OfficeGame.BattleMode.Actions
{
@@ -9,5 +9,8 @@ namespace Code.OfficeGame.BattleMode.Actions
public abstract BattleActionType ActionType { get; }
public abstract DeciderType DeciderType { get; }
public abstract BattleActionData MountAndGetFrames(EntityProperties entity, BattleActionDecisionResult result);
protected BattleTimeline BattleTimeline;
public void SetBattleTimeline(BattleTimeline battleTimeline) => BattleTimeline = battleTimeline;
}
}
Assets/Code/OfficeGame/BattleMode/Actions/BattleActionMove.cs
-1
View File
@@ -108,7 +108,6 @@ namespace Code.OfficeGame.BattleMode.Actions
private void StopMovementAndFinish(MovementController movementController)
{
Debug.Log("MovementFinished");
var emptyInputs = new AICharacterInputs
{
MoveVector = Vector3.zero,
Assets/Code/OfficeGame/BattleMode/Actions/BattleActionStugger.cs
+1 -2
View File
@@ -13,8 +13,7 @@ namespace Code.OfficeGame.BattleMode.Actions
private BattleActionParameters _actionParameters;
[Inject]
public void Construct(MultipleConfig<BattleActionParameters> actionData)
public BattleActionStugger(MultipleConfig<BattleActionParameters> actionData)
{
_actionParameters = actionData.Configs.SingleOrDefault(x => x.ActionType == ActionType);
}
Assets/Code/OfficeGame/BattleMode/Timeline/BattleTimeline.cs
+35 -6
View File
@@ -45,7 +45,14 @@ namespace Code.OfficeGame.BattleMode.Timeline
_cameraStateMachine = cameraStateMachine;
_battleActionDecisionPanel = battleActionDecisionPanel;
_timelinePanel = timelinePanel;
_battleActions = battleActions.ToDictionary(x => x.ActionType);
_battleActions = new();
foreach (var battleAction in battleActions)
{
battleAction.SetBattleTimeline(this);
_battleActions.Add(battleAction.ActionType, battleAction);
}
_battleActionDeciders = battleActionDeciders.ToDictionary(x => x.DeciderType);
}
@@ -149,12 +156,24 @@ namespace Code.OfficeGame.BattleMode.Timeline
|| !actionDataSnapshots.TryGetValue(entityId, out var battleActionData))
continue;
bool actionChanged = false;
if (!_actionDecisionResults.TryAdd(entityId, actionDecisionResult))
_actionDecisionResults[entityId]?.RestoreSnapshot(actionDecisionResult);
{
actionChanged = actionDecisionResult.ActionType !=
_actionDecisionResults[entityId].ActionType;
if(actionChanged)
_actionDecisionResults[entityId] = actionDecisionResult;
else
_actionDecisionResults[entityId]?.RestoreSnapshot(actionDecisionResult);
}
if (!_battleActionDatas.TryAdd(entityId, battleActionData))
_battleActionDatas[entityId]?.RestoreSnapshot(battleActionData);
{
if(actionChanged) _battleActionDatas[entityId] = battleActionData;
else _battleActionDatas[entityId]?.RestoreSnapshot(battleActionData);
}
entity.RestoreSnapshot(entitySnapshots[entityId]);
}
}
@@ -290,8 +309,6 @@ namespace Code.OfficeGame.BattleMode.Timeline
decisionResult = await _battleActionDeciders[deciderType].GetDecision();
decisionResult.ActionType = decidedActionType;
Debug.Log(decisionResult.ResultCode);
actionData = _battleActions[decidedActionType].MountAndGetFrames(entity, decisionResult);
previewCancellationToken.Cancel();
@@ -331,5 +348,17 @@ namespace Code.OfficeGame.BattleMode.Timeline
return (decisionResult, actionData);
}
public void ForceDecideAction(
EntityId entityId,
BattleActionData forcedBattleActionData,
BattleActionDecisionResult forcedBattleActionDataResult)
{
_battleActionDatas[entityId] = forcedBattleActionData;
_actionDecisionResults[entityId] = forcedBattleActionDataResult;
Debug.Log($"Задано действие {forcedBattleActionDataResult.ActionType} для {entityId}");
}
}
}
Assets/OfficeGame/Battle/BattleActionsConfigs.meta
+8
View File
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 21a01a816b299453384daa48f59e6bbf
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/OfficeGame/Player/Animations/Mma Kick.asset → Assets/OfficeGame/Battle/BattleActionsConfigs/Mma Kick.asset
+4 -3
View File
@@ -15,7 +15,8 @@ MonoBehaviour:
ActionType: 3
AnimationClip: {fileID: -203655887218126122, guid: 89b0eb37cf5604921b0b8ebf81e46d8f, type: 3}
TotalFrames: 100
HitboxStartFrame: 36
HitboxEndFrame: 52
AttackingBodyPart: 3
HitboxStartFrame: 1
HitboxEndFrame: 99
AttackingBodyPart: 12
StuggerFrames: 180
Damage: 5
Assets/OfficeGame/Player/Animations/Mma Kick.asset.meta → Assets/OfficeGame/Battle/BattleActionsConfigs/Mma Kick.asset.meta
View File
File renamed without changes.
Assets/OfficeGame/Player/Animations/Stugger.asset → Assets/OfficeGame/Battle/BattleActionsConfigs/Stugger.asset
View File
File renamed without changes.
Assets/OfficeGame/Player/Animations/Stugger.asset.meta → Assets/OfficeGame/Battle/BattleActionsConfigs/Stugger.asset.meta
View File
File renamed without changes.
Assets/OfficeGame/Companions/Companion.prefab
+22 -21
View File
@@ -796,12 +796,12 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3178227630714667686}
serializedVersion: 2
m_LocalRotation: {x: 0.72430015, y: -0.012503041, z: -0.0007734359, w: 0.6893711}
m_LocalPosition: {x: -0.000058, y: 0.005081, z: 0.000887}
m_LocalScale: {x: 0.0008310459, y: 0.0024236469, z: 0.0006792192}
m_LocalRotation: {x: 0.27275798, y: 0.011116624, z: -0.03180616, w: 0.9614926}
m_LocalPosition: {x: 0, y: 0.0011913115, z: -0.0003177984}
m_LocalScale: {x: 0.00083104573, y: 0.002423644, z: 0.00067921897}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 8807995033794877385}
m_Father: {fileID: 5646850281401693253}
m_LocalEulerAnglesHint: {x: 93.028015, y: 20.335999, z: 21.287003}
--- !u!33 &6774455916949461975
MeshFilter:
@@ -1055,6 +1055,7 @@ MonoBehaviour:
battleActionTypes: 0100000002000000i
MovementController: {fileID: 1169814968730905922}
KinematicCharacterMotor: {fileID: 1099954219580652693}
EntityHitBoxes: {fileID: 0}
--- !u!1 &4999618383784345993
GameObject:
m_ObjectHideFlags: 0
@@ -1306,12 +1307,12 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7534648138589251582}
serializedVersion: 2
m_LocalRotation: {x: -0.10030921, y: 0.065068245, z: 0.0061848094, w: 0.99280715}
m_LocalPosition: {x: -0.000155, y: 0.006855, z: -0.000766}
m_LocalScale: {x: 0.0009827293, y: 0.0045207865, z: 0.00096685736}
m_LocalRotation: {x: 0.014902424, y: 0.06707111, z: 0.01011665, w: 0.9975856}
m_LocalPosition: {x: -0.00014021885, y: 0.0023434416, z: -0.00023565153}
m_LocalScale: {x: 0.0009827297, y: 0.0045207883, z: 0.00096685754}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 2068551906827566226}
m_Father: {fileID: 8807995033794877385}
m_LocalEulerAnglesHint: {x: -11.536, y: 7.504, z: -0.045}
--- !u!33 &1624420173695047922
MeshFilter:
@@ -1418,12 +1419,12 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7579030851221987636}
serializedVersion: 2
m_LocalRotation: {x: -0.0040713265, y: 0.00013359914, z: 0.9999225, w: 0.011766074}
m_LocalPosition: {x: 0.00094, y: -0.002123, z: 0.000101}
m_LocalScale: {x: 0.0012496426, y: 0.004520786, z: 0.0010296222}
m_LocalRotation: {x: -0.05578211, y: 0.14236857, z: 0.0013149006, w: 0.9882398}
m_LocalPosition: {x: 0.0000618242, y: 0.0023535336, z: 0}
m_LocalScale: {x: 0.0012496418, y: 0.004520785, z: 0.001029617}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 3064029595341815347}
m_Father: {fileID: 2068551906827566226}
m_LocalEulerAnglesHint: {x: -0.021, y: -0.466, z: 178.652}
--- !u!33 &3301192295303638505
MeshFilter:
@@ -1942,9 +1943,6 @@ PrefabInstance:
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects:
- targetCorrespondingSourceObject: {fileID: 1531172710553138607, guid: 22f5406d0dd3e496dab66400ad658fb8, type: 3}
insertIndex: 2
addedObject: {fileID: 8030142778319377205}
- targetCorrespondingSourceObject: {fileID: -9000482945971038761, guid: 22f5406d0dd3e496dab66400ad658fb8, type: 3}
insertIndex: -1
addedObject: {fileID: 2214277512379952466}
@@ -1956,8 +1954,11 @@ PrefabInstance:
addedObject: {fileID: 4141237407270016018}
- targetCorrespondingSourceObject: {fileID: -6697214219869047026, guid: 22f5406d0dd3e496dab66400ad658fb8, type: 3}
insertIndex: -1
addedObject: {fileID: 6487267368616855715}
addedObject: {fileID: 8030142778319377205}
- targetCorrespondingSourceObject: {fileID: -4213672668784436139, guid: 22f5406d0dd3e496dab66400ad658fb8, type: 3}
insertIndex: -1
addedObject: {fileID: 6487267368616855715}
- targetCorrespondingSourceObject: {fileID: 8207787990394109913, guid: 22f5406d0dd3e496dab66400ad658fb8, type: 3}
insertIndex: -1
addedObject: {fileID: 1569761256180007230}
- targetCorrespondingSourceObject: {fileID: 2559326207539228873, guid: 22f5406d0dd3e496dab66400ad658fb8, type: 3}
@@ -2026,11 +2027,6 @@ Transform:
m_CorrespondingSourceObject: {fileID: -7489006422537243202, guid: 22f5406d0dd3e496dab66400ad658fb8, type: 3}
m_PrefabInstance: {fileID: 4592070565194058652}
m_PrefabAsset: {fileID: 0}
--- !u!4 &3064029595341815347 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 1531172710553138607, guid: 22f5406d0dd3e496dab66400ad658fb8, type: 3}
m_PrefabInstance: {fileID: 4592070565194058652}
m_PrefabAsset: {fileID: 0}
--- !u!4 &4049007249699777655 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 22f5406d0dd3e496dab66400ad658fb8, type: 3}
@@ -2051,6 +2047,11 @@ Transform:
m_CorrespondingSourceObject: {fileID: 94383288270192461, guid: 22f5406d0dd3e496dab66400ad658fb8, type: 3}
m_PrefabInstance: {fileID: 4592070565194058652}
m_PrefabAsset: {fileID: 0}
--- !u!4 &5646850281401693253 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 8207787990394109913, guid: 22f5406d0dd3e496dab66400ad658fb8, type: 3}
m_PrefabInstance: {fileID: 4592070565194058652}
m_PrefabAsset: {fileID: 0}
--- !u!4 &7785671683496135453 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -3191349008443277183, guid: 22f5406d0dd3e496dab66400ad658fb8, type: 3}
Assets/OfficeGame/Player/Player.prefab
-280
View File
@@ -1261,150 +1261,6 @@ BoxCollider:
serializedVersion: 3
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!1 &5865940515695367313
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 342766060722697506}
- component: {fileID: 6894003323627830512}
- component: {fileID: 1067183535363547161}
- component: {fileID: 315944951666586202}
- component: {fileID: 4168235549514175667}
m_Layer: 0
m_Name: HoloCop
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!4 &342766060722697506
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5865940515695367313}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 3186131212207065069}
m_Father: {fileID: 4102848286648065809}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &6894003323627830512
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5865940515695367313}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: b4067e559c4d4556a335b4c507f9702f, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::Code.OfficeGame.BattleMode.Actions.HoloCopy.HoloCop
movementController: {fileID: 4168235549514175667}
motor: {fileID: 315944951666586202}
originMotor: {fileID: 2650801570508942627}
animator: {fileID: 8851620147763273111}
originAnimator: {fileID: 2511146916935397012}
--- !u!136 &1067183535363547161
CapsuleCollider:
m_ObjectHideFlags: 8
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5865940515695367313}
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.2
m_Height: 1.35
m_Direction: 1
m_Center: {x: 0, y: 0.675, z: 0}
--- !u!114 &315944951666586202
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5865940515695367313}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4d1bc5515e3ab954e80599c538834774, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::KinematicCharacterController.KinematicCharacterMotor
Capsule: {fileID: 1067183535363547161}
CapsuleRadius: 0.2
CapsuleHeight: 1.35
CapsuleYOffset: 0.675
CapsulePhysicsMaterial: {fileID: 0}
GroundDetectionExtraDistance: 0
MaxStableSlopeAngle: 60
StableGroundLayers:
serializedVersion: 2
m_Bits: 4294967295
DiscreteCollisionEvents: 0
StepHandling: 1
MaxStepHeight: 0.5
AllowSteppingWithoutStableGrounding: 0
MinRequiredStepDepth: 0
LedgeAndDenivelationHandling: 1
MaxStableDistanceFromLedge: 0
MaxVelocityForLedgeSnap: 0
MaxStableDenivelationAngle: 180
InteractiveRigidbodyHandling: 1
RigidbodyInteractionType: 0
SimulatedCharacterMass: 1
PreserveAttachedRigidbodyMomentum: 1
HasPlanarConstraint: 0
PlanarConstraintAxis: {x: 0, y: 0, z: 1}
MaxMovementIterations: 5
MaxDecollisionIterations: 1
CheckMovementInitialOverlaps: 1
KillVelocityWhenExceedMaxMovementIterations: 1
KillRemainingMovementWhenExceedMaxMovementIterations: 1
--- !u!114 &4168235549514175667
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5865940515695367313}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 45d9830d22b54832ade96a92f599643a, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::Code.Game.Gameplay.Player.PlayerMovementController
Motor: {fileID: 315944951666586202}
Freeze: 0
MaxStableMoveSpeed: 3
StableMovementSharpness: 15
OrientationSharpness: 10
OrientationMethod: 0
MaxAirMoveSpeed: 15
AirAccelerationSpeed: 15
Drag: 0.1
BonusOrientationMethod: 0
BonusOrientationSharpness: 1
BonusOrientationGravitySharpness: 0
Gravity: {x: 0, y: -30, z: 0}
IgnoredColliders: []
--- !u!1 &6137683549794358498
GameObject:
m_ObjectHideFlags: 0
@@ -1892,7 +1748,6 @@ Transform:
m_Children:
- {fileID: 257380888280300741}
- {fileID: 8374810763302122734}
- {fileID: 342766060722697506}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!136 &6939642111494274883
@@ -2083,141 +1938,6 @@ MonoBehaviour:
MovementController: {fileID: 382175622288203694}
KinematicCharacterMotor: {fileID: 2650801570508942627}
EntityHitBoxes: {fileID: 4165226838920277257}
--- !u!1001 &3151904053883985926
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 342766060722697506}
m_Modifications:
- target: {fileID: -9114889020240603615, guid: 22f5406d0dd3e496dab66400ad658fb8, type: 3}
propertyPath: 'm_Materials.Array.data[0]'
value:
objectReference: {fileID: 2100000, guid: 110b054cbfe874bf2bb643705c76dcb3, type: 2}
- target: {fileID: -8679921383154817045, guid: 22f5406d0dd3e496dab66400ad658fb8, type: 3}
propertyPath: m_LocalScale.x
value: 80.4
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 22f5406d0dd3e496dab66400ad658fb8, type: 3}
propertyPath: m_LocalScale.y
value: 80.4
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 22f5406d0dd3e496dab66400ad658fb8, type: 3}
propertyPath: m_LocalScale.z
value: 80.4
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 22f5406d0dd3e496dab66400ad658fb8, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 22f5406d0dd3e496dab66400ad658fb8, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 22f5406d0dd3e496dab66400ad658fb8, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 22f5406d0dd3e496dab66400ad658fb8, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 22f5406d0dd3e496dab66400ad658fb8, type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 22f5406d0dd3e496dab66400ad658fb8, type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 22f5406d0dd3e496dab66400ad658fb8, type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 22f5406d0dd3e496dab66400ad658fb8, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 22f5406d0dd3e496dab66400ad658fb8, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 22f5406d0dd3e496dab66400ad658fb8, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 22f5406d0dd3e496dab66400ad658fb8, type: 3}
propertyPath: m_ConstrainProportionsScale
value: 1
objectReference: {fileID: 0}
- target: {fileID: -7823293702887809713, guid: 22f5406d0dd3e496dab66400ad658fb8, type: 3}
propertyPath: 'm_Materials.Array.data[0]'
value:
objectReference: {fileID: 2100000, guid: 110b054cbfe874bf2bb643705c76dcb3, type: 2}
- target: {fileID: -6452266432751415832, guid: 22f5406d0dd3e496dab66400ad658fb8, type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: -2321449255681548753, guid: 22f5406d0dd3e496dab66400ad658fb8, type: 3}
propertyPath: m_LocalScale.x
value: 0.87
objectReference: {fileID: 0}
- target: {fileID: -2321449255681548753, guid: 22f5406d0dd3e496dab66400ad658fb8, type: 3}
propertyPath: m_LocalScale.y
value: 0.87
objectReference: {fileID: 0}
- target: {fileID: -2321449255681548753, guid: 22f5406d0dd3e496dab66400ad658fb8, type: 3}
propertyPath: m_LocalScale.z
value: 0.87
objectReference: {fileID: 0}
- target: {fileID: -2321449255681548753, guid: 22f5406d0dd3e496dab66400ad658fb8, type: 3}
propertyPath: m_ConstrainProportionsScale
value: 1
objectReference: {fileID: 0}
- target: {fileID: 919132149155446097, guid: 22f5406d0dd3e496dab66400ad658fb8, type: 3}
propertyPath: m_Name
value: Player_M1_1
objectReference: {fileID: 0}
- target: {fileID: 1287542132067729854, guid: 22f5406d0dd3e496dab66400ad658fb8, type: 3}
propertyPath: 'm_Materials.Array.data[0]'
value:
objectReference: {fileID: 2100000, guid: 110b054cbfe874bf2bb643705c76dcb3, type: 2}
- target: {fileID: 5797384429611982230, guid: 22f5406d0dd3e496dab66400ad658fb8, type: 3}
propertyPath: 'm_Materials.Array.data[0]'
value:
objectReference: {fileID: 2100000, guid: 110b054cbfe874bf2bb643705c76dcb3, type: 2}
- target: {fileID: 5797954692085622370, guid: 22f5406d0dd3e496dab66400ad658fb8, type: 3}
propertyPath: m_Name
value: Player_M1
objectReference: {fileID: 0}
- target: {fileID: 5866666021909216657, guid: 22f5406d0dd3e496dab66400ad658fb8, type: 3}
propertyPath: m_Controller
value:
objectReference: {fileID: 9100000, guid: 0a88085cbabf38ae084dd83fcdd5e566, type: 2}
- target: {fileID: 5866666021909216657, guid: 22f5406d0dd3e496dab66400ad658fb8, type: 3}
propertyPath: m_ApplyRootMotion
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9148548460791437811, guid: 22f5406d0dd3e496dab66400ad658fb8, type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 22f5406d0dd3e496dab66400ad658fb8, type: 3}
--- !u!4 &3186131212207065069 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 22f5406d0dd3e496dab66400ad658fb8, type: 3}
m_PrefabInstance: {fileID: 3151904053883985926}
m_PrefabAsset: {fileID: 0}
--- !u!95 &8851620147763273111 stripped
Animator:
m_CorrespondingSourceObject: {fileID: 5866666021909216657, guid: 22f5406d0dd3e496dab66400ad658fb8, type: 3}
m_PrefabInstance: {fileID: 3151904053883985926}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &8337279434272854789
PrefabInstance:
m_ObjectHideFlags: 0
Assets/Tremble Sync Settings.asset
+1 -1
View File
@@ -164,7 +164,7 @@ MonoBehaviour:
Path: Assets/OfficeGame/Companions/Companion.prefab
FullTypeName: UnityEngine.GameObject
AddressableName: Companion
SpawnOffset: {x: -0, y: -0.7675122, z: -0.07323936}
SpawnOffset: {x: -0, y: -0.7675165, z: -0.07323936}
- MapName: prefab_TestInteractable
Path: Assets/OfficeGame/Testing/TestInteractable.prefab
FullTypeName: UnityEngine.GameObject