try to fix
This commit is contained in:
go38coz
Vendored
+5
@@ -0,0 +1,5 @@
|
||||
{
|
||||
"recommendations": [
|
||||
"visualstudiotoolsforunity.vstuc"
|
||||
]
|
||||
}
|
||||
Vendored
+10
@@ -0,0 +1,10 @@
|
||||
{
|
||||
"version": "0.2.0",
|
||||
"configurations": [
|
||||
{
|
||||
"name": "Attach to Unity",
|
||||
"type": "vstuc",
|
||||
"request": "attach"
|
||||
}
|
||||
]
|
||||
}
|
||||
Vendored
+72
@@ -0,0 +1,72 @@
|
||||
{
|
||||
"files.exclude": {
|
||||
"**/.DS_Store": true,
|
||||
"**/.git": true,
|
||||
"**/.vs": true,
|
||||
"**/.gitmodules": true,
|
||||
"**/.vsconfig": true,
|
||||
"**/*.booproj": true,
|
||||
"**/*.pidb": true,
|
||||
"**/*.suo": true,
|
||||
"**/*.user": true,
|
||||
"**/*.userprefs": true,
|
||||
"**/*.unityproj": true,
|
||||
"**/*.dll": true,
|
||||
"**/*.exe": true,
|
||||
"**/*.pdf": true,
|
||||
"**/*.mid": true,
|
||||
"**/*.midi": true,
|
||||
"**/*.wav": true,
|
||||
"**/*.gif": true,
|
||||
"**/*.ico": true,
|
||||
"**/*.jpg": true,
|
||||
"**/*.jpeg": true,
|
||||
"**/*.png": true,
|
||||
"**/*.psd": true,
|
||||
"**/*.tga": true,
|
||||
"**/*.tif": true,
|
||||
"**/*.tiff": true,
|
||||
"**/*.3ds": true,
|
||||
"**/*.3DS": true,
|
||||
"**/*.fbx": true,
|
||||
"**/*.FBX": true,
|
||||
"**/*.lxo": true,
|
||||
"**/*.LXO": true,
|
||||
"**/*.ma": true,
|
||||
"**/*.MA": true,
|
||||
"**/*.obj": true,
|
||||
"**/*.OBJ": true,
|
||||
"**/*.asset": true,
|
||||
"**/*.cubemap": true,
|
||||
"**/*.flare": true,
|
||||
"**/*.mat": true,
|
||||
"**/*.meta": true,
|
||||
"**/*.prefab": true,
|
||||
"**/*.unity": true,
|
||||
"build/": true,
|
||||
"Build/": true,
|
||||
"Library/": true,
|
||||
"library/": true,
|
||||
"obj/": true,
|
||||
"Obj/": true,
|
||||
"Logs/": true,
|
||||
"logs/": true,
|
||||
"ProjectSettings/": true,
|
||||
"UserSettings/": true,
|
||||
"temp/": true,
|
||||
"Temp/": true
|
||||
},
|
||||
"files.associations": {
|
||||
"*.asset": "yaml",
|
||||
"*.meta": "yaml",
|
||||
"*.prefab": "yaml",
|
||||
"*.unity": "yaml",
|
||||
},
|
||||
"explorer.fileNesting.enabled": true,
|
||||
"explorer.fileNesting.patterns": {
|
||||
"*.sln": "*.csproj",
|
||||
"*.slnx": "*.csproj"
|
||||
},
|
||||
"dotnet.defaultSolution": "Game.slnx",
|
||||
"dotnet.enableWorkspaceBasedDevelopment": false
|
||||
}
|
||||
@@ -0,0 +1,102 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!74 &7400000
|
||||
AnimationClip:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: IDLE
|
||||
serializedVersion: 7
|
||||
m_Legacy: 0
|
||||
m_Compressed: 0
|
||||
m_UseHighQualityCurve: 1
|
||||
m_RotationCurves: []
|
||||
m_CompressedRotationCurves: []
|
||||
m_EulerCurves: []
|
||||
m_PositionCurves: []
|
||||
m_ScaleCurves: []
|
||||
m_FloatCurves: []
|
||||
m_PPtrCurves:
|
||||
- serializedVersion: 2
|
||||
curve:
|
||||
- time: 0
|
||||
value: {fileID: -5254763888643210246, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3}
|
||||
- time: 0.083333336
|
||||
value: {fileID: 6308160273899767728, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3}
|
||||
- time: 0.16666667
|
||||
value: {fileID: -8810144250521748931, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3}
|
||||
- time: 0.25
|
||||
value: {fileID: 8716055518302679110, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3}
|
||||
- time: 0.33333334
|
||||
value: {fileID: -2831101797488401219, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3}
|
||||
- time: 0.41666666
|
||||
value: {fileID: 7011392334922980725, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3}
|
||||
- time: 0.5
|
||||
value: {fileID: 2847488349268310368, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3}
|
||||
- time: 0.5833333
|
||||
value: {fileID: -7052100710175725327, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3}
|
||||
- time: 0.6666667
|
||||
value: {fileID: 9099921138643276957, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3}
|
||||
- time: 0.75
|
||||
value: {fileID: 9079650132197346216, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3}
|
||||
- time: 0.8333333
|
||||
value: {fileID: -2803174831038805257, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3}
|
||||
attribute: m_Sprite
|
||||
path:
|
||||
classID: 212
|
||||
script: {fileID: 0}
|
||||
flags: 2
|
||||
m_SampleRate: 12
|
||||
m_WrapMode: 0
|
||||
m_Bounds:
|
||||
m_Center: {x: 0, y: 0, z: 0}
|
||||
m_Extent: {x: 0, y: 0, z: 0}
|
||||
m_ClipBindingConstant:
|
||||
genericBindings:
|
||||
- serializedVersion: 2
|
||||
path: 0
|
||||
attribute: 0
|
||||
script: {fileID: 0}
|
||||
typeID: 212
|
||||
customType: 23
|
||||
isPPtrCurve: 1
|
||||
isIntCurve: 0
|
||||
isSerializeReferenceCurve: 0
|
||||
pptrCurveMapping:
|
||||
- {fileID: -5254763888643210246, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3}
|
||||
- {fileID: 6308160273899767728, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3}
|
||||
- {fileID: -8810144250521748931, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3}
|
||||
- {fileID: 8716055518302679110, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3}
|
||||
- {fileID: -2831101797488401219, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3}
|
||||
- {fileID: 7011392334922980725, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3}
|
||||
- {fileID: 2847488349268310368, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3}
|
||||
- {fileID: -7052100710175725327, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3}
|
||||
- {fileID: 9099921138643276957, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3}
|
||||
- {fileID: 9079650132197346216, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3}
|
||||
- {fileID: -2803174831038805257, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3}
|
||||
m_AnimationClipSettings:
|
||||
serializedVersion: 2
|
||||
m_AdditiveReferencePoseClip: {fileID: 0}
|
||||
m_AdditiveReferencePoseTime: 0
|
||||
m_StartTime: 0
|
||||
m_StopTime: 0.9166666
|
||||
m_OrientationOffsetY: 0
|
||||
m_Level: 0
|
||||
m_CycleOffset: 0
|
||||
m_HasAdditiveReferencePose: 0
|
||||
m_LoopTime: 1
|
||||
m_LoopBlend: 0
|
||||
m_LoopBlendOrientation: 0
|
||||
m_LoopBlendPositionY: 0
|
||||
m_LoopBlendPositionXZ: 0
|
||||
m_KeepOriginalOrientation: 0
|
||||
m_KeepOriginalPositionY: 1
|
||||
m_KeepOriginalPositionXZ: 0
|
||||
m_HeightFromFeet: 0
|
||||
m_Mirror: 0
|
||||
m_EditorCurves: []
|
||||
m_EulerEditorCurves: []
|
||||
m_HasGenericRootTransform: 0
|
||||
m_HasMotionFloatCurves: 0
|
||||
m_Events: []
|
||||
@@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 690f4f6ba2c1a4944ac1e7c986ca70fc
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 7400000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -0,0 +1,108 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!74 &7400000
|
||||
AnimationClip:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: New Animation
|
||||
serializedVersion: 7
|
||||
m_Legacy: 0
|
||||
m_Compressed: 0
|
||||
m_UseHighQualityCurve: 1
|
||||
m_RotationCurves: []
|
||||
m_CompressedRotationCurves: []
|
||||
m_EulerCurves: []
|
||||
m_PositionCurves: []
|
||||
m_ScaleCurves: []
|
||||
m_FloatCurves: []
|
||||
m_PPtrCurves:
|
||||
- serializedVersion: 2
|
||||
curve:
|
||||
- time: 0
|
||||
value: {fileID: -5254763888643210246, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3}
|
||||
- time: 0.083333336
|
||||
value: {fileID: 6308160273899767728, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3}
|
||||
- time: 0.16666667
|
||||
value: {fileID: -8810144250521748931, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3}
|
||||
- time: 0.25
|
||||
value: {fileID: 8716055518302679110, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3}
|
||||
- time: 0.33333334
|
||||
value: {fileID: -2831101797488401219, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3}
|
||||
- time: 0.41666666
|
||||
value: {fileID: 7011392334922980725, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3}
|
||||
- time: 0.5
|
||||
value: {fileID: 2847488349268310368, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3}
|
||||
- time: 0.5833333
|
||||
value: {fileID: -7052100710175725327, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3}
|
||||
- time: 0.6666667
|
||||
value: {fileID: 9099921138643276957, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3}
|
||||
- time: 0.75
|
||||
value: {fileID: 9079650132197346216, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3}
|
||||
- time: 0.8333333
|
||||
value: {fileID: -2803174831038805257, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3}
|
||||
- time: 0.9166667
|
||||
value: {fileID: -4434201147178631899, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3}
|
||||
- time: 1
|
||||
value: {fileID: 2832486465855652433, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3}
|
||||
attribute: m_Sprite
|
||||
path:
|
||||
classID: 212
|
||||
script: {fileID: 0}
|
||||
flags: 2
|
||||
m_SampleRate: 12
|
||||
m_WrapMode: 0
|
||||
m_Bounds:
|
||||
m_Center: {x: 0, y: 0, z: 0}
|
||||
m_Extent: {x: 0, y: 0, z: 0}
|
||||
m_ClipBindingConstant:
|
||||
genericBindings:
|
||||
- serializedVersion: 2
|
||||
path: 0
|
||||
attribute: 0
|
||||
script: {fileID: 0}
|
||||
typeID: 212
|
||||
customType: 23
|
||||
isPPtrCurve: 1
|
||||
isIntCurve: 0
|
||||
isSerializeReferenceCurve: 0
|
||||
pptrCurveMapping:
|
||||
- {fileID: -5254763888643210246, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3}
|
||||
- {fileID: 6308160273899767728, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3}
|
||||
- {fileID: -8810144250521748931, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3}
|
||||
- {fileID: 8716055518302679110, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3}
|
||||
- {fileID: -2831101797488401219, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3}
|
||||
- {fileID: 7011392334922980725, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3}
|
||||
- {fileID: 2847488349268310368, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3}
|
||||
- {fileID: -7052100710175725327, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3}
|
||||
- {fileID: 9099921138643276957, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3}
|
||||
- {fileID: 9079650132197346216, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3}
|
||||
- {fileID: -2803174831038805257, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3}
|
||||
- {fileID: -4434201147178631899, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3}
|
||||
- {fileID: 2832486465855652433, guid: 538f90e730a0f7546ab3734b86c40ba9, type: 3}
|
||||
m_AnimationClipSettings:
|
||||
serializedVersion: 2
|
||||
m_AdditiveReferencePoseClip: {fileID: 0}
|
||||
m_AdditiveReferencePoseTime: 0
|
||||
m_StartTime: 0
|
||||
m_StopTime: 1.0833334
|
||||
m_OrientationOffsetY: 0
|
||||
m_Level: 0
|
||||
m_CycleOffset: 0
|
||||
m_HasAdditiveReferencePose: 0
|
||||
m_LoopTime: 1
|
||||
m_LoopBlend: 0
|
||||
m_LoopBlendOrientation: 0
|
||||
m_LoopBlendPositionY: 0
|
||||
m_LoopBlendPositionXZ: 0
|
||||
m_KeepOriginalOrientation: 0
|
||||
m_KeepOriginalPositionY: 1
|
||||
m_KeepOriginalPositionXZ: 0
|
||||
m_HeightFromFeet: 0
|
||||
m_Mirror: 0
|
||||
m_EditorCurves: []
|
||||
m_EulerEditorCurves: []
|
||||
m_HasGenericRootTransform: 0
|
||||
m_HasMotionFloatCurves: 0
|
||||
m_Events: []
|
||||
@@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: f2b51e043776ecd43b84ba8a0d8fd11e
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 7400000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 139 KiB |
@@ -0,0 +1,538 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 538f90e730a0f7546ab3734b86c40ba9
|
||||
guid: 640e946956ffb084c8d0f325a978f7be
|
||||
TextureImporter:
|
||||
internalIDToNameTable:
|
||||
- first:
|
||||
213: -5254763888643210246
|
||||
second: idle sprites_0
|
||||
- first:
|
||||
213: 6308160273899767728
|
||||
second: idle sprites_1
|
||||
- first:
|
||||
213: -8810144250521748931
|
||||
second: idle sprites_2
|
||||
- first:
|
||||
213: 8716055518302679110
|
||||
second: idle sprites_3
|
||||
- first:
|
||||
213: -2831101797488401219
|
||||
second: idle sprites_4
|
||||
- first:
|
||||
213: 7011392334922980725
|
||||
second: idle sprites_5
|
||||
- first:
|
||||
213: 2847488349268310368
|
||||
second: idle sprites_6
|
||||
- first:
|
||||
213: -7052100710175725327
|
||||
second: idle sprites_7
|
||||
- first:
|
||||
213: 9099921138643276957
|
||||
second: idle sprites_8
|
||||
- first:
|
||||
213: 9079650132197346216
|
||||
second: idle sprites_9
|
||||
- first:
|
||||
213: -2803174831038805257
|
||||
second: idle sprites_10
|
||||
- first:
|
||||
213: -4434201147178631899
|
||||
second: idle sprites_11
|
||||
- first:
|
||||
213: 2832486465855652433
|
||||
second: idle sprites_12
|
||||
externalObjects: {}
|
||||
serializedVersion: 13
|
||||
mipmaps:
|
||||
mipMapMode: 0
|
||||
enableMipMap: 0
|
||||
sRGBTexture: 1
|
||||
linearTexture: 0
|
||||
fadeOut: 0
|
||||
borderMipMap: 0
|
||||
mipMapsPreserveCoverage: 0
|
||||
alphaTestReferenceValue: 0.5
|
||||
mipMapFadeDistanceStart: 1
|
||||
mipMapFadeDistanceEnd: 3
|
||||
bumpmap:
|
||||
convertToNormalMap: 0
|
||||
externalNormalMap: 0
|
||||
heightScale: 0.25
|
||||
normalMapFilter: 0
|
||||
flipGreenChannel: 0
|
||||
isReadable: 0
|
||||
streamingMipmaps: 0
|
||||
streamingMipmapsPriority: 0
|
||||
vTOnly: 0
|
||||
ignoreMipmapLimit: 0
|
||||
grayScaleToAlpha: 0
|
||||
generateCubemap: 6
|
||||
cubemapConvolution: 0
|
||||
seamlessCubemap: 0
|
||||
textureFormat: 1
|
||||
maxTextureSize: 2048
|
||||
textureSettings:
|
||||
serializedVersion: 2
|
||||
filterMode: 1
|
||||
aniso: 1
|
||||
mipBias: 0
|
||||
wrapU: 1
|
||||
wrapV: 1
|
||||
wrapW: 1
|
||||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 2
|
||||
spriteExtrude: 1
|
||||
spriteMeshType: 1
|
||||
alignment: 0
|
||||
spritePivot: {x: 0.5, y: 0.5}
|
||||
spritePixelsToUnits: 100
|
||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||
spriteGenerateFallbackPhysicsShape: 1
|
||||
alphaUsage: 1
|
||||
alphaIsTransparency: 1
|
||||
spriteTessellationDetail: -1
|
||||
textureType: 8
|
||||
textureShape: 1
|
||||
singleChannelComponent: 0
|
||||
flipbookRows: 1
|
||||
flipbookColumns: 1
|
||||
maxTextureSizeSet: 0
|
||||
compressionQualitySet: 0
|
||||
textureFormatSet: 0
|
||||
ignorePngGamma: 0
|
||||
applyGammaDecoding: 0
|
||||
swizzle: 50462976
|
||||
cookieLightType: 0
|
||||
platformSettings:
|
||||
- serializedVersion: 4
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 4
|
||||
buildTarget: Standalone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 4
|
||||
buildTarget: WebGL
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites:
|
||||
- serializedVersion: 2
|
||||
name: idle sprites_0
|
||||
rect:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
width: 174
|
||||
height: 1080
|
||||
alignment: 0
|
||||
pivot: {x: 0.5, y: 0.5}
|
||||
y: 729
|
||||
width: 6
|
||||
height: 13
|
||||
alignment: 0
|
||||
pivot: {x: 0, y: 0}
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
customData:
|
||||
outline: []
|
||||
physicsShape: []
|
||||
tessellationDetail: -1
|
||||
bones: []
|
||||
spriteID: af30fde85145317b0800000000000000
|
||||
internalID: -5254763888643210246
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
- serializedVersion: 2
|
||||
name: idle sprites_1
|
||||
rect:
|
||||
serializedVersion: 2
|
||||
x: 174
|
||||
y: 0
|
||||
width: 174
|
||||
height: 1080
|
||||
alignment: 0
|
||||
pivot: {x: 0.5, y: 0.5}
|
||||
x: 11
|
||||
y: 700
|
||||
width: 156
|
||||
height: 104
|
||||
alignment: 0
|
||||
pivot: {x: 0, y: 0}
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
customData:
|
||||
outline: []
|
||||
physicsShape: []
|
||||
tessellationDetail: -1
|
||||
bones: []
|
||||
spriteID: 0b7c608d8561b8750800000000000000
|
||||
internalID: 6308160273899767728
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
- serializedVersion: 2
|
||||
name: idle sprites_2
|
||||
rect:
|
||||
serializedVersion: 2
|
||||
x: 348
|
||||
y: 0
|
||||
width: 174
|
||||
height: 1080
|
||||
alignment: 0
|
||||
pivot: {x: 0.5, y: 0.5}
|
||||
x: 182
|
||||
y: 702
|
||||
width: 155
|
||||
height: 92
|
||||
alignment: 0
|
||||
pivot: {x: 0, y: 0}
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
customData:
|
||||
outline: []
|
||||
physicsShape: []
|
||||
tessellationDetail: -1
|
||||
bones: []
|
||||
spriteID: d3a73b77b741cb580800000000000000
|
||||
internalID: -8810144250521748931
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
- serializedVersion: 2
|
||||
name: idle sprites_3
|
||||
rect:
|
||||
serializedVersion: 2
|
||||
x: 522
|
||||
y: 0
|
||||
width: 174
|
||||
height: 1080
|
||||
alignment: 0
|
||||
pivot: {x: 0.5, y: 0.5}
|
||||
x: 343
|
||||
y: 702
|
||||
width: 155
|
||||
height: 87
|
||||
alignment: 0
|
||||
pivot: {x: 0, y: 0}
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
customData:
|
||||
outline: []
|
||||
physicsShape: []
|
||||
tessellationDetail: -1
|
||||
bones: []
|
||||
spriteID: 640b3037056a5f870800000000000000
|
||||
internalID: 8716055518302679110
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
- serializedVersion: 2
|
||||
name: idle sprites_4
|
||||
rect:
|
||||
serializedVersion: 2
|
||||
x: 696
|
||||
y: 0
|
||||
width: 174
|
||||
height: 1080
|
||||
alignment: 0
|
||||
pivot: {x: 0.5, y: 0.5}
|
||||
x: 506
|
||||
y: 702
|
||||
width: 163
|
||||
height: 84
|
||||
alignment: 0
|
||||
pivot: {x: 0, y: 0}
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
customData:
|
||||
outline: []
|
||||
physicsShape: []
|
||||
tessellationDetail: -1
|
||||
bones: []
|
||||
spriteID: db4ebbd3ae7e5b8d0800000000000000
|
||||
internalID: -2831101797488401219
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
- serializedVersion: 2
|
||||
name: idle sprites_5
|
||||
rect:
|
||||
serializedVersion: 2
|
||||
x: 870
|
||||
y: 0
|
||||
width: 174
|
||||
height: 1080
|
||||
alignment: 0
|
||||
pivot: {x: 0.5, y: 0.5}
|
||||
x: 674
|
||||
y: 699
|
||||
width: 168
|
||||
height: 81
|
||||
alignment: 0
|
||||
pivot: {x: 0, y: 0}
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
customData:
|
||||
outline: []
|
||||
physicsShape: []
|
||||
tessellationDetail: -1
|
||||
bones: []
|
||||
spriteID: 57d1bff3e287d4160800000000000000
|
||||
internalID: 7011392334922980725
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
- serializedVersion: 2
|
||||
name: idle sprites_6
|
||||
rect:
|
||||
serializedVersion: 2
|
||||
x: 1044
|
||||
y: 0
|
||||
width: 174
|
||||
height: 1080
|
||||
alignment: 0
|
||||
pivot: {x: 0.5, y: 0.5}
|
||||
x: 852
|
||||
y: 699
|
||||
width: 177
|
||||
height: 76
|
||||
alignment: 0
|
||||
pivot: {x: 0, y: 0}
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
customData:
|
||||
outline: []
|
||||
physicsShape: []
|
||||
tessellationDetail: -1
|
||||
bones: []
|
||||
spriteID: 0697338219f448720800000000000000
|
||||
internalID: 2847488349268310368
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
- serializedVersion: 2
|
||||
name: idle sprites_7
|
||||
rect:
|
||||
serializedVersion: 2
|
||||
x: 1218
|
||||
y: 0
|
||||
width: 174
|
||||
height: 1080
|
||||
alignment: 0
|
||||
pivot: {x: 0.5, y: 0.5}
|
||||
x: 1045
|
||||
y: 704
|
||||
width: 182
|
||||
height: 64
|
||||
alignment: 0
|
||||
pivot: {x: 0, y: 0}
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
customData:
|
||||
outline: []
|
||||
physicsShape: []
|
||||
tessellationDetail: -1
|
||||
bones: []
|
||||
spriteID: 1f822b984c7e12e90800000000000000
|
||||
internalID: -7052100710175725327
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
- serializedVersion: 2
|
||||
name: idle sprites_8
|
||||
rect:
|
||||
serializedVersion: 2
|
||||
x: 1392
|
||||
y: 0
|
||||
width: 174
|
||||
height: 1080
|
||||
alignment: 0
|
||||
pivot: {x: 0.5, y: 0.5}
|
||||
x: 1241
|
||||
y: 706
|
||||
width: 176
|
||||
height: 68
|
||||
alignment: 0
|
||||
pivot: {x: 0, y: 0}
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
customData:
|
||||
outline: []
|
||||
physicsShape: []
|
||||
tessellationDetail: -1
|
||||
bones: []
|
||||
spriteID: d9496e8ef0a694e70800000000000000
|
||||
internalID: 9099921138643276957
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
- serializedVersion: 2
|
||||
name: idle sprites_9
|
||||
rect:
|
||||
serializedVersion: 2
|
||||
x: 1566
|
||||
y: 0
|
||||
width: 174
|
||||
height: 1080
|
||||
alignment: 0
|
||||
pivot: {x: 0.5, y: 0.5}
|
||||
x: 1427
|
||||
y: 703
|
||||
width: 163
|
||||
height: 84
|
||||
alignment: 0
|
||||
pivot: {x: 0, y: 0}
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
customData:
|
||||
outline: []
|
||||
physicsShape: []
|
||||
tessellationDetail: -1
|
||||
bones: []
|
||||
spriteID: 8ab837e60b5610e70800000000000000
|
||||
internalID: 9079650132197346216
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
- serializedVersion: 2
|
||||
name: idle sprites_10
|
||||
rect:
|
||||
serializedVersion: 2
|
||||
x: 1740
|
||||
y: 0
|
||||
width: 174
|
||||
height: 1080
|
||||
alignment: 0
|
||||
pivot: {x: 0.5, y: 0.5}
|
||||
x: 1596
|
||||
y: 706
|
||||
width: 154
|
||||
height: 92
|
||||
alignment: 0
|
||||
pivot: {x: 0, y: 0}
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
customData:
|
||||
outline: []
|
||||
physicsShape: []
|
||||
tessellationDetail: -1
|
||||
bones: []
|
||||
spriteID: 7facd90d75f1919d0800000000000000
|
||||
internalID: -2803174831038805257
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
- serializedVersion: 2
|
||||
name: idle sprites_11
|
||||
rect:
|
||||
serializedVersion: 2
|
||||
x: 1751
|
||||
y: 728
|
||||
width: 7
|
||||
height: 13
|
||||
alignment: 0
|
||||
pivot: {x: 0, y: 0}
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
customData:
|
||||
outline: []
|
||||
physicsShape: []
|
||||
tessellationDetail: -1
|
||||
bones: []
|
||||
spriteID: 52db9cfcc8d8672c0800000000000000
|
||||
internalID: -4434201147178631899
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
- serializedVersion: 2
|
||||
name: idle sprites_12
|
||||
rect:
|
||||
serializedVersion: 2
|
||||
x: 1763
|
||||
y: 699
|
||||
width: 156
|
||||
height: 104
|
||||
alignment: 0
|
||||
pivot: {x: 0, y: 0}
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
customData:
|
||||
outline: []
|
||||
physicsShape: []
|
||||
tessellationDetail: -1
|
||||
bones: []
|
||||
spriteID: 1528d6cfe630f4720800000000000000
|
||||
internalID: 2832486465855652433
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
outline: []
|
||||
customData:
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 26189bb86b37500408da1f12c9a366d4
|
||||
spriteID:
|
||||
internalID: 0
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
secondaryTextures: []
|
||||
spriteCustomMetadata:
|
||||
entries:
|
||||
- key: SpriteEditor.SliceSettings
|
||||
value: '{"sliceOnImport":false,"gridCellCount":{"x":11.0,"y":1.0},"gridSpriteSize":{"x":174.0,"y":1080.0},"gridSpriteOffset":{"x":0.0,"y":0.0},"gridSpritePadding":{"x":0.0,"y":0.0},"pivot":{"x":0.5,"y":0.5},"pivotPixels":{"x":0.0,"y":0.0},"autoSlicingMethod":0,"spriteAlignment":0,"pivotUnitMode":0,"slicingType":2,"keepEmptyRects":false,"isAlternate":false}'
|
||||
entries: []
|
||||
nameFileIdTable:
|
||||
idle sprites_0: -5254763888643210246
|
||||
idle sprites_1: 6308160273899767728
|
||||
idle sprites_10: -2803174831038805257
|
||||
idle sprites_11: -4434201147178631899
|
||||
idle sprites_12: 2832486465855652433
|
||||
idle sprites_2: -8810144250521748931
|
||||
idle sprites_3: 8716055518302679110
|
||||
idle sprites_4: -2831101797488401219
|
||||
idle sprites_5: 7011392334922980725
|
||||
idle sprites_6: 2847488349268310368
|
||||
idle sprites_7: -7052100710175725327
|
||||
idle sprites_8: 9099921138643276957
|
||||
idle sprites_9: 9079650132197346216
|
||||
mipmapLimitGroupName:
|
||||
pSDRemoveMatte: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -0,0 +1,73 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1102 &-8470273330122212232
|
||||
AnimatorState:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 1
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: IDLE
|
||||
m_Speed: 1
|
||||
m_CycleOffset: 0
|
||||
m_Transitions: []
|
||||
m_StateMachineBehaviours: []
|
||||
m_Position: {x: 50, y: 50, z: 0}
|
||||
m_IKOnFeet: 0
|
||||
m_WriteDefaultValues: 1
|
||||
m_Mirror: 0
|
||||
m_SpeedParameterActive: 0
|
||||
m_MirrorParameterActive: 0
|
||||
m_CycleOffsetParameterActive: 0
|
||||
m_TimeParameterActive: 0
|
||||
m_Motion: {fileID: 7400000, guid: 690f4f6ba2c1a4944ac1e7c986ca70fc, type: 2}
|
||||
m_Tag:
|
||||
m_SpeedParameter:
|
||||
m_MirrorParameter:
|
||||
m_CycleOffsetParameter:
|
||||
m_TimeParameter:
|
||||
--- !u!1107 &-3480220879903128428
|
||||
AnimatorStateMachine:
|
||||
serializedVersion: 7
|
||||
m_ObjectHideFlags: 1
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: Base Layer
|
||||
m_ChildStates:
|
||||
- serializedVersion: 1
|
||||
m_State: {fileID: -8470273330122212232}
|
||||
m_Position: {x: 200, y: 0, z: 0}
|
||||
m_ChildStateMachines: []
|
||||
m_AnyStateTransitions: []
|
||||
m_EntryTransitions: []
|
||||
m_StateMachineTransitions: {}
|
||||
m_StateMachineBehaviours: []
|
||||
m_AnyStatePosition: {x: 50, y: 20, z: 0}
|
||||
m_EntryPosition: {x: 50, y: 120, z: 0}
|
||||
m_ExitPosition: {x: 800, y: 120, z: 0}
|
||||
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
|
||||
m_DefaultState: {fileID: -8470273330122212232}
|
||||
--- !u!91 &9100000
|
||||
AnimatorController:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: idle sprites_0 1
|
||||
serializedVersion: 6
|
||||
m_AnimatorParameters: []
|
||||
m_AnimatorLayers:
|
||||
- serializedVersion: 5
|
||||
m_Name: Base Layer
|
||||
m_StateMachine: {fileID: -3480220879903128428}
|
||||
m_Mask: {fileID: 0}
|
||||
m_Motions: []
|
||||
m_Behaviours: []
|
||||
m_BlendingMode: 0
|
||||
m_SyncedLayerIndex: -1
|
||||
m_DefaultWeight: 0
|
||||
m_IKPass: 0
|
||||
m_SyncedLayerAffectsTiming: 0
|
||||
m_Controller: {fileID: 9100000}
|
||||
m_EvaluateTransitionsOnStart: 1
|
||||
@@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 45af239697c23ba4193cb2d9284303b4
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 9100000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -0,0 +1,160 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1102 &-8599204486223594959
|
||||
AnimatorState:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 1
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: New Animation 0
|
||||
m_Speed: 1
|
||||
m_CycleOffset: 0
|
||||
m_Transitions: []
|
||||
m_StateMachineBehaviours: []
|
||||
m_Position: {x: 50, y: 50, z: 0}
|
||||
m_IKOnFeet: 0
|
||||
m_WriteDefaultValues: 1
|
||||
m_Mirror: 0
|
||||
m_SpeedParameterActive: 0
|
||||
m_MirrorParameterActive: 0
|
||||
m_CycleOffsetParameterActive: 0
|
||||
m_TimeParameterActive: 0
|
||||
m_Motion: {fileID: 7400000, guid: f2b51e043776ecd43b84ba8a0d8fd11e, type: 2}
|
||||
m_Tag:
|
||||
m_SpeedParameter:
|
||||
m_MirrorParameter:
|
||||
m_CycleOffsetParameter:
|
||||
m_TimeParameter:
|
||||
--- !u!1102 &-1055372056651480406
|
||||
AnimatorState:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 1
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: IDLE
|
||||
m_Speed: 1
|
||||
m_CycleOffset: 0
|
||||
m_Transitions: []
|
||||
m_StateMachineBehaviours: []
|
||||
m_Position: {x: 50, y: 50, z: 0}
|
||||
m_IKOnFeet: 0
|
||||
m_WriteDefaultValues: 1
|
||||
m_Mirror: 0
|
||||
m_SpeedParameterActive: 0
|
||||
m_MirrorParameterActive: 0
|
||||
m_CycleOffsetParameterActive: 0
|
||||
m_TimeParameterActive: 0
|
||||
m_Motion: {fileID: 7400000, guid: 690f4f6ba2c1a4944ac1e7c986ca70fc, type: 2}
|
||||
m_Tag:
|
||||
m_SpeedParameter:
|
||||
m_MirrorParameter:
|
||||
m_CycleOffsetParameter:
|
||||
m_TimeParameter:
|
||||
--- !u!1107 &-249702646013297434
|
||||
AnimatorStateMachine:
|
||||
serializedVersion: 7
|
||||
m_ObjectHideFlags: 1
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: Base Layer
|
||||
m_ChildStates:
|
||||
- serializedVersion: 1
|
||||
m_State: {fileID: 2181362964201342827}
|
||||
m_Position: {x: 200, y: 0, z: 0}
|
||||
- serializedVersion: 1
|
||||
m_State: {fileID: -8599204486223594959}
|
||||
m_Position: {x: 235, y: 65, z: 0}
|
||||
- serializedVersion: 1
|
||||
m_State: {fileID: 2450296654011153953}
|
||||
m_Position: {x: 270, y: 130, z: 0}
|
||||
- serializedVersion: 1
|
||||
m_State: {fileID: -1055372056651480406}
|
||||
m_Position: {x: 305, y: 195, z: 0}
|
||||
m_ChildStateMachines: []
|
||||
m_AnyStateTransitions: []
|
||||
m_EntryTransitions: []
|
||||
m_StateMachineTransitions: {}
|
||||
m_StateMachineBehaviours: []
|
||||
m_AnyStatePosition: {x: 50, y: 20, z: 0}
|
||||
m_EntryPosition: {x: 50, y: 120, z: 0}
|
||||
m_ExitPosition: {x: 800, y: 120, z: 0}
|
||||
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
|
||||
m_DefaultState: {fileID: 2181362964201342827}
|
||||
--- !u!91 &9100000
|
||||
AnimatorController:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: idle sprites_0
|
||||
serializedVersion: 6
|
||||
m_AnimatorParameters: []
|
||||
m_AnimatorLayers:
|
||||
- serializedVersion: 5
|
||||
m_Name: Base Layer
|
||||
m_StateMachine: {fileID: -249702646013297434}
|
||||
m_Mask: {fileID: 0}
|
||||
m_Motions: []
|
||||
m_Behaviours: []
|
||||
m_BlendingMode: 0
|
||||
m_SyncedLayerIndex: -1
|
||||
m_DefaultWeight: 0
|
||||
m_IKPass: 0
|
||||
m_SyncedLayerAffectsTiming: 0
|
||||
m_Controller: {fileID: 9100000}
|
||||
m_EvaluateTransitionsOnStart: 1
|
||||
--- !u!1102 &2181362964201342827
|
||||
AnimatorState:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 1
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: New Animation
|
||||
m_Speed: 1
|
||||
m_CycleOffset: 0
|
||||
m_Transitions: []
|
||||
m_StateMachineBehaviours: []
|
||||
m_Position: {x: 50, y: 50, z: 0}
|
||||
m_IKOnFeet: 0
|
||||
m_WriteDefaultValues: 1
|
||||
m_Mirror: 0
|
||||
m_SpeedParameterActive: 0
|
||||
m_MirrorParameterActive: 0
|
||||
m_CycleOffsetParameterActive: 0
|
||||
m_TimeParameterActive: 0
|
||||
m_Motion: {fileID: 7400000, guid: f2b51e043776ecd43b84ba8a0d8fd11e, type: 2}
|
||||
m_Tag:
|
||||
m_SpeedParameter:
|
||||
m_MirrorParameter:
|
||||
m_CycleOffsetParameter:
|
||||
m_TimeParameter:
|
||||
--- !u!1102 &2450296654011153953
|
||||
AnimatorState:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 1
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: New Animation 1
|
||||
m_Speed: 1
|
||||
m_CycleOffset: 0
|
||||
m_Transitions: []
|
||||
m_StateMachineBehaviours: []
|
||||
m_Position: {x: 50, y: 50, z: 0}
|
||||
m_IKOnFeet: 0
|
||||
m_WriteDefaultValues: 1
|
||||
m_Mirror: 0
|
||||
m_SpeedParameterActive: 0
|
||||
m_MirrorParameterActive: 0
|
||||
m_CycleOffsetParameterActive: 0
|
||||
m_TimeParameterActive: 0
|
||||
m_Motion: {fileID: 7400000, guid: f2b51e043776ecd43b84ba8a0d8fd11e, type: 2}
|
||||
m_Tag:
|
||||
m_SpeedParameter:
|
||||
m_MirrorParameter:
|
||||
m_CycleOffsetParameter:
|
||||
m_TimeParameter:
|
||||
@@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 68a5ea0278ade9b46a889ab648eb07d2
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 9100000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -8,6 +8,7 @@ public class DropletMovement : MonoBehaviour
|
||||
// helper variables
|
||||
private bool isGrounded = true;
|
||||
private float facingDirection = 1f;
|
||||
private bool isDropping = false;
|
||||
|
||||
// movement
|
||||
private Vector2 movement;
|
||||
@@ -62,7 +63,7 @@ public class DropletMovement : MonoBehaviour
|
||||
|
||||
private void FixedUpdate()
|
||||
{
|
||||
if (isDashing)
|
||||
if (isDashing || isDropping)
|
||||
{
|
||||
return;
|
||||
}
|
||||
@@ -127,15 +128,26 @@ public class DropletMovement : MonoBehaviour
|
||||
|
||||
while (elapsed < duration)
|
||||
{
|
||||
<<<<<<< HEAD
|
||||
rb.useGravity = false;
|
||||
=======
|
||||
isDropping = true;
|
||||
rb.gravityScale = 0;
|
||||
>>>>>>> origin/main
|
||||
transform.Translate(Vector3.down * speed * Time.deltaTime);
|
||||
elapsed += Time.deltaTime; //update time
|
||||
yield return null;
|
||||
}
|
||||
|
||||
//enable collider --> not a trigger anymore
|
||||
<<<<<<< HEAD
|
||||
rb.useGravity = true;
|
||||
playerCollider.isTrigger = false;
|
||||
=======
|
||||
rb.gravityScale = 1;
|
||||
playerCollider.isTrigger = false;
|
||||
isDropping = false;
|
||||
>>>>>>> origin/main
|
||||
|
||||
}
|
||||
}
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 93 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 95 KiB |
Reference in New Issue
Block a user