Fixes and a couple new features here and there (#616)

* i love the blue bear

* launch party beginning

* fork lifter fixes

* whiff strum guitar + snekky

* rockers score miss fix

* splashdown tweak

* auto dispense and inactive dispense iteration 1

* fixed some auto dispense bugs

* another small fix

* auto dispense + miss stuff

* fixed mr game and watch being slow boy

* no log

* monk fix

* bg launch aprt

* coint oss layer thing

* tap troupe and double date fixes

* fixing spaceball line

* extended cheer reaers bg

* upbeat constant

* fixed uglyness

* Gomenasai

* fix lines 2

* tram and pauline new sprite

---------

Co-authored-by: ev <85412919+evdial@users.noreply.github.com>
Co-authored-by: minenice55 <star.elementa@gmail.com>
This commit is contained in:
Rapandrasmus 2024-01-09 17:55:00 +01:00 committed by GitHub
parent 92da1f808e
commit 54897f2118
40 changed files with 9455 additions and 17990 deletions

View file

@ -1229,9 +1229,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
SoundSequences: []
EligibleHits: []
scheduledInputs: []
firstEnable: 0
farLeft: {fileID: 7518443851165344965}
farRight: {fileID: 6713782291520362818}
assistantAnim: {fileID: 1521746322850907348}
@ -1240,7 +1238,6 @@ MonoBehaviour:
- {fileID: 6299728505360095184}
firstSpinner: {fileID: 0}
shakeIntensity: 0.5
shouldBop: 1
--- !u!1 &4694930924533062141
GameObject:
m_ObjectHideFlags: 0
@ -2448,6 +2445,90 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1 &7692319912555466056
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2327120719424392110}
- component: {fileID: 1761198211587892282}
m_Layer: 0
m_Name: BG BM_2 (1)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &2327120719424392110
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7692319912555466056}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -5.46, y: -2.646, z: 0}
m_LocalScale: {x: 0.37, y: 0.37, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 5396135612834373355}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &1761198211587892282
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7692319912555466056}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 0
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: b0a1d7d7f9ff2cd429ca4a190e43f870, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 0
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: -100
m_Sprite: {fileID: 1828705492, guid: 993d3ee06decd3b4aa65852d66a3180d, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 2
m_Size: {x: 100, y: 13.44}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1 &7693505318456935900
GameObject:
m_ObjectHideFlags: 0
@ -2796,6 +2877,7 @@ Transform:
- {fileID: 2446071777684279398}
- {fileID: 8567651959911606324}
- {fileID: 5237250537066865816}
- {fileID: 2327120719424392110}
m_Father: {fileID: 8702929335642151782}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

File diff suppressed because it is too large Load diff

View file

@ -27,6 +27,7 @@ Transform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -4.3, y: 9.92, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 2083908003750235240}
m_RootOrder: 0
@ -42,6 +43,7 @@ SpriteRenderer:
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@ -109,6 +111,7 @@ Transform:
m_LocalRotation: {x: -0, y: -0, z: -0.7071068, w: 0.7071068}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.5, y: 0.5, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 3170172331476655201}
m_RootOrder: 0
@ -124,6 +127,7 @@ SpriteRenderer:
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@ -191,6 +195,7 @@ Transform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -4.24, y: 1.8, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 2083908003750235240}
m_RootOrder: 2
@ -206,6 +211,7 @@ SpriteRenderer:
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@ -273,6 +279,7 @@ Transform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -4.520001, y: 0.78000045, z: 0}
m_LocalScale: {x: 0.5, y: 0.5, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1615845594994777750}
- {fileID: 7476450758015735169}
@ -291,6 +298,7 @@ SpriteRenderer:
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@ -358,6 +366,7 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 49.213802, y: 29.528282, z: 2.7341}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 8906338938816874952}
m_RootOrder: 0
@ -373,6 +382,7 @@ SpriteRenderer:
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@ -440,6 +450,7 @@ Transform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 8906338938816874952}
m_RootOrder: 1
@ -455,6 +466,7 @@ SpriteRenderer:
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@ -522,6 +534,7 @@ Transform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -5.44, y: 3.66, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 2083908003750235240}
m_RootOrder: 1
@ -537,6 +550,7 @@ SpriteRenderer:
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@ -565,7 +579,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_SortingOrder: 2
m_Sprite: {fileID: -8904420264161679176, guid: eab6bdf53b08c644db9afb05df441329, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
@ -604,6 +618,7 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 5417053695332528972}
- {fileID: 7982481497042899067}
@ -624,9 +639,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
SoundSequences: []
EligibleHits: []
scheduledInputs: []
firstEnable: 0
fg: {fileID: 4608248523716601930}
bg: {fileID: 3722363597051273302}
handAnimator: {fileID: 6887173419118620922}
@ -660,6 +673,7 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 6.66, y: -3.4, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 531613198458803261}
- {fileID: 2083908003750235240}
@ -668,7 +682,7 @@ Transform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!95 &6887173419118620922
Animator:
serializedVersion: 3
serializedVersion: 5
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@ -681,7 +695,9 @@ Animator:
m_UpdateMode: 0
m_ApplyRootMotion: 0
m_LinearVelocityBlending: 0
m_StabilizeFeet: 0
m_WarningMessage:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
m_KeepAnimatorStateOnDisable: 0
m_WriteDefaultValuesOnDisable: 0

View file

