Merge branch 'master' into tunnel

This commit is contained in:
DPS2004 2022-08-19 21:02:50 -04:00
commit 19fe5c31b4
107 changed files with 27740 additions and 1785 deletions

View file

@ -526,7 +526,7 @@ SpriteRenderer:
m_FlipX: 0 m_FlipX: 0
m_FlipY: 0 m_FlipY: 0
m_DrawMode: 0 m_DrawMode: 0
m_Size: {x: 0.81, y: 1.05} m_Size: {x: 1.13, y: 1.21}
m_AdaptiveModeThreshold: 0.5 m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0 m_SpriteTileMode: 0
m_WasSpriteAssigned: 1 m_WasSpriteAssigned: 1
@ -12169,7 +12169,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0} m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0 m_SortingLayerID: 0
m_SortingLayer: 0 m_SortingLayer: 0
m_SortingOrder: -58 m_SortingOrder: -50
m_Sprite: {fileID: -3026878226303679876, guid: 01a2ac0ac3bc28c4b9d1349ebe7a1d7e, type: 3} m_Sprite: {fileID: -3026878226303679876, guid: 01a2ac0ac3bc28c4b9d1349ebe7a1d7e, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0 m_FlipX: 0
@ -17208,7 +17208,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0} m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0 m_SortingLayerID: 0
m_SortingLayer: 0 m_SortingLayer: 0
m_SortingOrder: -50 m_SortingOrder: -51
m_Sprite: {fileID: -7008951743355193757, guid: 01a2ac0ac3bc28c4b9d1349ebe7a1d7e, type: 3} m_Sprite: {fileID: -7008951743355193757, guid: 01a2ac0ac3bc28c4b9d1349ebe7a1d7e, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0 m_FlipX: 0
@ -22556,7 +22556,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0} m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0 m_SortingLayerID: 0
m_SortingLayer: 0 m_SortingLayer: 0
m_SortingOrder: 0 m_SortingOrder: 2
m_Sprite: {fileID: 7516679348042953344, guid: 3ceb27c8c676e7a428cf6e15cd11b7ef, type: 3} m_Sprite: {fileID: 7516679348042953344, guid: 3ceb27c8c676e7a428cf6e15cd11b7ef, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 1 m_FlipX: 1
@ -28362,7 +28362,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0} m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0 m_SortingLayerID: 0
m_SortingLayer: 0 m_SortingLayer: 0
m_SortingOrder: -58 m_SortingOrder: -50
m_Sprite: {fileID: -3026878226303679876, guid: 01a2ac0ac3bc28c4b9d1349ebe7a1d7e, type: 3} m_Sprite: {fileID: -3026878226303679876, guid: 01a2ac0ac3bc28c4b9d1349ebe7a1d7e, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0 m_FlipX: 0
@ -29577,7 +29577,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0} m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0 m_SortingLayerID: 0
m_SortingLayer: 0 m_SortingLayer: 0
m_SortingOrder: -50 m_SortingOrder: -51
m_Sprite: {fileID: -7008951743355193757, guid: 01a2ac0ac3bc28c4b9d1349ebe7a1d7e, type: 3} m_Sprite: {fileID: -7008951743355193757, guid: 01a2ac0ac3bc28c4b9d1349ebe7a1d7e, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0 m_FlipX: 0

File diff suppressed because it is too large Load diff

Binary file not shown.

View file

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: 4f5ca5816cffa3445a27fe2ec580f2c7
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName: karate/common
assetBundleVariant:

Binary file not shown.

View file

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: 7b08306b83f77c442806ea0d839727b1
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName: karate/common
assetBundleVariant:

View file

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: 1469db15577ce2341a37123d4d49c07a
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName: karate/common
assetBundleVariant:

View file

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: 02292b1992c44b14383bfa77534231eb
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName: karate/common
assetBundleVariant:

View file

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: 573f76233fd1ee849b46c6ef8de672b9
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName: ntrsamurai/common
assetBundleVariant:

View file

@ -68,7 +68,7 @@ TextureImporter:
maxTextureSize: 256 maxTextureSize: 256
resizeAlgorithm: 0 resizeAlgorithm: 0
textureFormat: -1 textureFormat: -1
textureCompression: 1 textureCompression: 0
compressionQuality: 50 compressionQuality: 50
crunchedCompression: 0 crunchedCompression: 0
allowsAlphaSplitting: 0 allowsAlphaSplitting: 0
@ -80,7 +80,7 @@ TextureImporter:
maxTextureSize: 256 maxTextureSize: 256
resizeAlgorithm: 0 resizeAlgorithm: 0
textureFormat: -1 textureFormat: -1
textureCompression: 1 textureCompression: 0
compressionQuality: 50 compressionQuality: 50
crunchedCompression: 0 crunchedCompression: 0
allowsAlphaSplitting: 0 allowsAlphaSplitting: 0

View file

@ -68,7 +68,7 @@ TextureImporter:
maxTextureSize: 128 maxTextureSize: 128
resizeAlgorithm: 0 resizeAlgorithm: 0
textureFormat: -1 textureFormat: -1
textureCompression: 1 textureCompression: 0
compressionQuality: 50 compressionQuality: 50
crunchedCompression: 0 crunchedCompression: 0
allowsAlphaSplitting: 0 allowsAlphaSplitting: 0
@ -80,7 +80,7 @@ TextureImporter:
maxTextureSize: 128 maxTextureSize: 128
resizeAlgorithm: 0 resizeAlgorithm: 0
textureFormat: -1 textureFormat: -1
textureCompression: 1 textureCompression: 0
compressionQuality: 50 compressionQuality: 50
crunchedCompression: 0 crunchedCompression: 0
allowsAlphaSplitting: 0 allowsAlphaSplitting: 0

View file

@ -68,7 +68,7 @@ TextureImporter:
maxTextureSize: 256 maxTextureSize: 256
resizeAlgorithm: 0 resizeAlgorithm: 0
textureFormat: -1 textureFormat: -1
textureCompression: 1 textureCompression: 0
compressionQuality: 50 compressionQuality: 50
crunchedCompression: 0 crunchedCompression: 0
allowsAlphaSplitting: 0 allowsAlphaSplitting: 0
@ -80,7 +80,7 @@ TextureImporter:
maxTextureSize: 256 maxTextureSize: 256
resizeAlgorithm: 0 resizeAlgorithm: 0
textureFormat: -1 textureFormat: -1
textureCompression: 1 textureCompression: 0
compressionQuality: 50 compressionQuality: 50
crunchedCompression: 0 crunchedCompression: 0
allowsAlphaSplitting: 0 allowsAlphaSplitting: 0

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

After

Width:  |  Height:  |  Size: 306 KiB

View file

@ -65,7 +65,7 @@ TextureImporter:
platformSettings: platformSettings:
- serializedVersion: 3 - serializedVersion: 3
buildTarget: DefaultTexturePlatform buildTarget: DefaultTexturePlatform
maxTextureSize: 64 maxTextureSize: 256
resizeAlgorithm: 0 resizeAlgorithm: 0
textureFormat: -1 textureFormat: -1
textureCompression: 0 textureCompression: 0
@ -77,7 +77,7 @@ TextureImporter:
forceMaximumCompressionQuality_BC6H_BC7: 0 forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3 - serializedVersion: 3
buildTarget: Standalone buildTarget: Standalone
maxTextureSize: 64 maxTextureSize: 256
resizeAlgorithm: 0 resizeAlgorithm: 0
textureFormat: -1 textureFormat: -1
textureCompression: 0 textureCompression: 0

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

View file

@ -0,0 +1,108 @@
fileFormatVersion: 2
guid: 1281822311c7abb4f93e8923068088e9
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
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
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 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: 1
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
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 256
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 256
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

View file

@ -68,7 +68,7 @@ TextureImporter:
maxTextureSize: 256 maxTextureSize: 256
resizeAlgorithm: 0 resizeAlgorithm: 0
textureFormat: -1 textureFormat: -1
textureCompression: 1 textureCompression: 0
compressionQuality: 50 compressionQuality: 50
crunchedCompression: 0 crunchedCompression: 0
allowsAlphaSplitting: 0 allowsAlphaSplitting: 0
@ -80,7 +80,7 @@ TextureImporter:
maxTextureSize: 256 maxTextureSize: 256
resizeAlgorithm: 0 resizeAlgorithm: 0
textureFormat: -1 textureFormat: -1
textureCompression: 1 textureCompression: 0
compressionQuality: 50 compressionQuality: 50
crunchedCompression: 0 crunchedCompression: 0
allowsAlphaSplitting: 0 allowsAlphaSplitting: 0

Binary file not shown.

Before

Width:  |  Height:  |  Size: 54 KiB

After

Width:  |  Height:  |  Size: 813 KiB

View file

@ -65,7 +65,7 @@ TextureImporter:
platformSettings: platformSettings:
- serializedVersion: 3 - serializedVersion: 3
buildTarget: DefaultTexturePlatform buildTarget: DefaultTexturePlatform
maxTextureSize: 64 maxTextureSize: 256
resizeAlgorithm: 0 resizeAlgorithm: 0
textureFormat: -1 textureFormat: -1
textureCompression: 0 textureCompression: 0
@ -77,7 +77,7 @@ TextureImporter:
forceMaximumCompressionQuality_BC6H_BC7: 0 forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3 - serializedVersion: 3
buildTarget: Standalone buildTarget: Standalone
maxTextureSize: 64 maxTextureSize: 256
resizeAlgorithm: 0 resizeAlgorithm: 0
textureFormat: -1 textureFormat: -1
textureCompression: 0 textureCompression: 0

Binary file not shown.

After

Width:  |  Height:  |  Size: 126 KiB

View file

@ -0,0 +1,108 @@
fileFormatVersion: 2
guid: f46311c26d2a248408d3c3967a8d379e
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
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
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 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: 1
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
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 256
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 256
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

View file

@ -65,7 +65,19 @@ TextureImporter:
platformSettings: platformSettings:
- serializedVersion: 3 - serializedVersion: 3
buildTarget: DefaultTexturePlatform buildTarget: DefaultTexturePlatform
maxTextureSize: 2048 maxTextureSize: 256
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 256
resizeAlgorithm: 0 resizeAlgorithm: 0
textureFormat: -1 textureFormat: -1
textureCompression: 1 textureCompression: 1

View file

@ -65,10 +65,10 @@ TextureImporter:
platformSettings: platformSettings:
- serializedVersion: 3 - serializedVersion: 3
buildTarget: DefaultTexturePlatform buildTarget: DefaultTexturePlatform
maxTextureSize: 2048 maxTextureSize: 256
resizeAlgorithm: 0 resizeAlgorithm: 0
textureFormat: -1 textureFormat: -1
textureCompression: 2 textureCompression: 0
compressionQuality: 50 compressionQuality: 50
crunchedCompression: 0 crunchedCompression: 0
allowsAlphaSplitting: 0 allowsAlphaSplitting: 0
@ -77,10 +77,10 @@ TextureImporter:
forceMaximumCompressionQuality_BC6H_BC7: 0 forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3 - serializedVersion: 3
buildTarget: Standalone buildTarget: Standalone
maxTextureSize: 2048 maxTextureSize: 256
resizeAlgorithm: 0 resizeAlgorithm: 0
textureFormat: -1 textureFormat: -1
textureCompression: 2 textureCompression: 0
compressionQuality: 50 compressionQuality: 50
crunchedCompression: 0 crunchedCompression: 0
allowsAlphaSplitting: 0 allowsAlphaSplitting: 0

View file

@ -68,7 +68,7 @@ TextureImporter:
maxTextureSize: 256 maxTextureSize: 256
resizeAlgorithm: 0 resizeAlgorithm: 0
textureFormat: -1 textureFormat: -1
textureCompression: 1 textureCompression: 0
compressionQuality: 50 compressionQuality: 50
crunchedCompression: 0 crunchedCompression: 0
allowsAlphaSplitting: 0 allowsAlphaSplitting: 0
@ -80,7 +80,7 @@ TextureImporter:
maxTextureSize: 256 maxTextureSize: 256
resizeAlgorithm: 0 resizeAlgorithm: 0
textureFormat: -1 textureFormat: -1
textureCompression: 1 textureCompression: 0
compressionQuality: 50 compressionQuality: 50
crunchedCompression: 0 crunchedCompression: 0
allowsAlphaSplitting: 0 allowsAlphaSplitting: 0

View file

@ -68,7 +68,7 @@ TextureImporter:
maxTextureSize: 256 maxTextureSize: 256
resizeAlgorithm: 0 resizeAlgorithm: 0
textureFormat: -1 textureFormat: -1
textureCompression: 1 textureCompression: 0
compressionQuality: 50 compressionQuality: 50
crunchedCompression: 0 crunchedCompression: 0
allowsAlphaSplitting: 0 allowsAlphaSplitting: 0
@ -80,7 +80,7 @@ TextureImporter:
maxTextureSize: 256 maxTextureSize: 256
resizeAlgorithm: 0 resizeAlgorithm: 0
textureFormat: -1 textureFormat: -1
textureCompression: 1 textureCompression: 0
compressionQuality: 50 compressionQuality: 50
crunchedCompression: 0 crunchedCompression: 0
allowsAlphaSplitting: 0 allowsAlphaSplitting: 0

View file

@ -68,7 +68,7 @@ TextureImporter:
maxTextureSize: 256 maxTextureSize: 256
resizeAlgorithm: 0 resizeAlgorithm: 0
textureFormat: -1 textureFormat: -1
textureCompression: 1 textureCompression: 0
compressionQuality: 50 compressionQuality: 50
crunchedCompression: 0 crunchedCompression: 0
allowsAlphaSplitting: 0 allowsAlphaSplitting: 0
@ -80,7 +80,7 @@ TextureImporter:
maxTextureSize: 256 maxTextureSize: 256
resizeAlgorithm: 0 resizeAlgorithm: 0
textureFormat: -1 textureFormat: -1
textureCompression: 1 textureCompression: 0
compressionQuality: 50 compressionQuality: 50
crunchedCompression: 0 crunchedCompression: 0
allowsAlphaSplitting: 0 allowsAlphaSplitting: 0

View file

@ -68,7 +68,7 @@ TextureImporter:
maxTextureSize: 256 maxTextureSize: 256
resizeAlgorithm: 0 resizeAlgorithm: 0
textureFormat: -1 textureFormat: -1
textureCompression: 1 textureCompression: 0
compressionQuality: 50 compressionQuality: 50
crunchedCompression: 0 crunchedCompression: 0
allowsAlphaSplitting: 0 allowsAlphaSplitting: 0
@ -80,7 +80,7 @@ TextureImporter:
maxTextureSize: 256 maxTextureSize: 256
resizeAlgorithm: 0 resizeAlgorithm: 0
textureFormat: -1 textureFormat: -1
textureCompression: 1 textureCompression: 0
compressionQuality: 50 compressionQuality: 50
crunchedCompression: 0 crunchedCompression: 0
allowsAlphaSplitting: 0 allowsAlphaSplitting: 0

View file

@ -68,7 +68,7 @@ TextureImporter:
maxTextureSize: 256 maxTextureSize: 256
resizeAlgorithm: 0 resizeAlgorithm: 0
textureFormat: -1 textureFormat: -1
textureCompression: 1 textureCompression: 0
compressionQuality: 50 compressionQuality: 50
crunchedCompression: 0 crunchedCompression: 0
allowsAlphaSplitting: 0 allowsAlphaSplitting: 0
@ -80,7 +80,7 @@ TextureImporter:
maxTextureSize: 256 maxTextureSize: 256
resizeAlgorithm: 0 resizeAlgorithm: 0
textureFormat: -1 textureFormat: -1
textureCompression: 1 textureCompression: 0
compressionQuality: 50 compressionQuality: 50
crunchedCompression: 0 crunchedCompression: 0
allowsAlphaSplitting: 0 allowsAlphaSplitting: 0

Binary file not shown.

Before

Width:  |  Height:  |  Size: 476 B

After

Width:  |  Height:  |  Size: 572 KiB

View file

@ -65,7 +65,7 @@ TextureImporter:
platformSettings: platformSettings:
- serializedVersion: 3 - serializedVersion: 3
buildTarget: DefaultTexturePlatform buildTarget: DefaultTexturePlatform
maxTextureSize: 64 maxTextureSize: 256
resizeAlgorithm: 0 resizeAlgorithm: 0
textureFormat: -1 textureFormat: -1
textureCompression: 0 textureCompression: 0
@ -77,7 +77,7 @@ TextureImporter:
forceMaximumCompressionQuality_BC6H_BC7: 0 forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3 - serializedVersion: 3
buildTarget: Standalone buildTarget: Standalone
maxTextureSize: 64 maxTextureSize: 256
resizeAlgorithm: 0 resizeAlgorithm: 0
textureFormat: -1 textureFormat: -1
textureCompression: 0 textureCompression: 0

Binary file not shown.

After

Width:  |  Height:  |  Size: 21 KiB

View file

@ -0,0 +1,108 @@
fileFormatVersion: 2
guid: 31e4b97ba1ce5054d829112df2e034cd
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
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
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 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: 1
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
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 256
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 256
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

View file

@ -68,7 +68,7 @@ TextureImporter:
maxTextureSize: 256 maxTextureSize: 256
resizeAlgorithm: 0 resizeAlgorithm: 0
textureFormat: -1 textureFormat: -1
textureCompression: 1 textureCompression: 0
compressionQuality: 50 compressionQuality: 50
crunchedCompression: 0 crunchedCompression: 0
allowsAlphaSplitting: 0 allowsAlphaSplitting: 0
@ -80,7 +80,7 @@ TextureImporter:
maxTextureSize: 256 maxTextureSize: 256
resizeAlgorithm: 0 resizeAlgorithm: 0
textureFormat: -1 textureFormat: -1
textureCompression: 1 textureCompression: 0
compressionQuality: 50 compressionQuality: 50
crunchedCompression: 0 crunchedCompression: 0
allowsAlphaSplitting: 0 allowsAlphaSplitting: 0

View file

@ -68,7 +68,7 @@ TextureImporter:
maxTextureSize: 256 maxTextureSize: 256
resizeAlgorithm: 0 resizeAlgorithm: 0
textureFormat: -1 textureFormat: -1
textureCompression: 1 textureCompression: 0
compressionQuality: 50 compressionQuality: 50
crunchedCompression: 0 crunchedCompression: 0
allowsAlphaSplitting: 0 allowsAlphaSplitting: 0
@ -80,7 +80,7 @@ TextureImporter:
maxTextureSize: 256 maxTextureSize: 256
resizeAlgorithm: 0 resizeAlgorithm: 0
textureFormat: -1 textureFormat: -1
textureCompression: 1 textureCompression: 0
compressionQuality: 50 compressionQuality: 50
crunchedCompression: 0 crunchedCompression: 0
allowsAlphaSplitting: 0 allowsAlphaSplitting: 0

Binary file not shown.

Before

Width:  |  Height:  |  Size: 70 KiB

After

Width:  |  Height:  |  Size: 109 KiB

View file

@ -65,7 +65,7 @@ TextureImporter:
platformSettings: platformSettings:
- serializedVersion: 3 - serializedVersion: 3
buildTarget: DefaultTexturePlatform buildTarget: DefaultTexturePlatform
maxTextureSize: 64 maxTextureSize: 256
resizeAlgorithm: 0 resizeAlgorithm: 0
textureFormat: -1 textureFormat: -1
textureCompression: 0 textureCompression: 0
@ -77,7 +77,7 @@ TextureImporter:
forceMaximumCompressionQuality_BC6H_BC7: 0 forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3 - serializedVersion: 3
buildTarget: Standalone buildTarget: Standalone
maxTextureSize: 64 maxTextureSize: 256
resizeAlgorithm: 0 resizeAlgorithm: 0
textureFormat: -1 textureFormat: -1
textureCompression: 0 textureCompression: 0

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

View file

@ -0,0 +1,108 @@
fileFormatVersion: 2
guid: 4c2858a999ee57b409b2b8485d2c7f0d
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
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
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 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: 1
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
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 256
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 256
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 MiB

After

Width:  |  Height:  |  Size: 1.2 MiB

View file

@ -405,6 +405,56 @@ AnimationClip:
m_PostInfinity: 2 m_PostInfinity: 2
m_RotationOrder: 4 m_RotationOrder: 4
path: idol_torso/idol_collar path: idol_torso/idol_collar
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: {x: 0, y: -0.18, z: 0}
inSlope: {x: Infinity, y: Infinity, z: Infinity}
outSlope: {x: Infinity, y: Infinity, z: Infinity}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.06666667
value: {x: 0, y: -0.2, z: 0}
inSlope: {x: Infinity, y: Infinity, z: Infinity}
outSlope: {x: Infinity, y: Infinity, z: Infinity}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.13333334
value: {x: 0, y: -0.18, z: 0}
inSlope: {x: Infinity, y: Infinity, z: Infinity}
outSlope: {x: Infinity, y: Infinity, z: Infinity}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
path: idol_torso/idol_Clt_body_down0
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: {x: 0, y: 0.175, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0, y: 0.33333334, z: 0.33333334}
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
path: idol_torso/idol_Clt_body_up
m_ScaleCurves: m_ScaleCurves:
- curve: - curve:
serializedVersion: 2 serializedVersion: 2
@ -594,6 +644,82 @@ AnimationClip:
path: idol_torso/idol_collar path: idol_torso/idol_collar
classID: 212 classID: 212
script: {fileID: 0} script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Color.a
path: idol_torso/idol_Clt_body_down0
classID: 212
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_SortingOrder
path: idol_torso/idol_Clt_body_down0
classID: 212
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Color.a
path: idol_torso/idol_Clt_body_up
classID: 212
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_SortingOrder
path: idol_torso/idol_Clt_body_up
classID: 212
script: {fileID: 0}
m_PPtrCurves: m_PPtrCurves:
- curve: - curve:
- time: 0 - time: 0
@ -662,6 +788,20 @@ AnimationClip:
path: idol_mike path: idol_mike
classID: 212 classID: 212
script: {fileID: 0} script: {fileID: 0}
- curve:
- time: 0
value: {fileID: 0}
attribute: m_Sprite
path: idol_torso
classID: 212
script: {fileID: 0}
- curve:
- time: 0
value: {fileID: 6636417687825593121, guid: 3ceb27c8c676e7a428cf6e15cd11b7ef, type: 3}
attribute: m_Sprite
path: idol_torso/idol_Clt_body_down0
classID: 212
script: {fileID: 0}
m_SampleRate: 60 m_SampleRate: 60
m_WrapMode: 0 m_WrapMode: 0
m_Bounds: m_Bounds:
@ -753,6 +893,13 @@ AnimationClip:
typeID: 4 typeID: 4
customType: 0 customType: 0
isPPtrCurve: 0 isPPtrCurve: 0
- serializedVersion: 2
path: 759741572
attribute: 1
script: {fileID: 0}
typeID: 4
customType: 0
isPPtrCurve: 0
- serializedVersion: 2 - serializedVersion: 2
path: 2085883815 path: 2085883815
attribute: 4 attribute: 4
@ -886,6 +1033,20 @@ AnimationClip:
typeID: 212 typeID: 212
customType: 26 customType: 26
isPPtrCurve: 0 isPPtrCurve: 0
- serializedVersion: 2
path: 759741572
attribute: 3762991556
script: {fileID: 0}
typeID: 212
customType: 26
isPPtrCurve: 0
- serializedVersion: 2
path: 4260499122
attribute: 3762991556
script: {fileID: 0}
typeID: 212
customType: 26
isPPtrCurve: 0
- serializedVersion: 2 - serializedVersion: 2
path: 2085883815 path: 2085883815
attribute: 0 attribute: 0
@ -949,6 +1110,41 @@ AnimationClip:
typeID: 212 typeID: 212
customType: 23 customType: 23
isPPtrCurve: 1 isPPtrCurve: 1
- serializedVersion: 2
path: 2526016088
attribute: 0
script: {fileID: 0}
typeID: 212
customType: 23
isPPtrCurve: 1
- serializedVersion: 2
path: 759741572
attribute: 0
script: {fileID: 0}
typeID: 212
customType: 23
isPPtrCurve: 1
- serializedVersion: 2
path: 4260499122
attribute: 1
script: {fileID: 0}
typeID: 4
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 759741572
attribute: 304273561
script: {fileID: 0}
typeID: 212
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 4260499122
attribute: 304273561
script: {fileID: 0}
typeID: 212
customType: 0
isPPtrCurve: 0
pptrCurveMapping: pptrCurveMapping:
- {fileID: 4763604459074226989, guid: 3ceb27c8c676e7a428cf6e15cd11b7ef, type: 3} - {fileID: 4763604459074226989, guid: 3ceb27c8c676e7a428cf6e15cd11b7ef, type: 3}
- {fileID: -5555508115992296399, guid: 3ceb27c8c676e7a428cf6e15cd11b7ef, type: 3} - {fileID: -5555508115992296399, guid: 3ceb27c8c676e7a428cf6e15cd11b7ef, type: 3}
@ -961,6 +1157,8 @@ AnimationClip:
- {fileID: -3727349108590289553, guid: 3ceb27c8c676e7a428cf6e15cd11b7ef, type: 3} - {fileID: -3727349108590289553, guid: 3ceb27c8c676e7a428cf6e15cd11b7ef, type: 3}
- {fileID: 4846501274897350582, guid: 3ceb27c8c676e7a428cf6e15cd11b7ef, type: 3} - {fileID: 4846501274897350582, guid: 3ceb27c8c676e7a428cf6e15cd11b7ef, type: 3}
- {fileID: 7431816273384491690, guid: 3ceb27c8c676e7a428cf6e15cd11b7ef, type: 3} - {fileID: 7431816273384491690, guid: 3ceb27c8c676e7a428cf6e15cd11b7ef, type: 3}
- {fileID: 0}
- {fileID: 6636417687825593121, guid: 3ceb27c8c676e7a428cf6e15cd11b7ef, type: 3}
m_AnimationClipSettings: m_AnimationClipSettings:
serializedVersion: 2 serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseClip: {fileID: 0}
@ -2569,6 +2767,250 @@ AnimationClip:
path: idol_torso/idol_collar path: idol_torso/idol_collar
classID: 212 classID: 212
script: {fileID: 0} script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.06666667
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.13333334
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.x
path: idol_torso/idol_Clt_body_down0
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: -0.18
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.06666667
value: -0.2
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.13333334
value: -0.18
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.y
path: idol_torso/idol_Clt_body_down0
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.06666667
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.13333334
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.z
path: idol_torso/idol_Clt_body_down0
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Color.a
path: idol_torso/idol_Clt_body_down0
classID: 212
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_SortingOrder
path: idol_torso/idol_Clt_body_down0
classID: 212
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.x
path: idol_torso/idol_Clt_body_up
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0.175
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.y
path: idol_torso/idol_Clt_body_up
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.z
path: idol_torso/idol_Clt_body_up
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Color.a
path: idol_torso/idol_Clt_body_up
classID: 212
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_SortingOrder
path: idol_torso/idol_Clt_body_up
classID: 212
script: {fileID: 0}
m_EulerEditorCurves: m_EulerEditorCurves:
- curve: - curve:
serializedVersion: 2 serializedVersion: 2

View file

@ -378,6 +378,47 @@ AnimationClip:
m_PostInfinity: 2 m_PostInfinity: 2
m_RotationOrder: 4 m_RotationOrder: 4
path: idol_torso/idol_collar path: idol_torso/idol_collar
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: {x: 0, y: -0.13, z: 0}
inSlope: {x: Infinity, y: Infinity, z: Infinity}
outSlope: {x: Infinity, y: Infinity, z: Infinity}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.06666667
value: {x: 0, y: -0.16, z: 0}
inSlope: {x: Infinity, y: Infinity, z: Infinity}
outSlope: {x: Infinity, y: Infinity, z: Infinity}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
path: idol_torso/idol_Clt_body_down0
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: {x: 0, y: 0.175, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0, y: 0.33333334, z: 0.33333334}
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
path: idol_torso/idol_Clt_body_up
m_ScaleCurves: m_ScaleCurves:
- curve: - curve:
serializedVersion: 2 serializedVersion: 2
@ -567,6 +608,82 @@ AnimationClip:
path: idol_torso/idol_collar path: idol_torso/idol_collar
classID: 212 classID: 212
script: {fileID: 0} script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Color.a
path: idol_torso/idol_Clt_body_down0
classID: 212
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_SortingOrder
path: idol_torso/idol_Clt_body_down0
classID: 212
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Color.a
path: idol_torso/idol_Clt_body_up
classID: 212
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_SortingOrder
path: idol_torso/idol_Clt_body_up
classID: 212
script: {fileID: 0}
m_PPtrCurves: m_PPtrCurves:
- curve: - curve:
- time: 0 - time: 0
@ -631,6 +748,20 @@ AnimationClip:
path: idol_mike path: idol_mike
classID: 212 classID: 212
script: {fileID: 0} script: {fileID: 0}
- curve:
- time: 0
value: {fileID: 0}
attribute: m_Sprite
path: idol_torso
classID: 212
script: {fileID: 0}
- curve:
- time: 0
value: {fileID: 6636417687825593121, guid: 3ceb27c8c676e7a428cf6e15cd11b7ef, type: 3}
attribute: m_Sprite
path: idol_torso/idol_Clt_body_down0
classID: 212
script: {fileID: 0}
m_SampleRate: 60 m_SampleRate: 60
m_WrapMode: 0 m_WrapMode: 0
m_Bounds: m_Bounds:
@ -722,6 +853,13 @@ AnimationClip:
typeID: 4 typeID: 4
customType: 0 customType: 0
isPPtrCurve: 0 isPPtrCurve: 0
- serializedVersion: 2
path: 759741572
attribute: 1
script: {fileID: 0}
typeID: 4
customType: 0
isPPtrCurve: 0
- serializedVersion: 2 - serializedVersion: 2
path: 2085883815 path: 2085883815
attribute: 4 attribute: 4
@ -855,6 +993,20 @@ AnimationClip:
typeID: 212 typeID: 212
customType: 26 customType: 26
isPPtrCurve: 0 isPPtrCurve: 0
- serializedVersion: 2
path: 759741572
attribute: 3762991556
script: {fileID: 0}
typeID: 212
customType: 26
isPPtrCurve: 0
- serializedVersion: 2
path: 4260499122
attribute: 3762991556
script: {fileID: 0}
typeID: 212
customType: 26
isPPtrCurve: 0
- serializedVersion: 2 - serializedVersion: 2
path: 2085883815 path: 2085883815
attribute: 0 attribute: 0
@ -918,6 +1070,41 @@ AnimationClip:
typeID: 212 typeID: 212
customType: 23 customType: 23
isPPtrCurve: 1 isPPtrCurve: 1
- serializedVersion: 2
path: 2526016088
attribute: 0
script: {fileID: 0}
typeID: 212
customType: 23
isPPtrCurve: 1
- serializedVersion: 2
path: 759741572
attribute: 0
script: {fileID: 0}
typeID: 212
customType: 23
isPPtrCurve: 1
- serializedVersion: 2
path: 4260499122
attribute: 1
script: {fileID: 0}
typeID: 4
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 759741572
attribute: 304273561
script: {fileID: 0}
typeID: 212
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 4260499122
attribute: 304273561
script: {fileID: 0}
typeID: 212
customType: 0
isPPtrCurve: 0
pptrCurveMapping: pptrCurveMapping:
- {fileID: 5079826356707723058, guid: 3ceb27c8c676e7a428cf6e15cd11b7ef, type: 3} - {fileID: 5079826356707723058, guid: 3ceb27c8c676e7a428cf6e15cd11b7ef, type: 3}
- {fileID: -989471627981227243, guid: 3ceb27c8c676e7a428cf6e15cd11b7ef, type: 3} - {fileID: -989471627981227243, guid: 3ceb27c8c676e7a428cf6e15cd11b7ef, type: 3}
@ -928,6 +1115,8 @@ AnimationClip:
- {fileID: -3727349108590289553, guid: 3ceb27c8c676e7a428cf6e15cd11b7ef, type: 3} - {fileID: -3727349108590289553, guid: 3ceb27c8c676e7a428cf6e15cd11b7ef, type: 3}
- {fileID: 4846501274897350582, guid: 3ceb27c8c676e7a428cf6e15cd11b7ef, type: 3} - {fileID: 4846501274897350582, guid: 3ceb27c8c676e7a428cf6e15cd11b7ef, type: 3}
- {fileID: 7431816273384491690, guid: 3ceb27c8c676e7a428cf6e15cd11b7ef, type: 3} - {fileID: 7431816273384491690, guid: 3ceb27c8c676e7a428cf6e15cd11b7ef, type: 3}
- {fileID: 0}
- {fileID: 6636417687825593121, guid: 3ceb27c8c676e7a428cf6e15cd11b7ef, type: 3}
m_AnimationClipSettings: m_AnimationClipSettings:
serializedVersion: 2 serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseClip: {fileID: 0}
@ -2455,6 +2644,223 @@ AnimationClip:
path: idol_torso/idol_collar path: idol_torso/idol_collar
classID: 212 classID: 212
script: {fileID: 0} script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.06666667
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.x
path: idol_torso/idol_Clt_body_down0
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: -0.13
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.06666667
value: -0.16
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.y
path: idol_torso/idol_Clt_body_down0
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.06666667
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.z
path: idol_torso/idol_Clt_body_down0
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Color.a
path: idol_torso/idol_Clt_body_down0
classID: 212
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_SortingOrder
path: idol_torso/idol_Clt_body_down0
classID: 212
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.x
path: idol_torso/idol_Clt_body_up
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0.175
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.y
path: idol_torso/idol_Clt_body_up
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.z
path: idol_torso/idol_Clt_body_up
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Color.a
path: idol_torso/idol_Clt_body_up
classID: 212
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_SortingOrder
path: idol_torso/idol_Clt_body_up
classID: 212
script: {fileID: 0}
m_EulerEditorCurves: m_EulerEditorCurves:
- curve: - curve:
serializedVersion: 2 serializedVersion: 2

View file

@ -322,9 +322,18 @@ AnimationClip:
m_Curve: m_Curve:
- serializedVersion: 3 - serializedVersion: 3
time: 0 time: 0
value: {x: 0.7, y: 0.24, z: 0}
inSlope: {x: Infinity, y: Infinity, z: Infinity}
outSlope: {x: 0, y: 0.0666667, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.15
value: {x: 0.7, y: 0.25, z: 0} value: {x: 0.7, y: 0.25, z: 0}
inSlope: {x: Infinity, y: 0, z: 0} inSlope: {x: -0, y: 0.0666667, z: -0}
outSlope: {x: Infinity, y: 0, z: 0} outSlope: {x: Infinity, y: Infinity, z: Infinity}
tangentMode: 0 tangentMode: 0
weightedMode: 0 weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
@ -645,9 +654,18 @@ AnimationClip:
m_Curve: m_Curve:
- serializedVersion: 3 - serializedVersion: 3
time: 0 time: 0
value: {x: 1, y: 1.015, z: 1}
inSlope: {x: Infinity, y: Infinity, z: Infinity}
outSlope: {x: 0, y: -0.0999999, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.15
value: {x: 1, y: 1, z: 1} value: {x: 1, y: 1, z: 1}
inSlope: {x: Infinity, y: 0, z: 0} inSlope: {x: -0, y: -0.0999999, z: -0}
outSlope: {x: Infinity, y: 0, z: 0} outSlope: {x: Infinity, y: Infinity, z: Infinity}
tangentMode: 0 tangentMode: 0
weightedMode: 0 weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
@ -1602,8 +1620,17 @@ AnimationClip:
time: 0 time: 0
value: 0.7 value: 0.7
inSlope: Infinity inSlope: Infinity
outSlope: 0
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.15
value: 0.7
inSlope: -0
outSlope: Infinity outSlope: Infinity
tangentMode: 103 tangentMode: 69
weightedMode: 0 weightedMode: 0
inWeight: 0.33333334 inWeight: 0.33333334
outWeight: 0.33333334 outWeight: 0.33333334
@ -1619,10 +1646,19 @@ AnimationClip:
m_Curve: m_Curve:
- serializedVersion: 3 - serializedVersion: 3
time: 0 time: 0
value: 0.25 value: 0.24
inSlope: Infinity inSlope: Infinity
outSlope: 0.0666667
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.15
value: 0.25
inSlope: 0.0666667
outSlope: Infinity outSlope: Infinity
tangentMode: 103 tangentMode: 69
weightedMode: 0 weightedMode: 0
inWeight: 0.33333334 inWeight: 0.33333334
outWeight: 0.33333334 outWeight: 0.33333334
@ -1640,8 +1676,17 @@ AnimationClip:
time: 0 time: 0
value: 0 value: 0
inSlope: Infinity inSlope: Infinity
outSlope: 0
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.15
value: 0
inSlope: -0
outSlope: Infinity outSlope: Infinity
tangentMode: 103 tangentMode: 69
weightedMode: 0 weightedMode: 0
inWeight: 0.33333334 inWeight: 0.33333334
outWeight: 0.33333334 outWeight: 0.33333334
@ -1660,7 +1705,7 @@ AnimationClip:
value: 0 value: 0
inSlope: Infinity inSlope: Infinity
outSlope: Infinity outSlope: Infinity
tangentMode: 103 tangentMode: 69
weightedMode: 0 weightedMode: 0
inWeight: 0.33333334 inWeight: 0.33333334
outWeight: 0.33333334 outWeight: 0.33333334
@ -1679,7 +1724,7 @@ AnimationClip:
value: 0 value: 0
inSlope: Infinity inSlope: Infinity
outSlope: Infinity outSlope: Infinity
tangentMode: 103 tangentMode: 69
weightedMode: 0 weightedMode: 0
inWeight: 0.33333334 inWeight: 0.33333334
outWeight: 0.33333334 outWeight: 0.33333334
@ -1698,7 +1743,7 @@ AnimationClip:
value: 0 value: 0
inSlope: Infinity inSlope: Infinity
outSlope: Infinity outSlope: Infinity
tangentMode: 103 tangentMode: 69
weightedMode: 0 weightedMode: 0
inWeight: 0.33333334 inWeight: 0.33333334
outWeight: 0.33333334 outWeight: 0.33333334
@ -1716,8 +1761,17 @@ AnimationClip:
time: 0 time: 0
value: 1 value: 1
inSlope: Infinity inSlope: Infinity
outSlope: 0
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.15
value: 1
inSlope: -0
outSlope: Infinity outSlope: Infinity
tangentMode: 103 tangentMode: 69
weightedMode: 0 weightedMode: 0
inWeight: 0.33333334 inWeight: 0.33333334
outWeight: 0.33333334 outWeight: 0.33333334
@ -1733,10 +1787,19 @@ AnimationClip:
m_Curve: m_Curve:
- serializedVersion: 3 - serializedVersion: 3
time: 0 time: 0
value: 1 value: 1.015
inSlope: Infinity inSlope: Infinity
outSlope: -0.0999999
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.15
value: 1
inSlope: -0.0999999
outSlope: Infinity outSlope: Infinity
tangentMode: 103 tangentMode: 69
weightedMode: 0 weightedMode: 0
inWeight: 0.33333334 inWeight: 0.33333334
outWeight: 0.33333334 outWeight: 0.33333334
@ -1754,8 +1817,17 @@ AnimationClip:
time: 0 time: 0
value: 1 value: 1
inSlope: Infinity inSlope: Infinity
outSlope: 0
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.15
value: 1
inSlope: -0
outSlope: Infinity outSlope: Infinity
tangentMode: 103 tangentMode: 69
weightedMode: 0 weightedMode: 0
inWeight: 0.33333334 inWeight: 0.33333334
outWeight: 0.33333334 outWeight: 0.33333334
@ -3810,7 +3882,7 @@ AnimationClip:
m_PostInfinity: 2 m_PostInfinity: 2
m_RotationOrder: 4 m_RotationOrder: 4
attribute: m_LocalEulerAngles.z attribute: m_LocalEulerAngles.z
path: idol_head/idol_Hed_hair00 path: idol_torso/idol_arm_L/idol_hand_L
classID: 4 classID: 4
script: {fileID: 0} script: {fileID: 0}
- curve: - curve:
@ -3820,7 +3892,7 @@ AnimationClip:
m_PostInfinity: 2 m_PostInfinity: 2
m_RotationOrder: 4 m_RotationOrder: 4
attribute: m_LocalEulerAngles.y attribute: m_LocalEulerAngles.y
path: idol_head/idol_Hed_hair00 path: idol_torso/idol_arm_L/idol_hand_L
classID: 4 classID: 4
script: {fileID: 0} script: {fileID: 0}
- curve: - curve:
@ -3830,7 +3902,7 @@ AnimationClip:
m_PostInfinity: 2 m_PostInfinity: 2
m_RotationOrder: 4 m_RotationOrder: 4
attribute: m_LocalEulerAngles.x attribute: m_LocalEulerAngles.x
path: idol_head/idol_Hed_hair00 path: idol_torso/idol_arm_L/idol_hand_L
classID: 4 classID: 4
script: {fileID: 0} script: {fileID: 0}
- curve: - curve:
@ -3990,7 +4062,7 @@ AnimationClip:
m_PostInfinity: 2 m_PostInfinity: 2
m_RotationOrder: 4 m_RotationOrder: 4
attribute: m_LocalEulerAngles.x attribute: m_LocalEulerAngles.x
path: idol_torso/idol_arm_L/idol_hand_L path: idol_head/idol_Hed_hair00
classID: 4 classID: 4
script: {fileID: 0} script: {fileID: 0}
- curve: - curve:
@ -4000,7 +4072,7 @@ AnimationClip:
m_PostInfinity: 2 m_PostInfinity: 2
m_RotationOrder: 4 m_RotationOrder: 4
attribute: m_LocalEulerAngles.y attribute: m_LocalEulerAngles.y
path: idol_torso/idol_arm_L/idol_hand_L path: idol_head/idol_Hed_hair00
classID: 4 classID: 4
script: {fileID: 0} script: {fileID: 0}
- curve: - curve:
@ -4010,7 +4082,7 @@ AnimationClip:
m_PostInfinity: 2 m_PostInfinity: 2
m_RotationOrder: 4 m_RotationOrder: 4
attribute: m_LocalEulerAngles.z attribute: m_LocalEulerAngles.z
path: idol_torso/idol_arm_L/idol_hand_L path: idol_head/idol_Hed_hair00
classID: 4 classID: 4
script: {fileID: 0} script: {fileID: 0}
m_HasGenericRootTransform: 1 m_HasGenericRootTransform: 1

View file

@ -517,7 +517,7 @@ AnimationClip:
m_Curve: m_Curve:
- serializedVersion: 3 - serializedVersion: 3
time: 0 time: 0
value: {x: 0, y: -0.01, z: 0} value: {x: 0, y: 0.04, z: 0}
inSlope: {x: Infinity, y: Infinity, z: Infinity} inSlope: {x: Infinity, y: Infinity, z: Infinity}
outSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity}
tangentMode: 0 tangentMode: 0
@ -1004,7 +1004,7 @@ AnimationClip:
m_Curve: m_Curve:
- serializedVersion: 3 - serializedVersion: 3
time: 0 time: 0
value: 1 value: 0.5176471
inSlope: Infinity inSlope: Infinity
outSlope: Infinity outSlope: Infinity
tangentMode: 103 tangentMode: 103
@ -1023,7 +1023,7 @@ AnimationClip:
m_Curve: m_Curve:
- serializedVersion: 3 - serializedVersion: 3
time: 0 time: 0
value: 1 value: 0.5019608
inSlope: Infinity inSlope: Infinity
outSlope: Infinity outSlope: Infinity
tangentMode: 103 tangentMode: 103
@ -1042,7 +1042,7 @@ AnimationClip:
m_Curve: m_Curve:
- serializedVersion: 3 - serializedVersion: 3
time: 0 time: 0
value: 1 value: 0.39215687
inSlope: Infinity inSlope: Infinity
outSlope: Infinity outSlope: Infinity
tangentMode: 103 tangentMode: 103
@ -3547,7 +3547,7 @@ AnimationClip:
m_Curve: m_Curve:
- serializedVersion: 3 - serializedVersion: 3
time: 0 time: 0
value: -0.01 value: 0.04
inSlope: Infinity inSlope: Infinity
outSlope: Infinity outSlope: Infinity
tangentMode: 103 tangentMode: 103
@ -3675,7 +3675,7 @@ AnimationClip:
m_Curve: m_Curve:
- serializedVersion: 3 - serializedVersion: 3
time: 0 time: 0
value: 1 value: 0.5176471
inSlope: Infinity inSlope: Infinity
outSlope: Infinity outSlope: Infinity
tangentMode: 103 tangentMode: 103
@ -3694,7 +3694,7 @@ AnimationClip:
m_Curve: m_Curve:
- serializedVersion: 3 - serializedVersion: 3
time: 0 time: 0
value: 1 value: 0.5019608
inSlope: Infinity inSlope: Infinity
outSlope: Infinity outSlope: Infinity
tangentMode: 103 tangentMode: 103
@ -3713,7 +3713,7 @@ AnimationClip:
m_Curve: m_Curve:
- serializedVersion: 3 - serializedVersion: 3
time: 0 time: 0
value: 1 value: 0.39215687
inSlope: Infinity inSlope: Infinity
outSlope: Infinity outSlope: Infinity
tangentMode: 103 tangentMode: 103

View file

@ -405,6 +405,56 @@ AnimationClip:
m_PostInfinity: 2 m_PostInfinity: 2
m_RotationOrder: 4 m_RotationOrder: 4
path: idol_torso/idol_collar path: idol_torso/idol_collar
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: {x: 0, y: 0.175, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0, y: 0.33333334, z: 0.33333334}
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
path: idol_torso/idol_Clt_body_up
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: {x: 0, y: -0.18, z: 0}
inSlope: {x: Infinity, y: Infinity, z: Infinity}
outSlope: {x: Infinity, y: Infinity, z: Infinity}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.06666667
value: {x: 0, y: -0.2, z: 0}
inSlope: {x: Infinity, y: Infinity, z: Infinity}
outSlope: {x: Infinity, y: Infinity, z: Infinity}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.13333334
value: {x: 0, y: -0.18, z: 0}
inSlope: {x: Infinity, y: Infinity, z: Infinity}
outSlope: {x: Infinity, y: Infinity, z: Infinity}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
path: idol_torso/idol_Clt_body_down0
m_ScaleCurves: m_ScaleCurves:
- curve: - curve:
serializedVersion: 2 serializedVersion: 2
@ -561,7 +611,7 @@ AnimationClip:
m_Curve: m_Curve:
- serializedVersion: 3 - serializedVersion: 3
time: 0 time: 0
value: 2 value: 3
inSlope: Infinity inSlope: Infinity
outSlope: Infinity outSlope: Infinity
tangentMode: 103 tangentMode: 103
@ -594,6 +644,101 @@ AnimationClip:
path: idol_torso/idol_collar path: idol_torso/idol_collar
classID: 212 classID: 212
script: {fileID: 0} script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Color.a
path: idol_torso/idol_Clt_body_down0
classID: 212
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Color.a
path: idol_torso/idol_Clt_body_up
classID: 212
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_SortingOrder
path: idol_torso/idol_Clt_body_up
classID: 212
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_SortingOrder
path: idol_torso/idol_Clt_body_down0
classID: 212
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 2
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_SortingOrder
path: idol_torso/idol_arm_L
classID: 212
script: {fileID: 0}
m_PPtrCurves: m_PPtrCurves:
- curve: - curve:
- time: 0 - time: 0
@ -655,6 +800,20 @@ AnimationClip:
path: idol_torso/idol_arm_R/idol_hand_R path: idol_torso/idol_arm_R/idol_hand_R
classID: 212 classID: 212
script: {fileID: 0} script: {fileID: 0}
- curve:
- time: 0
value: {fileID: 6636417687825593121, guid: 3ceb27c8c676e7a428cf6e15cd11b7ef, type: 3}
attribute: m_Sprite
path: idol_torso/idol_Clt_body_down0
classID: 212
script: {fileID: 0}
- curve:
- time: 0
value: {fileID: 0}
attribute: m_Sprite
path: idol_torso
classID: 212
script: {fileID: 0}
m_SampleRate: 60 m_SampleRate: 60
m_WrapMode: 0 m_WrapMode: 0
m_Bounds: m_Bounds:
@ -746,6 +905,13 @@ AnimationClip:
typeID: 4 typeID: 4
customType: 0 customType: 0
isPPtrCurve: 0 isPPtrCurve: 0
- serializedVersion: 2
path: 759741572
attribute: 1
script: {fileID: 0}
typeID: 4
customType: 0
isPPtrCurve: 0
- serializedVersion: 2 - serializedVersion: 2
path: 2085883815 path: 2085883815
attribute: 4 attribute: 4
@ -879,6 +1045,27 @@ AnimationClip:
typeID: 212 typeID: 212
customType: 26 customType: 26
isPPtrCurve: 0 isPPtrCurve: 0
- serializedVersion: 2
path: 4260499122
attribute: 3762991556
script: {fileID: 0}
typeID: 212
customType: 26
isPPtrCurve: 0
- serializedVersion: 2
path: 759741572
attribute: 3762991556
script: {fileID: 0}
typeID: 212
customType: 26
isPPtrCurve: 0
- serializedVersion: 2
path: 192818143
attribute: 3762991556
script: {fileID: 0}
typeID: 212
customType: 26
isPPtrCurve: 0
- serializedVersion: 2 - serializedVersion: 2
path: 2085883815 path: 2085883815
attribute: 0 attribute: 0
@ -935,6 +1122,41 @@ AnimationClip:
typeID: 212 typeID: 212
customType: 23 customType: 23
isPPtrCurve: 1 isPPtrCurve: 1
- serializedVersion: 2
path: 759741572
attribute: 0
script: {fileID: 0}
typeID: 212
customType: 23
isPPtrCurve: 1
- serializedVersion: 2
path: 2526016088
attribute: 0
script: {fileID: 0}
typeID: 212
customType: 23
isPPtrCurve: 1
- serializedVersion: 2
path: 4260499122
attribute: 1
script: {fileID: 0}
typeID: 4
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 759741572
attribute: 304273561
script: {fileID: 0}
typeID: 212
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 4260499122
attribute: 304273561
script: {fileID: 0}
typeID: 212
customType: 0
isPPtrCurve: 0
pptrCurveMapping: pptrCurveMapping:
- {fileID: 4763604459074226989, guid: 3ceb27c8c676e7a428cf6e15cd11b7ef, type: 3} - {fileID: 4763604459074226989, guid: 3ceb27c8c676e7a428cf6e15cd11b7ef, type: 3}
- {fileID: -5555508115992296399, guid: 3ceb27c8c676e7a428cf6e15cd11b7ef, type: 3} - {fileID: -5555508115992296399, guid: 3ceb27c8c676e7a428cf6e15cd11b7ef, type: 3}
@ -946,6 +1168,8 @@ AnimationClip:
- {fileID: -2172476432286208557, guid: 3ceb27c8c676e7a428cf6e15cd11b7ef, type: 3} - {fileID: -2172476432286208557, guid: 3ceb27c8c676e7a428cf6e15cd11b7ef, type: 3}
- {fileID: -3727349108590289553, guid: 3ceb27c8c676e7a428cf6e15cd11b7ef, type: 3} - {fileID: -3727349108590289553, guid: 3ceb27c8c676e7a428cf6e15cd11b7ef, type: 3}
- {fileID: 4846501274897350582, guid: 3ceb27c8c676e7a428cf6e15cd11b7ef, type: 3} - {fileID: 4846501274897350582, guid: 3ceb27c8c676e7a428cf6e15cd11b7ef, type: 3}
- {fileID: 6636417687825593121, guid: 3ceb27c8c676e7a428cf6e15cd11b7ef, type: 3}
- {fileID: 0}
m_AnimationClipSettings: m_AnimationClipSettings:
serializedVersion: 2 serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseClip: {fileID: 0}
@ -2464,7 +2688,7 @@ AnimationClip:
m_Curve: m_Curve:
- serializedVersion: 3 - serializedVersion: 3
time: 0 time: 0
value: 2 value: 3
inSlope: Infinity inSlope: Infinity
outSlope: Infinity outSlope: Infinity
tangentMode: 103 tangentMode: 103
@ -2554,6 +2778,269 @@ AnimationClip:
path: idol_torso/idol_collar path: idol_torso/idol_collar
classID: 212 classID: 212
script: {fileID: 0} script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Color.a
path: idol_torso/idol_Clt_body_down0
classID: 212
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Color.a
path: idol_torso/idol_Clt_body_up
classID: 212
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.x
path: idol_torso/idol_Clt_body_up
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0.175
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.y
path: idol_torso/idol_Clt_body_up
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.z
path: idol_torso/idol_Clt_body_up
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.06666667
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.13333334
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.x
path: idol_torso/idol_Clt_body_down0
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: -0.18
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.06666667
value: -0.2
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.13333334
value: -0.18
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.y
path: idol_torso/idol_Clt_body_down0
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.06666667
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.13333334
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.z
path: idol_torso/idol_Clt_body_down0
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_SortingOrder
path: idol_torso/idol_Clt_body_up
classID: 212
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_SortingOrder
path: idol_torso/idol_Clt_body_down0
classID: 212
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 2
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_SortingOrder
path: idol_torso/idol_arm_L
classID: 212
script: {fileID: 0}
m_EulerEditorCurves: m_EulerEditorCurves:
- curve: - curve:
serializedVersion: 2 serializedVersion: 2

View file

@ -378,6 +378,47 @@ AnimationClip:
m_PostInfinity: 2 m_PostInfinity: 2
m_RotationOrder: 4 m_RotationOrder: 4
path: idol_torso/idol_collar path: idol_torso/idol_collar
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: {x: 0, y: -0.13, z: 0}
inSlope: {x: Infinity, y: Infinity, z: Infinity}
outSlope: {x: Infinity, y: Infinity, z: Infinity}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.06666667
value: {x: 0, y: -0.16, z: 0}
inSlope: {x: Infinity, y: Infinity, z: Infinity}
outSlope: {x: Infinity, y: Infinity, z: Infinity}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
path: idol_torso/idol_Clt_body_down0
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: {x: 0, y: 0.175, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0, y: 0.33333334, z: 0.33333334}
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
path: idol_torso/idol_Clt_body_up
m_ScaleCurves: m_ScaleCurves:
- curve: - curve:
serializedVersion: 2 serializedVersion: 2
@ -534,7 +575,7 @@ AnimationClip:
m_Curve: m_Curve:
- serializedVersion: 3 - serializedVersion: 3
time: 0 time: 0
value: 2 value: 3
inSlope: Infinity inSlope: Infinity
outSlope: Infinity outSlope: Infinity
tangentMode: 103 tangentMode: 103
@ -567,6 +608,82 @@ AnimationClip:
path: idol_torso/idol_collar path: idol_torso/idol_collar
classID: 212 classID: 212
script: {fileID: 0} script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Color.a
path: idol_torso/idol_Clt_body_down0
classID: 212
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_SortingOrder
path: idol_torso/idol_Clt_body_down0
classID: 212
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Color.a
path: idol_torso/idol_Clt_body_up
classID: 212
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_SortingOrder
path: idol_torso/idol_Clt_body_up
classID: 212
script: {fileID: 0}
m_PPtrCurves: m_PPtrCurves:
- curve: - curve:
- time: 0 - time: 0
@ -624,6 +741,20 @@ AnimationClip:
path: idol_torso/idol_arm_R/idol_hand_R path: idol_torso/idol_arm_R/idol_hand_R
classID: 212 classID: 212
script: {fileID: 0} script: {fileID: 0}
- curve:
- time: 0
value: {fileID: 0}
attribute: m_Sprite
path: idol_torso
classID: 212
script: {fileID: 0}
- curve:
- time: 0
value: {fileID: 6636417687825593121, guid: 3ceb27c8c676e7a428cf6e15cd11b7ef, type: 3}
attribute: m_Sprite
path: idol_torso/idol_Clt_body_down0
classID: 212
script: {fileID: 0}
m_SampleRate: 60 m_SampleRate: 60
m_WrapMode: 0 m_WrapMode: 0
m_Bounds: m_Bounds:
@ -715,6 +846,13 @@ AnimationClip:
typeID: 4 typeID: 4
customType: 0 customType: 0
isPPtrCurve: 0 isPPtrCurve: 0
- serializedVersion: 2
path: 759741572
attribute: 1
script: {fileID: 0}
typeID: 4
customType: 0
isPPtrCurve: 0
- serializedVersion: 2 - serializedVersion: 2
path: 2085883815 path: 2085883815
attribute: 4 attribute: 4
@ -848,6 +986,20 @@ AnimationClip:
typeID: 212 typeID: 212
customType: 26 customType: 26
isPPtrCurve: 0 isPPtrCurve: 0
- serializedVersion: 2
path: 759741572
attribute: 3762991556
script: {fileID: 0}
typeID: 212
customType: 26
isPPtrCurve: 0
- serializedVersion: 2
path: 4260499122
attribute: 3762991556
script: {fileID: 0}
typeID: 212
customType: 26
isPPtrCurve: 0
- serializedVersion: 2 - serializedVersion: 2
path: 2085883815 path: 2085883815
attribute: 0 attribute: 0
@ -904,6 +1056,41 @@ AnimationClip:
typeID: 212 typeID: 212
customType: 23 customType: 23
isPPtrCurve: 1 isPPtrCurve: 1
- serializedVersion: 2
path: 2526016088
attribute: 0
script: {fileID: 0}
typeID: 212
customType: 23
isPPtrCurve: 1
- serializedVersion: 2
path: 759741572
attribute: 0
script: {fileID: 0}
typeID: 212
customType: 23
isPPtrCurve: 1
- serializedVersion: 2
path: 4260499122
attribute: 1
script: {fileID: 0}
typeID: 4
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 759741572
attribute: 304273561
script: {fileID: 0}
typeID: 212
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 4260499122
attribute: 304273561
script: {fileID: 0}
typeID: 212
customType: 0
isPPtrCurve: 0
pptrCurveMapping: pptrCurveMapping:
- {fileID: 5079826356707723058, guid: 3ceb27c8c676e7a428cf6e15cd11b7ef, type: 3} - {fileID: 5079826356707723058, guid: 3ceb27c8c676e7a428cf6e15cd11b7ef, type: 3}
- {fileID: -989471627981227243, guid: 3ceb27c8c676e7a428cf6e15cd11b7ef, type: 3} - {fileID: -989471627981227243, guid: 3ceb27c8c676e7a428cf6e15cd11b7ef, type: 3}
@ -913,6 +1100,8 @@ AnimationClip:
- {fileID: -2172476432286208557, guid: 3ceb27c8c676e7a428cf6e15cd11b7ef, type: 3} - {fileID: -2172476432286208557, guid: 3ceb27c8c676e7a428cf6e15cd11b7ef, type: 3}
- {fileID: -3727349108590289553, guid: 3ceb27c8c676e7a428cf6e15cd11b7ef, type: 3} - {fileID: -3727349108590289553, guid: 3ceb27c8c676e7a428cf6e15cd11b7ef, type: 3}
- {fileID: 4846501274897350582, guid: 3ceb27c8c676e7a428cf6e15cd11b7ef, type: 3} - {fileID: 4846501274897350582, guid: 3ceb27c8c676e7a428cf6e15cd11b7ef, type: 3}
- {fileID: 0}
- {fileID: 6636417687825593121, guid: 3ceb27c8c676e7a428cf6e15cd11b7ef, type: 3}
m_AnimationClipSettings: m_AnimationClipSettings:
serializedVersion: 2 serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseClip: {fileID: 0}
@ -2350,7 +2539,7 @@ AnimationClip:
m_Curve: m_Curve:
- serializedVersion: 3 - serializedVersion: 3
time: 0 time: 0
value: 2 value: 3
inSlope: Infinity inSlope: Infinity
outSlope: Infinity outSlope: Infinity
tangentMode: 103 tangentMode: 103
@ -2440,6 +2629,223 @@ AnimationClip:
path: idol_torso/idol_collar path: idol_torso/idol_collar
classID: 212 classID: 212
script: {fileID: 0} script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.06666667
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.x
path: idol_torso/idol_Clt_body_down0
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: -0.13
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.06666667
value: -0.16
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.y
path: idol_torso/idol_Clt_body_down0
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.06666667
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.z
path: idol_torso/idol_Clt_body_down0
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Color.a
path: idol_torso/idol_Clt_body_down0
classID: 212
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_SortingOrder
path: idol_torso/idol_Clt_body_down0
classID: 212
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.x
path: idol_torso/idol_Clt_body_up
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0.175
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.y
path: idol_torso/idol_Clt_body_up
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.z
path: idol_torso/idol_Clt_body_up
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Color.a
path: idol_torso/idol_Clt_body_up
classID: 212
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_SortingOrder
path: idol_torso/idol_Clt_body_up
classID: 212
script: {fileID: 0}
m_EulerEditorCurves: m_EulerEditorCurves:
- curve: - curve:
serializedVersion: 2 serializedVersion: 2

View file

@ -340,9 +340,18 @@ AnimationClip:
m_Curve: m_Curve:
- serializedVersion: 3 - serializedVersion: 3
time: 0 time: 0
value: {x: 0.7, y: 0.24, z: 0}
inSlope: {x: Infinity, y: Infinity, z: Infinity}
outSlope: {x: 0, y: 0.0666667, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.15
value: {x: 0.7, y: 0.25, z: 0} value: {x: 0.7, y: 0.25, z: 0}
inSlope: {x: Infinity, y: 0, z: 0} inSlope: {x: -0, y: 0.0666667, z: -0}
outSlope: {x: Infinity, y: 0, z: 0} outSlope: {x: Infinity, y: Infinity, z: Infinity}
tangentMode: 0 tangentMode: 0
weightedMode: 0 weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
@ -681,9 +690,18 @@ AnimationClip:
m_Curve: m_Curve:
- serializedVersion: 3 - serializedVersion: 3
time: 0 time: 0
value: {x: 1, y: 1.015, z: 1}
inSlope: {x: Infinity, y: Infinity, z: Infinity}
outSlope: {x: 0, y: -0.0999999, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.15
value: {x: 1, y: 1, z: 1} value: {x: 1, y: 1, z: 1}
inSlope: {x: Infinity, y: 0, z: 0} inSlope: {x: -0, y: -0.0999999, z: -0}
outSlope: {x: Infinity, y: 0, z: 0} outSlope: {x: Infinity, y: Infinity, z: Infinity}
tangentMode: 0 tangentMode: 0
weightedMode: 0 weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
@ -1505,8 +1523,17 @@ AnimationClip:
time: 0 time: 0
value: 0.7 value: 0.7
inSlope: Infinity inSlope: Infinity
outSlope: 0
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.15
value: 0.7
inSlope: -0
outSlope: Infinity outSlope: Infinity
tangentMode: 103 tangentMode: 69
weightedMode: 0 weightedMode: 0
inWeight: 0.33333334 inWeight: 0.33333334
outWeight: 0.33333334 outWeight: 0.33333334
@ -1522,10 +1549,19 @@ AnimationClip:
m_Curve: m_Curve:
- serializedVersion: 3 - serializedVersion: 3
time: 0 time: 0
value: 0.25 value: 0.24
inSlope: Infinity inSlope: Infinity
outSlope: 0.0666667
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.15
value: 0.25
inSlope: 0.0666667
outSlope: Infinity outSlope: Infinity
tangentMode: 103 tangentMode: 69
weightedMode: 0 weightedMode: 0
inWeight: 0.33333334 inWeight: 0.33333334
outWeight: 0.33333334 outWeight: 0.33333334
@ -1543,8 +1579,17 @@ AnimationClip:
time: 0 time: 0
value: 0 value: 0
inSlope: Infinity inSlope: Infinity
outSlope: 0
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.15
value: 0
inSlope: -0
outSlope: Infinity outSlope: Infinity
tangentMode: 103 tangentMode: 69
weightedMode: 0 weightedMode: 0
inWeight: 0.33333334 inWeight: 0.33333334
outWeight: 0.33333334 outWeight: 0.33333334
@ -1563,7 +1608,7 @@ AnimationClip:
value: 0 value: 0
inSlope: Infinity inSlope: Infinity
outSlope: Infinity outSlope: Infinity
tangentMode: 103 tangentMode: 69
weightedMode: 0 weightedMode: 0
inWeight: 0.33333334 inWeight: 0.33333334
outWeight: 0.33333334 outWeight: 0.33333334
@ -1582,7 +1627,7 @@ AnimationClip:
value: 0 value: 0
inSlope: Infinity inSlope: Infinity
outSlope: Infinity outSlope: Infinity
tangentMode: 103 tangentMode: 69
weightedMode: 0 weightedMode: 0
inWeight: 0.33333334 inWeight: 0.33333334
outWeight: 0.33333334 outWeight: 0.33333334
@ -1601,7 +1646,7 @@ AnimationClip:
value: 0 value: 0
inSlope: Infinity inSlope: Infinity
outSlope: Infinity outSlope: Infinity
tangentMode: 103 tangentMode: 69
weightedMode: 0 weightedMode: 0
inWeight: 0.33333334 inWeight: 0.33333334
outWeight: 0.33333334 outWeight: 0.33333334
@ -1619,8 +1664,17 @@ AnimationClip:
time: 0 time: 0
value: 1 value: 1
inSlope: Infinity inSlope: Infinity
outSlope: 0
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.15
value: 1
inSlope: -0
outSlope: Infinity outSlope: Infinity
tangentMode: 103 tangentMode: 69
weightedMode: 0 weightedMode: 0
inWeight: 0.33333334 inWeight: 0.33333334
outWeight: 0.33333334 outWeight: 0.33333334
@ -1636,10 +1690,19 @@ AnimationClip:
m_Curve: m_Curve:
- serializedVersion: 3 - serializedVersion: 3
time: 0 time: 0
value: 1 value: 1.015
inSlope: Infinity inSlope: Infinity
outSlope: -0.0999999
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.15
value: 1
inSlope: -0.0999999
outSlope: Infinity outSlope: Infinity
tangentMode: 103 tangentMode: 69
weightedMode: 0 weightedMode: 0
inWeight: 0.33333334 inWeight: 0.33333334
outWeight: 0.33333334 outWeight: 0.33333334
@ -1657,8 +1720,17 @@ AnimationClip:
time: 0 time: 0
value: 1 value: 1
inSlope: Infinity inSlope: Infinity
outSlope: 0
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.15
value: 1
inSlope: -0
outSlope: Infinity outSlope: Infinity
tangentMode: 103 tangentMode: 69
weightedMode: 0 weightedMode: 0
inWeight: 0.33333334 inWeight: 0.33333334
outWeight: 0.33333334 outWeight: 0.33333334
@ -3765,7 +3837,7 @@ AnimationClip:
m_PostInfinity: 2 m_PostInfinity: 2
m_RotationOrder: 4 m_RotationOrder: 4
attribute: m_LocalEulerAngles.z attribute: m_LocalEulerAngles.z
path: idol_head/idol_Hed_hair00 path: idol_torso/idol_arm_R/idol_hand_R
classID: 4 classID: 4
script: {fileID: 0} script: {fileID: 0}
- curve: - curve:
@ -3775,7 +3847,7 @@ AnimationClip:
m_PostInfinity: 2 m_PostInfinity: 2
m_RotationOrder: 4 m_RotationOrder: 4
attribute: m_LocalEulerAngles.y attribute: m_LocalEulerAngles.y
path: idol_head/idol_Hed_hair00 path: idol_torso/idol_arm_R/idol_hand_R
classID: 4 classID: 4
script: {fileID: 0} script: {fileID: 0}
- curve: - curve:
@ -3785,7 +3857,7 @@ AnimationClip:
m_PostInfinity: 2 m_PostInfinity: 2
m_RotationOrder: 4 m_RotationOrder: 4
attribute: m_LocalEulerAngles.x attribute: m_LocalEulerAngles.x
path: idol_head/idol_Hed_hair00 path: idol_torso/idol_arm_R/idol_hand_R
classID: 4 classID: 4
script: {fileID: 0} script: {fileID: 0}
- curve: - curve:
@ -3945,7 +4017,7 @@ AnimationClip:
m_PostInfinity: 2 m_PostInfinity: 2
m_RotationOrder: 4 m_RotationOrder: 4
attribute: m_LocalEulerAngles.x attribute: m_LocalEulerAngles.x
path: idol_torso/idol_arm_R/idol_hand_R path: idol_head/idol_Hed_hair00
classID: 4 classID: 4
script: {fileID: 0} script: {fileID: 0}
- curve: - curve:
@ -3955,7 +4027,7 @@ AnimationClip:
m_PostInfinity: 2 m_PostInfinity: 2
m_RotationOrder: 4 m_RotationOrder: 4
attribute: m_LocalEulerAngles.y attribute: m_LocalEulerAngles.y
path: idol_torso/idol_arm_R/idol_hand_R path: idol_head/idol_Hed_hair00
classID: 4 classID: 4
script: {fileID: 0} script: {fileID: 0}
- curve: - curve:
@ -3965,7 +4037,7 @@ AnimationClip:
m_PostInfinity: 2 m_PostInfinity: 2
m_RotationOrder: 4 m_RotationOrder: 4
attribute: m_LocalEulerAngles.z attribute: m_LocalEulerAngles.z
path: idol_torso/idol_arm_R/idol_hand_R path: idol_head/idol_Hed_hair00
classID: 4 classID: 4
script: {fileID: 0} script: {fileID: 0}
m_HasGenericRootTransform: 1 m_HasGenericRootTransform: 1

View file

@ -1033,6 +1033,65 @@ AnimationClip:
m_PostInfinity: 2 m_PostInfinity: 2
m_RotationOrder: 4 m_RotationOrder: 4
path: idol_torso/idol_collar path: idol_torso/idol_collar
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: {x: 0, y: 0.175, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0, y: 0.33333334, z: 0.33333334}
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
path: idol_torso/idol_Clt_body_up
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: {x: 0, y: -0.27, z: 0}
inSlope: {x: Infinity, y: Infinity, z: Infinity}
outSlope: {x: Infinity, y: Infinity, z: Infinity}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.06666667
value: {x: 0, y: -0.25, z: 0}
inSlope: {x: Infinity, y: Infinity, z: Infinity}
outSlope: {x: Infinity, y: Infinity, z: Infinity}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.1
value: {x: 0, y: -0.24, z: 0}
inSlope: {x: Infinity, y: Infinity, z: Infinity}
outSlope: {x: Infinity, y: Infinity, z: Infinity}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.13333334
value: {x: 0, y: -0.27, z: 0}
inSlope: {x: Infinity, y: Infinity, z: Infinity}
outSlope: {x: Infinity, y: Infinity, z: Infinity}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
path: idol_torso/idol_Clt_body_down0
m_ScaleCurves: m_ScaleCurves:
- curve: - curve:
serializedVersion: 2 serializedVersion: 2
@ -1086,6 +1145,58 @@ AnimationClip:
m_PostInfinity: 2 m_PostInfinity: 2
m_RotationOrder: 4 m_RotationOrder: 4
path: idol_head/idol_Hed_hair00 path: idol_head/idol_Hed_hair00
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: {x: 1, y: 1, z: 1}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: Infinity, y: Infinity, z: Infinity}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.06666667
value: {x: 1.1, y: 1, z: 1}
inSlope: {x: 0.99999905, y: 0, z: 0}
outSlope: {x: 0.99999905, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.1
value: {x: 1.125, y: 1, z: 1}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: Infinity, y: Infinity, z: Infinity}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.13333334
value: {x: 0.95, y: 1, z: 1}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.2
value: {x: 1, y: 1, z: 1}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
path: idol_torso/idol_Clt_body_down0
m_FloatCurves: m_FloatCurves:
- curve: - curve:
serializedVersion: 2 serializedVersion: 2
@ -1476,6 +1587,82 @@ AnimationClip:
path: idol_mike path: idol_mike
classID: 212 classID: 212
script: {fileID: 0} script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Color.a
path: idol_torso/idol_Clt_body_down0
classID: 212
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Color.a
path: idol_torso/idol_Clt_body_up
classID: 212
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_SortingOrder
path: idol_torso/idol_Clt_body_up
classID: 212
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_SortingOrder
path: idol_torso/idol_Clt_body_down0
classID: 212
script: {fileID: 0}
m_PPtrCurves: m_PPtrCurves:
- curve: - curve:
- time: 0 - time: 0
@ -1577,6 +1764,20 @@ AnimationClip:
path: idol_torso/idol_arm_R/idol_hand_R path: idol_torso/idol_arm_R/idol_hand_R
classID: 212 classID: 212
script: {fileID: 0} script: {fileID: 0}
- curve:
- time: 0
value: {fileID: 0}
attribute: m_Sprite
path: idol_torso
classID: 212
script: {fileID: 0}
- curve:
- time: 0
value: {fileID: 6636417687825593121, guid: 3ceb27c8c676e7a428cf6e15cd11b7ef, type: 3}
attribute: m_Sprite
path: idol_torso/idol_Clt_body_down0
classID: 212
script: {fileID: 0}
m_SampleRate: 60 m_SampleRate: 60
m_WrapMode: 0 m_WrapMode: 0
m_Bounds: m_Bounds:
@ -1668,6 +1869,13 @@ AnimationClip:
typeID: 4 typeID: 4
customType: 0 customType: 0
isPPtrCurve: 0 isPPtrCurve: 0
- serializedVersion: 2
path: 759741572
attribute: 1
script: {fileID: 0}
typeID: 4
customType: 0
isPPtrCurve: 0
- serializedVersion: 2 - serializedVersion: 2
path: 2085883815 path: 2085883815
attribute: 4 attribute: 4
@ -1745,6 +1953,13 @@ AnimationClip:
typeID: 4 typeID: 4
customType: 0 customType: 0
isPPtrCurve: 0 isPPtrCurve: 0
- serializedVersion: 2
path: 759741572
attribute: 3
script: {fileID: 0}
typeID: 4
customType: 0
isPPtrCurve: 0
- serializedVersion: 2 - serializedVersion: 2
path: 2085883815 path: 2085883815
attribute: 3762991556 attribute: 3762991556
@ -1822,6 +2037,20 @@ AnimationClip:
typeID: 212 typeID: 212
customType: 26 customType: 26
isPPtrCurve: 0 isPPtrCurve: 0
- serializedVersion: 2
path: 4260499122
attribute: 3762991556
script: {fileID: 0}
typeID: 212
customType: 26
isPPtrCurve: 0
- serializedVersion: 2
path: 759741572
attribute: 3762991556
script: {fileID: 0}
typeID: 212
customType: 26
isPPtrCurve: 0
- serializedVersion: 2 - serializedVersion: 2
path: 2085883815 path: 2085883815
attribute: 0 attribute: 0
@ -1878,6 +2107,41 @@ AnimationClip:
typeID: 212 typeID: 212
customType: 23 customType: 23
isPPtrCurve: 1 isPPtrCurve: 1
- serializedVersion: 2
path: 2526016088
attribute: 0
script: {fileID: 0}
typeID: 212
customType: 23
isPPtrCurve: 1
- serializedVersion: 2
path: 759741572
attribute: 0
script: {fileID: 0}
typeID: 212
customType: 23
isPPtrCurve: 1
- serializedVersion: 2
path: 4260499122
attribute: 1
script: {fileID: 0}
typeID: 4
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 759741572
attribute: 304273561
script: {fileID: 0}
typeID: 212
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 4260499122
attribute: 304273561
script: {fileID: 0}
typeID: 212
customType: 0
isPPtrCurve: 0
pptrCurveMapping: pptrCurveMapping:
- {fileID: 5079826356707723058, guid: 3ceb27c8c676e7a428cf6e15cd11b7ef, type: 3} - {fileID: 5079826356707723058, guid: 3ceb27c8c676e7a428cf6e15cd11b7ef, type: 3}
- {fileID: -4822148881525915573, guid: 3ceb27c8c676e7a428cf6e15cd11b7ef, type: 3} - {fileID: -4822148881525915573, guid: 3ceb27c8c676e7a428cf6e15cd11b7ef, type: 3}
@ -1909,6 +2173,8 @@ AnimationClip:
- {fileID: -2172476432286208557, guid: 3ceb27c8c676e7a428cf6e15cd11b7ef, type: 3} - {fileID: -2172476432286208557, guid: 3ceb27c8c676e7a428cf6e15cd11b7ef, type: 3}
- {fileID: 4846501274897350582, guid: 3ceb27c8c676e7a428cf6e15cd11b7ef, type: 3} - {fileID: 4846501274897350582, guid: 3ceb27c8c676e7a428cf6e15cd11b7ef, type: 3}
- {fileID: -8671314134912825154, guid: 3ceb27c8c676e7a428cf6e15cd11b7ef, type: 3} - {fileID: -8671314134912825154, guid: 3ceb27c8c676e7a428cf6e15cd11b7ef, type: 3}
- {fileID: 0}
- {fileID: 6636417687825593121, guid: 3ceb27c8c676e7a428cf6e15cd11b7ef, type: 3}
m_AnimationClipSettings: m_AnimationClipSettings:
serializedVersion: 2 serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseClip: {fileID: 0}
@ -5736,6 +6002,442 @@ AnimationClip:
path: idol_mike path: idol_mike
classID: 212 classID: 212
script: {fileID: 0} script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Color.a
path: idol_torso/idol_Clt_body_down0
classID: 212
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Color.a
path: idol_torso/idol_Clt_body_up
classID: 212
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.x
path: idol_torso/idol_Clt_body_up
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0.175
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.y
path: idol_torso/idol_Clt_body_up
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.z
path: idol_torso/idol_Clt_body_up
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.06666667
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.1
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.13333334
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.x
path: idol_torso/idol_Clt_body_down0
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: -0.27
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.06666667
value: -0.25
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.1
value: -0.24
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.13333334
value: -0.27
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.y
path: idol_torso/idol_Clt_body_down0
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.06666667
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.1
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.13333334
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.z
path: idol_torso/idol_Clt_body_down0
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_SortingOrder
path: idol_torso/idol_Clt_body_up
classID: 212
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_SortingOrder
path: idol_torso/idol_Clt_body_down0
classID: 212
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: Infinity
tangentMode: 97
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.06666667
value: 1.1
inSlope: 0.99999905
outSlope: 0.99999905
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.1
value: 1.125
inSlope: 0
outSlope: Infinity
tangentMode: 97
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.13333334
value: 0.95
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.2
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalScale.x
path: idol_torso/idol_Clt_body_down0
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: Infinity
tangentMode: 97
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.06666667
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.1
value: 1
inSlope: 0
outSlope: Infinity
tangentMode: 97
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.13333334
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.2
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalScale.y
path: idol_torso/idol_Clt_body_down0
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: Infinity
tangentMode: 97
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.06666667
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.1
value: 1
inSlope: 0
outSlope: Infinity
tangentMode: 97
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.13333334
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.2
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalScale.z
path: idol_torso/idol_Clt_body_down0
classID: 4
script: {fileID: 0}
m_EulerEditorCurves: m_EulerEditorCurves:
- curve: - curve:
serializedVersion: 2 serializedVersion: 2

View file

@ -658,7 +658,7 @@ AnimationClip:
m_Curve: m_Curve:
- serializedVersion: 3 - serializedVersion: 3
time: 0 time: 0
value: {x: 0, y: -0.01, z: 0} value: {x: 0, y: 0.04, z: 0}
inSlope: {x: Infinity, y: Infinity, z: Infinity} inSlope: {x: Infinity, y: Infinity, z: Infinity}
outSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity}
tangentMode: 0 tangentMode: 0
@ -1141,7 +1141,7 @@ AnimationClip:
m_Curve: m_Curve:
- serializedVersion: 3 - serializedVersion: 3
time: 0 time: 0
value: 1 value: 0.5176471
inSlope: Infinity inSlope: Infinity
outSlope: Infinity outSlope: Infinity
tangentMode: 103 tangentMode: 103
@ -1160,7 +1160,7 @@ AnimationClip:
m_Curve: m_Curve:
- serializedVersion: 3 - serializedVersion: 3
time: 0 time: 0
value: 1 value: 0.5019608
inSlope: Infinity inSlope: Infinity
outSlope: Infinity outSlope: Infinity
tangentMode: 103 tangentMode: 103
@ -1179,7 +1179,7 @@ AnimationClip:
m_Curve: m_Curve:
- serializedVersion: 3 - serializedVersion: 3
time: 0 time: 0
value: 1 value: 0.39215687
inSlope: Infinity inSlope: Infinity
outSlope: Infinity outSlope: Infinity
tangentMode: 103 tangentMode: 103
@ -4069,7 +4069,7 @@ AnimationClip:
m_Curve: m_Curve:
- serializedVersion: 3 - serializedVersion: 3
time: 0 time: 0
value: 1 value: 0.5176471
inSlope: Infinity inSlope: Infinity
outSlope: Infinity outSlope: Infinity
tangentMode: 103 tangentMode: 103
@ -4088,7 +4088,7 @@ AnimationClip:
m_Curve: m_Curve:
- serializedVersion: 3 - serializedVersion: 3
time: 0 time: 0
value: 1 value: 0.5019608
inSlope: Infinity inSlope: Infinity
outSlope: Infinity outSlope: Infinity
tangentMode: 103 tangentMode: 103
@ -4107,7 +4107,7 @@ AnimationClip:
m_Curve: m_Curve:
- serializedVersion: 3 - serializedVersion: 3
time: 0 time: 0
value: 1 value: 0.39215687
inSlope: Infinity inSlope: Infinity
outSlope: Infinity outSlope: Infinity
tangentMode: 103 tangentMode: 103
@ -4401,7 +4401,7 @@ AnimationClip:
m_Curve: m_Curve:
- serializedVersion: 3 - serializedVersion: 3
time: 0 time: 0
value: -0.01 value: 0.04
inSlope: Infinity inSlope: Infinity
outSlope: Infinity outSlope: Infinity
tangentMode: 103 tangentMode: 103

Binary file not shown.

Before

Width:  |  Height:  |  Size: 154 KiB

After

Width:  |  Height:  |  Size: 8.3 MiB

View file

@ -76,9 +76,9 @@ TextureImporter:
spriteMeshType: 1 spriteMeshType: 1
alignment: 0 alignment: 0
spritePivot: {x: 0.5, y: 0.5} spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100 spritePixelsToUnits: 500
spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1 spriteGenerateFallbackPhysicsShape: 0
alphaUsage: 1 alphaUsage: 1
alphaIsTransparency: 1 alphaIsTransparency: 1
spriteTessellationDetail: -1 spriteTessellationDetail: -1
@ -95,7 +95,7 @@ TextureImporter:
platformSettings: platformSettings:
- serializedVersion: 3 - serializedVersion: 3
buildTarget: DefaultTexturePlatform buildTarget: DefaultTexturePlatform
maxTextureSize: 2048 maxTextureSize: 4096
resizeAlgorithm: 0 resizeAlgorithm: 0
textureFormat: -1 textureFormat: -1
textureCompression: 1 textureCompression: 1
@ -107,7 +107,7 @@ TextureImporter:
forceMaximumCompressionQuality_BC6H_BC7: 0 forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3 - serializedVersion: 3
buildTarget: Standalone buildTarget: Standalone
maxTextureSize: 2048 maxTextureSize: 4096
resizeAlgorithm: 0 resizeAlgorithm: 0
textureFormat: -1 textureFormat: -1
textureCompression: 1 textureCompression: 1
@ -124,16 +124,16 @@ TextureImporter:
name: ntrIdol_BG_stage name: ntrIdol_BG_stage
rect: rect:
serializedVersion: 2 serializedVersion: 2
x: 37 x: 185
y: 734 y: 8790
width: 627 width: 3135
height: 245 height: 1225
alignment: 0 alignment: 0
pivot: {x: 0.5, y: 0.5} pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0} border: {x: 0, y: 0, z: 0, w: 0}
outline: [] outline: []
physicsShape: [] physicsShape: []
tessellationDetail: 0 tessellationDetail: -1
bones: [] bones: []
spriteID: 9a85ba7d656485e30800000000000000 spriteID: 9a85ba7d656485e30800000000000000
internalID: 4492417967101532329 internalID: 4492417967101532329
@ -145,16 +145,16 @@ TextureImporter:
name: ntrIdol_BG_stageSteps name: ntrIdol_BG_stageSteps
rect: rect:
serializedVersion: 2 serializedVersion: 2
x: 23 x: 115
y: 474 y: 7490
width: 179 width: 895
height: 189 height: 945
alignment: 0 alignment: 0
pivot: {x: 0.5, y: 0.5} pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0} border: {x: 0, y: 0, z: 0, w: 0}
outline: [] outline: []
physicsShape: [] physicsShape: []
tessellationDetail: 0 tessellationDetail: -1
bones: [] bones: []
spriteID: 366757146833bbe90800000000000000 spriteID: 366757146833bbe90800000000000000
internalID: -7008951743355193757 internalID: -7008951743355193757
@ -166,16 +166,16 @@ TextureImporter:
name: ntrIdol_BG_sky name: ntrIdol_BG_sky
rect: rect:
serializedVersion: 2 serializedVersion: 2
x: 1412 x: 7060
y: 369 y: 6965
width: 40 width: 200
height: 623 height: 3115
alignment: 0 alignment: 0
pivot: {x: 0.5, y: 0.5} pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0} border: {x: 0, y: 0, z: 0, w: 0}
outline: [] outline: []
physicsShape: [] physicsShape: []
tessellationDetail: 0 tessellationDetail: -1
bones: [] bones: []
spriteID: d28c0980adf711500800000000000000 spriteID: d28c0980adf711500800000000000000
internalID: 365213619217025069 internalID: 365213619217025069
@ -187,16 +187,16 @@ TextureImporter:
name: ntrIdol_BG_kanaami00 name: ntrIdol_BG_kanaami00
rect: rect:
serializedVersion: 2 serializedVersion: 2
x: 967 x: 4835
y: 570 y: 7970
width: 341 width: 1705
height: 93 height: 465
alignment: 0 alignment: 0
pivot: {x: 0.5, y: 0.5} pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0} border: {x: 0, y: 0, z: 0, w: 0}
outline: [] outline: []
physicsShape: [] physicsShape: []
tessellationDetail: 0 tessellationDetail: -1
bones: [] bones: []
spriteID: c720ece4a4e5ef5d0800000000000000 spriteID: c720ece4a4e5ef5d0800000000000000
internalID: -3026878226303679876 internalID: -3026878226303679876
@ -208,16 +208,16 @@ TextureImporter:
name: ntrIdol_BG_kanaami01 name: ntrIdol_BG_kanaami01
rect: rect:
serializedVersion: 2 serializedVersion: 2
x: 491 x: 2455
y: 600 y: 8120
width: 429 width: 2176
height: 65 height: 325
alignment: 0 alignment: 0
pivot: {x: 0.5, y: 0.5} pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0} border: {x: 0, y: 0, z: 0, w: 0}
outline: [] outline: []
physicsShape: [] physicsShape: []
tessellationDetail: 0 tessellationDetail: -1
bones: [] bones: []
spriteID: b968614ccb70ab0a0800000000000000 spriteID: b968614ccb70ab0a0800000000000000
internalID: -6865166174647843173 internalID: -6865166174647843173
@ -229,16 +229,16 @@ TextureImporter:
name: ntrIdol_BG_lights name: ntrIdol_BG_lights
rect: rect:
serializedVersion: 2 serializedVersion: 2
x: 247 x: 1235
y: 582 y: 8030
width: 197 width: 985
height: 85 height: 425
alignment: 0 alignment: 0
pivot: {x: 0.5, y: 0.5} pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0} border: {x: 0, y: 0, z: 0, w: 0}
outline: [] outline: []
physicsShape: [] physicsShape: []
tessellationDetail: 0 tessellationDetail: -1
bones: [] bones: []
spriteID: 340bcf8adc5128d80800000000000000 spriteID: 340bcf8adc5128d80800000000000000
internalID: -8250007594341715901 internalID: -8250007594341715901
@ -250,16 +250,16 @@ TextureImporter:
name: ntrIdol_BG_lightRay name: ntrIdol_BG_lightRay
rect: rect:
serializedVersion: 2 serializedVersion: 2
x: 241 x: 1205
y: 518 y: 7710
width: 545 width: 2725
height: 21 height: 105
alignment: 0 alignment: 0
pivot: {x: 0.5, y: 0.5} pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0} border: {x: 0, y: 0, z: 0, w: 0}
outline: [] outline: []
physicsShape: [] physicsShape: []
tessellationDetail: 0 tessellationDetail: -1
bones: [] bones: []
spriteID: a58e78476111a9880800000000000000 spriteID: a58e78476111a9880800000000000000
internalID: -8603545349995894694 internalID: -8603545349995894694
@ -271,16 +271,16 @@ TextureImporter:
name: ntrIdol_BG_spot name: ntrIdol_BG_spot
rect: rect:
serializedVersion: 2 serializedVersion: 2
x: 239 x: 1195
y: 242 y: 6341
width: 545 width: 2719
height: 237 height: 1173
alignment: 0 alignment: 0
pivot: {x: 0.5, y: 0.5} pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0} border: {x: 0, y: 0, z: 0, w: 0}
outline: [] outline: []
physicsShape: [] physicsShape: []
tessellationDetail: 0 tessellationDetail: -1
bones: [] bones: []
spriteID: e6a4bb3a8b10e63b0800000000000000 spriteID: e6a4bb3a8b10e63b0800000000000000
internalID: -5517470600949708178 internalID: -5517470600949708178
@ -292,16 +292,16 @@ TextureImporter:
name: ntrIdol_BG_spotDrop name: ntrIdol_BG_spotDrop
rect: rect:
serializedVersion: 2 serializedVersion: 2
x: 817 x: 4085
y: 356 y: 6906
width: 237 width: 1161
height: 121 height: 598
alignment: 0 alignment: 0
pivot: {x: 0.5, y: 0.5} pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0} border: {x: 0, y: 0, z: 0, w: 0}
outline: [] outline: []
physicsShape: [] physicsShape: []
tessellationDetail: 0 tessellationDetail: -1
bones: [] bones: []
spriteID: 49a99cb9bc02464a0800000000000000 spriteID: 49a99cb9bc02464a0800000000000000
internalID: -6601115094954173804 internalID: -6601115094954173804
@ -313,16 +313,16 @@ TextureImporter:
name: ntrIdol_BG_lightsGlow name: ntrIdol_BG_lightsGlow
rect: rect:
serializedVersion: 2 serializedVersion: 2
x: 1095 x: 5475
y: 370 y: 6970
width: 225 width: 1125
height: 103 height: 515
alignment: 0 alignment: 0
pivot: {x: 0.5, y: 0.5} pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0} border: {x: 0, y: 0, z: 0, w: 0}
outline: [] outline: []
physicsShape: [] physicsShape: []
tessellationDetail: 0 tessellationDetail: -1
bones: [] bones: []
spriteID: 614c993c3405ca550800000000000000 spriteID: 614c993c3405ca550800000000000000
internalID: 6173397441192772630 internalID: 6173397441192772630

