Progressing fixes
This commit is contained in:
ThomasCharester committed
1 parent
d00ce7bb0e
commit
0619ada74f
62 files changed
+81418
-72853
No files matched your search
@@ -1,21 +0,0 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!114 &11400000
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 6d47fdf0c6f444c087bcc6f2492746af, type: 3}
|
||||
m_Name: Mma Kick
|
||||
m_EditorClassIdentifier: Assembly-CSharp::Code.OfficeGame.BattleMode.Actions.Attacks.AttackActionConfig
|
||||
ActionType: 3
|
||||
AnimationClip: {fileID: -203655887218126122, guid: 89b0eb37cf5604921b0b8ebf81e46d8f, type: 3}
|
||||
TotalFrames: 100
|
||||
HitboxStartFrame: 36
|
||||
HitboxEndFrame: 52
|
||||
AttackingBodyPart: 3
|
||||
Damage: 5
|
||||
@@ -1,8 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 1aba77af65c69314994f0eba6e4eee51
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 11400000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -1,17 +0,0 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!114 &11400000
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 3c9ef585559248f0ba66635a85a6c829, type: 3}
|
||||
m_Name: Stugger
|
||||
m_EditorClassIdentifier: Assembly-CSharp::Code.OfficeGame.BattleMode.Actions.BattleActionParameters
|
||||
ActionType: 4
|
||||
AnimationClip: {fileID: -2945207999064407817, guid: 6b292eac3f2644cf9b2aab9ab117c2a7, type: 3}
|
||||
TotalFrames: 59
|
||||
@@ -1,8 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 1e89d0da735f7493fb460a85555999d6
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 11400000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -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
|
||||
|
||||
Reference in new issue
Block a user