@ -486,7 +486,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!4 &5057601987836241533
Transform:
m_ObjectHideFlags: 0
@ -880,7 +880,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 3
m_SortingOrder: 5
m_Sprite: {fileID: -8241388437142500833, guid: e69d8631bbd6b4047b0cd9d9d78be671, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
@ -13502,7 +13502,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 4
m_SortingOrder: 6
m_Sprite: {fileID: -2886052291205970805, guid: e69d8631bbd6b4047b0cd9d9d78be671, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
@ -17588,8 +17588,8 @@ Transform:
m_LocalScale: {x: 0.92045, y: 0.92045, z: 0.92045}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 4287718705053222288}
- {fileID: 2602257268473603279}
- {fileID: 4287718705053222288}
- {fileID: 2886270264316386320}
- {fileID: 7529215513594783899}
- {fileID: 5057601987836241533}
@ -18129,7 +18129,7 @@ Transform:
- {fileID: 8284843346833121454}
- {fileID: 3196070111010031696}
m_Father: {fileID: 3114857684828203505}
m_RootOrder: 1
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!210 &6268125902584026029
SortingGroup:
@ -18176,7 +18176,7 @@ Transform:
- {fileID: 4165868219261623941}
- {fileID: 8615252329958160817}
m_Father: {fileID: 3114857684828203505}
m_RootOrder: 0
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!210 &3469472890315857684
SortingGroup:

File diff suppressed because it is too large Load diff

View file

@ -3258,7 +3258,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 150
m_SortingOrder: 152
m_Sprite: {fileID: 7953426270202603213, guid: de37f25efaa713347b9cfe924e2e3680, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
@ -3616,9 +3616,7 @@ MonoBehaviour:
looping: 0
offset: 0
parameters: []
EligibleHits: []
scheduledInputs: []
firstEnable: 0
dumplings: []
Baby: {fileID: 9030838172503822172}
BrowHolder: {fileID: 5330488048195279595}
@ -6899,7 +6897,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 100
m_SortingOrder: 151
m_Sprite: {fileID: 1030990730640347943, guid: de37f25efaa713347b9cfe924e2e3680, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0

View file

@ -562,7 +562,6 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
SoundSequences: []
EligibleHits: []
scheduledInputs: []
tram: {fileID: 6436903307986279996}
pauline: {fileID: 2176275447357796304}

View file

@ -134,7 +134,7 @@ TextureImporter:
width: 2865
height: 3847
alignment: 0
pivot: {x: 0, y: 0}
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
@ -155,7 +155,7 @@ TextureImporter:
width: 232
height: 1302
alignment: 0
pivot: {x: 0, y: 0}
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
@ -176,7 +176,7 @@ TextureImporter:
width: 259
height: 1302
alignment: 0
pivot: {x: 0, y: 0}
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
@ -188,6 +188,27 @@ TextureImporter:
indices:
edges: []
weights: []
- serializedVersion: 2
name: tex1_1024x1024_e5fe04bdb6c79e4d_5_2
rect:
serializedVersion: 2
x: 74
y: 82
width: 2841
height: 46
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 142638d2b5d980d42a221b7eab4fa6e1
internalID: 479367862
vertices: []
indices:
edges: []
weights: []
outline: []
physicsShape: []
bones: []
@ -201,6 +222,7 @@ TextureImporter:
nameFileIdTable:
tex1_1024x1024_e5fe04bdb6c79e4d_5_0: 3474984633670427006
tex1_1024x1024_e5fe04bdb6c79e4d_5_1: -3345518207574268676
tex1_1024x1024_e5fe04bdb6c79e4d_5_2: 703625535
tex1_1024x1024_e5fe04bdb6c79e4d_5_7: -292174439971434857
spritePackingTag:
pSDRemoveMatte: 0

View file

@ -399,6 +399,25 @@ AnimationClip:
path: WeaselGirl/WeaselGirlArm
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_IsActive
path: WeaselGirl/WeaselGirlArm
classID: 1
script: {fileID: 0}
m_PPtrCurves:
- curve:
- time: 0
@ -539,6 +558,13 @@ AnimationClip:
typeID: 212
customType: 26
isPPtrCurve: 0
- serializedVersion: 2
path: 2314837333
attribute: 2086281974
script: {fileID: 0}
typeID: 1
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 3018599444
attribute: 0
@ -1707,6 +1733,25 @@ AnimationClip:
path: WeaselGirl/WeaselGirlBody
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_IsActive
path: WeaselGirl/WeaselGirlArm
classID: 1
script: {fileID: 0}
m_EulerEditorCurves:
- curve:
serializedVersion: 2

View file

@ -498,6 +498,52 @@ AnimationClip:
path: WeaselBoy
classID: 1
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
- serializedVersion: 3
time: 0.033333335
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 0.2
value: 1
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 0.3
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_IsActive
path: Shock2
classID: 1
script: {fileID: 0}
m_PPtrCurves:
- curve:
- time: 0
@ -672,6 +718,13 @@ AnimationClip:
typeID: 1
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 4119893686
attribute: 2086281974
script: {fileID: 0}
typeID: 1
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 3484930362
attribute: 0
@ -1991,6 +2044,52 @@ AnimationClip:
path: WeaselGirl
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
- serializedVersion: 3
time: 0.033333335
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 0.2
value: 1
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 0.3
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_IsActive
path: Shock2
classID: 1
script: {fileID: 0}
m_EulerEditorCurves:
- curve:
serializedVersion: 2

View file

@ -84,8 +84,8 @@ Material:
m_Colors:
- _AddColor: {r: 0, g: 0, b: 0, a: 0}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _ColorAlpha: {r: 0.42745098, g: 0.6666668, b: 0.8784314, a: 1}
- _ColorAlpha: {r: 1, g: 1, b: 1, a: 1}
- _ColorBravo: {r: 1, g: 0, b: 0, a: 1}
- _ColorDelta: {r: 0.72156864, g: 0.972549, b: 1, a: 1}
- _ColorDelta: {r: 0.8117648, g: 0.8235295, b: 0.8117648, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
m_BuildTextureStacks: []

View file

@ -85,7 +85,7 @@ TextureImporter:
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
maxTextureSize: 4096
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
@ -138,10 +138,10 @@ TextureImporter:
name: Background Elements_0
rect:
serializedVersion: 2
x: 12
y: 6
width: 3374
height: 1568
x: 0
y: 0
width: 3875
height: 1611
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@ -248,7 +248,7 @@ TextureImporter:
width: 1555
height: 1594
alignment: 0
pivot: {x: 0, y: 0}
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
@ -260,6 +260,48 @@ TextureImporter:
indices:
edges: []
weights: []
- serializedVersion: 2
name: Background Elements_6
rect:
serializedVersion: 2
x: 2227
y: 3857
width: 187
height: 233
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: de9cc5d0d3a97ca45b7b5616c90d8448
internalID: -695422399
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: Background Elements_7
rect:
serializedVersion: 2
x: 2432
y: 3752
width: 223
height: 296
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 049567212cb2e7a48adf4d1be630af99
internalID: 519812580
vertices: []
indices:
edges: []
weights: []
outline: []
physicsShape: []
bones: []
@ -277,6 +319,8 @@ TextureImporter:
Background Elements_3: 2356066476548809487
Background Elements_4: -3829839989203116485
Background Elements_5: 286201189424744302
Background Elements_6: -695422399
Background Elements_7: 519812580
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0

View file

@ -0,0 +1,123 @@
fileFormatVersion: 2
guid: 530c9c31e414ec44ebc6b4dd79f80263
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 12
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
ignoreMasterTextureLimit: 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
cookieLightType: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 4096
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: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Server
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
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: []
nameFileIdTable: {}
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: rvlrocket/common
assetBundleVariant:

View file

@ -67,7 +67,7 @@ TextureImporter:
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
maxTextureSize: 4096
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1

View file

@ -173,8 +173,8 @@ AnimationClip:
- serializedVersion: 3
time: 0
value: {x: 0.0831, y: 0.016, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
inSlope: {x: Infinity, y: 0, z: 0}
outSlope: {x: Infinity, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0, y: 0.33333334, z: 0.33333334}
@ -297,6 +297,13 @@ AnimationClip:
typeID: 4
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 326924850
attribute: 1
script: {fileID: 0}
typeID: 4
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 3235357039
attribute: 4
@ -332,13 +339,6 @@ AnimationClip:
typeID: 212
customType: 23
isPPtrCurve: 1
- serializedVersion: 2
path: 326924850
attribute: 1
script: {fileID: 0}
typeID: 4
customType: 0
isPPtrCurve: 0
pptrCurveMapping:
- {fileID: 1852546927, guid: 2781bda31bd88924b9bc88f6c301b1d9, type: 3}
- {fileID: -2069977234, guid: 2781bda31bd88924b9bc88f6c301b1d9, type: 3}
@ -929,9 +929,9 @@ AnimationClip:
- serializedVersion: 3
time: 0
value: 0.0831
inSlope: 0
outSlope: 0
tangentMode: 136
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
@ -948,9 +948,9 @@ AnimationClip:
- serializedVersion: 3
time: 0
value: 0.016
inSlope: 0
outSlope: 0
tangentMode: 136
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
@ -967,9 +967,9 @@ AnimationClip:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0

View file

@ -931,7 +931,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: {x: -4.53, y: -3.41, z: 0}
value: {x: -4.75, y: -3.19, z: 0}
inSlope: {x: Infinity, y: Infinity, z: Infinity}
outSlope: {x: Infinity, y: Infinity, z: Infinity}
tangentMode: 0
@ -4606,7 +4606,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: -4.53
value: -4.75
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
@ -4634,7 +4634,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: -3.41
value: -3.19
inSlope: Infinity
outSlope: Infinity
tangentMode: 103

View file

@ -106,7 +106,7 @@ AnimationClip:
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.1
value: {x: -1.85, y: -0.863, z: 0}
value: {x: -1.777, y: -0.805, z: 0}
inSlope: {x: Infinity, y: Infinity, z: Infinity}
outSlope: {x: Infinity, y: Infinity, z: Infinity}
tangentMode: 0
@ -142,7 +142,7 @@ AnimationClip:
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.31666666
value: {x: 0.023, y: -2.568, z: 0}
value: {x: -0.02, y: -2.445, z: 0}
inSlope: {x: Infinity, y: Infinity, z: Infinity}
outSlope: {x: Infinity, y: Infinity, z: Infinity}
tangentMode: 0
@ -1209,7 +1209,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 0.1
value: -1.85
value: -1.777
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
@ -1245,7 +1245,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 0.31666666
value: 0.023
value: -0.02
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
@ -1282,7 +1282,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 0.1
value: -0.863
value: -0.805
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
@ -1318,7 +1318,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 0.31666666
value: -2.568
value: -2.445
inSlope: Infinity
outSlope: Infinity
tangentMode: 103

View file

@ -163,7 +163,7 @@ TextureImporter:
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 16384
maxTextureSize: 4096
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 2
@ -312,10 +312,10 @@ TextureImporter:
name: spaceball_player_4
rect:
serializedVersion: 2
x: 2351.0767
y: 2965.6355
width: 662.9397
height: 698.92554
x: 2351
y: 2966
width: 663
height: 701
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@ -397,9 +397,9 @@ TextureImporter:
rect:
serializedVersion: 2
x: 0
y: 2282.3037
width: 213.51617
height: 213.51617
y: 2283
width: 214
height: 214
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@ -585,10 +585,10 @@ TextureImporter:
name: spaceball_bat_4
rect:
serializedVersion: 2
x: 2386.6633
y: 3664.561
width: 627.35364
height: 430.63092
x: 2387
y: 3667
width: 627
height: 428
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@ -690,10 +690,10 @@ TextureImporter:
name: spaceball_hat_0_0
rect:
serializedVersion: 2
x: 103.55933
y: 2562.194
width: 149.14145
height: 311.47766
x: 104
y: 2562
width: 148
height: 313
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}

View file

@ -44,6 +44,15 @@ AnimationClip:
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.16666667
value: {x: 0, y: 0, 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.2
value: {x: 0, y: 0, z: 0}
@ -139,6 +148,15 @@ AnimationClip:
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.16666667
value: {x: 0, y: 0, z: 3.134}
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.2
value: {x: 0, y: 0, z: 3.134}
@ -185,7 +203,7 @@ AnimationClip:
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.16666667
value: {x: -0.75, y: -2.756, z: 9.178155}
value: {x: -0.734, y: -2.756, z: 9.178155}
inSlope: {x: Infinity, y: Infinity, z: Infinity}
outSlope: {x: Infinity, y: Infinity, z: Infinity}
tangentMode: 0
@ -194,7 +212,7 @@ AnimationClip:
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.2
value: {x: -0.75, y: -2.756, z: 9.178155}
value: {x: -0.718, y: -2.756, z: 9.178155}
inSlope: {x: Infinity, y: Infinity, z: Infinity}
outSlope: {x: Infinity, y: Infinity, z: Infinity}
tangentMode: 0
@ -341,7 +359,7 @@ AnimationClip:
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.16666667
value: {x: -0.49, y: 0.686, z: 9.178155}
value: {x: -0.47399998, y: 0.686, z: 9.178155}
inSlope: {x: Infinity, y: Infinity, z: Infinity}
outSlope: {x: Infinity, y: Infinity, z: Infinity}
tangentMode: 0
@ -350,7 +368,7 @@ AnimationClip:
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.2
value: {x: -0.49, y: 0.686, z: 9.178155}
value: {x: -0.453, y: 0.686, z: 9.178155}
inSlope: {x: Infinity, y: Infinity, z: Infinity}
outSlope: {x: Infinity, y: Infinity, z: Infinity}
tangentMode: 0
@ -549,6 +567,15 @@ AnimationClip:
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 0.16666667
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 0.2
value: 0
@ -573,6 +600,8 @@ AnimationClip:
value: {fileID: 846812011896355152, guid: 04e0d6d4bb4d17e43bcc11a96e3eb35b, type: 3}
- time: 0.1
value: {fileID: 846812011896355152, guid: 04e0d6d4bb4d17e43bcc11a96e3eb35b, type: 3}
- time: 0.16666667
value: {fileID: 846812011896355152, guid: 04e0d6d4bb4d17e43bcc11a96e3eb35b, type: 3}
- time: 0.2
value: {fileID: 846812011896355152, guid: 04e0d6d4bb4d17e43bcc11a96e3eb35b, type: 3}
attribute: m_Sprite
@ -785,6 +814,7 @@ AnimationClip:
- {fileID: 846812011896355152, guid: 04e0d6d4bb4d17e43bcc11a96e3eb35b, type: 3}
- {fileID: 846812011896355152, guid: 04e0d6d4bb4d17e43bcc11a96e3eb35b, type: 3}
- {fileID: 846812011896355152, guid: 04e0d6d4bb4d17e43bcc11a96e3eb35b, type: 3}
- {fileID: 846812011896355152, guid: 04e0d6d4bb4d17e43bcc11a96e3eb35b, type: 3}
- {fileID: -4641733496002515713, guid: 04e0d6d4bb4d17e43bcc11a96e3eb35b, type: 3}
- {fileID: -4641733496002515713, guid: 04e0d6d4bb4d17e43bcc11a96e3eb35b, type: 3}
- {fileID: -4641733496002515713, guid: 04e0d6d4bb4d17e43bcc11a96e3eb35b, type: 3}
@ -863,7 +893,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 0.16666667
value: -0.75
value: -0.734
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
@ -872,7 +902,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 0.2
value: -0.75
value: -0.718
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
@ -1026,6 +1056,15 @@ AnimationClip:
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.16666667
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.2
value: 0
@ -1072,6 +1111,15 @@ AnimationClip:
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.16666667
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.2
value: 0
@ -1118,6 +1166,15 @@ AnimationClip:
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.16666667
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.2
value: 0
@ -1329,6 +1386,15 @@ AnimationClip:
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 0.16666667
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 0.2
value: 0
@ -1707,7 +1773,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 0.16666667
value: -0.49
value: -0.47399998
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
@ -1716,7 +1782,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 0.2
value: -0.49
value: -0.453
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
@ -2365,6 +2431,15 @@ AnimationClip:
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.16666667
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.2
value: 0
@ -2411,6 +2486,15 @@ AnimationClip:
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.16666667
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.2
value: 0
@ -2457,6 +2541,15 @@ AnimationClip:
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.16666667
value: 3.134
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.2
value: 3.134

View file

@ -79,7 +79,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: {x: 0.711, y: -2.786, z: 9.178155}
value: {x: 0.714, y: -2.76, z: 9.178155}
inSlope: {x: Infinity, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
@ -238,7 +238,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: {x: -0.57, y: -8.02, z: 0}
value: {x: -0.5, y: -7.93, z: 0}
inSlope: {x: Infinity, y: Infinity, z: Infinity}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
@ -247,7 +247,7 @@ AnimationClip:
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.06666667
value: {x: -0.57, y: -8.08, z: 0}
value: {x: -0.5, y: -8, z: 0}
inSlope: {x: Infinity, y: Infinity, z: Infinity}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
@ -617,7 +617,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 0.711
value: 0.714
inSlope: Infinity
outSlope: 0
tangentMode: 7
@ -636,7 +636,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: -2.786
value: -2.76
inSlope: Infinity
outSlope: 0
tangentMode: 7
@ -1252,7 +1252,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: -0.57
value: -0.5
inSlope: Infinity
outSlope: 0
tangentMode: 7
@ -1261,7 +1261,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 0.06666667
value: -0.57
value: -0.5
inSlope: Infinity
outSlope: 0
tangentMode: 7
@ -1280,7 +1280,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: -8.02
value: -7.93
inSlope: Infinity
outSlope: 0
tangentMode: 7
@ -1289,7 +1289,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 0.06666667
value: -8.08
value: -8
inSlope: Infinity
outSlope: 0
tangentMode: 7

View file

@ -184,7 +184,7 @@ TextureImporter:
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
maxTextureSize: 4096
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1

View file

@ -121,7 +121,7 @@ TextureImporter:
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
maxTextureSize: 4096
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1

View file

@ -115,7 +115,7 @@ AnimationClip:
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.016666668
value: {x: 0, y: 0.236, z: 0}
value: {x: 0, y: 0.155, z: 0}
inSlope: {x: Infinity, y: Infinity, z: Infinity}
outSlope: {x: Infinity, y: Infinity, z: Infinity}
tangentMode: 0
@ -158,7 +158,7 @@ AnimationClip:
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.016666668
value: {x: 0, y: 1.707, z: 0}
value: {x: 0, y: 1.6259999, z: 0}
inSlope: {x: Infinity, y: Infinity, z: Infinity}
outSlope: {x: Infinity, y: Infinity, z: Infinity}
tangentMode: 0
@ -167,7 +167,7 @@ AnimationClip:
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.033333335
value: {x: 0, y: 1.613, z: 0}
value: {x: 0, y: 1.552, z: 0}
inSlope: {x: Infinity, y: Infinity, z: Infinity}
outSlope: {x: Infinity, y: Infinity, z: Infinity}
tangentMode: 0
@ -253,8 +253,8 @@ AnimationClip:
- serializedVersion: 3
time: 0
value: {x: 0.35, y: 0.35, z: 1}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
inSlope: {x: Infinity, y: 0, z: 0}
outSlope: {x: Infinity, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0, y: 0.33333334, z: 0.33333334}
@ -497,6 +497,13 @@ AnimationClip:
typeID: 4
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 2817783452
attribute: 3
script: {fileID: 0}
typeID: 4
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 1827934291
attribute: 304273561
@ -567,13 +574,6 @@ AnimationClip:
typeID: 212
customType: 23
isPPtrCurve: 1
- serializedVersion: 2
path: 2817783452
attribute: 3
script: {fileID: 0}
typeID: 4
customType: 0
isPPtrCurve: 0
pptrCurveMapping:
- {fileID: 1880164431, guid: 4bb254c95297bab478253f58952b6c19, type: 3}
- {fileID: 1880164431, guid: 4bb254c95297bab478253f58952b6c19, type: 3}
@ -1151,7 +1151,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 0.016666668
value: 0.236
value: 0.155
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
@ -1316,7 +1316,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 0.016666668
value: 1.707
value: 1.6259999
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
@ -1325,7 +1325,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 0.033333335
value: 1.613
value: 1.552
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
@ -1501,9 +1501,9 @@ AnimationClip:
- serializedVersion: 3
time: 0
value: 0.35
inSlope: 0
outSlope: 0
tangentMode: 136
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
@ -1520,9 +1520,9 @@ AnimationClip:
- serializedVersion: 3
time: 0
value: 0.35
inSlope: 0
outSlope: 0
tangentMode: 136
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
@ -1539,9 +1539,9 @@ AnimationClip:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0

View file

@ -20,7 +20,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: {x: 0.9, y: 1.13, z: 0}
value: {x: 0.914, y: 1.01, z: 0}
inSlope: {x: Infinity, y: Infinity, z: Infinity}
outSlope: {x: Infinity, y: Infinity, z: Infinity}
tangentMode: 0
@ -29,7 +29,7 @@ AnimationClip:
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.033333335
value: {x: 0.9, y: 1.15, z: 0}
value: {x: 0.915, y: 1.101, z: 0}
inSlope: {x: Infinity, y: Infinity, z: Infinity}
outSlope: {x: Infinity, y: Infinity, z: Infinity}
tangentMode: 0
@ -47,7 +47,7 @@ AnimationClip:
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.1
value: {x: 0.9, y: 1.254, z: 0}
value: {x: 0.907, y: 1.29, z: 0}
inSlope: {x: Infinity, y: Infinity, z: Infinity}
outSlope: {x: Infinity, y: Infinity, z: Infinity}
tangentMode: 0
@ -56,7 +56,7 @@ AnimationClip:
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.13333334
value: {x: 0.9, y: 1.264, z: 0}
value: {x: 0.9, y: 1.379, z: 0}
inSlope: {x: Infinity, y: Infinity, z: Infinity}
outSlope: {x: Infinity, y: Infinity, z: Infinity}
tangentMode: 0
@ -254,7 +254,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 0.9
value: 0.914
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
@ -263,7 +263,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 0.033333335
value: 0.9
value: 0.915
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
@ -281,7 +281,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 0.1
value: 0.9
value: 0.907
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
@ -309,7 +309,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 1.13
value: 1.01
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
@ -318,7 +318,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 0.033333335
value: 1.15
value: 1.101
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
@ -336,7 +336,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 0.1
value: 1.254
value: 1.29
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
@ -345,7 +345,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 0.13333334
value: 1.264
value: 1.379
inSlope: Infinity
outSlope: Infinity
tangentMode: 103

View file

@ -20,7 +20,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: {x: 0.9, y: 1.254, z: 0}
value: {x: 0.908, y: 1.295, z: 0}
inSlope: {x: Infinity, y: Infinity, z: Infinity}
outSlope: {x: Infinity, y: Infinity, z: Infinity}
tangentMode: 0
@ -29,7 +29,7 @@ AnimationClip:
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.033333335
value: {x: 0.9, y: 1.264, z: 0}
value: {x: 0.9, y: 1.39, z: 0}
inSlope: {x: Infinity, y: Infinity, z: Infinity}
outSlope: {x: Infinity, y: Infinity, z: Infinity}
tangentMode: 0
@ -38,7 +38,7 @@ AnimationClip:
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.06666667
value: {x: 0.9, y: 1.13, z: 0}
value: {x: 0.9, y: 1.035, z: 0}
inSlope: {x: Infinity, y: Infinity, z: Infinity}
outSlope: {x: Infinity, y: Infinity, z: Infinity}
tangentMode: 0
@ -47,7 +47,7 @@ AnimationClip:
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.1
value: {x: 0.9, y: 1.264, z: 0}
value: {x: 0.9, y: 1.39, z: 0}
inSlope: {x: Infinity, y: Infinity, z: Infinity}
outSlope: {x: Infinity, y: Infinity, z: Infinity}
tangentMode: 0
@ -56,7 +56,7 @@ AnimationClip:
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.13333334
value: {x: 0.9, y: 1.13, z: 0}
value: {x: 0.9, y: 1.035, z: 0}
inSlope: {x: Infinity, y: Infinity, z: Infinity}
outSlope: {x: Infinity, y: Infinity, z: Infinity}
tangentMode: 0
@ -65,7 +65,7 @@ AnimationClip:
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.16666667
value: {x: 0.9, y: 1.264, z: 0}
value: {x: 0.9, y: 1.39, z: 0}
inSlope: {x: Infinity, y: Infinity, z: Infinity}
outSlope: {x: Infinity, y: Infinity, z: Infinity}
tangentMode: 0
@ -74,7 +74,7 @@ AnimationClip:
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.21666667
value: {x: 0.9, y: 1.254, z: 0}
value: {x: 0.908, y: 1.295, z: 0}
inSlope: {x: Infinity, y: Infinity, z: Infinity}
outSlope: {x: Infinity, y: Infinity, z: Infinity}
tangentMode: 0
@ -107,6 +107,15 @@ AnimationClip:
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.033333335
value: {x: 0.4, y: -0.4, z: 1}
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.4, y: 0.4, z: 1}
@ -249,6 +258,15 @@ AnimationClip:
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.033333335
value: 0.4
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.06666667
value: 0.4
@ -313,6 +331,15 @@ AnimationClip:
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.033333335
value: -0.4
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.06666667
value: 0.4
@ -377,6 +404,15 @@ AnimationClip:
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.033333335
value: 1
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.06666667
value: 1
@ -434,7 +470,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 0.9
value: 0.908
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
@ -488,7 +524,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 0.21666667
value: 0.9
value: 0.908
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
@ -516,7 +552,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 1.254
value: 1.295
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
@ -525,7 +561,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 0.033333335
value: 1.264
value: 1.39
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
@ -534,7 +570,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 0.06666667
value: 1.13
value: 1.035
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
@ -543,7 +579,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 0.1
value: 1.264
value: 1.39
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
@ -552,7 +588,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 0.13333334
value: 1.13
value: 1.035
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
@ -561,7 +597,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 0.16666667
value: 1.264
value: 1.39
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
@ -570,7 +606,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 0.21666667
value: 1.254
value: 1.295
inSlope: Infinity
outSlope: Infinity
tangentMode: 103

View file

@ -29,7 +29,7 @@ AnimationClip:
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.083333336
value: {x: 0.9, y: 1.15, z: 0}
value: {x: 0.907, y: 1.118, z: 0}
inSlope: {x: Infinity, y: Infinity, z: Infinity}
outSlope: {x: Infinity, y: Infinity, z: Infinity}
tangentMode: 0
@ -38,7 +38,7 @@ AnimationClip:
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.16666667
value: {x: 0.9, y: 1.13, z: 0}
value: {x: 0.9, y: 1.02, z: 0}
inSlope: {x: Infinity, y: Infinity, z: Infinity}
outSlope: {x: Infinity, y: Infinity, z: Infinity}
tangentMode: 0
@ -146,7 +146,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 0.083333336
value: 0.9
value: 0.907
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
@ -183,7 +183,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 0.083333336
value: 1.15
value: 1.118
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
@ -192,7 +192,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 0.16666667
value: 1.13
value: 1.02
inSlope: Infinity
outSlope: Infinity
tangentMode: 103

View file

@ -171,10 +171,10 @@ TextureImporter:
name: Tram_Poline_3
rect:
serializedVersion: 2
x: 1629
y: 4431
width: 184
height: 328
x: 1614
y: 4420
width: 219
height: 338
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@ -255,10 +255,10 @@ TextureImporter:
name: Tram_Poline_7
rect:
serializedVersion: 2
x: 3733
y: 4427
width: 184
height: 328
x: 3719
y: 4419
width: 213
height: 343
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@ -402,10 +402,10 @@ TextureImporter:
name: Tram_Poline_14
rect:
serializedVersion: 2
x: 1545
y: 4027
width: 418
height: 338
x: 1544
y: 4015
width: 443
height: 350
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@ -465,10 +465,10 @@ TextureImporter:
name: Tram_Poline_17
rect:
serializedVersion: 2
x: 3649
y: 4021
width: 418
height: 340
x: 3647
y: 4013
width: 438
height: 348
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@ -486,10 +486,10 @@ TextureImporter:
name: Tram_Poline_18
rect:
serializedVersion: 2
x: 4351
x: 4303
y: 3835
width: 490
height: 586
width: 588
height: 583
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@ -507,10 +507,10 @@ TextureImporter:
name: Tram_Poline_19
rect:
serializedVersion: 2
x: 5065
y: 3749
width: 470
height: 586
x: 5027
y: 3737
width: 566
height: 598
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@ -528,9 +528,9 @@ TextureImporter:
name: Tram_Poline_20
rect:
serializedVersion: 2
x: 6323
x: 6267
y: 3835
width: 474
width: 585
height: 584
alignment: 0
pivot: {x: 0.5, y: 0.5}
@ -549,10 +549,10 @@ TextureImporter:
name: Tram_Poline_21
rect:
serializedVersion: 2
x: 7025
y: 3699
width: 482
height: 636
x: 6988
y: 3702
width: 565
height: 630
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@ -570,10 +570,10 @@ TextureImporter:
name: Tram_Poline_22
rect:
serializedVersion: 2
x: 127
y: 3381
width: 534
height: 452
x: 103
y: 3379
width: 589
height: 454
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@ -633,9 +633,9 @@ TextureImporter:
name: Tram_Poline_25
rect:
serializedVersion: 2
x: 2231
x: 2202
y: 3377
width: 534
width: 596
height: 452
alignment: 0
pivot: {x: 0.5, y: 0.5}
@ -675,8 +675,8 @@ TextureImporter:
name: Tram_Poline_27
rect:
serializedVersion: 2
x: 3609
y: 3585
x: 3610
y: 3594
width: 386
height: 330
alignment: 0
@ -738,10 +738,10 @@ TextureImporter:
name: Tram_Poline_30
rect:
serializedVersion: 2
x: 6419
y: 3281
width: 284
height: 548
x: 6323
y: 3332
width: 477
height: 497
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@ -801,10 +801,10 @@ TextureImporter:
name: Tram_Poline_33
rect:
serializedVersion: 2
x: 1495
y: 3151
width: 406
height: 332
x: 1483
y: 3145
width: 425
height: 338
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@ -843,10 +843,10 @@ TextureImporter:
name: Tram_Poline_35
rect:
serializedVersion: 2
x: 3601
y: 3147
width: 406
height: 332
x: 3587
y: 3141
width: 426
height: 339
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@ -865,9 +865,9 @@ TextureImporter:
rect:
serializedVersion: 2
x: 4351
y: 2863
width: 490
height: 418
y: 2853
width: 491
height: 428
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@ -886,9 +886,9 @@ TextureImporter:
rect:
serializedVersion: 2
x: 4997
y: 2535
width: 578
height: 906
y: 2522
width: 585
height: 919
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@ -949,9 +949,9 @@ TextureImporter:
rect:
serializedVersion: 2
x: 6959
y: 2547
width: 580
height: 872
y: 2480
width: 577
height: 939
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@ -990,7 +990,7 @@ TextureImporter:
name: Tram_Poline_42
rect:
serializedVersion: 2
x: 127
x: 134
y: 2449
width: 512
height: 402
@ -1011,10 +1011,10 @@ TextureImporter:
name: Tram_Poline_43
rect:
serializedVersion: 2
x: 1449
y: 2645
width: 508
height: 408
x: 1443
y: 2641
width: 520
height: 412
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@ -1074,10 +1074,10 @@ TextureImporter:
name: Tram_Poline_46
rect:
serializedVersion: 2
x: 4351
y: 2443
width: 490
height: 400
x: 4348
y: 2416
width: 493
height: 427
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@ -1095,10 +1095,10 @@ TextureImporter:
name: Tram_Poline_47
rect:
serializedVersion: 2
x: 5691
y: 2651
width: 430
height: 406
x: 5673
y: 2645
width: 463
height: 427
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@ -1137,10 +1137,10 @@ TextureImporter:
name: Tram_Poline_49
rect:
serializedVersion: 2
x: 7657
y: 2611
width: 428
height: 446
x: 7637
y: 2590
width: 469
height: 508
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@ -1263,10 +1263,10 @@ TextureImporter:
name: Tram_Poline_55
rect:
serializedVersion: 2
x: 183
y: 1533
x: 178
y: 1517
width: 1794
height: 110
height: 126
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@ -1305,10 +1305,10 @@ TextureImporter:
name: Tram_Poline_57
rect:
serializedVersion: 2
x: 181
y: 1325
width: 1792
height: 120
x: 173
y: 1271
width: 1803
height: 174
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@ -1608,6 +1608,7 @@ TextureImporter:
Tram_Poline_65: -1258078219
Tram_Poline_66: 1876203649
Tram_Poline_67: -470760272
Tram_Poline_68: 1922082235
Tram_Poline_7: -1086574686
Tram_Poline_8: -1983733368
Tram_Poline_9: -574011881

View file

@ -39,16 +39,12 @@ namespace HeavenStudio.Games.Loaders
},
new GameAction("stretchEmotion", "Emotion")
{
function = delegate { var e = eventCaller.currentEntity; if (e["instant"] || e["type"] == (int)BlueBear.EmotionStretchType.NoEmotion) BlueBear.instance.SetEmotion(e.beat, e["type"]); },
function = delegate { var e = eventCaller.currentEntity; if (BlueBear.IsInstantEmotion(e["type"])) BlueBear.instance.SetEmotion(e.beat, e["type"]); },
defaultLength = 4,
resizable = true,
parameters = new List<Param>()
{
new Param("type", BlueBear.EmotionStretchType.NoEmotion, "Emotion", "Which emotion should the blue bear use?", new()
{
new((x, _) => (int)x != (int)BlueBear.EmotionStretchType.NoEmotion, new string[] { "instant" })
}),
new Param("instant", false, "Instant"),
new Param("type", BlueBear.EmotionStretchType.NoEmotion, "Emotion", "Which emotion should the blue bear use?"),
}
},
new GameAction("wind", "Wind")
@ -109,7 +105,16 @@ namespace HeavenStudio.Games
LookUp = 0,
Smile = 1,
StartCrying = 2,
ClosedEyes = 3,
SmileInstant = 4,
CryingInstant
}
public static bool IsInstantEmotion(int emotion)
{
return emotion is (int)EmotionStretchType.NoEmotion or (int)EmotionStretchType.ClosedEyes or (int)EmotionStretchType.SmileInstant or (int)EmotionStretchType.CryingInstant;
}
public enum StoryType
{
Date,
@ -367,21 +372,27 @@ namespace HeavenStudio.Games
private void HandleEmotions(double beat)
{
_allEmotionsStretch = EventCaller.GetAllInGameManagerList("blueBear", new string[] { "stretchEmotion" }).FindAll(x => !(x["instant"] || x["type"] == (int)EmotionStretchType.NoEmotion));
if (_allEmotionsStretch.Count == 0) return;
UpdateEmotions();
var allEmosBeforeBeat = _allEmotionsStretch.FindAll(x => x.beat < beat);
if (allEmosBeforeBeat.Count != 0)
_allEmotionsStretch = EventCaller.GetAllInGameManagerList("blueBear", new string[] { "stretchEmotion" }).FindAll(x => !IsInstantEmotion(x["type"]));
if (_allEmotionsStretch.Count != 0)
{
if ((EmotionStretchType)allEmosBeforeBeat[^1]["type"] == EmotionStretchType.StartCrying)
UpdateEmotions();
var allEmosBeforeBeat = _allEmotionsStretch.FindAll(x => x.beat < beat);
if (allEmosBeforeBeat.Count != 0)
{
headAndBodyAnim.DoScaledAnimationAsync("CryIdle", 0.5f);
}
else if ((EmotionStretchType)allEmosBeforeBeat[^1]["type"] == EmotionStretchType.Smile)
{
headAndBodyAnim.DoScaledAnimationAsync("SmileIdle", 0.5f);
if ((EmotionStretchType)allEmosBeforeBeat[^1]["type"] == EmotionStretchType.StartCrying)
{
headAndBodyAnim.DoScaledAnimationAsync("CryIdle", 0.5f);
}
else if ((EmotionStretchType)allEmosBeforeBeat[^1]["type"] == EmotionStretchType.Smile)
{
headAndBodyAnim.DoScaledAnimationAsync("SmileIdle", 0.5f);
}
}
}
var allSetEmotionsBeforeBeat = EventCaller.GetAllInGameManagerList("blueBear", new string[] { "stretchEmotion" }).FindAll(x => IsInstantEmotion(x["type"]) && x.beat < beat);
if (allSetEmotionsBeforeBeat.Count == 0) return;
var lastEvent = allSetEmotionsBeforeBeat[^1];
SetEmotion(lastEvent.beat, lastEvent["type"]);
}
public override void OnPlay(double beat)
@ -497,7 +508,7 @@ namespace HeavenStudio.Games
private bool _wantMouthOpen = false;
public void SetEmotion(double beat, int emotion, bool ableToStopSmile = true)
public void SetEmotion(double beat, int emotion)
{
_emotionCancelledBeat = beat;
_wantMouthOpen = false;
@ -507,14 +518,14 @@ namespace HeavenStudio.Games
case (int)EmotionStretchType.NoEmotion:
headAndBodyAnim.DoScaledAnimationAsync("Idle", 0.5f);
break;
case (int)EmotionStretchType.LookUp:
case (int)EmotionStretchType.ClosedEyes:
headAndBodyAnim.DoScaledAnimationAsync("EyesClosed", 0.5f);
break;
case (int)EmotionStretchType.StartCrying:
case (int)EmotionStretchType.CryingInstant:
headAndBodyAnim.DoScaledAnimationAsync("CryIdle", 0.5f);
crying = true;
break;
case (int)EmotionStretchType.Smile:
case (int)EmotionStretchType.SmileInstant:
headAndBodyAnim.DoScaledAnimationAsync("SmileIdle", 0.5f);
break;
default:

View file

@ -92,6 +92,8 @@ namespace HeavenStudio.Games.Scripts_ForkLifter
public void Early()
{
player.Stab(null);
GameObject pea = new GameObject();
pea.transform.parent = player.early.transform;
@ -124,6 +126,8 @@ namespace HeavenStudio.Games.Scripts_ForkLifter
public void Late()
{
player.Stab(null);
GameObject pea = new GameObject();
pea.transform.parent = player.late.transform;
pea.transform.localScale = Vector2.one;
@ -161,18 +165,23 @@ namespace HeavenStudio.Games.Scripts_ForkLifter
private void Just(PlayerActionEvent caller, float state)
{
if (state >= 1f) {
if (state >= 1f)
{
Late();
} else if (state <= -1f) {
}
else if (state <= -1f)
{
Early();
} else {
}
else
{
Hit();
}
}
private void Miss(PlayerActionEvent caller)
{
SoundByte.PlayOneShot("forkLifter/disappointed");
SoundByte.PlayOneShotGame("forkLifter/disappointed");
BeatAction.New(game, new List<BeatAction.Action>()
{
new BeatAction.Action(startBeat+ 2.45f, delegate {

View file

@ -1,15 +1,7 @@
using HeavenStudio.Util;
using HeavenStudio.Common;
using JetBrains.Annotations;
using Starpelly.Transformer;
using System;
using System.Linq;
using System.Collections;
using System.Collections.Generic;
using System.Diagnostics;
using UnityEngine;
using UnityEngine.Rendering;
using static HeavenStudio.EntityTypes;
using Jukebox;
namespace HeavenStudio.Games.Loaders
@ -115,30 +107,6 @@ namespace HeavenStudio.Games.Loaders
new Param("ease", Util.EasingFunction.Ease.Linear, "Ease", "Which ease should the Launch Pad use?")
}
},
new GameAction("toggleStars", "Toggle Falling Stars")
{
function = delegate {var e = eventCaller.currentEntity; LaunchParty.instance.CreateParticles(e.beat, e["toggle"], e["valA"], e["valB"], e["valC"]);},
defaultLength = 0.5f,
parameters = new List<Param>()
{
new Param("toggle", true, "Stars Enabled", "Starfall Or No?", new List<Param.CollapseParam>()
{
new Param.CollapseParam((x, _) => (bool)x, new string[] { "valA", "valB", "valC"})
}),
new Param("valA", new EntityTypes.Float(0.1f, 10f, 1f), "Star Density", "How many stars are on the screen"),
new Param("valB", new EntityTypes.Float(0.01f, 5f, 0.1f), "Front Star Fall Speed", "How fast the front stars fall to the edge of the screen"),
new Param("valC", new EntityTypes.Float(0.01f, 5f, 0.1f), "Back Star Fall Speed", "How fast the stars fall to the edge of the screen")
}
},
new GameAction("scrollSpeed", "Change Scroll Speed")
{
function = delegate {var e = eventCaller.currentEntity; LaunchParty.instance.UpdateScrollSpeed(e["speed"]); },
defaultLength = 0.5f,
parameters = new List<Param>()
{
new Param("speed", new EntityTypes.Float(0, 100, 0.5f), "Scroll Speed", "How fast will the background scroll down?"),
}
}
},
new List<string>() {"rvl", "normal"},
"rvlrocket", "en",
@ -160,14 +128,11 @@ namespace HeavenStudio.Games
[SerializeField] GameObject bowlingPin;
[Header("Components")]
[SerializeField] ParticleSystem fallingStars;
[SerializeField] ParticleSystem fallingStarsBack;
[SerializeField] Transform launchPad;
[SerializeField] Transform launchPadRotatable;
[SerializeField] Transform spawnPad;
[SerializeField] Scroll scrollScript;
[SerializeField] Animator lensFlareAnim;
public Animator launchPadSpriteAnim;
[SerializeField] private SpriteRenderer _bgWhiteOverlay;
[Header("Variables")]
private float currentRotBeat;
@ -200,9 +165,11 @@ namespace HeavenStudio.Games
private int currentRotIndex;
private List<RiqEntity> allPosEvents = new List<RiqEntity>();
private List<RiqEntity> allPosEvents = new();
private List<RiqEntity> allRotEvents = new List<RiqEntity>();
private List<RiqEntity> allRotEvents = new();
private List<RiqEntity> _allOverlayEvents = new();
public static LaunchParty instance;
@ -218,33 +185,16 @@ namespace HeavenStudio.Games
void Awake()
{
instance = this;
lensFlareAnim.Play("Flashing", 0, 0);
var posEvents = EventCaller.GetAllInGameManagerList("launchParty", new string[] { "posMove" });
List<RiqEntity> tempPosEvents = new List<RiqEntity>();
for (int i = 0; i < posEvents.Count; i++)
{
if (posEvents[i].beat + posEvents[i].beat >= Conductor.instance.songPositionInBeatsAsDouble)
{
tempPosEvents.Add(posEvents[i]);
}
}
}
allPosEvents = tempPosEvents;
public override void OnGameSwitch(double beat)
{
HandleLaunchPadMoveEvents(beat);
}
var rotEvents = EventCaller.GetAllInGameManagerList("launchParty", new string[] { "rotMove" });
List<RiqEntity> tempRotEvents = new List<RiqEntity>();
for (int i = 0; i < rotEvents.Count; i++)
{
if (rotEvents[i].beat + rotEvents[i].beat >= Conductor.instance.songPositionInBeatsAsDouble)
{
tempRotEvents.Add(rotEvents[i]);
}
}
allRotEvents = tempRotEvents;
UpdateLaunchPadPos();
UpdateLaunchPadRot();
public override void OnPlay(double beat)
{
HandleLaunchPadMoveEvents(beat);
}
void Update()
@ -261,6 +211,31 @@ namespace HeavenStudio.Games
queuedRockets.Clear();
}
}
LaunchPadPositionAndRotationUpdate(cond);
}
private void UpdateOverlay(Conductor cond)
{
}
#region Launch Pad Position and Rotation
private void HandleLaunchPadMoveEvents(double beat)
{
var posEvents = EventCaller.GetAllInGameManagerList("launchParty", new string[] { "posMove" });
allPosEvents = posEvents;
var rotEvents = EventCaller.GetAllInGameManagerList("launchParty", new string[] { "rotMove" });
allRotEvents = rotEvents;
UpdateLaunchPadPos();
UpdateLaunchPadRot();
LaunchPadPositionAndRotationUpdate(Conductor.instance);
}
private void LaunchPadPositionAndRotationUpdate(Conductor cond)
{
if (allPosEvents.Count > 0)
{
if (currentPosIndex < allPosEvents.Count && currentPosIndex >= 0)
@ -335,11 +310,6 @@ namespace HeavenStudio.Games
}
}
public void UpdateScrollSpeed(float speed)
{
scrollScript.scrollSpeedY = speed * -1;
}
private void UpdateLaunchPadPos()
{
if (currentPosIndex < allPosEvents.Count && currentPosIndex >= 0)
@ -364,6 +334,10 @@ namespace HeavenStudio.Games
}
}
#endregion
#region Rockets
public void SpawnRocket(double beat, float beatOffset, RocketType type, List<int> notes)
{
GameObject rocketToSpawn = rocket;
@ -506,30 +480,7 @@ namespace HeavenStudio.Games
}
}
public void CreateParticles(double beat, bool toggle, float starDensity, float starSpeed, float starSpeedBack)
{
ParticleSystem.EmissionModule emm;
ParticleSystem.EmissionModule emm2;
switch (toggle)
{
case true:
var emmrate = fallingStars.velocityOverLifetime;
var emmrate2 = fallingStarsBack.velocityOverLifetime;
emmrate.speedModifier = starSpeed;
emmrate2.speedModifier = starSpeedBack;
emm = fallingStars.emission;
emm2 = fallingStarsBack.emission;
emm.rateOverTime = starDensity * 6f;
emm2.rateOverTime = starDensity * 6f;
fallingStars.Play();
fallingStarsBack.Play();
break;
default:
fallingStars.Stop();
fallingStarsBack.Stop();
break;
}
}
#endregion
}
}

View file

@ -1,13 +1,6 @@
using HeavenStudio.Util;
using JetBrains.Annotations;
using Starpelly.Transformer;
using System;
using System.Linq;
using System.Collections.Generic;
using System.Diagnostics;
using UnityEngine;
using UnityEngine.Rendering;
using static HeavenStudio.EntityTypes;
namespace HeavenStudio.Games.Scripts_LaunchParty
{

View file

@ -623,7 +623,7 @@ namespace HeavenStudio.Games
&& PlayerInput.GetIsAction(InputAction_FlickRelease) && !IsExpectingInputNow(InputAction_FlickRelease))
{
// todo: strum
Soshi.UnHold();
Soshi.StrumStringsLast(false, false, true);
}
if (PlayerInput.GetIsAction(InputAction_BasicRelease))
{
@ -783,11 +783,11 @@ namespace HeavenStudio.Games
});
RockersInput riffComp = Instantiate(rockerInputRef, transform);
riffComp.Init(false, new int[6], beat, 3, (PremadeSamples)SoshiSamples[0], SoshiPitches[0]);
ScheduleInput(beat, 4, InputAction_BasicPress, JustMute, MuteMiss, Empty);
ScheduleAutoplayInput(beat, 4, InputAction_BasicPress, JustMute, MuteMiss, Empty);
RockersInput riffComp2 = Instantiate(rockerInputRef, transform);
riffComp2.Init(false, new int[6], beat, 4.5f, (PremadeSamples)SoshiSamples[1], SoshiPitches[1]);
ScheduleInput(beat, 5.5f, InputAction_BasicPress, JustMute, MuteMiss, Empty);
ScheduleAutoplayInput(beat, 5.5f, InputAction_BasicPress, JustMute, MuteMiss, Empty);
RockersInput riffComp3 = Instantiate(rockerInputRef, transform);
riffComp3.Init(false, new int[6], beat, 6, (PremadeSamples)SoshiSamples[2], SoshiPitches[2]);
@ -795,7 +795,7 @@ namespace HeavenStudio.Games
RockersInput riffComp4 = Instantiate(rockerInputRef, transform);
riffComp4.Init(false, new int[6], beat, 7, (PremadeSamples)SoshiSamples[3], SoshiPitches[3], true);
ScheduleInput(beat, 10, InputAction_BasicPress, JustMute, MuteMiss, Empty);
ScheduleAutoplayInput(beat, 10, InputAction_BasicPress, JustMute, MuteMiss, Empty);
}
public void TogetherPrepare(double beat, bool cmon, bool muteSound, float muteBeat, float goToMiddleBeat, bool moveCamera)
@ -846,7 +846,8 @@ namespace HeavenStudio.Games
RockersInput riffComp = Instantiate(rockerInputRef, transform);
riffComp.Init(e["gcS"], new int[6] { e["1S"], e["2S"], e["3S"], e["4S"], e["5S"], e["6S"] }, beat, e.beat - beat,
(PremadeSamples)e["sampleS"], e["pitchSampleS"]);
ScheduleInput(beat, e.beat - beat + e.length, InputAction_BasicPress, JustMute, MuteMiss, Empty);
if (e.length <= 0.5f) ScheduleInput(beat, e.beat - beat + e.length, InputAction_BasicPress, JustMute, MuteMiss, Empty);
else ScheduleAutoplayInput(beat, e.beat - beat + e.length, InputAction_BasicPress, JustMute, MuteMiss, Empty);
}
else
{
@ -866,7 +867,8 @@ namespace HeavenStudio.Games
RockersInput riffComp = Instantiate(rockerInputRef, transform);
riffComp.Init(e["gcS"], new int[6] { e["1S"], e["2S"], e["3S"], e["4S"], e["5S"], e["6S"] }, beat, e.beat - beat,
(PremadeSamples)e["sampleS"], e["pitchSampleS"], true);
ScheduleInput(beat, e.beat - beat + e.length, InputAction_BasicPress, JustMute, MuteMiss, Empty);
if (e.length <= 0.5f) ScheduleInput(beat, e.beat - beat + e.length, InputAction_BasicPress, JustMute, MuteMiss, Empty);
else ScheduleAutoplayInput(beat, e.beat - beat + e.length, InputAction_BasicPress, JustMute, MuteMiss, Empty);
break;
}
}