Binary file not shown.

Before

Width:  |  Height:  |  Size: 604 KiB

After

Width:  |  Height:  |  Size: 1.3 MiB

View file

@ -0,0 +1,148 @@
%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: ObjMelonPickel
serializedVersion: 6
m_Legacy: 0
m_Compressed: 0
m_UseHighQualityCurve: 1
m_RotationCurves: []
m_CompressedRotationCurves: []
m_EulerCurves: []
m_PositionCurves: []
m_ScaleCurves:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: {x: 0.9, y: 0.9, z: 0.9}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0, y: 0.33333334, z: 0.33333334}
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
path:
m_FloatCurves: []
m_PPtrCurves:
- curve:
- time: 0
value: {fileID: 8668004041853910469, guid: 410272bf8a685fe4caa52d69b027a25e, type: 3}
attribute: m_Sprite
path:
classID: 212
script: {fileID: 0}
m_SampleRate: 60
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
- serializedVersion: 2
path: 0
attribute: 3
script: {fileID: 0}
typeID: 4
customType: 0
isPPtrCurve: 0
pptrCurveMapping:
- {fileID: 8668004041853910469, guid: 410272bf8a685fe4caa52d69b027a25e, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 0.016666668
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:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0.9
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalScale.x
path:
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0.9
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalScale.y
path:
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0.9
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalScale.z
path:
classID: 4
script: {fileID: 0}
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_Events: []

View file

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: b81c9d45bbe705b4d90cab4c6cdf173a
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:

View file

@ -0,0 +1,148 @@
%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: ObjMelonPickelDebris01
serializedVersion: 6
m_Legacy: 0
m_Compressed: 0
m_UseHighQualityCurve: 1
m_RotationCurves: []
m_CompressedRotationCurves: []
m_EulerCurves: []
m_PositionCurves: []
m_ScaleCurves:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: {x: 1, y: 1, z: 1}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0, y: 0.33333334, z: 0.33333334}
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
path:
m_FloatCurves: []
m_PPtrCurves:
- curve:
- time: 0
value: {fileID: 3194603433930847069, guid: 410272bf8a685fe4caa52d69b027a25e, type: 3}
attribute: m_Sprite
path:
classID: 212
script: {fileID: 0}
m_SampleRate: 60
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
- serializedVersion: 2
path: 0
attribute: 3
script: {fileID: 0}
typeID: 4
customType: 0
isPPtrCurve: 0
pptrCurveMapping:
- {fileID: 3194603433930847069, guid: 410272bf8a685fe4caa52d69b027a25e, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 0.016666668
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:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalScale.x
path:
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalScale.y
path:
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalScale.z
path:
classID: 4
script: {fileID: 0}
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_Events: []

View file

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: ed14eed3fbee6f44a8ba88c0ad913f8a
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:

View file

@ -0,0 +1,193 @@
%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: ObjMelonPickelDebris02
serializedVersion: 6
m_Legacy: 0
m_Compressed: 0
m_UseHighQualityCurve: 1
m_RotationCurves: []
m_CompressedRotationCurves: []
m_EulerCurves: []
m_PositionCurves: []
m_ScaleCurves:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: {x: 1, y: 1, z: 1}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0, y: 0.33333334, z: 0.33333334}
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
path:
m_FloatCurves:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_FlipX
path:
classID: 212
script: {fileID: 0}
m_PPtrCurves:
- curve:
- time: 0
value: {fileID: 3194603433930847069, guid: 410272bf8a685fe4caa52d69b027a25e, type: 3}
attribute: m_Sprite
path:
classID: 212
script: {fileID: 0}
m_SampleRate: 60
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: 555744692
script: {fileID: 0}
typeID: 212
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 0
script: {fileID: 0}
typeID: 212
customType: 23
isPPtrCurve: 1
- serializedVersion: 2
path: 0
attribute: 3
script: {fileID: 0}
typeID: 4
customType: 0
isPPtrCurve: 0
pptrCurveMapping:
- {fileID: 3194603433930847069, guid: 410272bf8a685fe4caa52d69b027a25e, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 0.016666668
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:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalScale.x
path:
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalScale.y
path:
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalScale.z
path:
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_FlipX
path:
classID: 212
script: {fileID: 0}
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_Events: []

View file

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: c8bd3301e6b9ae1418c9b2cc4e2c1b21
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:

View file

@ -1,5 +1,31 @@
%YAML 1.1 %YAML 1.1
%TAG !u! tag:unity3d.com,2011: %TAG !u! tag:unity3d.com,2011:
--- !u!1102 &-5119831288297818761
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: ObjMelonPickelDebris02
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: c8bd3301e6b9ae1418c9b2cc4e2c1b21, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1107 &-2746350847239184753 --- !u!1107 &-2746350847239184753
AnimatorStateMachine: AnimatorStateMachine:
serializedVersion: 6 serializedVersion: 6
@ -30,6 +56,15 @@ AnimatorStateMachine:
- serializedVersion: 1 - serializedVersion: 1
m_State: {fileID: 3295517830899510391} m_State: {fileID: 3295517830899510391}
m_Position: {x: 380, y: 490, z: 0} m_Position: {x: 380, y: 490, z: 0}
- serializedVersion: 1
m_State: {fileID: 1584009769318980435}
m_Position: {x: 415, y: 555, z: 0}
- serializedVersion: 1
m_State: {fileID: 9154971635799109909}
m_Position: {x: 450, y: 620, z: 0}
- serializedVersion: 1
m_State: {fileID: -5119831288297818761}
m_Position: {x: 485, y: 685, z: 0}
m_ChildStateMachines: [] m_ChildStateMachines: []
m_AnyStateTransitions: [] m_AnyStateTransitions: []
m_EntryTransitions: [] m_EntryTransitions: []
@ -114,6 +149,32 @@ AnimatorController:
m_IKPass: 0 m_IKPass: 0
m_SyncedLayerAffectsTiming: 0 m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000} m_Controller: {fileID: 9100000}
--- !u!1102 &1584009769318980435
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: ObjMelonPickel
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: b81c9d45bbe705b4d90cab4c6cdf173a, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &1602656684352213228 --- !u!1102 &1602656684352213228
AnimatorState: AnimatorState:
serializedVersion: 6 serializedVersion: 6
@ -244,3 +305,29 @@ AnimatorState:
m_MirrorParameter: m_MirrorParameter:
m_CycleOffsetParameter: m_CycleOffsetParameter:
m_TimeParameter: m_TimeParameter:
--- !u!1102 &9154971635799109909
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: ObjMelonPickelDebris01
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: ed14eed3fbee6f44a8ba88c0ad913f8a, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:

View file

@ -48,6 +48,32 @@ AnimatorState:
m_MirrorParameter: m_MirrorParameter:
m_CycleOffsetParameter: m_CycleOffsetParameter:
m_TimeParameter: m_TimeParameter:
--- !u!1102 &-2793958347424135821
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Unstep
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: 5157805c6c6b3e54ca60c1fbddbf317f, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!91 &9100000 --- !u!91 &9100000
AnimatorController: AnimatorController:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -121,6 +147,9 @@ AnimatorStateMachine:
- serializedVersion: 1 - serializedVersion: 1
m_State: {fileID: -5563777372090574972} m_State: {fileID: -5563777372090574972}
m_Position: {x: 300, y: 290, z: 0} m_Position: {x: 300, y: 290, z: 0}
- serializedVersion: 1
m_State: {fileID: -2793958347424135821}
m_Position: {x: 335, y: 355, z: 0}
m_ChildStateMachines: [] m_ChildStateMachines: []
m_AnyStateTransitions: [] m_AnyStateTransitions: []
m_EntryTransitions: [] m_EntryTransitions: []

File diff suppressed because it is too large Load diff

View file

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 5157805c6c6b3e54ca60c1fbddbf317f
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

Before

Width:  |  Height:  |  Size: 253 KiB

After

