diff --git a/Assets/Models/Characters/Zombunny.fbx.meta b/Assets/Models/Characters/Zombunny.fbx.meta
index 399582f21bd9972c5b2a0b8440272e2f772178a3..b883c8f492905f042e6386c2a939f0b8d1ed0c1e 100644
--- a/Assets/Models/Characters/Zombunny.fbx.meta
+++ b/Assets/Models/Characters/Zombunny.fbx.meta
@@ -1,109 +1,286 @@
fileFormatVersion: 2
guid: be66986effd141b4992d2d78be127139
ModelImporter:
- serializedVersion: 16
- fileIDToRecycleName:
- 100000: Ctrl_Grp
- 100002: Head
- 100004: HeadEnd
- 100006: Hips
- 100008: LeftEar
- 100010: LeftEarEnd
- 100012: LeftFoot
- 100014: LeftFootEnd
- 100016: LeftLeg
- 100018: LeftLowerArm
- 100020: LeftLowerArmFK
- 100022: LeftLowerArmIK
- 100024: LeftUpperArm
- 100026: LeftUpperArmFK
- 100028: LeftUpperArmIK
- 100030: LeftWrist
- 100032: LeftWristEnd
- 100034: LeftWristFK
- 100036: LeftWristIK
- 100038: RightEar
- 100040: RightEarEnd
- 100042: RightFoot
- 100044: RightFootEnd
- 100046: RightLeg
- 100048: RightLowerArm
- 100050: RightLowerArmFK
- 100052: RightLowerArmIK
- 100054: RightUpperArm
- 100056: RightUpperArmFK
- 100058: RightUpperArmIK
- 100060: RightWrist
- 100062: RightWristEnd
- 100064: RightWristFK
- 100066: RightWristIK
- 100068: Root
- 100070: Spine
- 100072: Zombunny
- 100074: //RootNode
- 400000: Ctrl_Grp
- 400002: Head
- 400004: HeadEnd
- 400006: Hips
- 400008: LeftEar
- 400010: LeftEarEnd
- 400012: LeftFoot
- 400014: LeftFootEnd
- 400016: LeftLeg
- 400018: LeftLowerArm
- 400020: LeftLowerArmFK
- 400022: LeftLowerArmIK
- 400024: LeftUpperArm
- 400026: LeftUpperArmFK
- 400028: LeftUpperArmIK
- 400030: LeftWrist
- 400032: LeftWristEnd
- 400034: LeftWristFK
- 400036: LeftWristIK
- 400038: RightEar
- 400040: RightEarEnd
- 400042: RightFoot
- 400044: RightFootEnd
- 400046: RightLeg
- 400048: RightLowerArm
- 400050: RightLowerArmFK
- 400052: RightLowerArmIK
- 400054: RightUpperArm
- 400056: RightUpperArmFK
- 400058: RightUpperArmIK
- 400060: RightWrist
- 400062: RightWristEnd
- 400064: RightWristFK
- 400066: RightWristIK
- 400068: Root
- 400070: Spine
- 400072: Zombunny
- 400074: //RootNode
- 4300000: Zombunny
- 7400000: Move
- 7400002: Idle
- 7400004: Death
- 9500000: //RootNode
- 13700000: Zombunny
+ serializedVersion: 20200
+ internalIDToNameTable:
+ - first:
+ 1: 100000
+ second: Ctrl_Grp
+ - first:
+ 1: 100002
+ second: Head
+ - first:
+ 1: 100004
+ second: HeadEnd
+ - first:
+ 1: 100006
+ second: Hips
+ - first:
+ 1: 100008
+ second: LeftEar
+ - first:
+ 1: 100010
+ second: LeftEarEnd
+ - first:
+ 1: 100012
+ second: LeftFoot
+ - first:
+ 1: 100014
+ second: LeftFootEnd
+ - first:
+ 1: 100016
+ second: LeftLeg
+ - first:
+ 1: 100018
+ second: LeftLowerArm
+ - first:
+ 1: 100020
+ second: LeftLowerArmFK
+ - first:
+ 1: 100022
+ second: LeftLowerArmIK
+ - first:
+ 1: 100024
+ second: LeftUpperArm
+ - first:
+ 1: 100026
+ second: LeftUpperArmFK
+ - first:
+ 1: 100028
+ second: LeftUpperArmIK
+ - first:
+ 1: 100030
+ second: LeftWrist
+ - first:
+ 1: 100032
+ second: LeftWristEnd
+ - first:
+ 1: 100034
+ second: LeftWristFK
+ - first:
+ 1: 100036
+ second: LeftWristIK
+ - first:
+ 1: 100038
+ second: RightEar
+ - first:
+ 1: 100040
+ second: RightEarEnd
+ - first:
+ 1: 100042
+ second: RightFoot
+ - first:
+ 1: 100044
+ second: RightFootEnd
+ - first:
+ 1: 100046
+ second: RightLeg
+ - first:
+ 1: 100048
+ second: RightLowerArm
+ - first:
+ 1: 100050
+ second: RightLowerArmFK
+ - first:
+ 1: 100052
+ second: RightLowerArmIK
+ - first:
+ 1: 100054
+ second: RightUpperArm
+ - first:
+ 1: 100056
+ second: RightUpperArmFK
+ - first:
+ 1: 100058
+ second: RightUpperArmIK
+ - first:
+ 1: 100060
+ second: RightWrist
+ - first:
+ 1: 100062
+ second: RightWristEnd
+ - first:
+ 1: 100064
+ second: RightWristFK
+ - first:
+ 1: 100066
+ second: RightWristIK
+ - first:
+ 1: 100068
+ second: Root
+ - first:
+ 1: 100070
+ second: Spine
+ - first:
+ 1: 100072
+ second: Zombunny
+ - first:
+ 1: 100074
+ second: //RootNode
+ - first:
+ 4: 400000
+ second: Ctrl_Grp
+ - first:
+ 4: 400002
+ second: Head
+ - first:
+ 4: 400004
+ second: HeadEnd
+ - first:
+ 4: 400006
+ second: Hips
+ - first:
+ 4: 400008
+ second: LeftEar
+ - first:
+ 4: 400010
+ second: LeftEarEnd
+ - first:
+ 4: 400012
+ second: LeftFoot
+ - first:
+ 4: 400014
+ second: LeftFootEnd
+ - first:
+ 4: 400016
+ second: LeftLeg
+ - first:
+ 4: 400018
+ second: LeftLowerArm
+ - first:
+ 4: 400020
+ second: LeftLowerArmFK
+ - first:
+ 4: 400022
+ second: LeftLowerArmIK
+ - first:
+ 4: 400024
+ second: LeftUpperArm
+ - first:
+ 4: 400026
+ second: LeftUpperArmFK
+ - first:
+ 4: 400028
+ second: LeftUpperArmIK
+ - first:
+ 4: 400030
+ second: LeftWrist
+ - first:
+ 4: 400032
+ second: LeftWristEnd
+ - first:
+ 4: 400034
+ second: LeftWristFK
+ - first:
+ 4: 400036
+ second: LeftWristIK
+ - first:
+ 4: 400038
+ second: RightEar
+ - first:
+ 4: 400040
+ second: RightEarEnd
+ - first:
+ 4: 400042
+ second: RightFoot
+ - first:
+ 4: 400044
+ second: RightFootEnd
+ - first:
+ 4: 400046
+ second: RightLeg
+ - first:
+ 4: 400048
+ second: RightLowerArm
+ - first:
+ 4: 400050
+ second: RightLowerArmFK
+ - first:
+ 4: 400052
+ second: RightLowerArmIK
+ - first:
+ 4: 400054
+ second: RightUpperArm
+ - first:
+ 4: 400056
+ second: RightUpperArmFK
+ - first:
+ 4: 400058
+ second: RightUpperArmIK
+ - first:
+ 4: 400060
+ second: RightWrist
+ - first:
+ 4: 400062
+ second: RightWristEnd
+ - first:
+ 4: 400064
+ second: RightWristFK
+ - first:
+ 4: 400066
+ second: RightWristIK
+ - first:
+ 4: 400068
+ second: Root
+ - first:
+ 4: 400070
+ second: Spine
+ - first:
+ 4: 400072
+ second: Zombunny
+ - first:
+ 4: 400074
+ second: //RootNode
+ - first:
+ 43: 4300000
+ second: Zombunny
+ - first:
+ 74: 7400000
+ second: Move
+ - first:
+ 74: 7400002
+ second: Idle
+ - first:
+ 74: 7400004
+ second: Death
+ - first:
+ 95: 9500000
+ second: //RootNode
+ - first:
+ 137: 13700000
+ second: Zombunny
+ externalObjects: {}
materials:
- importMaterials: 1
+ materialImportMode: 1
materialName: 1
materialSearch: 1
+ materialLocation: 0
animations:
legacyGenerateAnimations: 4
bakeSimulation: 0
+ resampleCurves: 1
optimizeGameObjects: 1
motionNodeName:
+ rigImportErrors:
+ rigImportWarnings:
+ animationImportErrors:
+ animationImportWarnings:
+ animationRetargetingWarnings:
+ animationDoRetargetingWarnings: 0
+ importAnimatedCustomProperties: 0
+ importConstraints: 0
animationCompression: 1
- animationRotationError: .5
- animationPositionError: .5
- animationScaleError: .5
+ animationRotationError: 0.5
+ animationPositionError: 0.5
+ animationScaleError: 0.5
animationWrapMode: 0
extraExposedTransformPaths: []
+ extraUserProperties: []
clipAnimations:
- serializedVersion: 16
name: Move
takeName: Take 001
+ internalID: 0
firstFrame: 0
lastFrame: 30
wrapMode: 0
@@ -111,6 +288,7 @@ ModelImporter:
level: 0
cycleOffset: 0
loop: 0
+ hasAdditiveReferencePose: 0
loopTime: 1
loopBlend: 1
loopBlendOrientation: 0
@@ -203,9 +381,11 @@ ModelImporter:
weight: 1
maskType: 0
maskSource: {instanceID: 0}
+ additiveReferencePoseFrame: 0
- serializedVersion: 16
name: Idle
takeName: Take 001
+ internalID: 0
firstFrame: 40
lastFrame: 280
wrapMode: 0
@@ -213,6 +393,7 @@ ModelImporter:
level: 0
cycleOffset: 0
loop: 0
+ hasAdditiveReferencePose: 0
loopTime: 1
loopBlend: 1
loopBlendOrientation: 0
@@ -305,9 +486,11 @@ ModelImporter:
weight: 1
maskType: 0
maskSource: {instanceID: 0}
+ additiveReferencePoseFrame: 0
- serializedVersion: 16
name: Death
takeName: Take 001
+ internalID: 0
firstFrame: 285
lastFrame: 320
wrapMode: 0
@@ -315,6 +498,7 @@ ModelImporter:
level: 0
cycleOffset: 0
loop: 0
+ hasAdditiveReferencePose: 0
loopTime: 0
loopBlend: 0
loopBlendOrientation: 0
@@ -328,7 +512,7 @@ ModelImporter:
bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
curves: []
events:
- - time: .333863825
+ - time: 0.28567106
functionName: StartSinking
data:
objectReferenceParameter: {instanceID: 0}
@@ -414,41 +598,73 @@ ModelImporter:
weight: 1
maskType: 0
maskSource: {instanceID: 0}
+ additiveReferencePoseFrame: 0
isReadable: 1
meshes:
lODScreenPercentages: []
- globalScale: .00999999978
+ globalScale: 0.01
meshCompression: 0
addColliders: 0
+ useSRGBMaterialColor: 1
+ sortHierarchyByName: 1
+ importVisibility: 0
importBlendShapes: 1
+ importCameras: 0
+ importLights: 0
+ fileIdsGeneration: 1
swapUVChannels: 0
generateSecondaryUV: 0
useFileUnits: 1
- optimizeMeshForGPU: 1
+ keepQuads: 0
weldVertices: 1
+ bakeAxisConversion: 0
+ preserveHierarchy: 0
+ skinWeightsMode: 0
+ maxBonesPerVertex: 4
+ minBoneWeight: 0.001
+ meshOptimizationFlags: -1
+ indexFormat: 1
secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15.000001
secondaryUVHardAngle: 88
+ secondaryUVMarginMethod: 0
+ secondaryUVMinLightmapResolution: 40
+ secondaryUVMinObjectScale: 1
secondaryUVPackMargin: 4
+ useFileScale: 0
tangentSpace:
normalSmoothAngle: 60
- splitTangentsAcrossUV: 1
normalImportMode: 0
- tangentImportMode: 1
+ tangentImportMode: 4
+ normalCalculationMode: 0
+ legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 1
+ blendShapeNormalImportMode: 1
+ normalSmoothingSource: 0
+ referencedClips: []
importAnimation: 1
- copyAvatar: 0
humanDescription:
+ serializedVersion: 3
human: []
skeleton: []
- armTwist: .5
- foreArmTwist: .5
- upperLegTwist: .5
- legTwist: .5
- armStretch: .0500000007
- legStretch: .0500000007
+ armTwist: 0.5
+ foreArmTwist: 0.5
+ upperLegTwist: 0.5
+ legTwist: 0.5
+ armStretch: 0.05
+ legStretch: 0.05
feetSpacing: 0
+ globalScale: 0.01
rootMotionBoneName:
+ hasTranslationDoF: 0
+ hasExtraRoot: 0
+ skeletonHasParents: 0
lastHumanDescriptionAvatarSource: {instanceID: 0}
+ autoGenerateAvatarMappingIfUnspecified: 1
animationType: 2
+ humanoidOversampling: 1
+ avatarSetup: 1
+ addHumanoidExtraRootOnlyWhenUsingAvatar: 0
additionalBone: 0
userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scenes/Level_01.unity b/Assets/Scenes/Level_01.unity
index 782860406d3a8e185871ae4104cce722a07a3d05..bb699057e9f935739a8d212d72e71e8b840cf579 100644
--- a/Assets/Scenes/Level_01.unity
+++ b/Assets/Scenes/Level_01.unity
@@ -123,6 +123,296 @@ NavMeshSettings:
debug:
m_Flags: 0
m_NavMeshData: {fileID: 0}
+--- !u!1 &47128029 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 100006, guid: f1d84cc28597f5641a3d9cbc4df7e306, type: 3}
+ m_PrefabInstance: {fileID: 689597212}
+ m_PrefabAsset: {fileID: 0}
+--- !u!4 &47128030 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 400006, guid: f1d84cc28597f5641a3d9cbc4df7e306, type: 3}
+ m_PrefabInstance: {fileID: 689597212}
+ m_PrefabAsset: {fileID: 0}
+--- !u!114 &47128031
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 47128029}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 27c63be2a8918c741863160b9d9da122, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ damagePerShot: 20
+ timeBetweenBullets: 0.15
+ range: 100
+--- !u!82 &47128032
+AudioSource:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 47128029}
+ m_Enabled: 1
+ serializedVersion: 4
+ OutputAudioMixerGroup: {fileID: 0}
+ m_audioClip: {fileID: 8300000, guid: fa7f046ce321d4021b5e753bf1152916, type: 3}
+ m_PlayOnAwake: 0
+ m_Volume: 1
+ m_Pitch: 1
+ Loop: 0
+ Mute: 0
+ Spatialize: 0
+ SpatializePostEffects: 0
+ Priority: 128
+ DopplerLevel: 1
+ MinDistance: 1
+ MaxDistance: 500
+ Pan2D: 0
+ rolloffMode: 0
+ BypassEffects: 0
+ BypassListenerEffects: 0
+ BypassReverbZones: 0
+ rolloffCustomCurve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 1
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 1
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ panLevelCustomCurve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ spreadCustomCurve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ reverbZoneMixCustomCurve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 1
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+--- !u!108 &47128033
+Light:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 47128029}
+ m_Enabled: 0
+ serializedVersion: 10
+ m_Type: 2
+ m_Shape: 0
+ m_Color: {r: 0.9837978, g: 1, b: 0, a: 1}
+ m_Intensity: 1
+ m_Range: 10
+ m_SpotAngle: 30
+ m_InnerSpotAngle: 21.80208
+ m_CookieSize: 10
+ m_Shadows:
+ m_Type: 0
+ m_Resolution: -1
+ m_CustomResolution: -1
+ m_Strength: 1
+ m_Bias: 0.05
+ m_NormalBias: 0.4
+ m_NearPlane: 0.2
+ m_CullingMatrixOverride:
+ e00: 1
+ e01: 0
+ e02: 0
+ e03: 0
+ e10: 0
+ e11: 1
+ e12: 0
+ e13: 0
+ e20: 0
+ e21: 0
+ e22: 1
+ e23: 0
+ e30: 0
+ e31: 0
+ e32: 0
+ e33: 1
+ m_UseCullingMatrixOverride: 0
+ m_Cookie: {fileID: 0}
+ m_DrawHalo: 0
+ m_Flare: {fileID: 0}
+ m_RenderMode: 0
+ m_CullingMask:
+ serializedVersion: 2
+ m_Bits: 4294967295
+ m_RenderingLayerMask: 1
+ m_Lightmapping: 4
+ m_LightShadowCasterMode: 0
+ m_AreaSize: {x: 1, y: 1}
+ m_BounceIntensity: 1
+ m_ColorTemperature: 6570
+ m_UseColorTemperature: 0
+ m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
+ m_UseBoundingSphereOverride: 0
+ m_UseViewFrustumForShadowCasterCull: 1
+ m_ShadowRadius: 0
+ m_ShadowAngle: 0
+--- !u!120 &47128034
+LineRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 47128029}
+ m_Enabled: 0
+ m_CastShadows: 1
+ m_ReceiveShadows: 1
+ m_DynamicOccludee: 1
+ m_MotionVectors: 0
+ m_LightProbeUsage: 0
+ m_ReflectionProbeUsage: 0
+ m_RayTracingMode: 0
+ m_RayTraceProcedural: 0
+ m_RenderingLayerMask: 1
+ m_RendererPriority: 0
+ m_Materials:
+ - {fileID: 2100000, guid: 007cd3dce0e6539409edcc484011c877, type: 2}
+ m_StaticBatchInfo:
+ firstSubMesh: 0
+ subMeshCount: 0
+ m_StaticBatchRoot: {fileID: 0}
+ m_ProbeAnchor: {fileID: 0}
+ m_LightProbeVolumeOverride: {fileID: 0}
+ m_ScaleInLightmap: 1
+ m_ReceiveGI: 1
+ m_PreserveUVs: 0
+ m_IgnoreNormalsForChartDetection: 0
+ m_ImportantGI: 0
+ m_StitchLightmapSeams: 1
+ m_SelectedEditorRenderState: 3
+ m_MinimumChartSize: 4
+ m_AutoUVMaxDistance: 0.5
+ m_AutoUVMaxAngle: 89
+ m_LightmapParameters: {fileID: 0}
+ m_SortingLayerID: 0
+ m_SortingLayer: 0
+ m_SortingOrder: 0
+ m_Positions:
+ - {x: 0, y: 0, z: 0}
+ - {x: 0, y: 0, z: 1}
+ m_Parameters:
+ serializedVersion: 3
+ widthMultiplier: 1
+ widthCurve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0.05376625
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.061946902
+ value: 0.06451613
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ colorGradient:
+ serializedVersion: 2
+ key0: {r: 1, g: 1, b: 1, a: 1}
+ key1: {r: 1, g: 1, b: 1, a: 1}
+ key2: {r: 0, g: 0, b: 0, a: 0}
+ key3: {r: 0, g: 0, b: 0, a: 0}
+ key4: {r: 0, g: 0, b: 0, a: 0}
+ key5: {r: 0, g: 0, b: 0, a: 0}
+ key6: {r: 0, g: 0, b: 0, a: 0}
+ key7: {r: 0, g: 0, b: 0, a: 0}
+ ctime0: 0
+ ctime1: 65535
+ ctime2: 0
+ ctime3: 0
+ ctime4: 0
+ ctime5: 0
+ ctime6: 0
+ ctime7: 0
+ atime0: 0
+ atime1: 65535
+ atime2: 0
+ atime3: 0
+ atime4: 0
+ atime5: 0
+ atime6: 0
+ atime7: 0
+ m_Mode: 0
+ m_NumColorKeys: 2
+ m_NumAlphaKeys: 2
+ numCornerVertices: 0
+ numCapVertices: 0
+ alignment: 0
+ textureMode: 0
+ shadowBias: 0.5
+ generateLightingData: 0
+ m_UseWorldSpace: 1
+ m_Loop: 0
--- !u!1 &122243111
GameObject:
m_ObjectHideFlags: 0
@@ -151,7 +441,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 12
+ m_RootOrder: 14
m_LocalEulerAnglesHint: {x: 0, y: 240, z: 0}
--- !u!1001 &689597212
PrefabInstance:
@@ -472,6 +762,63 @@ MonoBehaviour:
m_OnValueChanged:
m_PersistentCalls:
m_Calls: []
+--- !u!1001 &747424707
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 47128030}
+ m_Modifications:
+ - target: {fileID: 100000, guid: 0bd11145ced4539458f937fc4609544a, type: 3}
+ propertyPath: m_Name
+ value: GunParticles
+ objectReference: {fileID: 0}
+ - target: {fileID: 400000, guid: 0bd11145ced4539458f937fc4609544a, type: 3}
+ propertyPath: m_RootOrder
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 400000, guid: 0bd11145ced4539458f937fc4609544a, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 400000, guid: 0bd11145ced4539458f937fc4609544a, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 400000, guid: 0bd11145ced4539458f937fc4609544a, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 400000, guid: 0bd11145ced4539458f937fc4609544a, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 400000, guid: 0bd11145ced4539458f937fc4609544a, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 400000, guid: 0bd11145ced4539458f937fc4609544a, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 400000, guid: 0bd11145ced4539458f937fc4609544a, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 400000, guid: 0bd11145ced4539458f937fc4609544a, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 400000, guid: 0bd11145ced4539458f937fc4609544a, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 400000, guid: 0bd11145ced4539458f937fc4609544a, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 0bd11145ced4539458f937fc4609544a, type: 3}
--- !u!1 &923290940 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 204115237681001574, guid: a937ab19083ba0949b4893926220d1ae, type: 3}
@@ -1452,7 +1799,7 @@ RectTransform:
- {fileID: 1519157136}
- {fileID: 1564363404}
m_Father: {fileID: 0}
- m_RootOrder: 8
+ m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
@@ -1584,7 +1931,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 9
+ m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1768814679
GameObject:
@@ -1722,7 +2069,7 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 1456058780071548087, guid: bb69b5f0213c13d4bad23b4b8a965fd7, type: 3}
propertyPath: m_RootOrder
- value: 6
+ value: 10
objectReference: {fileID: 0}
- target: {fileID: 1456058780071548087, guid: bb69b5f0213c13d4bad23b4b8a965fd7, type: 3}
propertyPath: m_LocalPosition.x
@@ -1864,7 +2211,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 14
+ m_RootOrder: 12
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &2119092650
GameObject:
@@ -1909,7 +2256,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 204115237681489990, guid: a937ab19083ba0949b4893926220d1ae, type: 3}
propertyPath: m_RootOrder
- value: 10
+ value: 9
objectReference: {fileID: 0}
- target: {fileID: 204115237681489990, guid: a937ab19083ba0949b4893926220d1ae, type: 3}
propertyPath: m_LocalPosition.x
diff --git a/Assets/Scripts/Enemy/EnemyAttack.cs b/Assets/Scripts/Enemy/EnemyAttack.cs
index f277bbb420523c0462a5324db279d92eff52353d..e0e02404373563b056a619da9abbcb7c40e72ec9 100644
--- a/Assets/Scripts/Enemy/EnemyAttack.cs
+++ b/Assets/Scripts/Enemy/EnemyAttack.cs
@@ -10,7 +10,7 @@ public class EnemyAttack : MonoBehaviour
Animator anim;
GameObject player;
PlayerHealth playerHealth;
- //EnemyHealth enemyHealth;
+ EnemyHealth enemyHealth;
bool playerInRange;
float timer;
@@ -19,7 +19,7 @@ public class EnemyAttack : MonoBehaviour
{
player = GameObject.FindGameObjectWithTag ("Player");
playerHealth = player.GetComponent <PlayerHealth> ();
- //enemyHealth = GetComponent<EnemyHealth>();
+ enemyHealth = GetComponent<EnemyHealth>();
anim = GetComponent <Animator> ();
}
@@ -44,7 +44,7 @@ public class EnemyAttack : MonoBehaviour
{
timer += Time.deltaTime;
- if(timer >= timeBetweenAttacks && playerInRange/* && enemyHealth.currentHealth > 0*/)
+ if(timer >= timeBetweenAttacks && playerInRange && enemyHealth.currentHealth > 0)
{
Attack ();
}
diff --git a/Assets/Scripts/Enemy/EnemyMovement.cs b/Assets/Scripts/Enemy/EnemyMovement.cs
index ed5ae7070fe7306d6f33c270d7aef0e320d5d547..d667fd7601deca0ef816257e21c2eb634b0b02d7 100644
--- a/Assets/Scripts/Enemy/EnemyMovement.cs
+++ b/Assets/Scripts/Enemy/EnemyMovement.cs
@@ -4,8 +4,8 @@ using System.Collections;
public class EnemyMovement : MonoBehaviour
{
Transform player;
- //PlayerHealth playerHealth;
- //EnemyHealth enemyHealth;
+ PlayerHealth playerHealth;
+ EnemyHealth enemyHealth;
UnityEngine.AI.NavMeshAgent nav;
@@ -13,21 +13,21 @@ public class EnemyMovement : MonoBehaviour
{
player = GameObject.FindGameObjectWithTag ("Player").transform;
- //playerHealth = player.GetComponent <PlayerHealth> ();
- //enemyHealth = GetComponent <EnemyHealth> ();
+ playerHealth = player.GetComponent <PlayerHealth> ();
+ enemyHealth = GetComponent <EnemyHealth> ();
nav = GetComponent <UnityEngine.AI.NavMeshAgent> ();
}
void Update ()
{
- //if (enemyHealth.currentHealth > 0 && playerHealth.currentHealth > 0)
- //{
+ if (enemyHealth.currentHealth > 0 && playerHealth.currentHealth > 0)
+ {
nav.SetDestination (player.position);
- //}
- //else
- //{
- // nav.enabled = false;
- //}
+ }
+ else
+ {
+ nav.enabled = false;
+ }
}
}
diff --git a/Assets/Scripts/Player/Command.cs b/Assets/Scripts/Player/Command.cs
new file mode 100644
index 0000000000000000000000000000000000000000..580fe4602d8d7d7b7fbf858ef1e26a7802353cae
--- /dev/null
+++ b/Assets/Scripts/Player/Command.cs
@@ -0,0 +1,9 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public abstract class Command
+{
+ public abstract void Execute();
+ public abstract void UnExecute();
+}
diff --git a/Assets/Scripts/Player/Command.cs.meta b/Assets/Scripts/Player/Command.cs.meta
new file mode 100644
index 0000000000000000000000000000000000000000..5f7ef6d0e6c1963e8ede07c016fe7f83ddd519d2
--- /dev/null
+++ b/Assets/Scripts/Player/Command.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 55872ae6206ed78418c74019c6e42826
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/Player/InputHandler.cs b/Assets/Scripts/Player/InputHandler.cs
new file mode 100644
index 0000000000000000000000000000000000000000..b1b0608d6c4a59b8f2de8209c7da34decd025093
--- /dev/null
+++ b/Assets/Scripts/Player/InputHandler.cs
@@ -0,0 +1,88 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class InputHandler : MonoBehaviour
+{
+ public PlayerMovement playerMovement;
+ public PlayerShooting playerShooting;
+
+ //Queue untuk menyimpan list command
+ Queue<Command> commands = new Queue<Command>();
+
+ void FixedUpdate()
+ {
+ //Menghandle input movement
+ Command moveCommand = InputMovementHandling();
+ if (moveCommand != null)
+ {
+ commands.Enqueue(moveCommand);
+
+ moveCommand.Execute();
+ }
+ }
+
+ void Update()
+ {
+ //Mengahndle shoot
+ Command shootCommand = InputShootHandling();
+ if (shootCommand != null)
+ {
+ shootCommand.Execute();
+ }
+ }
+
+ Command InputMovementHandling()
+ {
+ //Check jika movement sesuai dengan key nya
+ if (Input.GetKey(KeyCode.D))
+ {
+ return new MoveCommand(playerMovement, 1, 0);
+ }
+ else if (Input.GetKey(KeyCode.A))
+ {
+ return new MoveCommand(playerMovement, -1, 0);
+ }
+ else if (Input.GetKey(KeyCode.W))
+ {
+ return new MoveCommand(playerMovement, 0, 1);
+ }
+ else if (Input.GetKey(KeyCode.S))
+ {
+ return new MoveCommand(playerMovement, 0, -1);
+ }
+ else if (Input.GetKey(KeyCode.Z))
+ {
+ //Undo movement
+ return Undo();
+ }
+ else
+ {
+ return new MoveCommand(playerMovement, 0, 0); ;
+ }
+ }
+
+ Command Undo()
+ {
+ //Jika Queue command tidak kosong, lakukan perintah undo
+ if (commands.Count > 0)
+ {
+ Command undoCommand = commands.Dequeue();
+ undoCommand.UnExecute();
+ }
+ return null;
+ }
+
+ Command InputShootHandling()
+ {
+ //Jika menembak trigger shoot command
+ if (Input.GetButtonDown("Fire1"))
+ {
+ return new ShootCommand(playerShooting);
+ }
+ else
+ {
+ return null;
+ }
+ }
+}
diff --git a/Assets/Scripts/Player/InputHandler.cs.meta b/Assets/Scripts/Player/InputHandler.cs.meta
new file mode 100644
index 0000000000000000000000000000000000000000..257967e4969f103b2ea1ef14bc1791c30e2c71e6
--- /dev/null
+++ b/Assets/Scripts/Player/InputHandler.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 9731d9927dd98f747813f210ca373b6e
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/Player/MoveCommand.cs b/Assets/Scripts/Player/MoveCommand.cs
new file mode 100644
index 0000000000000000000000000000000000000000..d41f44ba5febcd93f319728f7189ba11d2994de4
--- /dev/null
+++ b/Assets/Scripts/Player/MoveCommand.cs
@@ -0,0 +1,32 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class MoveCommand : Command
+{
+ PlayerMovement playerMovement;
+ float h, v;
+
+ public MoveCommand(PlayerMovement _playerMovement, float _h, float _v)
+ {
+ this.playerMovement = _playerMovement;
+ this.h = _h;
+ this.v = _v;
+ }
+
+ //Trigger perintah movement
+ public override void Execute()
+ {
+ playerMovement.Move(h, v);
+ //Menganimasikan player
+ playerMovement.Animating(h, v);
+ }
+
+ public override void UnExecute()
+ {
+ //Invers arah dari movement player
+ playerMovement.Move(-h, -v);
+ //Menganimasikan player
+ playerMovement.Animating(h, v);
+ }
+}
diff --git a/Assets/Scripts/Player/MoveCommand.cs.meta b/Assets/Scripts/Player/MoveCommand.cs.meta
new file mode 100644
index 0000000000000000000000000000000000000000..bacad3b7c2da2a4941d4c678b1f9f6f22964cba2
--- /dev/null
+++ b/Assets/Scripts/Player/MoveCommand.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 6b5802e70cacdc4429ad906157757c2e
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/Player/PlayerMovement.cs b/Assets/Scripts/Player/PlayerMovement.cs
index 181236ec4cb113fe748d907af687cb880a969cee..b1bedbb8f49d76991612493590b1d0d57fc7dadf 100644
--- a/Assets/Scripts/Player/PlayerMovement.cs
+++ b/Assets/Scripts/Player/PlayerMovement.cs
@@ -1,6 +1,51 @@
using UnityEngine;
-
public class PlayerMovement : MonoBehaviour
{
-
-}
+ public float speed = 6f;
+ Vector3 movement;
+ Animator anim;
+ Rigidbody playerRigidbody;
+ int floorMask;
+ float camRayLength = 100f;
+
+ private void Awake()
+ {
+Â Â Â Â //mendapatkan nilai mask dari layer yang bernama Floor
+Â Â Â Â floorMask = LayerMask.GetMask("Floor");
+
+ //Mendapatkan komponen Animator
+ anim = GetComponent<Animator>();
+
+ //Mendapatkan komponen Rigidbody
+ playerRigidbody = GetComponent<Rigidbody>();
+ }
+
+ private void FixedUpdate()
+ {
+Â Â Â Â //Mendapatkan nilai input horizontal (-1,0,1)
+Â Â Â Â float h = Input.GetAxisRaw("Horizontal");
+
+ //Mendapatkan nilai input vertical (-1,0,1)
+ float v = Input.GetAxisRaw("Vertical");
+
+ Move(h, v);
+ }
+
+ //Method player dapat berjalan
+Â Â public void Move(float h, float v)
+ {
+Â Â Â Â //Set nilai x dan y
+Â Â Â Â movement.Set(h, 0f, v);
+
+ //Menormalisasi nilai vector agar total panjang dari vector adalah 1
+ movement = movement.normalized * speed * Time.deltaTime;
+
+ //Move to position
+ playerRigidbody.MovePosition(transform.position + movement);
+ }
+ public void Animating(float h, float v)
+ {
+ bool walking = h != 0f || v != 0f;
+ anim.SetBool("IsWalking", walking);
+ }
+}
\ No newline at end of file
diff --git a/Assets/Scripts/Player/PlayerShooting.cs b/Assets/Scripts/Player/PlayerShooting.cs
index d4e3c43b4b6d92eaf074ce006f1baeb70ba611c1..ed8fe6136224369a65e0aa24314862d0d8d15c5e 100644
--- a/Assets/Scripts/Player/PlayerShooting.cs
+++ b/Assets/Scripts/Player/PlayerShooting.cs
@@ -46,7 +46,7 @@ public class PlayerShooting : MonoBehaviour
gunLight.enabled = false;
}
- void Shoot()
+ public void Shoot()
{
timer = 0f;
diff --git a/Assets/Scripts/Player/ShootCommand.cs b/Assets/Scripts/Player/ShootCommand.cs
new file mode 100644
index 0000000000000000000000000000000000000000..fabe08734b25c79cd62131380110da2320b2df56
--- /dev/null
+++ b/Assets/Scripts/Player/ShootCommand.cs
@@ -0,0 +1,25 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class ShootCommand : Command
+{
+
+ PlayerShooting playerShooting;
+
+ public ShootCommand(PlayerShooting _playerShooting)
+ {
+ playerShooting = _playerShooting;
+ }
+
+ public override void Execute()
+ {
+ //Player menembak
+ playerShooting.Shoot();
+ }
+
+ public override void UnExecute()
+ {
+
+ }
+}
diff --git a/Assets/Scripts/Player/ShootCommand.cs.meta b/Assets/Scripts/Player/ShootCommand.cs.meta
new file mode 100644
index 0000000000000000000000000000000000000000..568497bef39d82329903b88870f0500eb2e03c53
--- /dev/null
+++ b/Assets/Scripts/Player/ShootCommand.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: af312ddca25f14e4eb57e5dc6e1afa13
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/utils.meta b/Assets/Scripts/utils.meta
new file mode 100644
index 0000000000000000000000000000000000000000..cefdd51bc9d8429db9ea0ffc17b4a70de3c231c5
--- /dev/null
+++ b/Assets/Scripts/utils.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 632f63df1bab54a4295d4ce0bba8bd58
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Library/ArtifactDB b/Library/ArtifactDB
index ac1c83c9c558531a8eca1b7a50b9d93ebbd0f318..1b6dc5b8fa67e61c5781a74ab493113675f7b9a4 100644
Binary files a/Library/ArtifactDB and b/Library/ArtifactDB differ
diff --git a/Library/Artifacts/86/86c77f49d083fa075214a59d311fdd5a b/Library/Artifacts/0a/0a4a5de24d288b74b3067f72b81a157c
similarity index 94%
rename from Library/Artifacts/86/86c77f49d083fa075214a59d311fdd5a
rename to Library/Artifacts/0a/0a4a5de24d288b74b3067f72b81a157c
index c6affa30a723be1fef944098e57ed471abf7c771..17e12b825d3f7e03099019e08b611f70c3ba1fe8 100644
Binary files a/Library/Artifacts/86/86c77f49d083fa075214a59d311fdd5a and b/Library/Artifacts/0a/0a4a5de24d288b74b3067f72b81a157c differ
diff --git a/Library/Artifacts/77/77a4530d2b5e4ef842945b3031a2517e b/Library/Artifacts/15/15c6bffdbf86aaff43621699e7f3195d
similarity index 94%
rename from Library/Artifacts/77/77a4530d2b5e4ef842945b3031a2517e
rename to Library/Artifacts/15/15c6bffdbf86aaff43621699e7f3195d
index aba3c1decabdcae01a9ea4d12f1a2468d9b01d02..d88ac8abad3dd5db91e14321f20e4ac7f715c021 100644
Binary files a/Library/Artifacts/77/77a4530d2b5e4ef842945b3031a2517e and b/Library/Artifacts/15/15c6bffdbf86aaff43621699e7f3195d differ
diff --git a/Library/Artifacts/18/18cb2ca719a0c4eaebb8cd9603f19688 b/Library/Artifacts/18/18cb2ca719a0c4eaebb8cd9603f19688
new file mode 100644
index 0000000000000000000000000000000000000000..f34a2b41b25484c27bf2b8989441d334a41ffede
Binary files /dev/null and b/Library/Artifacts/18/18cb2ca719a0c4eaebb8cd9603f19688 differ
diff --git a/Library/Artifacts/20/2059cf21e014d14f4b3aa4d50aec6866 b/Library/Artifacts/20/2059cf21e014d14f4b3aa4d50aec6866
new file mode 100644
index 0000000000000000000000000000000000000000..d62207a07aa20b3cc757b2451a38f9395325ec94
Binary files /dev/null and b/Library/Artifacts/20/2059cf21e014d14f4b3aa4d50aec6866 differ
diff --git a/Library/Artifacts/7c/7cc654f3edcdc56e3d12a3295bed1de1 b/Library/Artifacts/21/21e3b4f36b6ce3118c0b65a44367af02
similarity index 98%
rename from Library/Artifacts/7c/7cc654f3edcdc56e3d12a3295bed1de1
rename to Library/Artifacts/21/21e3b4f36b6ce3118c0b65a44367af02
index 2f6f72d5e3edb89c5a0c06680c365cc1aeb0fe01..1fd072877908364cd0d7d1233ce0a0cfacbdf79e 100644
Binary files a/Library/Artifacts/7c/7cc654f3edcdc56e3d12a3295bed1de1 and b/Library/Artifacts/21/21e3b4f36b6ce3118c0b65a44367af02 differ
diff --git a/Library/Artifacts/d6/d6d95ed5cf79b739e7b481d038ccc2ee b/Library/Artifacts/2d/2d7ab4b040e5d352d5cc76791df701ea
similarity index 98%
rename from Library/Artifacts/d6/d6d95ed5cf79b739e7b481d038ccc2ee
rename to Library/Artifacts/2d/2d7ab4b040e5d352d5cc76791df701ea
index 12afa3ab8e257c8ff31a7cb3a1ee35251cd9ee21..eb95e8558665276e6fc1c49d7da3e3ccce4077d8 100644
Binary files a/Library/Artifacts/d6/d6d95ed5cf79b739e7b481d038ccc2ee and b/Library/Artifacts/2d/2d7ab4b040e5d352d5cc76791df701ea differ
diff --git a/Library/Artifacts/2f/2f644fe0a66748c4a7030aa2eee5d6d3 b/Library/Artifacts/2f/2f644fe0a66748c4a7030aa2eee5d6d3
new file mode 100644
index 0000000000000000000000000000000000000000..5f99e01a1d40bdd93f9f00942ab070222c7d1a83
Binary files /dev/null and b/Library/Artifacts/2f/2f644fe0a66748c4a7030aa2eee5d6d3 differ
diff --git a/Library/Artifacts/39/39093ca57276f205ff61ef3175057112 b/Library/Artifacts/39/39093ca57276f205ff61ef3175057112
new file mode 100644
index 0000000000000000000000000000000000000000..ed2dcf64617bc0bac5eb116a96187da1221ff41a
Binary files /dev/null and b/Library/Artifacts/39/39093ca57276f205ff61ef3175057112 differ
diff --git a/Library/Artifacts/49/49d7821dd05e9eb51b10bde122e17ebc b/Library/Artifacts/49/49d7821dd05e9eb51b10bde122e17ebc
new file mode 100644
index 0000000000000000000000000000000000000000..1fec728327950c56b79c43d4efacfd7ae7e26e3e
Binary files /dev/null and b/Library/Artifacts/49/49d7821dd05e9eb51b10bde122e17ebc differ
diff --git a/Library/Artifacts/4a/4a88221a20bfe9dbce94c7793ec01424 b/Library/Artifacts/4a/4a88221a20bfe9dbce94c7793ec01424
new file mode 100644
index 0000000000000000000000000000000000000000..3adc279eed6ff996c4f05b8f794f16d27100b661
Binary files /dev/null and b/Library/Artifacts/4a/4a88221a20bfe9dbce94c7793ec01424 differ
diff --git a/Library/Artifacts/54/5490740ab2e18b0a5723ed812c710427 b/Library/Artifacts/54/5490740ab2e18b0a5723ed812c710427
new file mode 100644
index 0000000000000000000000000000000000000000..2bc42c6f3435342b0d2ded8e36c20e2cd03b5d2e
Binary files /dev/null and b/Library/Artifacts/54/5490740ab2e18b0a5723ed812c710427 differ
diff --git a/Library/Artifacts/59/5909d1dda0bd9c0fa9c677146213a378 b/Library/Artifacts/59/5909d1dda0bd9c0fa9c677146213a378
new file mode 100644
index 0000000000000000000000000000000000000000..6933fa625b2eb8e58be3561b96a40f6b424d3f4d
Binary files /dev/null and b/Library/Artifacts/59/5909d1dda0bd9c0fa9c677146213a378 differ
diff --git a/Library/Artifacts/5d/5ded34b8b8810c288519630c0d0d0eb2 b/Library/Artifacts/5d/5ded34b8b8810c288519630c0d0d0eb2
new file mode 100644
index 0000000000000000000000000000000000000000..121bc421ecac072850833ac265cb3d979a69053a
Binary files /dev/null and b/Library/Artifacts/5d/5ded34b8b8810c288519630c0d0d0eb2 differ
diff --git a/Library/Artifacts/5e/5e28250b50da122a4f8741720d88c67e b/Library/Artifacts/5e/5e28250b50da122a4f8741720d88c67e
new file mode 100644
index 0000000000000000000000000000000000000000..f7b95d317e9acb40aa0d259a6de9aebb337da491
Binary files /dev/null and b/Library/Artifacts/5e/5e28250b50da122a4f8741720d88c67e differ
diff --git a/Library/Artifacts/66/660249863827d2b078e6900cacb10386 b/Library/Artifacts/66/660249863827d2b078e6900cacb10386
new file mode 100644
index 0000000000000000000000000000000000000000..bb81ad530ea83cdd75de70a5844af2bc1a42b48d
Binary files /dev/null and b/Library/Artifacts/66/660249863827d2b078e6900cacb10386 differ
diff --git a/Library/Artifacts/66/668c39d0bef3ab45667040d5bc698b1f b/Library/Artifacts/66/668c39d0bef3ab45667040d5bc698b1f
new file mode 100644
index 0000000000000000000000000000000000000000..0c601503182fbfe9f567d87bd2bea1b4863d3823
Binary files /dev/null and b/Library/Artifacts/66/668c39d0bef3ab45667040d5bc698b1f differ
diff --git a/Library/Artifacts/6a/6a3072db62a32e908b97f7d1c554f52f b/Library/Artifacts/6a/6a3072db62a32e908b97f7d1c554f52f
new file mode 100644
index 0000000000000000000000000000000000000000..cea473b4305ba6289b13780c22459c3856af4f98
Binary files /dev/null and b/Library/Artifacts/6a/6a3072db62a32e908b97f7d1c554f52f differ
diff --git a/Library/Artifacts/72/7217865884870ddabd9df6a808e636b9 b/Library/Artifacts/72/7217865884870ddabd9df6a808e636b9
new file mode 100644
index 0000000000000000000000000000000000000000..660835d8463fb245595ba9768f13b29bcdd425b8
Binary files /dev/null and b/Library/Artifacts/72/7217865884870ddabd9df6a808e636b9 differ
diff --git a/Library/Artifacts/7c/7c8edf2dcbc23f9a2b6d052f111ac1eb b/Library/Artifacts/7c/7c8edf2dcbc23f9a2b6d052f111ac1eb
new file mode 100644
index 0000000000000000000000000000000000000000..6088949a01753dd37ada2c23db597b235cda9622
Binary files /dev/null and b/Library/Artifacts/7c/7c8edf2dcbc23f9a2b6d052f111ac1eb differ
diff --git a/Library/Artifacts/7e/7e222c139bc7e3e3cac8fa7677eb296d b/Library/Artifacts/7e/7e222c139bc7e3e3cac8fa7677eb296d
new file mode 100644
index 0000000000000000000000000000000000000000..7700f07f4e05aca50eed9946784b46e12a8152e4
Binary files /dev/null and b/Library/Artifacts/7e/7e222c139bc7e3e3cac8fa7677eb296d differ
diff --git a/Library/Artifacts/7f/7fb4d4485468efe7f05a31fb3c45c421 b/Library/Artifacts/7f/7fb4d4485468efe7f05a31fb3c45c421
new file mode 100644
index 0000000000000000000000000000000000000000..55abe9eeee30b4a57f68e2dbe3d834bfbd2f54fa
Binary files /dev/null and b/Library/Artifacts/7f/7fb4d4485468efe7f05a31fb3c45c421 differ
diff --git a/Library/Artifacts/80/80053d9471338b731a40bc74fd2de707 b/Library/Artifacts/80/80053d9471338b731a40bc74fd2de707
new file mode 100644
index 0000000000000000000000000000000000000000..264e270e16eb3173f79e8ab198d82c65196682d7
Binary files /dev/null and b/Library/Artifacts/80/80053d9471338b731a40bc74fd2de707 differ
diff --git a/Library/Artifacts/84/84bbbe297f17a852057b453677c8dc16 b/Library/Artifacts/84/84bbbe297f17a852057b453677c8dc16
new file mode 100644
index 0000000000000000000000000000000000000000..3d68c0b02b23538646d90baa705a78d6af202d8e
Binary files /dev/null and b/Library/Artifacts/84/84bbbe297f17a852057b453677c8dc16 differ
diff --git a/Library/Artifacts/86/86e91ba649fb73e9b63a2bb795ce1836 b/Library/Artifacts/86/86e91ba649fb73e9b63a2bb795ce1836
new file mode 100644
index 0000000000000000000000000000000000000000..b8c41fc635612db06b779f82bbe4ae6e7c95ee3f
Binary files /dev/null and b/Library/Artifacts/86/86e91ba649fb73e9b63a2bb795ce1836 differ
diff --git a/Library/Artifacts/97/971f47921e7562e6e95eb45ebeb28f58 b/Library/Artifacts/97/971f47921e7562e6e95eb45ebeb28f58
new file mode 100644
index 0000000000000000000000000000000000000000..8c203986f6c0fc5fc80f838a3ef367d6a36f4dd3
Binary files /dev/null and b/Library/Artifacts/97/971f47921e7562e6e95eb45ebeb28f58 differ
diff --git a/Library/Artifacts/a3/a3acfc2f7fad78a632fd9419b1029167 b/Library/Artifacts/a3/a3acfc2f7fad78a632fd9419b1029167
new file mode 100644
index 0000000000000000000000000000000000000000..4b542b1e6f656b84608725b6ce725d178b90565a
Binary files /dev/null and b/Library/Artifacts/a3/a3acfc2f7fad78a632fd9419b1029167 differ
diff --git a/Library/Artifacts/a4/a4ff54e35db7943bb85957e808cf47e2 b/Library/Artifacts/a4/a4ff54e35db7943bb85957e808cf47e2
new file mode 100644
index 0000000000000000000000000000000000000000..4179f5d281c1c1b910e99bb96312d3e028244421
Binary files /dev/null and b/Library/Artifacts/a4/a4ff54e35db7943bb85957e808cf47e2 differ
diff --git a/Library/Artifacts/ad/adf1cba949e30592f1e0caebd097e9c2 b/Library/Artifacts/ad/adf1cba949e30592f1e0caebd097e9c2
new file mode 100644
index 0000000000000000000000000000000000000000..7964c06e01b74c3222e8d4fab8db6b0c181f5658
Binary files /dev/null and b/Library/Artifacts/ad/adf1cba949e30592f1e0caebd097e9c2 differ
diff --git a/Library/Artifacts/be/beed970d975c4b96df4147f9100de2b3 b/Library/Artifacts/be/beed970d975c4b96df4147f9100de2b3
new file mode 100644
index 0000000000000000000000000000000000000000..d6211e0f9c32b61a50a0f83483c43ea2227a26cd
Binary files /dev/null and b/Library/Artifacts/be/beed970d975c4b96df4147f9100de2b3 differ
diff --git a/Library/Artifacts/c7/c7fb268cbee8e200b720872d895f31d5 b/Library/Artifacts/c7/c7fb268cbee8e200b720872d895f31d5
new file mode 100644
index 0000000000000000000000000000000000000000..38e7dd72b9e313d20c428c85c6666e4e227bdba0
Binary files /dev/null and b/Library/Artifacts/c7/c7fb268cbee8e200b720872d895f31d5 differ
diff --git a/Library/Artifacts/c8/c85e8d609031a28ceca08caecaec2e52 b/Library/Artifacts/c8/c85e8d609031a28ceca08caecaec2e52
new file mode 100644
index 0000000000000000000000000000000000000000..f0ed4a95ad3c30226cc5fcef6f159fff86a38cbe
Binary files /dev/null and b/Library/Artifacts/c8/c85e8d609031a28ceca08caecaec2e52 differ
diff --git a/Library/Artifacts/ca/ca981beff2dfda4675f204637eeb52e6 b/Library/Artifacts/ca/ca981beff2dfda4675f204637eeb52e6
new file mode 100644
index 0000000000000000000000000000000000000000..7e98c079f8b0063d53859ddcf27b9faa962651e2
Binary files /dev/null and b/Library/Artifacts/ca/ca981beff2dfda4675f204637eeb52e6 differ
diff --git a/Library/Artifacts/cc/cc46abcfe9e64098cf4343d0d7ac8526 b/Library/Artifacts/cc/cc46abcfe9e64098cf4343d0d7ac8526
new file mode 100644
index 0000000000000000000000000000000000000000..025ff17e63b437a8bdf319152d73b31700db30ff
Binary files /dev/null and b/Library/Artifacts/cc/cc46abcfe9e64098cf4343d0d7ac8526 differ
diff --git a/Library/Artifacts/cd/cdd3e9b66d25ad2b1986ba5b46811a72 b/Library/Artifacts/cd/cdd3e9b66d25ad2b1986ba5b46811a72
new file mode 100644
index 0000000000000000000000000000000000000000..cf3eef38d7cbc83c52784a55f260e61cdf322c0e
Binary files /dev/null and b/Library/Artifacts/cd/cdd3e9b66d25ad2b1986ba5b46811a72 differ
diff --git a/Library/Artifacts/ce/ce03183e9c33a5adabcdf13c6260b1a0 b/Library/Artifacts/ce/ce03183e9c33a5adabcdf13c6260b1a0
new file mode 100644
index 0000000000000000000000000000000000000000..84c0465f7d5ba869dd27be15ae906d9cdcdeea5e
Binary files /dev/null and b/Library/Artifacts/ce/ce03183e9c33a5adabcdf13c6260b1a0 differ
diff --git a/Library/Artifacts/d2/d22912a1f4adb7a4b879e489b0260ab5 b/Library/Artifacts/d2/d22912a1f4adb7a4b879e489b0260ab5
new file mode 100644
index 0000000000000000000000000000000000000000..378611f97d7a0e13e2e2f633b258be7944904e58
Binary files /dev/null and b/Library/Artifacts/d2/d22912a1f4adb7a4b879e489b0260ab5 differ
diff --git a/Library/Artifacts/d2/d2a8ea8422d5b2789edc7ecb8d4f54e2 b/Library/Artifacts/d2/d2a8ea8422d5b2789edc7ecb8d4f54e2
new file mode 100644
index 0000000000000000000000000000000000000000..454302f9c5c61a9fc90815987f97adebdaf1760b
Binary files /dev/null and b/Library/Artifacts/d2/d2a8ea8422d5b2789edc7ecb8d4f54e2 differ
diff --git a/Library/Artifacts/d4/d4967e1899c5122641a264f30abde11c b/Library/Artifacts/d4/d4967e1899c5122641a264f30abde11c
new file mode 100644
index 0000000000000000000000000000000000000000..cf6d85dcc1986d9f83a8ef5919e3a1e98a146082
Binary files /dev/null and b/Library/Artifacts/d4/d4967e1899c5122641a264f30abde11c differ
diff --git a/Library/Artifacts/d8/d8bf8ccc02f9d9b46017d64b1dc91af0 b/Library/Artifacts/d8/d8bf8ccc02f9d9b46017d64b1dc91af0
new file mode 100644
index 0000000000000000000000000000000000000000..0a28dbce6308f048f1c66c590ca0634c75a378d8
Binary files /dev/null and b/Library/Artifacts/d8/d8bf8ccc02f9d9b46017d64b1dc91af0 differ
diff --git a/Library/Artifacts/db/db06c3646e4e0271f2d46d52f462cd8b b/Library/Artifacts/db/db06c3646e4e0271f2d46d52f462cd8b
new file mode 100644
index 0000000000000000000000000000000000000000..82ba5be3632b0b3f650c118090611221d0a56de1
Binary files /dev/null and b/Library/Artifacts/db/db06c3646e4e0271f2d46d52f462cd8b differ
diff --git a/Library/Artifacts/e6/e6bf34e2d9a034f78a1de34acc57ad44 b/Library/Artifacts/e6/e6bf34e2d9a034f78a1de34acc57ad44
new file mode 100644
index 0000000000000000000000000000000000000000..6a806b1134e89e615d983067219f00b42077cbc2
Binary files /dev/null and b/Library/Artifacts/e6/e6bf34e2d9a034f78a1de34acc57ad44 differ
diff --git a/Library/Artifacts/e8/e8f764b67c0d31125cc3365691ef7f46 b/Library/Artifacts/e8/e8f764b67c0d31125cc3365691ef7f46
new file mode 100644
index 0000000000000000000000000000000000000000..2ab6d66dc8310ab15a6a3cddbca3f5a99fc7f79a
Binary files /dev/null and b/Library/Artifacts/e8/e8f764b67c0d31125cc3365691ef7f46 differ
diff --git a/Library/Artifacts/eb/eb80bd9088d4b7e0cae26054552fe466 b/Library/Artifacts/eb/eb80bd9088d4b7e0cae26054552fe466
new file mode 100644
index 0000000000000000000000000000000000000000..a5e1ad389ad3f508c70ade8e5cdceb6322c3cc4b
Binary files /dev/null and b/Library/Artifacts/eb/eb80bd9088d4b7e0cae26054552fe466 differ
diff --git a/Library/Artifacts/ec/ec7c7923692649b75410f73a7bdbfccd b/Library/Artifacts/ec/ec7c7923692649b75410f73a7bdbfccd
new file mode 100644
index 0000000000000000000000000000000000000000..182e812767c71531c145db29dff1e108793924ab
Binary files /dev/null and b/Library/Artifacts/ec/ec7c7923692649b75410f73a7bdbfccd differ
diff --git a/Library/Artifacts/f1/f1d1eb43a3b9631a3808bdecf14bb20b b/Library/Artifacts/f1/f1d1eb43a3b9631a3808bdecf14bb20b
new file mode 100644
index 0000000000000000000000000000000000000000..fa9f2d9b07bb12be66c7c48e89a1da446c9613fd
Binary files /dev/null and b/Library/Artifacts/f1/f1d1eb43a3b9631a3808bdecf14bb20b differ
diff --git a/Library/Artifacts/f5/f5c7e9c7f7d2845bd2e5a46edefc0bb3 b/Library/Artifacts/f5/f5c7e9c7f7d2845bd2e5a46edefc0bb3
new file mode 100644
index 0000000000000000000000000000000000000000..58f1f8d3d76d99ed2bd2fb28bd95e4fdacf6ae6b
Binary files /dev/null and b/Library/Artifacts/f5/f5c7e9c7f7d2845bd2e5a46edefc0bb3 differ
diff --git a/Library/Artifacts/f7/f775b272afb110604a30447f640e2af1 b/Library/Artifacts/f7/f775b272afb110604a30447f640e2af1
new file mode 100644
index 0000000000000000000000000000000000000000..178a6bc9c2f13c4c9c1d3c10de81b164ad9a06fb
Binary files /dev/null and b/Library/Artifacts/f7/f775b272afb110604a30447f640e2af1 differ
diff --git a/Library/Artifacts/f9/f93aa28b5b8cb30dcedb4e1d8d0146fd b/Library/Artifacts/f9/f93aa28b5b8cb30dcedb4e1d8d0146fd
new file mode 100644
index 0000000000000000000000000000000000000000..19d4d0caeeaae4510f157a5e81b1a838d5ebd658
Binary files /dev/null and b/Library/Artifacts/f9/f93aa28b5b8cb30dcedb4e1d8d0146fd differ
diff --git a/Library/Artifacts/f9/f9ed672f403e0aa1c3bb20c256b7f8a0 b/Library/Artifacts/f9/f9ed672f403e0aa1c3bb20c256b7f8a0
new file mode 100644
index 0000000000000000000000000000000000000000..8e257c0a49e6809899bfc4d73a578c9a9124ba54
Binary files /dev/null and b/Library/Artifacts/f9/f9ed672f403e0aa1c3bb20c256b7f8a0 differ
diff --git a/Library/Artifacts/fd/fda3e0ffe470dad792db7b832aacda6a b/Library/Artifacts/fd/fda3e0ffe470dad792db7b832aacda6a
new file mode 100644
index 0000000000000000000000000000000000000000..940cc742eac474cdb6293507d8f77b5bf2114d2d
Binary files /dev/null and b/Library/Artifacts/fd/fda3e0ffe470dad792db7b832aacda6a differ
diff --git a/Library/Artifacts/fd/fdaac603e87eb7b65eab5cde702acee2 b/Library/Artifacts/fd/fdaac603e87eb7b65eab5cde702acee2
new file mode 100644
index 0000000000000000000000000000000000000000..3b0e20c1767b3c3a47e853a0cf9c3ded003827ce
Binary files /dev/null and b/Library/Artifacts/fd/fdaac603e87eb7b65eab5cde702acee2 differ
diff --git a/Library/Artifacts/fe/fe1860b049e35a16fa7f23a0430f6759 b/Library/Artifacts/fe/fe1860b049e35a16fa7f23a0430f6759
deleted file mode 100644
index bb163863b30b58fc213e2227d8aea85430e7fee2..0000000000000000000000000000000000000000
Binary files a/Library/Artifacts/fe/fe1860b049e35a16fa7f23a0430f6759 and /dev/null differ
diff --git a/Library/Artifacts/ff/ff84a45d53c0da3b57c7e59808e3f5ef b/Library/Artifacts/ff/ff84a45d53c0da3b57c7e59808e3f5ef
new file mode 100644
index 0000000000000000000000000000000000000000..fa98f65b8f3db39c9d0b4da5c6c4f65113916cf6
Binary files /dev/null and b/Library/Artifacts/ff/ff84a45d53c0da3b57c7e59808e3f5ef differ
diff --git a/Library/CurrentLayout-default.dwlt b/Library/CurrentLayout-default.dwlt
index 90c6cfa156a67f353806d3273a038438f2f7c856..43e777f3f5885e893e7dc5406aa89dc4de4dc84d 100644
--- a/Library/CurrentLayout-default.dwlt
+++ b/Library/CurrentLayout-default.dwlt
@@ -21,7 +21,7 @@ MonoBehaviour:
m_ShowMode: 4
m_Title: Game
m_RootView: {fileID: 6}
- m_MinSize: {x: 875, y: 542}
+ m_MinSize: {x: 875, y: 300}
m_MaxSize: {x: 10000, y: 10000}
m_Maximized: 1
--- !u!114 &2
@@ -48,7 +48,7 @@ MonoBehaviour:
m_MinSize: {x: 679, y: 492}
m_MaxSize: {x: 14002, y: 14042}
vertical: 0
- controlID: 49
+ controlID: 139
--- !u!114 &3
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -94,8 +94,8 @@ MonoBehaviour:
y: 0
width: 258
height: 397
- m_MinSize: {x: 200, y: 200}
- m_MaxSize: {x: 4000, y: 4000}
+ m_MinSize: {x: 201, y: 221}
+ m_MaxSize: {x: 4001, y: 4021}
m_ActualView: {fileID: 15}
m_Panes:
- {fileID: 15}
@@ -226,7 +226,7 @@ MonoBehaviour:
m_MinSize: {x: 403, y: 492}
m_MaxSize: {x: 10001, y: 14042}
vertical: 1
- controlID: 50
+ controlID: 85
--- !u!114 &10
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -251,7 +251,7 @@ MonoBehaviour:
m_MinSize: {x: 403, y: 221}
m_MaxSize: {x: 8003, y: 4021}
vertical: 0
- controlID: 51
+ controlID: 86
--- !u!114 &11
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -271,8 +271,8 @@ MonoBehaviour:
y: 0
width: 786
height: 397
- m_MinSize: {x: 200, y: 200}
- m_MaxSize: {x: 4000, y: 4000}
+ m_MinSize: {x: 202, y: 221}
+ m_MaxSize: {x: 4002, y: 4021}
m_ActualView: {fileID: 17}
m_Panes:
- {fileID: 16}
@@ -409,25 +409,25 @@ MonoBehaviour:
m_IsLocked: 0
m_FolderTreeState:
scrollPos: {x: 0, y: 79}
- m_SelectedIDs: 9e410000
- m_LastClickedID: 16798
- m_ExpandedIDs: 00000000e0400000704100007641000000ca9a3b
+ m_SelectedIDs: a6410000
+ m_LastClickedID: 16806
+ m_ExpandedIDs: 000000008a410000984100009e41000000ca9a3b
m_RenameOverlay:
m_UserAcceptedRename: 0
- m_Name:
- m_OriginalName:
+ m_Name: Characters
+ m_OriginalName: Characters
m_EditFieldRect:
serializedVersion: 2
x: 0
y: 0
width: 0
height: 0
- m_UserData: 0
+ m_UserData: 17080
m_IsWaitingForDelay: 0
m_IsRenaming: 0
- m_OriginalEventType: 11
+ m_OriginalEventType: 0
m_IsRenamingFilename: 1
- m_ClientGUIView: {fileID: 0}
+ m_ClientGUIView: {fileID: 5}
m_SearchString:
m_CreateAssetUtility:
m_EndAction: {fileID: 0}
@@ -439,7 +439,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
- m_ExpandedIDs: 00000000e0400000
+ m_ExpandedIDs: 000000008a410000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -467,7 +467,7 @@ MonoBehaviour:
m_SelectedInstanceIDs:
m_LastClickedInstanceID: 0
m_HadKeyboardFocusLastEvent: 1
- m_ExpandedInstanceIDs: c62300008a410000
+ m_ExpandedInstanceIDs: c62300008a410000c4420000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -560,9 +560,9 @@ MonoBehaviour:
m_SceneHierarchy:
m_TreeViewState:
scrollPos: {x: 0, y: 0}
- m_SelectedIDs: 66e3ffff
- m_LastClickedID: -7322
- m_ExpandedIDs: 20e9ffff2ce9ffff10ebffff8aecffff72fbffff8e3d0000
+ m_SelectedIDs:
+ m_LastClickedID: 0
+ m_ExpandedIDs: 7ef9ffff72fbffff
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -578,7 +578,7 @@ MonoBehaviour:
m_IsRenaming: 0
m_OriginalEventType: 11
m_IsRenamingFilename: 0
- m_ClientGUIView: {fileID: 4}
+ m_ClientGUIView: {fileID: 0}
m_SearchString:
m_ExpandedScenes: []
m_CurrenRootInstanceID: 0
@@ -760,7 +760,7 @@ MonoBehaviour:
m_HSlider: 0
m_VSlider: 0
m_IgnoreScrollWheelUntilClicked: 0
- m_EnableMouseInput: 0
+ m_EnableMouseInput: 1
m_EnableSliderZoomHorizontal: 0
m_EnableSliderZoomVertical: 0
m_UniformScale: 1
diff --git a/Library/EditorInstance.json b/Library/EditorInstance.json
index e6d03537a2aefddc512c075cdc8a6eaa94b92a61..cd522675d956c5e5a2f232a8626d3a67e3bfd265 100644
--- a/Library/EditorInstance.json
+++ b/Library/EditorInstance.json
@@ -1,5 +1,5 @@
{
- "process_id" : 7120,
+ "process_id" : 11528,
"version" : "2020.3.30f1",
"app_path" : "C:/Program Files/Unity/Hub/Editor/2020.3.30f1/Editor/Unity.exe",
"app_contents_path" : "C:/Program Files/Unity/Hub/Editor/2020.3.30f1/Editor/Data"
diff --git a/Library/InspectorExpandedItems.asset b/Library/InspectorExpandedItems.asset
index 0ba2171ba03b541218fe09e95daf8137b88abd7b..9e1090cbe409e5e1c07626dde2dcc324edd52bda 100644
Binary files a/Library/InspectorExpandedItems.asset and b/Library/InspectorExpandedItems.asset differ
diff --git a/Library/SceneVisibilityState.asset b/Library/SceneVisibilityState.asset
index 3139b172d7d77f0be5b383a928cf931e3521a7dd..3625131ba38df92b8f2a0ee245eb8c7c0c464b5e 100644
Binary files a/Library/SceneVisibilityState.asset and b/Library/SceneVisibilityState.asset differ
diff --git a/Library/ScriptAssemblies/Assembly-CSharp.dll b/Library/ScriptAssemblies/Assembly-CSharp.dll
index 9d44fb9c100e2ee57f68013c1c95853273bdfa31..e4bc133638be25a44d0e273d0bd0885ff864ba93 100644
Binary files a/Library/ScriptAssemblies/Assembly-CSharp.dll and b/Library/ScriptAssemblies/Assembly-CSharp.dll differ
diff --git a/Library/ScriptAssemblies/Assembly-CSharp.pdb b/Library/ScriptAssemblies/Assembly-CSharp.pdb
index 6279f515543d15c32919e73260d166ceab00efdf..84a8c9a622723fa52d83bcfe41eecb4ae06c2564 100644
Binary files a/Library/ScriptAssemblies/Assembly-CSharp.pdb and b/Library/ScriptAssemblies/Assembly-CSharp.pdb differ
diff --git a/Library/ShaderCache/0/017208a9338af7fd616af68f1b93c7ba.bin b/Library/ShaderCache/0/017208a9338af7fd616af68f1b93c7ba.bin
new file mode 100644
index 0000000000000000000000000000000000000000..c6e3624878861bbf4ad07d22c176ecf1f357b9d0
Binary files /dev/null and b/Library/ShaderCache/0/017208a9338af7fd616af68f1b93c7ba.bin differ
diff --git a/Library/ShaderCache/6/64a69c799ba22df72945b17f86dfc698.bin b/Library/ShaderCache/6/64a69c799ba22df72945b17f86dfc698.bin
new file mode 100644
index 0000000000000000000000000000000000000000..4725d996488aafff97632d6335857ec3c7748498
Binary files /dev/null and b/Library/ShaderCache/6/64a69c799ba22df72945b17f86dfc698.bin differ
diff --git a/Library/ShaderCache/9/9fb6cdfe0b5594ad1b7044a398de2c2c.bin b/Library/ShaderCache/9/9fb6cdfe0b5594ad1b7044a398de2c2c.bin
new file mode 100644
index 0000000000000000000000000000000000000000..d898127cb1c03ccb92d3c541d568ba7377722fa9
Binary files /dev/null and b/Library/ShaderCache/9/9fb6cdfe0b5594ad1b7044a398de2c2c.bin differ
diff --git a/Library/ShaderCache/EditorEncounteredVariants b/Library/ShaderCache/EditorEncounteredVariants
index 4cdb33c664417984689b2274659a5d93212a0ff2..1c95c958057f0858060cc240be1b3dcc79a49282 100644
Binary files a/Library/ShaderCache/EditorEncounteredVariants and b/Library/ShaderCache/EditorEncounteredVariants differ
diff --git a/Library/ShaderCache/c/c6f897c27285346903f36ea605fa03d6.bin b/Library/ShaderCache/c/c6f897c27285346903f36ea605fa03d6.bin
new file mode 100644
index 0000000000000000000000000000000000000000..7ca34a1c25c22f842be5acd064695937b6d19a88
Binary files /dev/null and b/Library/ShaderCache/c/c6f897c27285346903f36ea605fa03d6.bin differ
diff --git a/Library/SourceAssetDB b/Library/SourceAssetDB
index 6d789c039ad30f06d50e83463f3b29a53ad3369e..559e375048e060b5f62cf7fcbd747e517e89c6d2 100644
Binary files a/Library/SourceAssetDB and b/Library/SourceAssetDB differ
diff --git a/Library/StateCache/MainStageHierarchy/4d/4d2a36d9faf65734f0bbefb3ee623532.json b/Library/StateCache/MainStageHierarchy/4d/4d2a36d9faf65734f0bbefb3ee623532.json
index 6866e5b694861f2988c715a8f7b52c1feb1c8f19..247d994bb76f68fc19ea0d120b22fc9d94646486 100644
--- a/Library/StateCache/MainStageHierarchy/4d/4d2a36d9faf65734f0bbefb3ee623532.json
+++ b/Library/StateCache/MainStageHierarchy/4d/4d2a36d9faf65734f0bbefb3ee623532.json
@@ -1 +1 @@
-{"m_ScrollY":0.0,"m_ExpandedSceneGameObjectInstanceIDs":[-1166],"m_LastClickedInstanceID":0,"m_OpenSceneGUIDs":["7c6548dde5dbbeb4c8b3a296639c3b06"]}
\ No newline at end of file
+{"m_ScrollY":0.0,"m_ExpandedSceneGameObjectInstanceIDs":[-1350,-1340,15804],"m_LastClickedInstanceID":0,"m_OpenSceneGUIDs":["7c6548dde5dbbeb4c8b3a296639c3b06"]}
\ No newline at end of file
diff --git a/Library/StateCache/PrefabStageHierarchy/c1/c13e479c314eba2688a883323a7f712f.json b/Library/StateCache/PrefabStageHierarchy/c1/c13e479c314eba2688a883323a7f712f.json
new file mode 100644
index 0000000000000000000000000000000000000000..a128d83aa7f24ce642bb6842335ec014634fba90
--- /dev/null
+++ b/Library/StateCache/PrefabStageHierarchy/c1/c13e479c314eba2688a883323a7f712f.json
@@ -0,0 +1 @@
+{"m_ScrollY":0.0,"m_ExpandedPrefabGameObjectFileIDs":[],"m_LastClickedFileID":0}
\ No newline at end of file
diff --git a/Library/StateCache/SceneView/0e/0e647035e22a32c65b8bed5590937545.json b/Library/StateCache/SceneView/0e/0e647035e22a32c65b8bed5590937545.json
new file mode 100644
index 0000000000000000000000000000000000000000..2411f66b1e16933b704c39a61dc47e165f9a04be
--- /dev/null
+++ b/Library/StateCache/SceneView/0e/0e647035e22a32c65b8bed5590937545.json
@@ -0,0 +1 @@
+{"cameraMode":{"drawMode":0,"name":"Shaded","section":"Shading Mode"},"sceneLighting":false,"audioPlay":false,"sceneViewState":{"m_AlwaysRefresh":false,"showFog":true,"showSkybox":false,"showFlares":true,"showImageEffects":true,"showParticleSystems":true,"showVisualEffectGraphs":true,"m_FxEnabled":true},"in2DMode":false,"pivot":{"x":0.0,"y":0.0,"z":0.2999999523162842},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":1.3658286333084107,"orthographic":false}
\ No newline at end of file
diff --git a/Logs/ApiUpdaterCheck.txt b/Logs/ApiUpdaterCheck.txt
index aaf51f0c0099ee3c2807b262d58d742f9a022dc2..8ca9846a6d708fc19baaf0d22a80f86bd55d676e 100644
--- a/Logs/ApiUpdaterCheck.txt
+++ b/Logs/ApiUpdaterCheck.txt
@@ -8,3 +8,53 @@ C# parse time : 756ms
candidates check time : 35ms
console write time : 1ms
+[api-updater (non-obsolete-error-filter)] 3/23/2022 9:20:56 PM : Starting C:/Program Files/Unity/Hub/Editor/2020.3.30f1/Editor/Data/Tools/ScriptUpdater/APIUpdater.NonObsoleteApiUpdaterDetector.exe
+[api-updater (non-obsolete-error-filter)]
+----------------------------------
+jit/startup time : 635.7771ms
+moved types parse time: 71ms
+candidates parse time : 1ms
+C# parse time : 399ms
+candidates check time : 36ms
+console write time : 1ms
+
+[api-updater (non-obsolete-error-filter)] 3/23/2022 10:07:07 PM : Starting C:/Program Files/Unity/Hub/Editor/2020.3.30f1/Editor/Data/Tools/ScriptUpdater/APIUpdater.NonObsoleteApiUpdaterDetector.exe
+[api-updater (non-obsolete-error-filter)]
+----------------------------------
+jit/startup time : 62.0335ms
+moved types parse time: 50ms
+candidates parse time : 1ms
+C# parse time : 192ms
+candidates check time : 33ms
+console write time : 0ms
+
+[api-updater (non-obsolete-error-filter)] 3/23/2022 10:09:02 PM : Starting C:/Program Files/Unity/Hub/Editor/2020.3.30f1/Editor/Data/Tools/ScriptUpdater/APIUpdater.NonObsoleteApiUpdaterDetector.exe
+[api-updater (non-obsolete-error-filter)]
+----------------------------------
+jit/startup time : 59.6021ms
+moved types parse time: 50ms
+candidates parse time : 1ms
+C# parse time : 188ms
+candidates check time : 39ms
+console write time : 0ms
+
+[api-updater (non-obsolete-error-filter)] 3/23/2022 10:10:53 PM : Starting C:/Program Files/Unity/Hub/Editor/2020.3.30f1/Editor/Data/Tools/ScriptUpdater/APIUpdater.NonObsoleteApiUpdaterDetector.exe
+[api-updater (non-obsolete-error-filter)]
+----------------------------------
+jit/startup time : 54.8396ms
+moved types parse time: 50ms
+candidates parse time : 1ms
+C# parse time : 182ms
+candidates check time : 39ms
+console write time : 0ms
+
+[api-updater (non-obsolete-error-filter)] 3/23/2022 10:11:22 PM : Starting C:/Program Files/Unity/Hub/Editor/2020.3.30f1/Editor/Data/Tools/ScriptUpdater/APIUpdater.NonObsoleteApiUpdaterDetector.exe
+[api-updater (non-obsolete-error-filter)]
+----------------------------------
+jit/startup time : 56.0003ms
+moved types parse time: 51ms
+candidates parse time : 1ms
+C# parse time : 188ms
+candidates check time : 39ms
+console write time : 0ms
+
diff --git a/Logs/AssetImportWorker0-prev.log b/Logs/AssetImportWorker0-prev.log
new file mode 100644
index 0000000000000000000000000000000000000000..c4bae6118802c63af17525d5168c9b5a11f25197
--- /dev/null
+++ b/Logs/AssetImportWorker0-prev.log
@@ -0,0 +1,254 @@
+Using pre-set license
+Built from '2020.3/staging' branch; Version is '2020.3.30f1 (1fb1bf06830e) revision 2077119'; Using compiler version '192528614'; Build Type 'Release'
+OS: 'Windows 10 (10.0.19044) 64bit CoreSingleLanguage' Language: 'en' Physical Memory: 12110 MB
+BatchMode: 1, IsHumanControllingUs: 0, StartBugReporterOnCrash: 0, Is64bit: 1, IsPro: 0
+
+COMMAND LINE ARGUMENTS:
+C:\Program Files\Unity\Hub\Editor\2020.3.30f1\Editor\Unity.exe
+-adb2
+-batchMode
+-noUpm
+-name
+AssetImportWorker0
+-projectPath
+D:/GIT/Github/UNITY/Survival Shooter
+-logFile
+Logs/AssetImportWorker0.log
+-srvPort
+63267
+Successfully changed project path to: D:/GIT/Github/UNITY/Survival Shooter
+D:/GIT/Github/UNITY/Survival Shooter
+Using Asset Import Pipeline V2.
+Refreshing native plugins compatible for Editor in 36.85 ms, found 2 plugins.
+Preloading 0 native plugins for Editor in 0.00 ms.
+Initialize engine version: 2020.3.30f1 (1fb1bf06830e)
+[Subsystems] Discovering subsystems at path C:/Program Files/Unity/Hub/Editor/2020.3.30f1/Editor/Data/Resources/UnitySubsystems
+[Subsystems] Discovering subsystems at path D:/GIT/Github/UNITY/Survival Shooter/Assets
+GfxDevice: creating device client; threaded=0
+Direct3D:
+ Version: Direct3D 11.0 [level 11.1]
+ Renderer: Radeon 530 Series (ID=0x6900)
+ Vendor:
+ VRAM: 2038 MB
+ Driver: 27.20.15002.118
+Initialize mono
+Mono path[0] = 'C:/Program Files/Unity/Hub/Editor/2020.3.30f1/Editor/Data/Managed'
+Mono path[1] = 'C:/Program Files/Unity/Hub/Editor/2020.3.30f1/Editor/Data/MonoBleedingEdge/lib/mono/unityjit'
+Mono config path = 'C:/Program Files/Unity/Hub/Editor/2020.3.30f1/Editor/Data/MonoBleedingEdge/etc'
+Using monoOptions --debugger-agent=transport=dt_socket,embedding=1,server=y,suspend=n,address=127.0.0.1:56664
+Begin MonoManager ReloadAssembly
+Registering precompiled unity dll's ...
+Register platform support module: C:/Program Files/Unity/Hub/Editor/2020.3.30f1/Editor/Data/PlaybackEngines/WebGLSupport/UnityEditor.WebGL.Extensions.dll
+Register platform support module: C:/Program Files/Unity/Hub/Editor/2020.3.30f1/Editor/Data/PlaybackEngines/WindowsStandaloneSupport/UnityEditor.WindowsStandalone.Extensions.dll
+Registered in 0.002977 seconds.
+Native extension for WindowsStandalone target not found
+Native extension for WebGL target not found
+Refreshing native plugins compatible for Editor in 34.87 ms, found 2 plugins.
+Preloading 0 native plugins for Editor in 0.00 ms.
+Mono: successfully reloaded assembly
+- Completed reload, in 0.678 seconds
+Domain Reload Profiling:
+ ReloadAssembly (678ms)
+ BeginReloadAssembly (81ms)
+ ExecutionOrderSort (0ms)
+ DisableScriptedObjects (0ms)
+ BackupInstance (0ms)
+ ReleaseScriptingObjects (0ms)
+ CreateAndSetChildDomain (1ms)
+ EndReloadAssembly (509ms)
+ LoadAssemblies (79ms)
+ RebuildTransferFunctionScriptingTraits (0ms)
+ SetupTypeCache (181ms)
+ ReleaseScriptCaches (0ms)
+ RebuildScriptCaches (33ms)
+ SetupLoadedEditorAssemblies (177ms)
+ LogAssemblyErrors (0ms)
+ InitializePlatformSupportModulesInManaged (5ms)
+ SetLoadedEditorAssemblies (0ms)
+ RefreshPlugins (35ms)
+ BeforeProcessingInitializeOnLoad (10ms)
+ ProcessInitializeOnLoadAttributes (90ms)
+ ProcessInitializeOnLoadMethodAttributes (36ms)
+ AfterProcessingInitializeOnLoad (0ms)
+ EditorAssembliesLoaded (0ms)
+ ExecutionOrderSort2 (0ms)
+ AwakeInstancesAfterBackupRestoration (0ms)
+Platform modules already initialized, skipping
+Registering precompiled user dll's ...
+Registered in 0.001906 seconds.
+Begin MonoManager ReloadAssembly
+Native extension for WindowsStandalone target not found
+Native extension for WebGL target not found
+Refreshing native plugins compatible for Editor in 0.44 ms, found 2 plugins.
+Preloading 0 native plugins for Editor in 0.00 ms.
+Mono: successfully reloaded assembly
+- Completed reload, in 1.174 seconds
+Domain Reload Profiling:
+ ReloadAssembly (1174ms)
+ BeginReloadAssembly (173ms)
+ ExecutionOrderSort (0ms)
+ DisableScriptedObjects (5ms)
+ BackupInstance (0ms)
+ ReleaseScriptingObjects (0ms)
+ CreateAndSetChildDomain (18ms)
+ EndReloadAssembly (926ms)
+ LoadAssemblies (109ms)
+ RebuildTransferFunctionScriptingTraits (0ms)
+ SetupTypeCache (326ms)
+ ReleaseScriptCaches (0ms)
+ RebuildScriptCaches (48ms)
+ SetupLoadedEditorAssemblies (359ms)
+ LogAssemblyErrors (0ms)
+ InitializePlatformSupportModulesInManaged (6ms)
+ SetLoadedEditorAssemblies (1ms)
+ RefreshPlugins (0ms)
+ BeforeProcessingInitializeOnLoad (63ms)
+ ProcessInitializeOnLoadAttributes (271ms)
+ ProcessInitializeOnLoadMethodAttributes (11ms)
+ AfterProcessingInitializeOnLoad (8ms)
+ EditorAssembliesLoaded (0ms)
+ ExecutionOrderSort2 (0ms)
+ AwakeInstancesAfterBackupRestoration (8ms)
+Platform modules already initialized, skipping
+========================================================================
+Worker process is ready to serve import requests
+Launched and connected shader compiler UnityShaderCompiler.exe after 0.04 seconds
+Refreshing native plugins compatible for Editor in 0.41 ms, found 2 plugins.
+Preloading 0 native plugins for Editor in 0.00 ms.
+Unloading 1535 Unused Serialized files (Serialized files now loaded: 0)
+System memory in use before: 70.2 MB.
+System memory in use after: 70.3 MB.
+
+Unloading 16 unused Assets to reduce memory usage. Loaded Objects now: 1972.
+Total: 2.860900 ms (FindLiveObjects: 0.133800 ms CreateObjectMapping: 0.050400 ms MarkObjects: 2.611700 ms DeleteObjects: 0.063800 ms)
+
+AssetImportParameters requested are different than current active one (requested -> active):
+ custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 ->
+ custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc ->
+ custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b ->
+ custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 ->
+ custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 ->
+ custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 ->
+ custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 ->
+ custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 ->
+ custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 ->
+========================================================================
+Received Import Request.
+ path: Assets/Scripts/Enemy/EnemyAttack.cs
+ artifactKey: Guid(e15099f5ee559584089d5851df572def) Importer(815301076,1909f56bfc062723c751e8b465ee728b)
+Start importing Assets/Scripts/Enemy/EnemyAttack.cs using Guid(e15099f5ee559584089d5851df572def) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: '5f3e849790bb7f3660fe6e6d8f492e12') in 0.023304 seconds
+========================================================================
+Received Prepare
+Registering precompiled user dll's ...
+Registered in 0.002499 seconds.
+Begin MonoManager ReloadAssembly
+Native extension for WindowsStandalone target not found
+Native extension for WebGL target not found
+Refreshing native plugins compatible for Editor in 0.37 ms, found 2 plugins.
+Preloading 0 native plugins for Editor in 0.00 ms.
+Mono: successfully reloaded assembly
+- Completed reload, in 1.083 seconds
+Domain Reload Profiling:
+ ReloadAssembly (1084ms)
+ BeginReloadAssembly (124ms)
+ ExecutionOrderSort (0ms)
+ DisableScriptedObjects (4ms)
+ BackupInstance (0ms)
+ ReleaseScriptingObjects (0ms)
+ CreateAndSetChildDomain (31ms)
+ EndReloadAssembly (889ms)
+ LoadAssemblies (104ms)
+ RebuildTransferFunctionScriptingTraits (0ms)
+ SetupTypeCache (306ms)
+ ReleaseScriptCaches (1ms)
+ RebuildScriptCaches (42ms)
+ SetupLoadedEditorAssemblies (338ms)
+ LogAssemblyErrors (0ms)
+ InitializePlatformSupportModulesInManaged (6ms)
+ SetLoadedEditorAssemblies (1ms)
+ RefreshPlugins (0ms)
+ BeforeProcessingInitializeOnLoad (67ms)
+ ProcessInitializeOnLoadAttributes (245ms)
+ ProcessInitializeOnLoadMethodAttributes (9ms)
+ AfterProcessingInitializeOnLoad (8ms)
+ EditorAssembliesLoaded (0ms)
+ ExecutionOrderSort2 (0ms)
+ AwakeInstancesAfterBackupRestoration (7ms)
+Platform modules already initialized, skipping
+Refreshing native plugins compatible for Editor in 0.46 ms, found 2 plugins.
+Preloading 0 native plugins for Editor in 0.00 ms.
+Unloading 1529 Unused Serialized files (Serialized files now loaded: 0)
+System memory in use before: 70.0 MB.
+System memory in use after: 70.1 MB.
+
+Unloading 11 unused Assets to reduce memory usage. Loaded Objects now: 1974.
+Total: 2.825500 ms (FindLiveObjects: 0.159700 ms CreateObjectMapping: 0.049800 ms MarkObjects: 2.591900 ms DeleteObjects: 0.022800 ms)
+
+AssetImportParameters requested are different than current active one (requested -> active):
+ custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 ->
+ custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc ->
+ custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b ->
+ custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 ->
+ custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 ->
+ custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 ->
+ custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 ->
+ custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 ->
+ custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 ->
+========================================================================
+Received Prepare
+Registering precompiled user dll's ...
+Registered in 0.002158 seconds.
+Begin MonoManager ReloadAssembly
+Native extension for WindowsStandalone target not found
+Native extension for WebGL target not found
+Refreshing native plugins compatible for Editor in 0.42 ms, found 2 plugins.
+Preloading 0 native plugins for Editor in 0.00 ms.
+Mono: successfully reloaded assembly
+- Completed reload, in 7.085 seconds
+Domain Reload Profiling:
+ ReloadAssembly (7088ms)
+ BeginReloadAssembly (1986ms)
+ ExecutionOrderSort (0ms)
+ DisableScriptedObjects (106ms)
+ BackupInstance (0ms)
+ ReleaseScriptingObjects (0ms)
+ CreateAndSetChildDomain (491ms)
+ EndReloadAssembly (3985ms)
+ LoadAssemblies (1729ms)
+ RebuildTransferFunctionScriptingTraits (0ms)
+ SetupTypeCache (2813ms)
+ ReleaseScriptCaches (1ms)
+ RebuildScriptCaches (49ms)
+ SetupLoadedEditorAssemblies (329ms)
+ LogAssemblyErrors (0ms)
+ InitializePlatformSupportModulesInManaged (6ms)
+ SetLoadedEditorAssemblies (1ms)
+ RefreshPlugins (0ms)
+ BeforeProcessingInitializeOnLoad (57ms)
+ ProcessInitializeOnLoadAttributes (244ms)
+ ProcessInitializeOnLoadMethodAttributes (14ms)
+ AfterProcessingInitializeOnLoad (7ms)
+ EditorAssembliesLoaded (0ms)
+ ExecutionOrderSort2 (0ms)
+ AwakeInstancesAfterBackupRestoration (8ms)
+Platform modules already initialized, skipping
+Refreshing native plugins compatible for Editor in 0.50 ms, found 2 plugins.
+Preloading 0 native plugins for Editor in 0.00 ms.
+Unloading 1529 Unused Serialized files (Serialized files now loaded: 0)
+System memory in use before: 70.1 MB.
+System memory in use after: 70.2 MB.
+
+Unloading 11 unused Assets to reduce memory usage. Loaded Objects now: 1976.
+Total: 2.388200 ms (FindLiveObjects: 0.116800 ms CreateObjectMapping: 0.046200 ms MarkObjects: 2.202500 ms DeleteObjects: 0.021800 ms)
+
+AssetImportParameters requested are different than current active one (requested -> active):
+ custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 ->
+ custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc ->
+ custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b ->
+ custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 ->
+ custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 ->
+ custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 ->
+ custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 ->
+ custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 ->
+ custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 ->
+AssetImportWorkerClient::OnTransportError - code=2 error=End of file
diff --git a/Logs/shadercompiler-UnityShaderCompiler.exe0.log b/Logs/shadercompiler-UnityShaderCompiler.exe0.log
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..3f69716475f4300bb19bf6d9b27411eafc5bf607 100644
--- a/Logs/shadercompiler-UnityShaderCompiler.exe0.log
+++ b/Logs/shadercompiler-UnityShaderCompiler.exe0.log
@@ -0,0 +1,3 @@
+Base path: 'C:/Program Files/Unity/Hub/Editor/2020.3.30f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2020.3.30f1/Editor/Data/PlaybackEngines'
+Cmd: initializeCompiler
+
diff --git a/Logs/shadercompiler-UnityShaderCompiler.exe3.log b/Logs/shadercompiler-UnityShaderCompiler.exe3.log
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000