View file

@ -99,9 +99,21 @@ namespace HeavenStudio.Games.Scripts_Rockers
}
}
private bool lastGleeClub = false;
private Rockers.PremadeSamples lastSample;
private int lastSampleTones;
public void StrumStringsLast(bool disableStrumEffect = false, bool jump = false, bool barely = false)
{
StrumStrings(lastGleeClub, lastPitches, lastSample, lastSampleTones, disableStrumEffect, jump, barely);
}
public void StrumStrings(bool gleeClub, int[] pitches, Rockers.PremadeSamples sample, int sampleTones, bool disableStrumEffect = false, bool jump = false, bool barely = false)
{
if (strumming) return;
lastGleeClub = gleeClub;
lastSample = sample;
lastSampleTones = sampleTones;
muted = false;
strumming = true;
StopSounds();

View file

@ -317,10 +317,6 @@ namespace HeavenStudio.Games
tempEvents.Remove(jump);
}
allJumpEvents = tempEvents;
foreach (var jump in allJumpEvents)
{
Debug.Log(jump.beat);
}
}
private void PersistColor(double beat)

View file

@ -199,13 +199,13 @@ namespace HeavenStudio.Games
{
MultiSound.Play(new MultiSound.Sound[]
{
new MultiSound.Sound("sneakySpirits/moving", beat, 1f, volume1 * 0.01f),
new MultiSound.Sound("sneakySpirits/moving", beat + length, 1f, volume2 * 0.01f),
new MultiSound.Sound("sneakySpirits/moving", beat + length * 2, 1f, volume3 * 0.01f),
new MultiSound.Sound("sneakySpirits/moving", beat + length * 3, 1f, volume4 * 0.01f),
new MultiSound.Sound("sneakySpirits/moving", beat + length * 4, 1f, volume5 * 0.01f),
new MultiSound.Sound("sneakySpirits/moving", beat + length * 5, 1f, volume6 * 0.01f),
new MultiSound.Sound("sneakySpirits/moving", beat + length * 6, 1f, volume7 * 0.01f),
new MultiSound.Sound("sneakySpirits/moving", beat, 1f, volume1 * 0.01f, false, 0.019),
new MultiSound.Sound("sneakySpirits/moving", beat + length, 1f, volume2 * 0.01f, false, 0.019),
new MultiSound.Sound("sneakySpirits/moving", beat + length * 2, 1f, volume3 * 0.01f, false, 0.019),
new MultiSound.Sound("sneakySpirits/moving", beat + length * 3, 1f, volume4 * 0.01f, false, 0.019),
new MultiSound.Sound("sneakySpirits/moving", beat + length * 4, 1f, volume5 * 0.01f, false, 0.019),
new MultiSound.Sound("sneakySpirits/moving", beat + length * 5, 1f, volume6 * 0.01f, false, 0.019),
new MultiSound.Sound("sneakySpirits/moving", beat + length * 6, 1f, volume7 * 0.01f, false, 0.019),
}, forcePlay: true);
}