Width:  |  Height:  |  Size: 739 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 162 KiB

After

Width:  |  Height:  |  Size: 168 KiB

View file

@ -77,6 +77,9 @@ TextureImporter:
- first: - first:
213: -3985528753034488826 213: -3985528753034488826
second: sword02 second: sword02
- first:
213: 4203110707174598171
second: legR02
externalObjects: {} externalObjects: {}
serializedVersion: 11 serializedVersion: 11
mipmaps: mipmaps:
@ -123,7 +126,7 @@ TextureImporter:
spritePivot: {x: 0.5, y: 0.5} spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100 spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1 spriteGenerateFallbackPhysicsShape: 0
alphaUsage: 1 alphaUsage: 1
alphaIsTransparency: 1 alphaIsTransparency: 1
spriteTessellationDetail: -1 spriteTessellationDetail: -1
@ -169,8 +172,8 @@ TextureImporter:
name: head00 name: head00
rect: rect:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 9
y: 2294 y: 2291
width: 128 width: 128
height: 126 height: 126
alignment: 0 alignment: 0
@ -190,7 +193,7 @@ TextureImporter:
name: head01 name: head01
rect: rect:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 19
y: 2087 y: 2087
width: 84 width: 84
height: 149 height: 149
@ -211,7 +214,7 @@ TextureImporter:
name: head02 name: head02
rect: rect:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 15
y: 1902 y: 1902
width: 128 width: 128
height: 127 height: 127
@ -337,8 +340,8 @@ TextureImporter:
name: attatch name: attatch
rect: rect:
serializedVersion: 2 serializedVersion: 2
x: 287 x: 307
y: 1376 y: 945
width: 73 width: 73
height: 50 height: 50
alignment: 0 alignment: 0
@ -547,9 +550,9 @@ TextureImporter:
name: sword00 name: sword00
rect: rect:
serializedVersion: 2 serializedVersion: 2
x: 1294 x: 1329
y: 1097 y: 1095
width: 477 width: 475
height: 241 height: 241
alignment: 0 alignment: 0
pivot: {x: 0.5, y: 0.5} pivot: {x: 0.5, y: 0.5}
@ -568,10 +571,10 @@ TextureImporter:
name: sword01 name: sword01
rect: rect:
serializedVersion: 2 serializedVersion: 2
x: 693 x: 727
y: 1097 y: 1097
width: 486 width: 485
height: 358 height: 356
alignment: 0 alignment: 0
pivot: {x: 0.5, y: 0.5} pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0} border: {x: 0, y: 0, z: 0, w: 0}
@ -611,7 +614,7 @@ TextureImporter:
rect: rect:
serializedVersion: 2 serializedVersion: 2
x: 755 x: 755
y: 2230 y: 2210
width: 326 width: 326
height: 190 height: 190
alignment: 0 alignment: 0
@ -690,6 +693,27 @@ TextureImporter:
indices: indices:
edges: [] edges: []
weights: [] weights: []
- serializedVersion: 2
name: legR02
rect:
serializedVersion: 2
x: 329
y: 1194
width: 229
height: 219
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: b1668cc4be2745a30800000000000000
internalID: 4203110707174598171
vertices: []
indices:
edges: []
weights: []
outline: [] outline: []
physicsShape: [] physicsShape: []
bones: [] bones: []

