You've already forked Darklings-FightingGame
mirror of
https://github.com/izzy2lost/Darklings-FightingGame.git
synced 2026-03-10 11:35:19 -07:00
Add camera shake and polish abaddon arcana
This commit is contained in:
@@ -1615,11 +1615,18 @@ AnimationClip:
|
||||
messageOptions: 0
|
||||
- time: 0.75
|
||||
functionName: PlayerSoundAnimationEvent
|
||||
data: Impact1
|
||||
data: Impact6
|
||||
objectReferenceParameter: {fileID: 0}
|
||||
floatParameter: 0
|
||||
intParameter: 0
|
||||
messageOptions: 0
|
||||
- time: 0.75
|
||||
functionName: ShakeCamera
|
||||
data:
|
||||
objectReferenceParameter: {fileID: 11400000, guid: 84aadf3764a04334eae5102f731ca6e0, type: 2}
|
||||
floatParameter: 0
|
||||
intParameter: 0
|
||||
messageOptions: 0
|
||||
- time: 0.9166667
|
||||
functionName: ThrowEnd
|
||||
data:
|
||||
|
||||
@@ -1182,7 +1182,6 @@ MonoBehaviour:
|
||||
m_EditorClassIdentifier:
|
||||
_player: {fileID: 8073473790702501988}
|
||||
_playerMovement: {fileID: 8073473790702501987}
|
||||
_playerAnimator: {fileID: 8073473789928578677}
|
||||
_inputBuffer: {fileID: 4664395619888274278}
|
||||
_audio: {fileID: 7611394710214668632}
|
||||
--- !u!212 &8073473789928578676
|
||||
@@ -1665,6 +1664,14 @@ MonoBehaviour:
|
||||
loop: 0
|
||||
playOnAwake: 0
|
||||
playOneInstanceAtATime: 0
|
||||
- source: {fileID: 0}
|
||||
clip: {fileID: 8300000, guid: f24d8ef3923a78e44b989571a79f684d, type: 3}
|
||||
volume: 1
|
||||
pitch: 0.75
|
||||
name: Impact6
|
||||
loop: 0
|
||||
playOnAwake: 0
|
||||
playOneInstanceAtATime: 0
|
||||
_sounds3D: []
|
||||
_soundGroups:
|
||||
- name: Footsteps
|
||||
|
||||
@@ -3363,6 +3363,7 @@ GameObject:
|
||||
- component: {fileID: 360034939}
|
||||
- component: {fileID: 360034938}
|
||||
- component: {fileID: 360034941}
|
||||
- component: {fileID: 360034942}
|
||||
m_Layer: 0
|
||||
m_Name: Camera_cinemachineVirtualCamera
|
||||
m_TagString: Untagged
|
||||
@@ -3451,6 +3452,18 @@ MonoBehaviour:
|
||||
m_BoundingShape2D: {fileID: 365773108}
|
||||
m_Damping: 4.49
|
||||
m_MaxWindowSize: 0
|
||||
--- !u!114 &360034942
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 360034937}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 54d3458e6f20368449a1042a0380e2d0, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1 &365773107
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -16785,6 +16798,7 @@ GameObject:
|
||||
- component: {fileID: 1524101023}
|
||||
- component: {fileID: 1524101025}
|
||||
- component: {fileID: 1524101024}
|
||||
- component: {fileID: 1524101026}
|
||||
m_Layer: 0
|
||||
m_Name: cm
|
||||
m_TagString: Untagged
|
||||
@@ -16873,6 +16887,23 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!114 &1524101026
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 3
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1524101022}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 68bb026fafb42b14791938953eaace77, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_NoiseProfile: {fileID: 11400000, guid: 69ce8388f6785dd4c8c39915efece2f4, type: 2}
|
||||
m_PivotOffset: {x: 0, y: 0, z: 0}
|
||||
m_AmplitudeGain: 0
|
||||
m_FrequencyGain: 5
|
||||
mNoiseOffsets: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &1544325958
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
||||
@@ -20,7 +20,7 @@ MonoBehaviour:
|
||||
knockbackDirection: {x: 0, y: 0.5}
|
||||
knockbackDuration: 0.172
|
||||
attackTypeEnum: 4
|
||||
hitstop: 0.075
|
||||
hitstop: 0.1
|
||||
isAirAttack: 0
|
||||
isProjectile: 1
|
||||
isArcana: 1
|
||||
@@ -31,7 +31,7 @@ MonoBehaviour:
|
||||
hitEffectPosition: {x: 4, y: 0.1}
|
||||
hitEffectRotation: 0
|
||||
hurtEffect: {fileID: 6697712921357175186, guid: 42fff4f540e4cdd4b9969996164b54a8, type: 3}
|
||||
hurtEffectPosition: {x: 2.8922544, y: -3.15}
|
||||
hurtEffectPosition: {x: -3.9100504, y: -3.0300002}
|
||||
hurtEffectRotation: 0
|
||||
startUpFrames: 10
|
||||
activeFrames: 20
|
||||
|
||||
@@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 73e6ae2abe3808f43a314c62964888d8
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -0,0 +1,16 @@
|
||||
%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: 869e412cc060faa45a4ea37ea7eb4f6d, type: 3}
|
||||
m_Name: HellishDive
|
||||
m_EditorClassIdentifier:
|
||||
intensity: 5
|
||||
timer: 0.1
|
||||
@@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 84aadf3764a04334eae5102f731ca6e0
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 11400000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
48
Assets/_Project/Scripts/CameraShake.cs
Normal file
48
Assets/_Project/Scripts/CameraShake.cs
Normal file
@@ -0,0 +1,48 @@
|
||||
using Cinemachine;
|
||||
using UnityEngine;
|
||||
|
||||
public class CameraShake : MonoBehaviour
|
||||
{
|
||||
public static CameraShake Instance { get; private set; }
|
||||
private CinemachineVirtualCamera _cinemachineVirtualCamera;
|
||||
private CinemachineBasicMultiChannelPerlin _cinemachineBasicMultiChannelPerlin;
|
||||
private float _shakeTimer;
|
||||
|
||||
|
||||
void Awake()
|
||||
{
|
||||
_cinemachineVirtualCamera = GetComponent<CinemachineVirtualCamera>();
|
||||
_cinemachineBasicMultiChannelPerlin = _cinemachineVirtualCamera.GetCinemachineComponent<CinemachineBasicMultiChannelPerlin>();
|
||||
CheckInstance();
|
||||
}
|
||||
|
||||
private void CheckInstance()
|
||||
{
|
||||
if (Instance != null && Instance != this)
|
||||
{
|
||||
Destroy(gameObject);
|
||||
}
|
||||
else
|
||||
{
|
||||
Instance = this;
|
||||
}
|
||||
}
|
||||
|
||||
public void Shake(float intensity, float time)
|
||||
{
|
||||
_cinemachineBasicMultiChannelPerlin.m_AmplitudeGain = intensity;
|
||||
_shakeTimer = time;
|
||||
}
|
||||
|
||||
private void Update()
|
||||
{
|
||||
if (_shakeTimer > 0)
|
||||
{
|
||||
_shakeTimer -= Time.deltaTime;
|
||||
if (_shakeTimer <= 0)
|
||||
{
|
||||
_cinemachineBasicMultiChannelPerlin.m_AmplitudeGain = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
11
Assets/_Project/Scripts/CameraShake.cs.meta
Normal file
11
Assets/_Project/Scripts/CameraShake.cs.meta
Normal file
@@ -0,0 +1,11 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 54d3458e6f20368449a1042a0380e2d0
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -31,6 +31,7 @@ public class Player : MonoBehaviour, IHurtboxResponder, IHitboxResponder
|
||||
public PlayerStatsSO PlayerStats { get { return _playerStats.PlayerStatsSO; } private set { } }
|
||||
public PlayerUI PlayerUI { get { return _playerUI; } private set { } }
|
||||
public AttackSO CurrentAttack { get; set; }
|
||||
public AttackSO CurrentHurtAttack { get; set; }
|
||||
public float Health { get; private set; }
|
||||
public bool IsBlocking { get; private set; }
|
||||
public bool IsKnockedDown { get; private set; }
|
||||
@@ -367,6 +368,7 @@ public class Player : MonoBehaviour, IHurtboxResponder, IHitboxResponder
|
||||
|
||||
public bool TakeDamage(AttackSO attackSO)
|
||||
{
|
||||
CurrentHurtAttack = attackSO;
|
||||
DestroyEffects();
|
||||
if (!_playerMovement.IsGrounded)
|
||||
{
|
||||
@@ -470,6 +472,8 @@ public class Player : MonoBehaviour, IHurtboxResponder, IHitboxResponder
|
||||
|
||||
private void LoseHealth()
|
||||
{
|
||||
GameObject effect = Instantiate(CurrentHurtAttack.hurtEffect);
|
||||
effect.transform.localPosition = CurrentHurtAttack.hurtEffectPosition;
|
||||
if (!GameManager.Instance.InfiniteHealth)
|
||||
{
|
||||
Health--;
|
||||
@@ -482,7 +486,7 @@ public class Player : MonoBehaviour, IHurtboxResponder, IHitboxResponder
|
||||
else
|
||||
{
|
||||
StartCoroutine(KnockdownCoroutine());
|
||||
GameManager.Instance.HitStop(0.05f);
|
||||
GameManager.Instance.HitStop(CurrentHurtAttack.hitstop);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -76,4 +76,9 @@ public class PlayerAnimationEvents : MonoBehaviour
|
||||
{
|
||||
_playerMovement.AddForce(moveHorizontally);
|
||||
}
|
||||
|
||||
public void ShakeCamera(CameraShakerSO cameraShaker)
|
||||
{
|
||||
CameraShake.Instance.Shake(cameraShaker.intensity, cameraShaker.timer);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,7 @@
|
||||
using UnityEngine;
|
||||
[CreateAssetMenu(fileName = "CameraShaker", menuName = "Scriptable Objects/CameraShaker", order = 2)]
|
||||
public class CameraShakerSO : ScriptableObject
|
||||
{
|
||||
public float intensity;
|
||||
public float timer;
|
||||
}
|
||||
@@ -0,0 +1,11 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 869e412cc060faa45a4ea37ea7eb4f6d
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -24,7 +24,7 @@ MonoBehaviour:
|
||||
m_MinSize: {x: 300, y: 200}
|
||||
m_MaxSize: {x: 24288, y: 16192}
|
||||
vertical: 0
|
||||
controlID: 570
|
||||
controlID: 18017
|
||||
--- !u!114 &2
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
@@ -33,15 +33,15 @@ MonoBehaviour:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 12071, guid: 0000000000000000e000000000000000, type: 0}
|
||||
m_EditorHideFlags: 1
|
||||
m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_MinSize: {x: 100, y: 100}
|
||||
m_MinSize: {x: 200, y: 200}
|
||||
m_MaxSize: {x: 4000, y: 4000}
|
||||
m_TitleContent:
|
||||
m_Text: Animation
|
||||
m_Image: {fileID: -8166618308981325432, guid: 0000000000000000d000000000000000, type: 0}
|
||||
m_Text: Game
|
||||
m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0}
|
||||
m_Tooltip:
|
||||
m_Pos:
|
||||
serializedVersion: 2
|
||||
@@ -53,9 +53,70 @@ MonoBehaviour:
|
||||
m_OverlayCanvas:
|
||||
m_LastAppliedPresetName: Default
|
||||
m_SaveData: []
|
||||
m_LockTracker:
|
||||
m_IsLocked: 0
|
||||
m_LastSelectedObjectID: -1660
|
||||
m_SerializedViewNames: []
|
||||
m_SerializedViewValues: []
|
||||
m_PlayModeViewName: GameView
|
||||
m_ShowGizmos: 0
|
||||
m_TargetDisplay: 0
|
||||
m_ClearColor: {r: 0, g: 0, b: 0, a: 0}
|
||||
m_TargetSize: {x: 1920, y: 1080}
|
||||
m_TextureFilterMode: 0
|
||||
m_TextureHideFlags: 61
|
||||
m_RenderIMGUI: 1
|
||||
m_EnterPlayModeBehavior: 1
|
||||
m_UseMipMap: 0
|
||||
m_VSyncEnabled: 0
|
||||
m_Gizmos: 0
|
||||
m_Stats: 0
|
||||
m_SelectedSizes: 03000000000000000000000000000000000000000000000000000000000000000000000000000000
|
||||
m_ZoomArea:
|
||||
m_HRangeLocked: 0
|
||||
m_VRangeLocked: 0
|
||||
hZoomLockedByDefault: 0
|
||||
vZoomLockedByDefault: 0
|
||||
m_HBaseRangeMin: -960
|
||||
m_HBaseRangeMax: 960
|
||||
m_VBaseRangeMin: -540
|
||||
m_VBaseRangeMax: 540
|
||||
m_HAllowExceedBaseRangeMin: 1
|
||||
m_HAllowExceedBaseRangeMax: 1
|
||||
m_VAllowExceedBaseRangeMin: 1
|
||||
m_VAllowExceedBaseRangeMax: 1
|
||||
m_ScaleWithWindow: 0
|
||||
m_HSlider: 0
|
||||
m_VSlider: 0
|
||||
m_IgnoreScrollWheelUntilClicked: 0
|
||||
m_EnableMouseInput: 1
|
||||
m_EnableSliderZoomHorizontal: 0
|
||||
m_EnableSliderZoomVertical: 0
|
||||
m_UniformScale: 1
|
||||
m_UpDirection: 1
|
||||
m_DrawArea:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 21
|
||||
width: 980
|
||||
height: 480
|
||||
m_Scale: {x: 0.44444445, y: 0.44444445}
|
||||
m_Translation: {x: 490, y: 240}
|
||||
m_MarginLeft: 0
|
||||
m_MarginRight: 0
|
||||
m_MarginTop: 0
|
||||
m_MarginBottom: 0
|
||||
m_LastShownAreaInsideMargins:
|
||||
serializedVersion: 2
|
||||
x: -1102.5
|
||||
y: -540
|
||||
width: 2205
|
||||
height: 1080
|
||||
m_MinimalGUI: 1
|
||||
m_defaultScale: 0.44444445
|
||||
m_LastWindowPixelSize: {x: 980, y: 501}
|
||||
m_ClearInEditMode: 1
|
||||
m_NoCameraWarning: 1
|
||||
m_LowResolutionForAspectRatios: 01000000000000000000
|
||||
m_XRRenderMode: 0
|
||||
m_RenderTexture: {fileID: 0}
|
||||
--- !u!114 &3
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
@@ -80,7 +141,7 @@ MonoBehaviour:
|
||||
m_MinSize: {x: 200, y: 200}
|
||||
m_MaxSize: {x: 16192, y: 16192}
|
||||
vertical: 0
|
||||
controlID: 571
|
||||
controlID: 18018
|
||||
--- !u!114 &4
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
@@ -105,7 +166,7 @@ MonoBehaviour:
|
||||
m_MinSize: {x: 100, y: 200}
|
||||
m_MaxSize: {x: 8096, y: 16192}
|
||||
vertical: 1
|
||||
controlID: 572
|
||||
controlID: 18019
|
||||
--- !u!114 &5
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
@@ -359,9 +420,9 @@ MonoBehaviour:
|
||||
m_PlayAudio: 0
|
||||
m_AudioPlay: 0
|
||||
m_Position:
|
||||
m_Target: {x: -4.9977746, y: -2.893555, z: 0.016286982}
|
||||
m_Target: {x: -5.52, y: -4.5, z: 0}
|
||||
speed: 2
|
||||
m_Value: {x: -4.9977746, y: -2.893555, z: 0.016286982}
|
||||
m_Value: {x: -5.52, y: -4.5, z: 0}
|
||||
m_RenderMode: 0
|
||||
m_CameraMode:
|
||||
drawMode: 0
|
||||
@@ -412,9 +473,9 @@ MonoBehaviour:
|
||||
speed: 2
|
||||
m_Value: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_Size:
|
||||
m_Target: 1.997672
|
||||
m_Target: 10
|
||||
speed: 2
|
||||
m_Value: 1.997672
|
||||
m_Value: 10
|
||||
m_Ortho:
|
||||
m_Target: 1
|
||||
speed: 2
|
||||
@@ -462,7 +523,7 @@ MonoBehaviour:
|
||||
x: 0
|
||||
y: 73
|
||||
width: 980
|
||||
height: 396
|
||||
height: 404
|
||||
m_ViewDataDictionary: {fileID: 0}
|
||||
m_OverlayCanvas:
|
||||
m_LastAppliedPresetName: Default
|
||||
@@ -470,7 +531,6 @@ MonoBehaviour:
|
||||
m_ViewTransforms:
|
||||
m_KeySerializationHelper:
|
||||
- {fileID: 8204161146273501805, guid: 0bfa287c34589f847aa8257262d4f23a, type: 2}
|
||||
- {fileID: 3290997080312797380, guid: b1b7b9ccddc48304a9b8771629dfe6a5, type: 2}
|
||||
- {fileID: -4534781135918228906, guid: d07b4c2442277164a847eaaa08ae9e05, type: 2}
|
||||
m_ValueSerializationHelper:
|
||||
- e00: 1
|
||||
@@ -505,22 +565,6 @@ MonoBehaviour:
|
||||
e31: 0
|
||||
e32: 0
|
||||
e33: 1
|
||||
- e00: 0.78448063
|
||||
e01: 0
|
||||
e02: 0
|
||||
e03: 67.98917
|
||||
e10: 0
|
||||
e11: 0.78448063
|
||||
e12: 0
|
||||
e13: -25.50708
|
||||
e20: 0
|
||||
e21: 0
|
||||
e22: 1
|
||||
e23: 0
|
||||
e30: 0
|
||||
e31: 0
|
||||
e32: 0
|
||||
e33: 1
|
||||
m_PreviewAnimator: {fileID: 0}
|
||||
m_AnimatorController: {fileID: 9100000, guid: d07b4c2442277164a847eaaa08ae9e05, type: 2}
|
||||
m_BreadCrumbs:
|
||||
@@ -723,7 +767,7 @@ MonoBehaviour:
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
|
||||
m_Name: AnimationWindow
|
||||
m_Name: GameView
|
||||
m_EditorClassIdentifier:
|
||||
m_Children: []
|
||||
m_Position:
|
||||
@@ -732,108 +776,16 @@ MonoBehaviour:
|
||||
y: 417
|
||||
width: 981
|
||||
height: 522
|
||||
m_MinSize: {x: 101, y: 121}
|
||||
m_MinSize: {x: 201, y: 221}
|
||||
m_MaxSize: {x: 4001, y: 4021}
|
||||
m_ActualView: {fileID: 2}
|
||||
m_Panes:
|
||||
- {fileID: 2}
|
||||
- {fileID: 10}
|
||||
- {fileID: 11}
|
||||
- {fileID: 2}
|
||||
m_Selected: 2
|
||||
m_LastSelected: 0
|
||||
m_Selected: 0
|
||||
m_LastSelected: 2
|
||||
--- !u!114 &10
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 1
|
||||
m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_MinSize: {x: 200, y: 200}
|
||||
m_MaxSize: {x: 4000, y: 4000}
|
||||
m_TitleContent:
|
||||
m_Text: Game
|
||||
m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0}
|
||||
m_Tooltip:
|
||||
m_Pos:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 490
|
||||
width: 980
|
||||
height: 501
|
||||
m_ViewDataDictionary: {fileID: 0}
|
||||
m_OverlayCanvas:
|
||||
m_LastAppliedPresetName: Default
|
||||
m_SaveData: []
|
||||
m_SerializedViewNames: []
|
||||
m_SerializedViewValues: []
|
||||
m_PlayModeViewName: GameView
|
||||
m_ShowGizmos: 0
|
||||
m_TargetDisplay: 0
|
||||
m_ClearColor: {r: 0, g: 0, b: 0, a: 0}
|
||||
m_TargetSize: {x: 1920, y: 1080}
|
||||
m_TextureFilterMode: 0
|
||||
m_TextureHideFlags: 61
|
||||
m_RenderIMGUI: 1
|
||||
m_EnterPlayModeBehavior: 0
|
||||
m_UseMipMap: 0
|
||||
m_VSyncEnabled: 0
|
||||
m_Gizmos: 0
|
||||
m_Stats: 0
|
||||
m_SelectedSizes: 03000000000000000000000000000000000000000000000000000000000000000000000000000000
|
||||
m_ZoomArea:
|
||||
m_HRangeLocked: 0
|
||||
m_VRangeLocked: 0
|
||||
hZoomLockedByDefault: 0
|
||||
vZoomLockedByDefault: 0
|
||||
m_HBaseRangeMin: -960
|
||||
m_HBaseRangeMax: 960
|
||||
m_VBaseRangeMin: -540
|
||||
m_VBaseRangeMax: 540
|
||||
m_HAllowExceedBaseRangeMin: 1
|
||||
m_HAllowExceedBaseRangeMax: 1
|
||||
m_VAllowExceedBaseRangeMin: 1
|
||||
m_VAllowExceedBaseRangeMax: 1
|
||||
m_ScaleWithWindow: 0
|
||||
m_HSlider: 0
|
||||
m_VSlider: 0
|
||||
m_IgnoreScrollWheelUntilClicked: 0
|
||||
m_EnableMouseInput: 1
|
||||
m_EnableSliderZoomHorizontal: 0
|
||||
m_EnableSliderZoomVertical: 0
|
||||
m_UniformScale: 1
|
||||
m_UpDirection: 1
|
||||
m_DrawArea:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 21
|
||||
width: 980
|
||||
height: 480
|
||||
m_Scale: {x: 0.44444445, y: 0.44444445}
|
||||
m_Translation: {x: 490, y: 240}
|
||||
m_MarginLeft: 0
|
||||
m_MarginRight: 0
|
||||
m_MarginTop: 0
|
||||
m_MarginBottom: 0
|
||||
m_LastShownAreaInsideMargins:
|
||||
serializedVersion: 2
|
||||
x: -1102.5
|
||||
y: -540
|
||||
width: 2205
|
||||
height: 1080
|
||||
m_MinimalGUI: 1
|
||||
m_defaultScale: 0.44444445
|
||||
m_LastWindowPixelSize: {x: 980, y: 501}
|
||||
m_ClearInEditMode: 1
|
||||
m_NoCameraWarning: 1
|
||||
m_LowResolutionForAspectRatios: 01000000000000000000
|
||||
m_XRRenderMode: 0
|
||||
m_RenderTexture: {fileID: 0}
|
||||
--- !u!114 &11
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
@@ -861,6 +813,37 @@ MonoBehaviour:
|
||||
m_OverlayCanvas:
|
||||
m_LastAppliedPresetName: Default
|
||||
m_SaveData: []
|
||||
--- !u!114 &11
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
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: 12071, guid: 0000000000000000e000000000000000, type: 0}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_MinSize: {x: 100, y: 100}
|
||||
m_MaxSize: {x: 4000, y: 4000}
|
||||
m_TitleContent:
|
||||
m_Text: Animation
|
||||
m_Image: {fileID: -8166618308981325432, guid: 0000000000000000d000000000000000, type: 0}
|
||||
m_Tooltip:
|
||||
m_Pos:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 490
|
||||
width: 980
|
||||
height: 501
|
||||
m_ViewDataDictionary: {fileID: 0}
|
||||
m_OverlayCanvas:
|
||||
m_LastAppliedPresetName: Default
|
||||
m_SaveData: []
|
||||
m_LockTracker:
|
||||
m_IsLocked: 0
|
||||
m_LastSelectedObjectID: -1664
|
||||
--- !u!114 &12
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
@@ -885,7 +868,7 @@ MonoBehaviour:
|
||||
m_MinSize: {x: 100, y: 200}
|
||||
m_MaxSize: {x: 8096, y: 16192}
|
||||
vertical: 1
|
||||
controlID: 25
|
||||
controlID: 17967
|
||||
--- !u!114 &13
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
@@ -905,8 +888,8 @@ MonoBehaviour:
|
||||
y: 0
|
||||
width: 501
|
||||
height: 595
|
||||
m_MinSize: {x: 202, y: 221}
|
||||
m_MaxSize: {x: 4002, y: 4021}
|
||||
m_MinSize: {x: 200, y: 200}
|
||||
m_MaxSize: {x: 4000, y: 4000}
|
||||
m_ActualView: {fileID: 14}
|
||||
m_Panes:
|
||||
- {fileID: 14}
|
||||
@@ -942,10 +925,10 @@ MonoBehaviour:
|
||||
m_SaveData: []
|
||||
m_SceneHierarchy:
|
||||
m_TreeViewState:
|
||||
scrollPos: {x: 0, y: 0}
|
||||
m_SelectedIDs: 84f9ffff
|
||||
m_LastClickedID: -1660
|
||||
m_ExpandedIDs: f2d6ffffa0f9ffff16fbffff
|
||||
scrollPos: {x: 0, y: 135}
|
||||
m_SelectedIDs:
|
||||
m_LastClickedID: 0
|
||||
m_ExpandedIDs: 58f1ffff82f1ffff9cf9ffff12fbffff46520000185500007c560000
|
||||
m_RenameOverlay:
|
||||
m_UserAcceptedRename: 0
|
||||
m_Name:
|
||||
@@ -988,8 +971,8 @@ MonoBehaviour:
|
||||
y: 595
|
||||
width: 501
|
||||
height: 344
|
||||
m_MinSize: {x: 232, y: 271}
|
||||
m_MaxSize: {x: 10002, y: 10021}
|
||||
m_MinSize: {x: 230, y: 250}
|
||||
m_MaxSize: {x: 10000, y: 10000}
|
||||
m_ActualView: {fileID: 16}
|
||||
m_Panes:
|
||||
- {fileID: 16}
|
||||
@@ -1036,7 +1019,8 @@ MonoBehaviour:
|
||||
m_ShowAllHits: 0
|
||||
m_SkipHidden: 0
|
||||
m_SearchArea: 1
|
||||
m_Folders: []
|
||||
m_Folders:
|
||||
- Assets/_Project/Prefabs/CharacterPrefabs
|
||||
m_Globs: []
|
||||
m_OriginalText:
|
||||
m_ViewMode: 0
|
||||
@@ -1050,7 +1034,7 @@ MonoBehaviour:
|
||||
scrollPos: {x: 0, y: 154}
|
||||
m_SelectedIDs: da490000
|
||||
m_LastClickedID: 18906
|
||||
m_ExpandedIDs: 0000000018660000246a0000266a0000286a00002a6a00002c6a00002e6a0000306a0000326a0000346a0000366a0000386a00003a6a00003c6a00003e6a0000406a0000426a0000446a0000466a0000486a00004a6a00004c6a00004e6a0000506a0000526a0000546a0000566a0000586a00005a6a00005c6a00005e6a0000606a0000626a0000646a0000666a0000686a00006a6a00006c6a00006e6a0000706a0000726a0000746a0000766a0000786a00007a6a00007c6a0000
|
||||
m_ExpandedIDs: ffffffff000000001e6600001c6a00001e6a0000206a0000226a0000246a0000266a0000286a00002a6a00002c6a00002e6a0000306a0000326a0000346a0000366a0000386a00003a6a00003c6a00003e6a0000406a0000426a0000446a0000466a0000486a00004a6a00004c6a00004e6a0000506a0000546a0000586a00005a6a00005c6a0000626a0000646a0000666a0000686a00006a6a00006c6a00006e6a0000706a0000c26a0000d46a0000f46a00003a6d0000166e0000186e0000
|
||||
m_RenameOverlay:
|
||||
m_UserAcceptedRename: 0
|
||||
m_Name:
|
||||
@@ -1075,10 +1059,10 @@ MonoBehaviour:
|
||||
m_Icon: {fileID: 0}
|
||||
m_ResourceFile:
|
||||
m_AssetTreeState:
|
||||
scrollPos: {x: 0, y: 1124}
|
||||
m_SelectedIDs: 84f9ffff
|
||||
scrollPos: {x: 0, y: 0}
|
||||
m_SelectedIDs: 2284fdff
|
||||
m_LastClickedID: 0
|
||||
m_ExpandedIDs: ffffffff0000000018660000246a0000266a0000286a00002a6a00002c6a00002e6a0000306a0000326a0000346a0000366a0000386a00003a6a00003c6a00003e6a0000406a0000426a0000446a0000466a0000486a00004a6a00004c6a00004e6a0000506a0000526a0000546a0000566a0000586a00005a6a00005c6a00005e6a0000606a0000626a0000646a0000666a0000686a00006a6a00006c6a00006e6a0000706a0000726a0000746a0000766a0000786a00007a6a00007c6a0000
|
||||
m_ExpandedIDs: ffffffff000000001e6600001c6a00001e6a0000206a0000226a0000246a0000266a0000286a00002a6a00002c6a00002e6a0000306a0000326a0000346a0000366a0000386a00003a6a00003c6a00003e6a0000406a0000426a0000446a0000466a0000486a00004a6a00004c6a00004e6a0000506a0000546a0000586a00005a6a00005c6a0000626a0000646a0000666a0000686a00006a6a00006c6a00006e6a0000706a0000ba6a0000c26a0000d46a0000f46a00003a6d0000166e0000186e0000
|
||||
m_RenameOverlay:
|
||||
m_UserAcceptedRename: 0
|
||||
m_Name:
|
||||
@@ -1103,8 +1087,8 @@ MonoBehaviour:
|
||||
m_Icon: {fileID: 0}
|
||||
m_ResourceFile:
|
||||
m_ListAreaState:
|
||||
m_SelectedInstanceIDs: 84f9ffff
|
||||
m_LastClickedInstanceID: -1660
|
||||
m_SelectedInstanceIDs: 2284fdff
|
||||
m_LastClickedInstanceID: -162782
|
||||
m_HadKeyboardFocusLastEvent: 1
|
||||
m_ExpandedInstanceIDs: c6230000
|
||||
m_RenameOverlay:
|
||||
@@ -1222,7 +1206,7 @@ MonoBehaviour:
|
||||
m_CachedPref: 175
|
||||
m_ControlHash: -371814159
|
||||
m_PrefName: Preview_InspectorPreview
|
||||
m_LastInspectedObjectInstanceID: -1
|
||||
m_LastInspectedObjectInstanceID: -162782
|
||||
m_LastVerticalScrollValue: 0
|
||||
m_GlobalObjectId:
|
||||
m_InspectorMode: 0
|
||||
|
||||
Reference in New Issue
Block a user