View file

@ -384,6 +384,7 @@ namespace HeavenStudio.Games.Scripts_SpaceSoccer
// queue normal kick input
nextHit = game.ScheduleInput(caller.startBeat + caller.timer, ball.GetAnimLength(Ball.State.Kicked), SpaceSoccer.InputAction_BasicPress, KickJust, Miss, Out);
}
game.hitBeats.Add(caller.startBeat + caller.timer);
}
private void Miss(PlayerActionEvent caller)
@ -407,6 +408,7 @@ namespace HeavenStudio.Games.Scripts_SpaceSoccer
Toe(true);
nextHit = game.ScheduleInput(caller.startBeat, 3f, SpaceSoccer.InputAction_BasicPress, KickJust, Miss, Out);
ball.canKick = false;
game.hitBeats.Add(caller.startBeat + caller.timer);
}
private void ToePrepareJust(PlayerActionEvent caller, float state)

View file

@ -13,12 +13,17 @@ namespace HeavenStudio.Games.Loaders
{
new GameAction("ball dispense", "Ball Dispense")
{
function = delegate { SpaceSoccer.instance.Dispense(eventCaller.currentEntity.beat, !eventCaller.currentEntity["toggle"], false, eventCaller.currentEntity["down"]); },
function = delegate { var e = eventCaller.currentEntity; SpaceSoccer.instance.Dispense(e.beat, !e["toggle"], false, e["down"], e["auto"], e["interval"]); },
defaultLength = 2f,
parameters = new List<Param>()
{
new Param("toggle", false, "Disable Sound", "Disables the dispense sound"),
new Param("down", false, "Down Sound", "Will the Down sound be played?")
new Param("down", false, "Down Sound", "Will the Down sound be played?"),
new Param("auto", true, "Auto Redispense", "", new()
{
new((x, _) => (bool)x, new string[] { "interval" })
}),
new("interval", new EntityTypes.Integer(2, 20, 2), "Redispense Interval")
},
inactiveFunction = delegate
{
@ -163,6 +168,7 @@ namespace HeavenStudio.Games
using HeavenStudio.Common;
using UnityEngine.Rendering;
using UnityEngine.UI;
using System;
public class SpaceSoccer : Minigame
{
@ -214,6 +220,12 @@ namespace HeavenStudio.Games
float yScrollMultiplier = 0.3f;
[SerializeField] private float xBaseSpeed = 1;
[SerializeField] private float yBaseSpeed = 1;
private List<double> _highKickToeBeats = new();
private List<double> _stopBeats = new();
[NonSerialized] public List<double> hitBeats = new();
#region Space Kicker Position Easing
float easeBeat;
float easeLength;
@ -234,6 +246,11 @@ namespace HeavenStudio.Games
instance = this;
colorStart = defaultBGColor;
colorEnd = defaultBGColor;
var allHighKickToeEvents = EventCaller.GetAllInGameManagerList("spaceSoccer", new string[] { "high kick-toe!" });
foreach (var e in allHighKickToeEvents)
{
_highKickToeBeats.Add(e.beat);
}
}
new void OnDrawGizmos()
@ -276,6 +293,31 @@ namespace HeavenStudio.Games
}
}
public override void OnBeatPulse(double beat)
{
if (!ballDispensed) return;
double offsetBeat = beat + (lastDispensedBeat % 1);
if (_stopBeats.Exists(x => offsetBeat >= x) || offsetBeat < lastDispensedBeat + 2) return;
if (_highKickToeBeats.Exists(x => offsetBeat >= x + 1 && offsetBeat < x + 3))
{
if (_highKickToeBeats.Exists(x => offsetBeat == x + 2) && !IsExpectingInputNow(InputAction_FlickRelease))
{
if (hitBeats.Exists(x => x == offsetBeat - 0.5)) return;
ScoreMiss();
Debug.Log("Miss toe");
}
}
else if (!IsExpectingInputNow(InputAction_BasicPress))
{
if (hitBeats.Exists(x => offsetBeat == x)) return;
ScoreMiss();
Debug.Log("Miss");
}
}
public void StopBall(bool stop)
{
foreach (var kicker in kickers)
@ -329,12 +371,12 @@ namespace HeavenStudio.Games
continue;
}
bool isOnGameSwitchBeat = entity.beat == beat;
Debug.Log(isOnGameSwitchBeat);
Dispense(entity.beat, isOnGameSwitchBeat && !entity["toggle"], false, isOnGameSwitchBeat && entity["down"]);
Dispense(entity.beat, isOnGameSwitchBeat && !entity["toggle"], false, isOnGameSwitchBeat && entity["down"], entity["auto"], entity["interval"]);
break;
}
PersistColor(beat);
AddStopEvents(beat);
}
public SuperCurveObject.Path GetPath(string name)
@ -349,6 +391,8 @@ namespace HeavenStudio.Games
return default(SuperCurveObject.Path);
}
#region VisualInterpolation
public void UpdateScrollSpeed(float scrollSpeedX, float scrollSpeedY)
{
xScrollMultiplier = scrollSpeedX;
@ -452,10 +496,35 @@ namespace HeavenStudio.Games
kickers.Add(spawnedKicker);
kickerHolder.gameObject.SetActive(true);
}
if (ballDispensed) Dispense(lastDispensedBeat, false, true);
if (ballDispensed) Dispense(lastDispensedBeat, false, true, false, false);
}
public void Dispense(double beat, bool playSound = true, bool ignorePlayer = false, bool playDown = false)
#endregion
public void Dispense(double beat, bool playSound = true, bool ignorePlayer = false, bool playDown = false, bool autoDispense = true, int autoInterval = 2)
{
DispenseExec(beat, playSound, ignorePlayer, playDown);
if (!autoDispense) return;
DispenseRecursion(beat + 2, autoInterval);
}
private void DispenseRecursion(double beat, int interval)
{
double dispenseBeat = beat + interval;
if (_stopBeats.Exists(x => dispenseBeat + 2 >= x)) return;
BeatAction.New(this, new()
{
new(dispenseBeat, delegate
{
if (!_highKickToeBeats.Exists(x => dispenseBeat + 2 > x && dispenseBeat + 2 < x + 3)) DispenseExec(dispenseBeat);
DispenseRecursion(dispenseBeat + 2, interval);
})
});
}
private void DispenseExec(double beat, bool playSound = true, bool ignorePlayer = false, bool playDown = false)
{
if (!ballDispensed) lastDispensedBeat = beat;
ballDispensed = true;
@ -496,6 +565,15 @@ namespace HeavenStudio.Games
}, forcePlay:true);
}
private void AddStopEvents(double beat)
{
var allStopEvents = EventCaller.GetAllInGameManagerList("spaceSoccer", new string[] { "stopBall" }).FindAll(x => x.beat >= beat);
foreach (var e in allStopEvents)
{
_stopBeats.Add(e.beat);
}
}
private double colorStartBeat = -1;
private float colorLength = 0f;
private Color colorStart; //obviously put to the default color of the game
@ -550,6 +628,7 @@ namespace HeavenStudio.Games
public override void OnPlay(double beat)
{
PersistColor(beat);
AddStopEvents(beat);
}
}
}