Binary file not shown.

Before

Width:  |  Height:  |  Size: 116 KiB

After

Width:  |  Height:  |  Size: 149 KiB

View file

@ -105,7 +105,7 @@ TextureImporter:
spritePivot: {x: 0.5, y: 0.5} spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100 spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1 spriteGenerateFallbackPhysicsShape: 0
alphaUsage: 1 alphaUsage: 1
alphaIsTransparency: 1 alphaIsTransparency: 1
spriteTessellationDetail: -1 spriteTessellationDetail: -1
@ -151,10 +151,10 @@ TextureImporter:
name: obj_00 name: obj_00
rect: rect:
serializedVersion: 2 serializedVersion: 2
x: 514 x: 528
y: 606 y: 609
width: 175 width: 153
height: 161 height: 153
alignment: 0 alignment: 0
pivot: {x: 0.5, y: 0.5} pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0} border: {x: 0, y: 0, z: 0, w: 0}
@ -172,10 +172,10 @@ TextureImporter:
name: obj_01 name: obj_01
rect: rect:
serializedVersion: 2 serializedVersion: 2
x: 777 x: 796
y: 606 y: 606
width: 175 width: 153
height: 161 height: 153
alignment: 0 alignment: 0
pivot: {x: 0.5, y: 0.5} pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0} border: {x: 0, y: 0, z: 0, w: 0}
@ -193,10 +193,10 @@ TextureImporter:
name: obj_10 name: obj_10
rect: rect:
serializedVersion: 2 serializedVersion: 2
x: 382 x: 383
y: 307 y: 314
width: 260 width: 259
height: 219 height: 220
alignment: 0 alignment: 0
pivot: {x: 0.5, y: 0.5} pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0} border: {x: 0, y: 0, z: 0, w: 0}
@ -214,10 +214,10 @@ TextureImporter:
name: obj_11 name: obj_11
rect: rect:
serializedVersion: 2 serializedVersion: 2
x: 729 x: 730
y: 307 y: 314
width: 249 width: 248
height: 219 height: 220
alignment: 0 alignment: 0
pivot: {x: 0.5, y: 0.5} pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0} border: {x: 0, y: 0, z: 0, w: 0}
@ -340,10 +340,10 @@ TextureImporter:
name: obj_12 name: obj_12
rect: rect:
serializedVersion: 2 serializedVersion: 2
x: 382 x: 522
y: 26 y: 98
width: 259 width: 91
height: 219 height: 78
alignment: 0 alignment: 0
pivot: {x: 0.5, y: 0.5} pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0} border: {x: 0, y: 0, z: 0, w: 0}
@ -361,10 +361,10 @@ TextureImporter:
name: obj_13 name: obj_13
rect: rect:
serializedVersion: 2 serializedVersion: 2
x: 719 x: 760
y: 24 y: 48
width: 259 width: 161
height: 219 height: 179
alignment: 0 alignment: 0
pivot: {x: 0.5, y: 0.5} pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0} border: {x: 0, y: 0, z: 0, w: 0}

View file

@ -1401,11 +1401,13 @@ AnimationClip:
script: {fileID: 0} script: {fileID: 0}
- curve: - curve:
- time: 0 - time: 0
value: {fileID: 5779691927641761196, guid: 62713d17eb1e1404bbafeb45c8b4b5b8, type: 3} value: {fileID: 8686924115327304628, guid: 62713d17eb1e1404bbafeb45c8b4b5b8, type: 3}
- time: 0.05 - time: 0.05
value: {fileID: 3882487003558339588, guid: 62713d17eb1e1404bbafeb45c8b4b5b8, type: 3} value: {fileID: 8686924115327304628, guid: 62713d17eb1e1404bbafeb45c8b4b5b8, type: 3}
- time: 0.1
value: {fileID: 1086597860007614453, guid: 62713d17eb1e1404bbafeb45c8b4b5b8, type: 3}
- time: 0.15 - time: 0.15
value: {fileID: 3882487003558339588, guid: 62713d17eb1e1404bbafeb45c8b4b5b8, type: 3} value: {fileID: 1086597860007614453, guid: 62713d17eb1e1404bbafeb45c8b4b5b8, type: 3}
attribute: m_Sprite attribute: m_Sprite
path: Head path: Head
classID: 212 classID: 212
@ -1955,9 +1957,10 @@ AnimationClip:
- {fileID: 5850673630285665839, guid: 62713d17eb1e1404bbafeb45c8b4b5b8, type: 3} - {fileID: 5850673630285665839, guid: 62713d17eb1e1404bbafeb45c8b4b5b8, type: 3}
- {fileID: 2848929583589385298, guid: 62713d17eb1e1404bbafeb45c8b4b5b8, type: 3} - {fileID: 2848929583589385298, guid: 62713d17eb1e1404bbafeb45c8b4b5b8, type: 3}
- {fileID: -9219228821748572251, guid: 62713d17eb1e1404bbafeb45c8b4b5b8, type: 3} - {fileID: -9219228821748572251, guid: 62713d17eb1e1404bbafeb45c8b4b5b8, type: 3}
- {fileID: 5779691927641761196, guid: 62713d17eb1e1404bbafeb45c8b4b5b8, type: 3} - {fileID: 8686924115327304628, guid: 62713d17eb1e1404bbafeb45c8b4b5b8, type: 3}
- {fileID: 3882487003558339588, guid: 62713d17eb1e1404bbafeb45c8b4b5b8, type: 3} - {fileID: 8686924115327304628, guid: 62713d17eb1e1404bbafeb45c8b4b5b8, type: 3}
- {fileID: 3882487003558339588, guid: 62713d17eb1e1404bbafeb45c8b4b5b8, type: 3} - {fileID: 1086597860007614453, guid: 62713d17eb1e1404bbafeb45c8b4b5b8, type: 3}
- {fileID: 1086597860007614453, guid: 62713d17eb1e1404bbafeb45c8b4b5b8, type: 3}
- {fileID: -7448459852879131668, guid: 62713d17eb1e1404bbafeb45c8b4b5b8, type: 3} - {fileID: -7448459852879131668, guid: 62713d17eb1e1404bbafeb45c8b4b5b8, type: 3}
- {fileID: 6653196610736110185, guid: 62713d17eb1e1404bbafeb45c8b4b5b8, type: 3} - {fileID: 6653196610736110185, guid: 62713d17eb1e1404bbafeb45c8b4b5b8, type: 3}
- {fileID: 925825240639634137, guid: 62713d17eb1e1404bbafeb45c8b4b5b8, type: 3} - {fileID: 925825240639634137, guid: 62713d17eb1e1404bbafeb45c8b4b5b8, type: 3}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 395 KiB

After

Width:  |  Height:  |  Size: 1 MiB

View file

@ -7634,8 +7634,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 602.5, y: -3164.16} m_AnchoredPosition: {x: 602.5, y: -3382.16}
m_SizeDelta: {x: 1165, y: 64} m_SizeDelta: {x: 1165, y: 100}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &344042805 --- !u!222 &344042805
CanvasRenderer: CanvasRenderer:
@ -19238,8 +19238,8 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 1589389272} m_TargetGraphic: {fileID: 1589389272}
m_HandleRect: {fileID: 1589389271} m_HandleRect: {fileID: 1589389271}
m_Direction: 2 m_Direction: 2
m_Value: 1 m_Value: 0
m_Size: 0.9972352 m_Size: 1
m_NumberOfSteps: 0 m_NumberOfSteps: 0
m_OnValueChanged: m_OnValueChanged:
m_PersistentCalls: m_PersistentCalls:
@ -24820,7 +24820,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5} m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: 0, y: 129.91093} m_AnchoredPosition: {x: 0, y: 129.9111}
m_SizeDelta: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 1} m_Pivot: {x: 0.5, y: 1}
--- !u!114 &1154875944 --- !u!114 &1154875944
@ -28006,7 +28006,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0.000026703} m_AnchoredPosition: {x: 0, y: 0.000026703}
m_SizeDelta: {x: 64, y: 64} m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1294339011 --- !u!114 &1294339011
MonoBehaviour: MonoBehaviour:
@ -35580,9 +35580,9 @@ MonoBehaviour:
m_PersistentCalls: m_PersistentCalls:
m_Calls: m_Calls:
- m_Target: {fileID: 1423699437} - m_Target: {fileID: 1423699437}
m_TargetAssemblyTypeName: RhythmHeavenMania.Editor.Editor, Assembly-CSharp m_TargetAssemblyTypeName: HeavenStudio.Editor.Editor, Assembly-CSharp
m_MethodName: LoadRemix m_MethodName: NewRemix
m_Mode: 5 m_Mode: 1
m_Arguments: m_Arguments:
m_ObjectArgument: {fileID: 0} m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
@ -40746,7 +40746,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0.000026703} m_AnchoredPosition: {x: 0, y: 0.000026703}
m_SizeDelta: {x: 64, y: 64} m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1973314442 --- !u!114 &1973314442
MonoBehaviour: MonoBehaviour:
@ -40768,7 +40768,7 @@ MonoBehaviour:
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_Sprite: {fileID: 3882487003558339588, guid: 62713d17eb1e1404bbafeb45c8b4b5b8, type: 3} m_Sprite: {fileID: 6703875778577109625, guid: 62713d17eb1e1404bbafeb45c8b4b5b8, type: 3}
m_Type: 0 m_Type: 0
m_PreserveAspect: 1 m_PreserveAspect: 1
m_FillCenter: 1 m_FillCenter: 1

View file

@ -148,8 +148,8 @@ namespace HeavenStudio
EasingFunction.Function func = EasingFunction.GetEasingFunction(e.ease); EasingFunction.Function func = EasingFunction.GetEasingFunction(e.ease);
float dx = func(rotEluerLast.x, e.valA, Mathf.Min(prog, 1f)); float dx = func(rotEluerLast.x, e.valA, Mathf.Min(prog, 1f));
float dy = func(rotEluerLast.y, e.valB, Mathf.Min(prog, 1f)); float dy = func(rotEluerLast.y, e.valB, Mathf.Min(prog, 1f));
float dz = func(rotEluerLast.z, e.valC, Mathf.Min(prog, 1f)); float dz = func(-rotEluerLast.z, e.valC, Mathf.Min(prog, 1f));
rotEluer = new Vector3(dx, dy, dz); rotEluer = new Vector3(dx, dy, dz); //I'm stupid and forgot to negate the rotation gfd 😢
} }
if (prog > 1f) if (prog > 1f)
@ -159,7 +159,6 @@ namespace HeavenStudio
} }
} }
//scren shake spaghetti
private void SetShakeIntensity() private void SetShakeIntensity()
{ {
foreach (var e in shakeEvents) foreach (var e in shakeEvents)
@ -167,11 +166,8 @@ namespace HeavenStudio
float prog = Conductor.instance.GetPositionFromBeat(e.beat, e.length); float prog = Conductor.instance.GetPositionFromBeat(e.beat, e.length);
if (prog >= 0f) if (prog >= 0f)
{ {
EasingFunction.Function func = EasingFunction.GetEasingFunction(e.ease); float fac = Mathf.Cos(Time.time * 80f) * 0.5f;
float dx = func(positionLast.x, e.valA, Mathf.Min(prog, 1f)); shakeResult = new Vector3(fac * e.valA, fac * e.valB);
float dy = func(positionLast.y, e.valA, Mathf.Min(prog, 1f));
shakeResult = new Vector3(Mathf.Cos(dx * e.length * 20f) * (e.valA / 2), Mathf.Cos(dy * e.length * 30f) * (e.valA / 2));
} }
if (prog > 1f) if (prog > 1f)
{ {

View file

@ -151,7 +151,7 @@ namespace HeavenStudio.Games
public static FanClub instance; public static FanClub instance;
const int FAN_COUNT = 12; const int FAN_COUNT = 12;
const float RADIUS = 1.3f; const float RADIUS = 1.5f;
private void Awake() private void Awake()
{ {
instance = this; instance = this;
@ -732,7 +732,7 @@ namespace HeavenStudio.Games
{ {
if (Spectators[i].GetComponent<NtrIdolFan>().IsJumping()) if (Spectators[i].GetComponent<NtrIdolFan>().IsJumping())
continue; continue;
Spectators[i].GetComponent<Animator>().Play("FanPrepare"); Spectators[i].GetComponent<Animator>().Play("FanPrepare", -1, 0);
} }
} }
@ -741,7 +741,7 @@ namespace HeavenStudio.Games
BeatAction.New(this.gameObject, new List<BeatAction.Action>() BeatAction.New(this.gameObject, new List<BeatAction.Action>()
{ {
new BeatAction.Action(beat, delegate { PlayAnimationAll("FanClap", true, true);}), new BeatAction.Action(beat, delegate { PlayAnimationAll("FanClap", true, true);}),
new BeatAction.Action(beat + 0.25f, delegate { PlayAnimationAll("FanFree", true);}), new BeatAction.Action(beat + 0.1f, delegate { PlayAnimationAll("FanFree", true, true);}),
}); });
} }
@ -750,7 +750,7 @@ namespace HeavenStudio.Games
BeatAction.New(this.gameObject, new List<BeatAction.Action>() BeatAction.New(this.gameObject, new List<BeatAction.Action>()
{ {
new BeatAction.Action(beat, delegate { PlayAnimationAll("FanClap", true, true);}), new BeatAction.Action(beat, delegate { PlayAnimationAll("FanClap", true, true);}),
new BeatAction.Action(beat + 1f, delegate { PlayAnimationAll("FanFree", true);}), new BeatAction.Action(beat + 1f, delegate { PlayAnimationAll("FanFree", true, true);}),
}); });
} }

View file

@ -53,7 +53,7 @@ namespace HeavenStudio.Games.Scripts_FanClub
public void ClapJust(PlayerActionEvent caller, float state) public void ClapJust(PlayerActionEvent caller, float state)
{ {
bool auto = GameManager.instance.autoplay; bool auto = GameManager.instance.autoplay;
ClapStart(true, false, auto ? 0.25f : 0f); ClapStart(true, false, auto ? 0.1f : 0f);
} }
public void ChargeClapJust(PlayerActionEvent caller, float state) public void ChargeClapJust(PlayerActionEvent caller, float state)

View file

@ -705,14 +705,15 @@ namespace HeavenStudio.Games
if (e.beat > beat) if (e.beat > beat)
break; break;
SetBgAndShadowCol(e.beat, e.length, e.type, e.type2, e.colorA, e.colorB, e.type3); SetBgAndShadowCol(e.beat, e.length, e.type, e.type2, e.colorA, e.colorB, e.type3);
SetBgTexture(e.type4, e.type5, e.colorC, e.colorD);
} }
var bgtex = GameManager.instance.Beatmap.entities.FindAll(en => en.datamodel == "karateman/set background texture"); var camfx = GameManager.instance.Beatmap.entities.FindAll(en => en.datamodel == "karateman/special camera");
for (int i = 0; i < bgtex.Count; i++) for (int i = 0; i < camfx.Count; i++)
{ {
var e = bgtex[i]; var e = camfx[i];
if (e.beat > beat) if (e.beat > beat)
break; break;
SetBgTexture(e.type, e.type2, e.colorA, e.colorB); DoSpecialCamera(e.beat, e.length, e.toggle);
} }
// has issues when creating a new hitx entity so this is deactivated for now // has issues when creating a new hitx entity so this is deactivated for now
// var hitx = GameManager.instance.Beatmap.entities.FindAll(en => en.datamodel == "karateman/hitX"); // var hitx = GameManager.instance.Beatmap.entities.FindAll(en => en.datamodel == "karateman/hitX");
@ -756,7 +757,10 @@ namespace HeavenStudio.Games
//😢 //😢
if (fx != (int) BackgroundFXType.Fade) if (fx != (int) BackgroundFXType.Fade)
{
bgColourLast = bgColour;
oldShadowColour = GetShadowColor(true); oldShadowColour = GetShadowColor(true);
}
if (textureFilterType == (int) ShadowType.Tinted) if (textureFilterType == (int) ShadowType.Tinted)
filterColour = Color.LerpUnclamped(bgColour, ShadowBlendColor, 0.45f); filterColour = Color.LerpUnclamped(bgColour, ShadowBlendColor, 0.45f);