View file

@ -269,12 +269,12 @@ namespace HeavenStudio.Games
}));
SoundByte.PlayOneShotGame("splashdown/yeah", diveBeat);
SoundByte.PlayOneShotGame("splashdown/jumpOthers", diveBeat);
SoundByte.PlayOneShotGame("splashdown/rollOthers", diveBeat + 1);
if (dolphin) SoundByte.PlayOneShotGame("splashdown/rollOthers", diveBeat + 1);
SoundByte.PlayOneShotGame("splashdown/splashOthers", diveBeat + 1.75);
}
BeatAction.New(instance, actions);
SoundByte.PlayOneShotGame("splashdown/yeah", beat + (currentSynchrettes.Count * length));
ScheduleInput(beat, currentSynchrettes.Count * length, InputAction_FlickRelease, dolphin ? JustJump : JustJumpNoDolphin, Out, Out);
ScheduleInput(beat, currentSynchrettes.Count * length, InputAction_FlickRelease, dolphin ? JustJump : JustJumpNoRollSound, Out, Out);
}
public void TogetherJump(double beat, bool alleyoop)
@ -416,25 +416,6 @@ namespace HeavenStudio.Games
});
}
private void JustJumpNoDolphin(PlayerActionEvent caller, float state)
{
double diveBeat = caller.timer + caller.startBeat;
SoundByte.PlayOneShotGame("splashdown/jumpPlayer");
SoundByte.PlayOneShotGame("splashdown/splashPlayer", diveBeat + 1.75);
if (state >= 1f || state <= -1f)
{
player.Jump(diveBeat, true, true);
return;
}
SoundByte.PlayOneShotGame("splashdown/rollPlayer", diveBeat + 1);
player.Jump(diveBeat, false, true);
BeatAction.New(instance, new List<BeatAction.Action>()
{
new BeatAction.Action(diveBeat + 1.75, delegate { crowdAnim.DoScaledAnimationAsync("CrowdCheer", 0.5f); }),
new BeatAction.Action(diveBeat + 4, delegate { crowdAnim.Play("CrowdIdle", 0, 0); })
});
}
private void JustJumpNoRollSound(PlayerActionEvent caller, float state)
{
double diveBeat = caller.timer + caller.startBeat;

View file

@ -16,13 +16,23 @@ namespace HeavenStudio.Games.Loaders
{
new GameAction("dispense", "Dispense")
{
function = delegate { var e = eventCaller.currentEntity; TossBoys.instance.Dispense(e.beat, e.length, e["who"], e["call"]); },
function = delegate { var e = eventCaller.currentEntity; TossBoys.instance.Dispense(e.beat, e.length, e["who"], e["auto"], e["interval"], e["ignore"], e["callAuto"], true, e["call"]); },
inactiveFunction = delegate { var e = eventCaller.currentEntity; TossBoys.DispenseSound(e.beat, e["who"], e["call"]); },
defaultLength = 2f,
resizable = true,
parameters = new List<Param>()
{
new Param("who", TossBoys.KidChoice.Akachan, "Receiver", "Who will receive the ball?"),
new Param("call", false, "Name Call", "Should the other kids than the receiver call their name?")
new Param("call", false, "Name Call", "Should the other kids than the receiver call their name?"),
//auto dispense stuff
new Param("auto", true, "Auto Redispense", "", new()
{
new((x, _) => (bool)x, new string[] { "interval", "ignore", "callAuto" })
}),
new Param("interval", new EntityTypes.Integer(1, 20, 2), "Redispense Interval", "Based on passes and not beats"),
new Param("ignore", true, "Ignore Special Passes"),
new Param("callAuto", false, "Name Call On Redispense")
}
},
new GameAction("pass", "Normal Toss")
@ -235,6 +245,7 @@ namespace HeavenStudio.Games
colorStart = defaultBGColor;
colorEnd = defaultBGColor;
SetupBopRegion("tossBoys", "bop", "auto");
SetPassBallEvents();
}
new void OnDrawGizmos()
@ -339,6 +350,17 @@ namespace HeavenStudio.Games
public override void OnGameSwitch(double beat)
{
PersistColor(beat);
HandleDispenses(beat);
}
private void HandleDispenses(double beat)
{
var allRelevantDispenses = EventCaller.GetAllInGameManagerList("tossBoys", new string[] { "dispense" }).FindAll(x => x.beat < beat && x.beat + x.length >= beat);
if (allRelevantDispenses.Count == 0) return;
var e = allRelevantDispenses[^1];
Dispense(e.beat, e.length, e["who"], e["auto"], e["interval"], e["ignore"], e["callAuto"], false, e["call"]);
}
#region Bop
@ -363,13 +385,112 @@ namespace HeavenStudio.Games
}
#endregion
public void Dispense(double beat, float length, int who, bool call)
public static void DispenseSound(double beat, int who, bool call)
{
SoundByte.PlayOneShotGame("tossBoys/ballStart" + GetColorBasedOnTossKid((WhichTossKid)who, true), beat, forcePlay: true);
if (!call) return;
double callBeat = beat;
switch (who)
{
case (int)WhichTossKid.Akachan:
MultiSound.Play(new MultiSound.Sound[]
{
new MultiSound.Sound("tossBoys/blueRedHigh1", callBeat),
new MultiSound.Sound("tossBoys/yellowRedHigh1", callBeat),
new MultiSound.Sound("tossBoys/blueRedHigh2", callBeat + 0.25f),
new MultiSound.Sound("tossBoys/yellowRedHigh2", callBeat + 0.25f),
new MultiSound.Sound("tossBoys/blueRedHigh3", callBeat + 0.5f),
new MultiSound.Sound("tossBoys/yellowRedHigh3", callBeat + 0.5f),
}, forcePlay: true);
break;
case (int)WhichTossKid.Aokun:
MultiSound.Play(new MultiSound.Sound[]
{
new MultiSound.Sound("tossBoys/redBlueHigh1", callBeat),
new MultiSound.Sound("tossBoys/yellowBlueHigh1", callBeat),
new MultiSound.Sound("tossBoys/redBlueHigh2", callBeat + 0.5f),
new MultiSound.Sound("tossBoys/yellowBlueHigh2", callBeat + 0.5f),
}, forcePlay: true);
break;
case (int)WhichTossKid.Kiiyan:
MultiSound.Play(new MultiSound.Sound[]
{
new MultiSound.Sound("tossBoys/redYellowHigh1", callBeat),
new MultiSound.Sound("tossBoys/blueYellowHigh1", callBeat),
new MultiSound.Sound("tossBoys/redYellowHigh2", callBeat + 0.5f),
new MultiSound.Sound("tossBoys/blueYellowHigh2", callBeat + 0.5f),
}, forcePlay: true);
break;
default:
break;
}
}
public void Dispense(double beat, float length, int who, bool auto, int autoInterval, bool ignoreSpecial, bool callAuto, bool playSound, bool call)
{
if (playSound) DispenseSound(beat, who, call);
DispenseExec(beat, length, who, false, "");
if (auto && passBallDict.TryGetValue(beat + length, out var e))
{
if (e.datamodel == "tossBoys/blur")
{
DispenseRecursion(beat + length, -1, autoInterval, ignoreSpecial, callAuto, (int)WhichTossKid.None, who, false, e.length, true, true, e.datamodel);
}
else DispenseRecursion(beat + length, -1, autoInterval, ignoreSpecial, callAuto, e["who"], who, false, e.length, IsSpecialEvent(e.datamodel), false, e.datamodel);
}
}
public void DispenseRecursion(double beat, int index, int interval, bool ignore, bool call, int curReceiver, int previousReceiver, bool isBlur, float currentLength, bool isSpecial, bool shouldForce, string eventDatamodel)
{
if (index % interval == 0 && !isBlur && !(ignore && isSpecial))
{
double dispenseBeat = beat - 2;
BeatAction.New(this, new()
{
new(dispenseBeat, delegate
{
if (currentBall != null) return;
DispenseSound(dispenseBeat, curReceiver, call);
DispenseExec(dispenseBeat, 2, curReceiver, shouldForce, eventDatamodel);
})
});
}
if (!isBlur && !(ignore && isSpecial)) index++;
var tempLastReceiver = previousReceiver;
var lastLength = isBlur ? 1 : currentLength;
previousReceiver = curReceiver;
var nextIsSpecial = isSpecial;
var blurSet = isBlur;
var nextForce = false;
if (passBallDict.TryGetValue(beat + lastLength, out var e))
{
if (e.datamodel == "tossBoys/pop") return;
curReceiver = e["who"];
blurSet = e.datamodel == "tossBoys/blur";
currentLength = e.length;
nextIsSpecial = IsSpecialEvent(e.datamodel);
eventDatamodel = e.datamodel;
}
else
{
curReceiver = tempLastReceiver;
nextForce = true;
}
// let's not do a stack overflow, alright?
BeatAction.New(this, new()
{
new(beat + lastLength - 2, delegate { DispenseRecursion(beat + lastLength, index, interval, ignore, call, curReceiver, previousReceiver, blurSet, currentLength, nextIsSpecial, nextForce, eventDatamodel); })
});
}
public void DispenseExec(double beat, float length, int who, bool forcePass, string eventDatamodel)
{
if (currentBall != null) return;
SetPassBallEvents();
SetReceiver(who);
GetCurrentReceiver().ShowArrow(beat, length - 1);
SoundByte.PlayOneShotGame("tossBoys/ballStart" + GetColorBasedOnTossKid(currentReceiver, true));
hatchAnim.Play("HatchOpen", 0, 0);
currentBall = Instantiate(ballPrefab, transform);
currentBall.gameObject.SetActive(true);
@ -388,50 +509,10 @@ namespace HeavenStudio.Games
break;
}
if (call)
{
double callBeat = beat;
switch (who)
{
case (int)WhichTossKid.Akachan:
MultiSound.Play(new MultiSound.Sound[]
{
new MultiSound.Sound("tossBoys/blueRedHigh1", callBeat),
new MultiSound.Sound("tossBoys/yellowRedHigh1", callBeat),
new MultiSound.Sound("tossBoys/blueRedHigh2", callBeat + 0.25f),
new MultiSound.Sound("tossBoys/yellowRedHigh2", callBeat + 0.25f),
new MultiSound.Sound("tossBoys/blueRedHigh3", callBeat + 0.5f),
new MultiSound.Sound("tossBoys/yellowRedHigh3", callBeat + 0.5f),
});
break;
case (int)WhichTossKid.Aokun:
MultiSound.Play(new MultiSound.Sound[]
{
new MultiSound.Sound("tossBoys/redBlueHigh1", callBeat),
new MultiSound.Sound("tossBoys/yellowBlueHigh1", callBeat),
new MultiSound.Sound("tossBoys/redBlueHigh2", callBeat + 0.5f),
new MultiSound.Sound("tossBoys/yellowBlueHigh2", callBeat + 0.5f),
});
break;
case (int)WhichTossKid.Kiiyan:
MultiSound.Play(new MultiSound.Sound[]
{
new MultiSound.Sound("tossBoys/redYellowHigh1", callBeat),
new MultiSound.Sound("tossBoys/blueYellowHigh1", callBeat),
new MultiSound.Sound("tossBoys/redYellowHigh2", callBeat + 0.5f),
new MultiSound.Sound("tossBoys/blueYellowHigh2", callBeat + 0.5f),
});
break;
default:
break;
}
}
if (passBallDict.ContainsKey(beat + length))
{
ScheduleInput(beat, length, GetInputTypeBasedOnCurrentReceiver(), JustHitBall, Miss, Empty);
if (passBallDict[beat + length].datamodel == "tossBoys/dual" || passBallDict[beat + length].datamodel == "tossBoys/lightning" || passBallDict[beat + length].datamodel == "tossBoys/blur")
if (IsSpecialEvent(passBallDict[beat + length].datamodel))
{
BeatAction.New(instance, new List<BeatAction.Action>()
{
@ -448,6 +529,26 @@ namespace HeavenStudio.Games
});
}
}
else if (forcePass)
{
ScheduleInput(beat, length, GetInputTypeBasedOnCurrentReceiver(), JustHitBall, Miss, Empty);
if (IsSpecialEvent(eventDatamodel))
{
BeatAction.New(instance, new List<BeatAction.Action>()
{
new BeatAction.Action(beat + length - 1, delegate { DoSpecialBasedOnReceiver(beat + length - 1); })
});
}
else if (eventDatamodel == "tossBoys/pop")
{
currentBall.willBePopped = true;
if (PlayerInput.CurrentControlStyle != InputController.ControlStyles.Touch)
BeatAction.New(instance, new List<BeatAction.Action>()
{
new BeatAction.Action(beat + length - 1, delegate { GetCurrentReceiver().PopBallPrepare(); })
});
}
}
else
{
BeatAction.New(instance, new List<BeatAction.Action>()
@ -461,36 +562,32 @@ namespace HeavenStudio.Games
{
passBallDict.Clear();
var passBallEvents = EventCaller.GetAllInGameManagerList("tossBoys", new string[] { "pass", "dual", "pop", "high", "lightning", "blur" });
for (int i = 0; i < passBallEvents.Count; i++)
for (int i = 0; i < passBallEvents.Count; i++)
{
if (passBallEvents[i].beat >= Conductor.instance.songPositionInBeatsAsDouble)
{
if (passBallDict.ContainsKey(passBallEvents[i].beat)) continue;
passBallDict.Add(passBallEvents[i].beat, passBallEvents[i]);
}
if (passBallDict.ContainsKey(passBallEvents[i].beat)) continue;
passBallDict.Add(passBallEvents[i].beat, passBallEvents[i]);
}
}
void DeterminePass(double beat, bool barely)
private void DeterminePassValues(double beat)
{
var tempLastReceiver = lastReceiver;
lastReceiver = currentReceiver;
if (passBallDict.TryGetValue(beat, out var receiver))
{
currentReceiver = (WhichTossKid)receiver["who"];
if (receiver.datamodel != "tossBoys/blur") currentReceiver = (WhichTossKid)receiver["who"];
currentPassType = receiver.datamodel;
currentEventLength = receiver.length;
}
else
{
/*
RiqEntity spawnedEntity = new RiqEntity();
spawnedEntity.DynamicData.Add("who", (int)tempLastReceiver);
spawnedEntity.datamodel = currentPassType;
passBallDict.Add(beat, spawnedEntity);
*/
currentReceiver = tempLastReceiver;
}
}
void DeterminePass(double beat, bool barely)
{
DeterminePassValues(beat);
switch (currentPassType)
{
case "tossBoys/pass":
@ -508,14 +605,7 @@ namespace HeavenStudio.Games
default:
break;
}
if (barely)
{
currentBall.anim.DoScaledAnimationAsync("WiggleBall", 0.5f);
}
else
{
currentBall.anim.DoScaledAnimationAsync("Hit", 0.5f);
}
currentBall.anim.DoScaledAnimationAsync(barely ? "WiggleBall" : "Hit", 0.5f);
if (passBallDict.ContainsKey(beat + currentEventLength) && passBallDict[beat + currentEventLength].datamodel == "tossBoys/pop")
{
currentBall.willBePopped = true;
@ -1048,6 +1138,7 @@ namespace HeavenStudio.Games
Destroy(currentBall.gameObject);
currentBall = null;
SoundByte.PlayOneShotGame("tossBoys/misshit");
if (caller != null) DeterminePassValues(caller.startBeat + caller.timer);
}
void Empty(PlayerActionEvent caller) { }
@ -1110,7 +1201,7 @@ namespace HeavenStudio.Games
}
}
string GetColorBasedOnTossKid(WhichTossKid tossKid, bool capital)
public static string GetColorBasedOnTossKid(WhichTossKid tossKid, bool capital)
{
switch (tossKid)
{
@ -1162,6 +1253,24 @@ namespace HeavenStudio.Games
return null;
}
}
private bool IsSpecialEvent(string e)
{
bool b = false;
switch (e)
{
case "tossBoys/dual":
case "tossBoys/lightning":
case "tossBoys/blur":
b = true; break;
default:
return b;
}
return b;
}
#endregion
}
}

View file

@ -367,9 +367,12 @@ namespace HeavenStudio.Games
}
}
}),
new BeatAction.Action(beat, delegate
{
if (gandwHasEntered && !bgDisabled) gandwAnim.Play("MrGameAndWatchLeverDown", 0, 0);
}),
new BeatAction.Action(beat + 1, delegate
{
if (gandwHasEntered && !bgDisabled) gandwAnim.Play("MrGameAndWatchLeverDown", 0, 0);
if (beat + 1 > GetLastIntervalBeforeBeat(beat + 1).beat + GetLastIntervalBeforeBeat(beat + 1).length)
{
ballTransporterLeftNPC.GetComponent<Animator>().Play("BallTransporterLeftClose", 0, 0);