View file

@ -117,6 +117,7 @@ namespace HeavenStudio.Games.Scripts_KarateMan
public void DoHit() public void DoHit()
{ {
if (noriMode == (int) KarateMan.NoriMode.None) return; if (noriMode == (int) KarateMan.NoriMode.None) return;
if (MaxNori <= 0) return;
float oldNori = Nori; float oldNori = Nori;
if (noriMode == (int) KarateMan.NoriMode.Tengoku) if (noriMode == (int) KarateMan.NoriMode.Tengoku)
{ {
@ -135,7 +136,7 @@ namespace HeavenStudio.Games.Scripts_KarateMan
NoriHeartAnimators[i].Play("NoriFull", -1, (Time.time * PeriodHigh) % 1f); NoriHeartAnimators[i].Play("NoriFull", -1, (Time.time * PeriodHigh) % 1f);
} }
} }
if (KarateMan.instance.NoriPerformance >= 0.6 && oldNori / MaxNori < 0.6) if (KarateMan.instance.NoriPerformance >= 0.6f && oldNori / MaxNori < 0.6f)
{ {
Jukebox.PlayOneShotGame("karateman/nori_just"); Jukebox.PlayOneShotGame("karateman/nori_just");
} }
@ -145,6 +146,7 @@ namespace HeavenStudio.Games.Scripts_KarateMan
public void DoNG() public void DoNG()
{ {
if (noriMode == (int) KarateMan.NoriMode.None) return; if (noriMode == (int) KarateMan.NoriMode.None) return;
if (MaxNori <= 0) return;
float oldNori = Nori; float oldNori = Nori;
if (noriMode == (int) KarateMan.NoriMode.Tengoku) if (noriMode == (int) KarateMan.NoriMode.Tengoku)
{ {
@ -172,7 +174,7 @@ namespace HeavenStudio.Games.Scripts_KarateMan
} }
} }
} }
if (KarateMan.instance.NoriPerformance < 0.6 && oldNori / MaxNori >= 0.6) if (KarateMan.instance.NoriPerformance < 0.6f && oldNori / MaxNori >= 0.6f)
{ {
Jukebox.PlayOneShotGame("karateman/nori_ng"); Jukebox.PlayOneShotGame("karateman/nori_ng");
} }
@ -182,6 +184,7 @@ namespace HeavenStudio.Games.Scripts_KarateMan
public void DoThrough() public void DoThrough()
{ {
if (noriMode == (int) KarateMan.NoriMode.None) return; if (noriMode == (int) KarateMan.NoriMode.None) return;
if (MaxNori <= 0) return;
if (noriMode == (int) KarateMan.NoriMode.Tengoku) if (noriMode == (int) KarateMan.NoriMode.Tengoku)
{ {
if (Nori >= MaxNori) if (Nori >= MaxNori)
@ -219,6 +222,7 @@ namespace HeavenStudio.Games.Scripts_KarateMan
{ {
var cond = Conductor.instance; var cond = Conductor.instance;
if (noriMode == (int) KarateMan.NoriMode.None) return; if (noriMode == (int) KarateMan.NoriMode.None) return;
if (MaxNori <= 0) return;
float flashPeriod; float flashPeriod;
for (int i = 0; i < NoriHeartMaterials.Length; i++) for (int i = 0; i < NoriHeartMaterials.Length; i++)
{ {

View file

@ -287,8 +287,17 @@ namespace HeavenStudio.Games.Scripts_KarateMan
prog = cond.GetPositionFromBeat(startBeat, curveTargetBeat); prog = cond.GetPositionFromBeat(startBeat, curveTargetBeat);
transform.position = CurrentCurve.GetPoint(Mathf.Min(prog, 1f)); transform.position = CurrentCurve.GetPoint(Mathf.Min(prog, 1f));
} }
if (type == ItemType.Bomb && cond.songPositionInBeats >= startBeat + 2f)
{
ParticleSystem p = Instantiate(HitParticles[7], transform.position, Quaternion.identity, KarateMan.instance.ItemHolder);
p.Play();
if (prog >= 2f || (ItemKickable() && prog >= 1f)) { GameObject.Destroy(ShadowInstance.gameObject);
GameObject.Destroy(gameObject);
return;
}
else if (prog >= 2f || (ItemKickable() && prog >= 1f)) {
if (type == ItemType.KickBomb) if (type == ItemType.KickBomb)
{ {
ParticleSystem p = Instantiate(HitParticles[7], ItemCurves[6].GetPoint(1f), Quaternion.identity, KarateMan.instance.ItemHolder); ParticleSystem p = Instantiate(HitParticles[7], ItemCurves[6].GetPoint(1f), Quaternion.identity, KarateMan.instance.ItemHolder);
@ -347,7 +356,18 @@ namespace HeavenStudio.Games.Scripts_KarateMan
break; break;
case FlyStatus.NG: case FlyStatus.NG:
prog = cond.GetPositionFromBeat(startBeat, curveTargetBeat); prog = cond.GetPositionFromBeat(startBeat, curveTargetBeat);
if (cond.songPositionInBeats >= startBeat + Mathf.Max(2f, curveTargetBeat) || (ItemKickable() && prog >= 1f) || CurrentCurve == null) {
if (type == ItemType.Bomb && cond.songPositionInBeats >= startBeat + curveTargetBeat)
{
KarateMan.instance.Joe.RemoveBombGlow(startBeat + curveTargetBeat, 1f);
ParticleSystem p = Instantiate(HitParticles[7], CurrentCurve.GetPoint(1f), Quaternion.identity, KarateMan.instance.ItemHolder);
p.Play();
GameObject.Destroy(ShadowInstance.gameObject);
GameObject.Destroy(gameObject);
return;
}
else if (cond.songPositionInBeats >= startBeat + Mathf.Max(2f, curveTargetBeat) || (ItemKickable() && prog >= 1f) || CurrentCurve == null) {
if (type == ItemType.KickBomb) if (type == ItemType.KickBomb)
{ {
ParticleSystem p = Instantiate(HitParticles[7], ItemCurves[8].GetPoint(1f), Quaternion.identity, KarateMan.instance.ItemHolder); ParticleSystem p = Instantiate(HitParticles[7], ItemCurves[8].GetPoint(1f), Quaternion.identity, KarateMan.instance.ItemHolder);
@ -371,13 +391,25 @@ namespace HeavenStudio.Games.Scripts_KarateMan
break; break;
case FlyStatus.HitWeak: case FlyStatus.HitWeak:
prog = cond.GetPositionFromBeat(startBeat, 1f); prog = cond.GetPositionFromBeat(startBeat, 1f);
if (cond.songPositionInBeats >= startBeat + 3f)
Vector3 pos = new Vector3(HitPosition[1].position.x + 0.25f, HitPosition[0].position.y, HitPosition[1].position.z);
if (type == ItemType.Bomb && cond.songPositionInBeats >= startBeat + 1f)
{
KarateMan.instance.Joe.RemoveBombGlow(startBeat + 1f, 1f);
ParticleSystem p = Instantiate(HitParticles[7], pos, Quaternion.identity, KarateMan.instance.ItemHolder);
p.Play();
GameObject.Destroy(ShadowInstance.gameObject);
GameObject.Destroy(gameObject);
return;
}
else if (cond.songPositionInBeats >= startBeat + 3f)
{ {
GameObject.Destroy(ShadowInstance.gameObject); GameObject.Destroy(ShadowInstance.gameObject);
GameObject.Destroy(gameObject); GameObject.Destroy(gameObject);
return; return;
} }
Vector3 pos = new Vector3(HitPosition[1].position.x + 0.25f, HitPosition[0].position.y, HitPosition[1].position.z);
if (prog <= 1f) if (prog <= 1f)
{ {
pos.y = EasingFunction.EaseInCubic(HitPosition[1].position.y, HitPosition[0].position.y, prog); pos.y = EasingFunction.EaseInCubic(HitPosition[1].position.y, HitPosition[0].position.y, prog);
@ -439,6 +471,9 @@ namespace HeavenStudio.Games.Scripts_KarateMan
Jukebox.PlayOneShotGame("karateman/rockHit", forcePlay: true); Jukebox.PlayOneShotGame("karateman/rockHit", forcePlay: true);
p = Instantiate(HitParticles[4], HitPosition[1].position, Quaternion.identity, game.ItemHolder); p = Instantiate(HitParticles[4], HitPosition[1].position, Quaternion.identity, game.ItemHolder);
p.Play(); p.Play();
if (game.IsNoriActive && game.NoriPerformance >= 1f)
Jukebox.PlayOneShotGame("karateman/rockHit_fullNori", forcePlay: true);
break; break;
case ItemType.Ball: case ItemType.Ball:
CurrentCurve = ItemCurves[1]; CurrentCurve = ItemCurves[1];
@ -455,6 +490,9 @@ namespace HeavenStudio.Games.Scripts_KarateMan
p.Play(); p.Play();
game.CreateItemInstance(startBeat + 1f, "Item09", 0, ItemType.CookingLid); game.CreateItemInstance(startBeat + 1f, "Item09", 0, ItemType.CookingLid);
GetComponent<Animator>().Play("Item08", -1, 0); GetComponent<Animator>().Play("Item08", -1, 0);
if (game.IsNoriActive && game.NoriPerformance >= 1f)
Jukebox.PlayOneShotGame("karateman/rockHit_fullNori", forcePlay: true);
break; break;
case ItemType.Alien: case ItemType.Alien:
CurrentCurve = ItemCurves[1]; CurrentCurve = ItemCurves[1];
@ -462,6 +500,9 @@ namespace HeavenStudio.Games.Scripts_KarateMan
Jukebox.PlayOneShotGame("karateman/alienHit", forcePlay: true); Jukebox.PlayOneShotGame("karateman/alienHit", forcePlay: true);
p = Instantiate(HitParticles[1], HitPosition[1].position, Quaternion.Euler(0, 0, UnityEngine.Random.Range(0f, 360f)), game.ItemHolder); p = Instantiate(HitParticles[1], HitPosition[1].position, Quaternion.Euler(0, 0, UnityEngine.Random.Range(0f, 360f)), game.ItemHolder);
p.Play(); p.Play();
if (game.IsNoriActive && game.NoriPerformance >= 1f)
Jukebox.PlayOneShotGame("karateman/rockHit_fullNori", forcePlay: true);
break; break;
case ItemType.Bomb: case ItemType.Bomb:
CurrentCurve = ItemCurves[1]; CurrentCurve = ItemCurves[1];
@ -470,6 +511,9 @@ namespace HeavenStudio.Games.Scripts_KarateMan
p = Instantiate(HitParticles[2], HitPosition[1].position, Quaternion.Euler(0, 0, UnityEngine.Random.Range(0f, 360f)), game.ItemHolder); p = Instantiate(HitParticles[2], HitPosition[1].position, Quaternion.Euler(0, 0, UnityEngine.Random.Range(0f, 360f)), game.ItemHolder);
p.Play(); p.Play();
game.Joe.RemoveBombGlow(startBeat + 1f, 1f); game.Joe.RemoveBombGlow(startBeat + 1f, 1f);
if (game.IsNoriActive && game.NoriPerformance >= 1f)
Jukebox.PlayOneShotGame("karateman/rockHit_fullNori", forcePlay: true);
break; break;
case ItemType.TacoBell: case ItemType.TacoBell:
CurrentCurve = ItemCurves[1]; CurrentCurve = ItemCurves[1];
@ -478,6 +522,9 @@ namespace HeavenStudio.Games.Scripts_KarateMan
Jukebox.PlayOneShotGame("karateman/tacobell", forcePlay: true); Jukebox.PlayOneShotGame("karateman/tacobell", forcePlay: true);
p = Instantiate(HitParticles[1], HitPosition[1].position, Quaternion.Euler(0, 0, UnityEngine.Random.Range(0f, 360f)), game.ItemHolder); p = Instantiate(HitParticles[1], HitPosition[1].position, Quaternion.Euler(0, 0, UnityEngine.Random.Range(0f, 360f)), game.ItemHolder);
p.Play(); p.Play();
if (game.IsNoriActive && game.NoriPerformance >= 1f)
Jukebox.PlayOneShotGame("karateman/rockHit_fullNori", forcePlay: true);
break; break;
case ItemType.ComboPot1: case ItemType.ComboPot1:
CurrentCurve = ItemCurves[straight ? 1 : 0]; CurrentCurve = ItemCurves[straight ? 1 : 0];
@ -551,9 +598,16 @@ namespace HeavenStudio.Games.Scripts_KarateMan
default: default:
CurrentCurve = ItemCurves[straight ? 1 : 0]; CurrentCurve = ItemCurves[straight ? 1 : 0];
curveTargetBeat = straight ? 1f : 1.5f; curveTargetBeat = straight ? 1f : 1.5f;
Jukebox.PlayOneShotGame("karateman/potHit", forcePlay: true); if (game.IsNoriActive && game.NoriPerformance < 0.6f)
{
Jukebox.PlayOneShotGame("karateman/potHit_lowNori", forcePlay: true);
Jukebox.PlayOneShotGame("karateman/potHit", volume: 0.66f, forcePlay: true);
}
else
Jukebox.PlayOneShotGame("karateman/potHit", forcePlay: true);
p = Instantiate(HitParticles[3], HitPosition[1].position, Quaternion.identity, game.ItemHolder); p = Instantiate(HitParticles[3], HitPosition[1].position, Quaternion.identity, game.ItemHolder);
p.Play(); p.Play();
break; break;
} }
@ -590,6 +644,21 @@ namespace HeavenStudio.Games.Scripts_KarateMan
} }
} }
bool ItemNeedNori()
{
switch (type)
{
case ItemType.Rock:
case ItemType.Cooking:
case ItemType.Alien:
case ItemType.Bomb:
case ItemType.TacoBell:
return true;
default:
return false;
}
}
void JoeComboSequence() void JoeComboSequence()
{ {
if (GameManager.instance.currentGame != "karateman") return; if (GameManager.instance.currentGame != "karateman") return;
@ -683,8 +752,7 @@ namespace HeavenStudio.Games.Scripts_KarateMan
else { else {
if (KarateMan.instance.IsNoriActive) if (KarateMan.instance.IsNoriActive)
{ {
if ((type == ItemType.Rock || type == ItemType.Cooking || type == ItemType.Alien || type == ItemType.TacoBell) if (ItemNeedNori() && KarateMan.instance.NoriPerformance < 0.6f)
&& KarateMan.instance.NoriPerformance < 0.6f)
{ {
CreateHitMark(false); CreateHitMark(false);
startBeat = Conductor.instance.songPositionInBeats; startBeat = Conductor.instance.songPositionInBeats;

View file

@ -11,6 +11,7 @@ namespace HeavenStudio.Games.Scripts_NtrSamurai
{ {
[Header("Objects")] [Header("Objects")]
public ParticleSystem moneyBurst; public ParticleSystem moneyBurst;
public ParticleSystem pickelBurst;
public Animator anim; public Animator anim;
public NtrSamuraiObject secondHalf; public NtrSamuraiObject secondHalf;
@ -44,6 +45,9 @@ namespace HeavenStudio.Games.Scripts_NtrSamurai
case (int) SamuraiSliceNtr.ObjectType.Demon: case (int) SamuraiSliceNtr.ObjectType.Demon:
anim.Play("ObjDemonDebris02"); anim.Play("ObjDemonDebris02");
break; break;
case (int) SamuraiSliceNtr.ObjectType.Melon2B2T:
anim.Play("ObjMelonPickelDebris02");
break;
default: default:
anim.Play("ObjMelonDebris"); anim.Play("ObjMelonDebris");
break; break;
@ -70,6 +74,9 @@ namespace HeavenStudio.Games.Scripts_NtrSamurai
new MultiSound.Sound("samuraiSliceNtr/ntrSamurai_in01", startBeat + 2f), new MultiSound.Sound("samuraiSliceNtr/ntrSamurai_in01", startBeat + 2f),
}); });
break; break;
case (int) SamuraiSliceNtr.ObjectType.Melon2B2T:
anim.Play("ObjMelonPickel");
break;
default: default:
anim.Play("ObjMelon"); anim.Play("ObjMelon");
break; break;
@ -280,8 +287,12 @@ namespace HeavenStudio.Games.Scripts_NtrSamurai
this.startBeat = caller.startBeat + caller.timer; this.startBeat = caller.startBeat + caller.timer;
if (type == (int) SamuraiSliceNtr.ObjectType.Demon) if (type == (int) SamuraiSliceNtr.ObjectType.Demon)
{
anim.Play("ObjDemonDebris01"); anim.Play("ObjDemonDebris01");
else if (type == (int) SamuraiSliceNtr.ObjectType.Melon2B2T)
{
Jukebox.PlayOneShotGame("samuraiSliceNtr/melon_dig");
pickelBurst.Play();
anim.Play("ObjMelonPickelDebris01");
} }
if (holdingCash > 0) if (holdingCash > 0)

View file

@ -41,7 +41,8 @@ namespace HeavenStudio.Games
public enum ObjectType { public enum ObjectType {
Melon, Melon,
Fish, Fish,
Demon Demon,
Melon2B2T,
} }
[Header("References")] [Header("References")]

View file

@ -9,7 +9,7 @@ namespace HeavenStudio.Games.Scripts_SpaceSoccer
public class Kicker : PlayerActionObject public class Kicker : PlayerActionObject
{ {
[Header("Properties")] [Header("Properties")]
public bool canKick; public bool canKick = true; //why was this false by default???
public bool canHighKick; public bool canHighKick;
private bool kickPrepare = false; private bool kickPrepare = false;
public bool kickLeft; public bool kickLeft;
@ -168,21 +168,22 @@ namespace HeavenStudio.Games.Scripts_SpaceSoccer
kickLeft = true; kickLeft = true;
} }
List<Beatmap.Entity> keepUps = GameManager.instance.Beatmap.entities.FindAll(c => c.datamodel == "spaceSoccer/keep-up"); // List<Beatmap.Entity> keepUps = GameManager.instance.Beatmap.entities.FindAll(c => c.datamodel == "spaceSoccer/keep-up");
// for (int i = 0; i < keepUps.Count; i++)
// {
// if ((keepUps[i].beat - 0.15f) <= Conductor.instance.songPositionInBeats && (keepUps[i].beat + keepUps[i].length) - 0.15f > Conductor.instance.songPositionInBeats)
// {
// canKick = true;
// canHighKick = false;
// break;
// }
// else
// {
// canKick = false;
// }
// }
List<Beatmap.Entity> highKicks = GameManager.instance.Beatmap.entities.FindAll(c => c.datamodel == "spaceSoccer/high kick-toe!"); List<Beatmap.Entity> highKicks = GameManager.instance.Beatmap.entities.FindAll(c => c.datamodel == "spaceSoccer/high kick-toe!");
for (int i = 0; i < keepUps.Count; i++)
{
if ((keepUps[i].beat - 0.15f) <= Conductor.instance.songPositionInBeats && (keepUps[i].beat + keepUps[i].length) - 0.15f > Conductor.instance.songPositionInBeats)
{
canKick = true;
canHighKick = false;
break;
}
else
{
canKick = false;
}
}
for (int i = 0; i < highKicks.Count; i++) for (int i = 0; i < highKicks.Count; i++)
{ {
if ((highKicks[i].beat - 0.15f) <= Conductor.instance.songPositionInBeats && highKicks[i].beat + 1f > Conductor.instance.songPositionInBeats) if ((highKicks[i].beat - 0.15f) <= Conductor.instance.songPositionInBeats && highKicks[i].beat + 1f > Conductor.instance.songPositionInBeats)
@ -200,6 +201,7 @@ namespace HeavenStudio.Games.Scripts_SpaceSoccer
} }
else else
{ {
canKick = true;
canHighKick = false; canHighKick = false;
} }
} }

View file

@ -18,11 +18,11 @@ namespace HeavenStudio.Games.Loaders
new Param("toggle", false, "Disable Sound", "Disables the dispense sound") new Param("toggle", false, "Disable Sound", "Disables the dispense sound")
}, },
inactiveFunction: delegate { if (!eventCaller.currentEntity.toggle) { SpaceSoccer.DispenseSound(eventCaller.currentEntity.beat); } }), inactiveFunction: delegate { if (!eventCaller.currentEntity.toggle) { SpaceSoccer.DispenseSound(eventCaller.currentEntity.beat); } }),
new GameAction("keep-up", delegate { }, 4f, true),
new GameAction("high kick-toe!", delegate { }, 3f, false, new List<Param>() new GameAction("high kick-toe!", delegate { }, 3f, false, new List<Param>()
{ {
new Param("swing", new EntityTypes.Float(0, 1, 0.5f), "Swing", "The amount of swing") new Param("swing", new EntityTypes.Float(0, 1, 0.5f), "Swing", "The amount of swing")
}), }),
new GameAction("keep-up", delegate { }, 4f, true, hidden: true),
}); });
} }
} }
@ -102,6 +102,8 @@ namespace HeavenStudio.Games
{ {
DispenseSound(beat); DispenseSound(beat);
} }
kicker.canKick = true;
} }
} }

View file

@ -70,6 +70,8 @@ namespace HeavenStudio.Editor
public bool editingInputField = false; public bool editingInputField = false;
public bool isCursorEnabled = true; public bool isCursorEnabled = true;
private byte[] MusicBytes;
public static Editor instance { get; private set; } public static Editor instance { get; private set; }
private void Start() private void Start()
@ -158,7 +160,7 @@ namespace HeavenStudio.Editor
{ {
if (Input.GetKeyDown(KeyCode.N)) if (Input.GetKeyDown(KeyCode.N))
{ {
LoadRemix(""); NewRemix();
} }
else if (Input.GetKeyDown(KeyCode.O)) else if (Input.GetKeyDown(KeyCode.O))
{ {
@ -294,6 +296,22 @@ namespace HeavenStudio.Editor
} }
} }
try
{
if (clip != null)
MusicBytes = OggVorbis.VorbisPlugin.GetOggVorbis(Conductor.instance.musicSource.clip, 1);
else
{
MusicBytes = null;
Debug.LogWarning("Failed to load music file! The stream is currently empty.");
}
}
catch (System.Exception)
{
MusicBytes = null;
Debug.LogWarning("Failed to load music file! The stream is currently empty.");
}
return clip; return clip;
} }
@ -343,15 +361,12 @@ namespace HeavenStudio.Editor
using (var zipStream = levelFile.Open()) using (var zipStream = levelFile.Open())
zipStream.Write(Encoding.UTF8.GetBytes(GetJson()), 0, Encoding.UTF8.GetBytes(GetJson()).Length); zipStream.Write(Encoding.UTF8.GetBytes(GetJson()), 0, Encoding.UTF8.GetBytes(GetJson()).Length);
if (changedMusic || currentRemixPath != path) if (MusicBytes != null)
{ {
// this gets rid of the music file for some reason, someone remind me to find a fix for this soon var musicFile = archive.CreateEntry("song.ogg", System.IO.Compression.CompressionLevel.NoCompression);
using (var zipStream = musicFile.Open())
zipStream.Write(MusicBytes, 0, MusicBytes.Length);
} }
byte[] bytes = OggVorbis.VorbisPlugin.GetOggVorbis(Conductor.instance.musicSource.clip, 1);
var musicFile = archive.CreateEntry("song.ogg", System.IO.Compression.CompressionLevel.NoCompression);
using (var zipStream = musicFile.Open())
zipStream.Write(bytes, 0, bytes.Length);
} }
currentRemixPath = path; currentRemixPath = path;
@ -359,6 +374,12 @@ namespace HeavenStudio.Editor
} }
} }
public void NewRemix()
{
MusicBytes = null;
LoadRemix("");
}
public void LoadRemix(string json = "") public void LoadRemix(string json = "")
{ {
GameManager.instance.LoadRemix(json); GameManager.instance.LoadRemix(json);
@ -367,6 +388,8 @@ namespace HeavenStudio.Editor
Timeline.instance.VolumeInfo.UpdateStartingVolumeText(); Timeline.instance.VolumeInfo.UpdateStartingVolumeText();
Timeline.instance.TempoInfo.UpdateOffsetText(); Timeline.instance.TempoInfo.UpdateOffsetText();
Timeline.FitToSong(); Timeline.FitToSong();
currentRemixPath = string.Empty;
} }
public void OpenRemix() public void OpenRemix()
@ -380,58 +403,45 @@ namespace HeavenStudio.Editor
{ {
var path = Path.Combine(paths); var path = Path.Combine(paths);
if (path != String.Empty) if (path == string.Empty) return;
{ loadedMusic = false;
loadedMusic = false;
using (FileStream zipFile = File.Open(path, FileMode.Open)) using var zipFile = File.Open(path, FileMode.Open);
using var archive = new ZipArchive(zipFile, ZipArchiveMode.Read);
foreach (var entry in archive.Entries)
switch (entry.Name)
{ {
using (var archive = new ZipArchive(zipFile, ZipArchiveMode.Read)) case "remix.json":
{ {
foreach (ZipArchiveEntry entry in archive.Entries) using var stream = entry.Open();
{ using var reader = new StreamReader(stream);
if (entry.Name == "remix.json") LoadRemix(reader.ReadToEnd());
{
using (var stream = entry.Open()) break;
{ }
byte[] bytes; case "song.ogg":
using (var ms = new MemoryStream()) {
{ using var stream = entry.Open();
stream.CopyTo(ms); using var memoryStream = new MemoryStream();
bytes = ms.ToArray(); stream.CopyTo(memoryStream);
string json = Encoding.UTF8.GetString(bytes); MusicBytes = memoryStream.ToArray();
LoadRemix(json); Conductor.instance.musicSource.clip = OggVorbis.VorbisPlugin.ToAudioClip(MusicBytes, "music");
} loadedMusic = true;
} Timeline.FitToSong();
}
else if (entry.Name == "song.ogg") break;
{
using (var stream = entry.Open())
{
byte[] bytes;
using (var ms = new MemoryStream())
{
stream.CopyTo(ms);
bytes = ms.ToArray();
Conductor.instance.musicSource.clip = OggVorbis.VorbisPlugin.ToAudioClip(bytes, "music");
loadedMusic = true;
Timeline.FitToSong();
}
}
}
}
} }
} }
if (!loadedMusic) if (!loadedMusic)
Conductor.instance.musicSource.clip = null; Conductor.instance.musicSource.clip = null;
currentRemixPath = path; currentRemixPath = path;
remixName = Path.GetFileName(path); remixName = Path.GetFileName(path);
UpdateEditorStatus(false); UpdateEditorStatus(false);
CommandManager.instance.Clear(); CommandManager.instance.Clear();
Timeline.FitToSong(); Timeline.FitToSong();
}
}); });
} }
@ -473,7 +483,7 @@ namespace HeavenStudio.Editor
private void UpdateEditorStatus(bool updateTime) private void UpdateEditorStatus(bool updateTime)
{ {
if (discordDuringTesting || !Application.isEditor) if (discordDuringTesting || !Application.isEditor)
DiscordRPC.DiscordRPC.UpdateActivity("In Editor", $"{remixName}", updateTime); DiscordRPC.DiscordRPC.UpdateActivity("In Editor", $"{remixName}", updateTime);
} }
public string GetJson() public string GetJson()

View file

@ -3,7 +3,7 @@ using System.Collections.Generic;
using UnityEngine; using UnityEngine;
using UnityEngine.UI; using UnityEngine.UI;
using System; using System;
using System.Linq;
using TMPro; using TMPro;
using Starpelly; using Starpelly;
@ -47,135 +47,139 @@ namespace HeavenStudio.Editor
this.propertyName = propertyName; this.propertyName = propertyName;
this.caption.text = caption; this.caption.text = caption;
var objType = type.GetType(); switch (type)
if (objType == typeof(EntityTypes.Integer))
{ {
var integer = ((EntityTypes.Integer)type); case EntityTypes.Integer integer:
slider.minValue = integer.min;
slider.maxValue = integer.max;
slider.minValue = integer.min; slider.wholeNumbers = true;
slider.maxValue = integer.max; slider.value = Convert.ToSingle(parameterManager.entity[propertyName]);
slider.value = Mathf.RoundToInt(System.Convert.ToSingle(parameterManager.entity[propertyName]));
inputField.text = slider.value.ToString();
slider.onValueChanged.AddListener(delegate
{
inputField.text = slider.value.ToString(); inputField.text = slider.value.ToString();
parameterManager.entity[propertyName] = (int)slider.value;
});
inputField.onSelect.AddListener(delegate slider.onValueChanged.AddListener(
{ _ =>
Editor.instance.editingInputField = true; {
}); inputField.text = slider.value.ToString();
parameterManager.entity[propertyName] = (int) slider.value;
}
);
inputField.onEndEdit.AddListener(delegate inputField.onSelect.AddListener(
{ _ =>
slider.value = Mathf.RoundToInt(System.Convert.ToSingle(System.Convert.ToSingle(inputField.text))); Editor.instance.editingInputField = true
parameterManager.entity[propertyName] = (int)slider.value; );
Editor.instance.editingInputField = false;
});
}
else if (objType == typeof(EntityTypes.Float))
{
var fl = ((EntityTypes.Float)type);
slider.minValue = fl.min; inputField.onEndEdit.AddListener(
slider.maxValue = fl.max; _ =>
{
slider.value = Convert.ToSingle(inputField.text);
parameterManager.entity[propertyName] = (int) slider.value;
Editor.instance.editingInputField = false;
}
);
break;
slider.value = System.Convert.ToSingle(parameterManager.entity[propertyName]); case EntityTypes.Float fl:
inputField.text = slider.value.ToString("G"); slider.minValue = fl.min;
slider.maxValue = fl.max;
slider.onValueChanged.AddListener(delegate slider.value = Convert.ToSingle(parameterManager.entity[propertyName]);
{ inputField.text = slider.value.ToString("G");
var newValue = (float)System.Math.Round(slider.value, 4);
inputField.text = newValue.ToString("G");
parameterManager.entity[propertyName] = newValue;
});
inputField.onSelect.AddListener(delegate slider.onValueChanged.AddListener(
{ _ =>
Editor.instance.editingInputField = true; {
}); var newValue = (float) Math.Round(slider.value, 4);
inputField.text = newValue.ToString("G");
parameterManager.entity[propertyName] = newValue;
}
);
inputField.onEndEdit.AddListener(delegate inputField.onSelect.AddListener(
{ _ =>
slider.value = (float)System.Math.Round(System.Convert.ToSingle(inputField.text), 4); Editor.instance.editingInputField = true
parameterManager.entity[propertyName] = slider.value; );
Editor.instance.editingInputField = false;
});
}
else if(type is bool)
{
toggle.isOn = System.Convert.ToBoolean(parameterManager.entity[propertyName]); // ' (bool)type ' always results in false
toggle.onValueChanged.AddListener(delegate inputField.onEndEdit.AddListener(
{ _ =>
parameterManager.entity[propertyName] = toggle.isOn; {
}); slider.value = (float) Math.Round(Convert.ToSingle(inputField.text), 4);
} parameterManager.entity[propertyName] = slider.value;
else if (objType.IsEnum) Editor.instance.editingInputField = false;
{ }
List<TMP_Dropdown.OptionData> dropDownData = new List<TMP_Dropdown.OptionData>(); );
var vals = Enum.GetValues(objType); break;
var selected = 0;
for (int i = 0; i < vals.Length; i++)
{
string name = Enum.GetNames(objType)[i];
TMP_Dropdown.OptionData optionData = new TMP_Dropdown.OptionData();
optionData.text = name; case bool _:
// ' (bool)type ' always results in false
toggle.isOn = Convert.ToBoolean(parameterManager.entity[propertyName]);
dropDownData.Add(optionData); toggle.onValueChanged.AddListener(
_ => parameterManager.entity[propertyName] = toggle.isOn
);
break;
if ((int)vals.GetValue(i) == (int)parameterManager.entity[propertyName]) case Color _:
selected = i; colorPreview.colorPicker.onColorChanged += _ =>
} parameterManager.entity[propertyName] = colorPreview.colorPicker.color;
dropdown.AddOptions(dropDownData);
dropdown.value = selected;
dropdown.onValueChanged.AddListener(delegate
{
parameterManager.entity[propertyName] = (int)Enum.GetValues(objType).GetValue(dropdown.value);
});
}
else if (objType == typeof(Color))
{
colorPreview.colorPicker.onColorChanged += delegate
{
parameterManager.entity[propertyName] = (Color)colorPreview.colorPicker.color;
};
Color paramCol = (Color)parameterManager.entity[propertyName]; var paramCol = (Color) parameterManager.entity[propertyName];
ColorBTN.onClick.AddListener(
() =>
{
ColorTable.gameObject.SetActive(true);
colorTableActive = true;
colorPreview.ChangeColor(paramCol);
}
);
ColorBTN.onClick.AddListener(delegate
{
ColorTable.gameObject.SetActive(true);
colorTableActive = true;
colorPreview.ChangeColor(paramCol); colorPreview.ChangeColor(paramCol);
}); ColorTable.gameObject.SetActive(false);
break;
colorPreview.ChangeColor(paramCol); case string _:
ColorTable.gameObject.SetActive(false); inputFieldString.text = (string) parameterManager.entity[propertyName];
}
//why the FUCK wasn't this a thing before lmao
else if(objType == typeof(string))
{
// Debug.Log("entity " + propertyName + " is: " + (string)(parameterManager.entity[propertyName]));
inputFieldString.text = (string)(parameterManager.entity[propertyName]);
inputFieldString.onSelect.AddListener(delegate inputFieldString.onSelect.AddListener(
{ _ =>
Editor.instance.editingInputField = true; Editor.instance.editingInputField = true
}); );
inputFieldString.onEndEdit.AddListener(
_ =>
{;
parameterManager.entity[propertyName] = inputFieldString.text;
Editor.instance.editingInputField = false;
}
);
break;
inputFieldString.onEndEdit.AddListener(delegate case Enum enumKind:
{ var enumType = enumKind.GetType();
// Debug.Log("setting " + propertyName + " to: " + inputFieldString.text); var enumVals = Enum.GetValues(enumType);
parameterManager.entity[propertyName] = inputFieldString.text; var enumNames = Enum.GetNames(enumType).ToList();
Editor.instance.editingInputField = false;
}); // Can we assume non-holey enum?
// If we can we can simplify to dropdown.value = (int) parameterManager.entity[propertyName]
var currentlySelected = (int) parameterManager.entity[propertyName];
var selected = enumVals
.Cast<object>()
.ToList()
.FindIndex(val => (int) val == currentlySelected);
dropdown.AddOptions(enumNames);
dropdown.value = selected;
dropdown.onValueChanged.AddListener(_ =>
parameterManager.entity[propertyName] = Enum.ToObject(enumType, dropdown.value)
);
break;
default:
throw new ArgumentOutOfRangeException(
nameof(type), type, "I don't know how to make a property of this type!"
);
} }
} }

View file

@ -217,7 +217,13 @@ namespace HeavenStudio
new Minigame("gameManager", "Game Manager", "", false, true, new List<GameAction>() new Minigame("gameManager", "Game Manager", "", false, true, new List<GameAction>()
{ {
new GameAction("switchGame", delegate { GameManager.instance.SwitchGame(eventCaller.currentSwitchGame, eventCaller.currentEntity.beat); }, 0.5f, inactiveFunction: delegate { GameManager.instance.SwitchGame(eventCaller.currentSwitchGame, eventCaller.currentEntity.beat); }), new GameAction("switchGame", delegate { GameManager.instance.SwitchGame(eventCaller.currentSwitchGame, eventCaller.currentEntity.beat); }, 0.5f, inactiveFunction: delegate { GameManager.instance.SwitchGame(eventCaller.currentSwitchGame, eventCaller.currentEntity.beat); }),
new GameAction("end", delegate { Debug.Log("end"); GameManager.instance.Stop(0); Timeline.instance?.SetTimeButtonColors(true, false, false);}), new GameAction("end", delegate {
Debug.Log("end");
if (Timeline.instance != null)
Timeline.instance?.Stop(0);
else
GameManager.instance.Stop(0);
}),
new GameAction("skill star", delegate { }, 1f, true), new GameAction("skill star", delegate { }, 1f, true),
new GameAction("toggle inputs", delegate new GameAction("toggle inputs", delegate
@ -332,18 +338,7 @@ namespace HeavenStudio
new Param("ease", EasingFunction.Ease.Linear, "Ease") new Param("ease", EasingFunction.Ease.Linear, "Ease")
}, hidden: false ), }, hidden: false ),
new GameAction("screen shake", delegate new GameAction("move camera", delegate {}, 1f, true, new List<Param>()
{
//TODO: move cam
}, 1f, true, new List<Param>()
{
new Param("valA", new EntityTypes.Float(0, 10, 2), "Intensity")
} ),
new GameAction("move camera", delegate
{
//TODO: move cam
}, 1f, true, new List<Param>()
{ {
new Param("valA", new EntityTypes.Float(-50, 50, 0), "Right / Left"), new Param("valA", new EntityTypes.Float(-50, 50, 0), "Right / Left"),
new Param("valB", new EntityTypes.Float(-50, 50, 0), "Up / Down"), new Param("valB", new EntityTypes.Float(-50, 50, 0), "Up / Down"),
@ -351,10 +346,7 @@ namespace HeavenStudio
new Param("ease", EasingFunction.Ease.Linear, "Ease Type") new Param("ease", EasingFunction.Ease.Linear, "Ease Type")
} ), } ),
new GameAction("rotate camera", delegate new GameAction("rotate camera", delegate {}, 1f, true, new List<Param>()
{
//TODO: rot cam
}, 1f, true, new List<Param>()
{ {
new Param("valA", new EntityTypes.Integer(-360, 360, 0), "Pitch"), new Param("valA", new EntityTypes.Integer(-360, 360, 0), "Pitch"),
new Param("valB", new EntityTypes.Integer(-360, 360, 0), "Yaw"), new Param("valB", new EntityTypes.Integer(-360, 360, 0), "Yaw"),
@ -362,6 +354,12 @@ namespace HeavenStudio
new Param("ease", EasingFunction.Ease.Linear, "Ease Type") new Param("ease", EasingFunction.Ease.Linear, "Ease Type")
} ), } ),
new GameAction("screen shake", delegate {}, 1f, true, new List<Param>()
{
new Param("valA", new EntityTypes.Float(0, 10, 0), "Horizontal Intensity"),
new Param("valB", new EntityTypes.Float(0, 10, 1), "Vertical Intensity")
} ),
new GameAction("display textbox", delegate new GameAction("display textbox", delegate
{ {
}, 1f, true, new List<Param>() }, 1f, true, new List<Param>()

Some files were not shown because too many files have changed in this diff Show more