Some Misc Animation Stuff
added move animations, attempted to get "Hai" bubbles to be random but failed, allowed Manzai's inputs to work between game switches
This commit is contained in:
ThePurpleAnon
parent
47a711f457
commit
d5ad219e80
|
|
@ -25,7 +25,7 @@ Transform:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 11877187932009852}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: -0.322, y: -0.843, z: 0.039872695}
|
||||
m_LocalPosition: {x: -0.322, y: -0.843, z: 0.03987269}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
|
|
@ -78,7 +78,7 @@ SpriteRenderer:
|
|||
m_FlipX: 0
|
||||
m_FlipY: 0
|
||||
m_DrawMode: 0
|
||||
m_Size: {x: 0.61, y: 0.57}
|
||||
m_Size: {x: 0.66, y: 0.62}
|
||||
m_AdaptiveModeThreshold: 0.5
|
||||
m_SpriteTileMode: 0
|
||||
m_WasSpriteAssigned: 1
|
||||
|
|
@ -109,7 +109,7 @@ Transform:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 155599222334457783}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: -0.343, y: -0.12600002, z: 0}
|
||||
m_LocalPosition: {x: -0.343, y: -0.126, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
|
|
@ -162,7 +162,7 @@ SpriteRenderer:
|
|||
m_FlipX: 0
|
||||
m_FlipY: 0
|
||||
m_DrawMode: 0
|
||||
m_Size: {x: 0.6, y: 0.45}
|
||||
m_Size: {x: 0.65, y: 0.5}
|
||||
m_AdaptiveModeThreshold: 0.5
|
||||
m_SpriteTileMode: 0
|
||||
m_WasSpriteAssigned: 1
|
||||
|
|
@ -279,7 +279,7 @@ SpriteRenderer:
|
|||
m_FlipX: 0
|
||||
m_FlipY: 0
|
||||
m_DrawMode: 0
|
||||
m_Size: {x: 0.42, y: 0.66}
|
||||
m_Size: {x: 0.47, y: 0.71}
|
||||
m_AdaptiveModeThreshold: 0.5
|
||||
m_SpriteTileMode: 0
|
||||
m_WasSpriteAssigned: 1
|
||||
|
|
@ -510,7 +510,7 @@ SpriteRenderer:
|
|||
m_FlipX: 0
|
||||
m_FlipY: 0
|
||||
m_DrawMode: 0
|
||||
m_Size: {x: 0.18, y: 0.14}
|
||||
m_Size: {x: 0.23, y: 0.19}
|
||||
m_AdaptiveModeThreshold: 0.5
|
||||
m_SpriteTileMode: 0
|
||||
m_WasSpriteAssigned: 1
|
||||
|
|
@ -594,7 +594,7 @@ SpriteRenderer:
|
|||
m_FlipX: 0
|
||||
m_FlipY: 0
|
||||
m_DrawMode: 0
|
||||
m_Size: {x: 0.24, y: 0.38}
|
||||
m_Size: {x: 0.29, y: 0.43}
|
||||
m_AdaptiveModeThreshold: 0.5
|
||||
m_SpriteTileMode: 0
|
||||
m_WasSpriteAssigned: 1
|
||||
|
|
@ -678,7 +678,7 @@ SpriteRenderer:
|
|||
m_FlipX: 1
|
||||
m_FlipY: 0
|
||||
m_DrawMode: 0
|
||||
m_Size: {x: 0.18, y: 0.14}
|
||||
m_Size: {x: 0.23, y: 0.19}
|
||||
m_AdaptiveModeThreshold: 0.5
|
||||
m_SpriteTileMode: 0
|
||||
m_WasSpriteAssigned: 1
|
||||
|
|
@ -762,7 +762,7 @@ SpriteRenderer:
|
|||
m_FlipX: 0
|
||||
m_FlipY: 0
|
||||
m_DrawMode: 0
|
||||
m_Size: {x: 0.27, y: 0.27}
|
||||
m_Size: {x: 0.32, y: 0.32}
|
||||
m_AdaptiveModeThreshold: 0.5
|
||||
m_SpriteTileMode: 0
|
||||
m_WasSpriteAssigned: 1
|
||||
|
|
@ -792,8 +792,8 @@ Transform:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2148490587613729356}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: -0.597, y: -0.045000006, z: 0.03987269}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: -0.597, y: -0.04500001, z: 0.03987269}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
|
|
@ -846,7 +846,7 @@ SpriteRenderer:
|
|||
m_FlipX: 0
|
||||
m_FlipY: 0
|
||||
m_DrawMode: 0
|
||||
m_Size: {x: 0.85, y: 1}
|
||||
m_Size: {x: 0.9, y: 1.05}
|
||||
m_AdaptiveModeThreshold: 0.5
|
||||
m_SpriteTileMode: 0
|
||||
m_WasSpriteAssigned: 1
|
||||
|
|
@ -1014,7 +1014,7 @@ SpriteRenderer:
|
|||
m_FlipX: 0
|
||||
m_FlipY: 0
|
||||
m_DrawMode: 0
|
||||
m_Size: {x: 0.56, y: 0.93}
|
||||
m_Size: {x: 0.61, y: 0.98}
|
||||
m_AdaptiveModeThreshold: 0.5
|
||||
m_SpriteTileMode: 0
|
||||
m_WasSpriteAssigned: 1
|
||||
|
|
@ -1182,7 +1182,7 @@ SpriteRenderer:
|
|||
m_FlipX: 1
|
||||
m_FlipY: 0
|
||||
m_DrawMode: 0
|
||||
m_Size: {x: 0.24, y: 0.38}
|
||||
m_Size: {x: 0.29, y: 0.43}
|
||||
m_AdaptiveModeThreshold: 0.5
|
||||
m_SpriteTileMode: 0
|
||||
m_WasSpriteAssigned: 1
|
||||
|
|
@ -1506,6 +1506,8 @@ MonoBehaviour:
|
|||
HaiBubbleL: {fileID: 8456601383015447979}
|
||||
HaiBubbleR: {fileID: 2672010817748250556}
|
||||
BothBirdsAnim: {fileID: 4047821211562032729}
|
||||
PivotL: {fileID: 5699949445852837137}
|
||||
PivotR: {fileID: 8717251280108068553}
|
||||
--- !u!1 &3161037767898396668
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -1614,7 +1616,7 @@ Transform:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3221213095628071392}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: -0.736, y: 0.16500002, z: 0.03987269}
|
||||
m_LocalPosition: {x: -0.736, y: 0.165, z: 0.03987269}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
|
|
@ -1703,7 +1705,7 @@ SpriteRenderer:
|
|||
m_FlipX: 1
|
||||
m_FlipY: 0
|
||||
m_DrawMode: 0
|
||||
m_Size: {x: 0.33, y: 0.34}
|
||||
m_Size: {x: 0.38, y: 0.39}
|
||||
m_AdaptiveModeThreshold: 0.5
|
||||
m_SpriteTileMode: 0
|
||||
m_WasSpriteAssigned: 1
|
||||
|
|
@ -1787,7 +1789,7 @@ SpriteRenderer:
|
|||
m_FlipX: 0
|
||||
m_FlipY: 0
|
||||
m_DrawMode: 0
|
||||
m_Size: {x: 0.51, y: 0.25}
|
||||
m_Size: {x: 0.56, y: 0.3}
|
||||
m_AdaptiveModeThreshold: 0.5
|
||||
m_SpriteTileMode: 0
|
||||
m_WasSpriteAssigned: 1
|
||||
|
|
@ -2070,7 +2072,7 @@ Transform:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3907370651963578647}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0.2376859, w: 0.97134215}
|
||||
m_LocalPosition: {x: -0.24599999, y: 0.09499997, z: 0}
|
||||
m_LocalPosition: {x: -0.246, y: 0.09499997, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
|
|
@ -2123,7 +2125,7 @@ SpriteRenderer:
|
|||
m_FlipX: 0
|
||||
m_FlipY: 0
|
||||
m_DrawMode: 0
|
||||
m_Size: {x: 0.2, y: 0.21}
|
||||
m_Size: {x: 0.25, y: 0.26}
|
||||
m_AdaptiveModeThreshold: 0.5
|
||||
m_SpriteTileMode: 0
|
||||
m_WasSpriteAssigned: 1
|
||||
|
|
@ -2527,7 +2529,7 @@ Transform:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4499874797347744792}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
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
|
||||
|
|
@ -2581,7 +2583,7 @@ SpriteRenderer:
|
|||
m_FlipX: 0
|
||||
m_FlipY: 0
|
||||
m_DrawMode: 0
|
||||
m_Size: {x: 0.6, y: 0.65}
|
||||
m_Size: {x: 0.65, y: 0.7}
|
||||
m_AdaptiveModeThreshold: 0.5
|
||||
m_SpriteTileMode: 0
|
||||
m_WasSpriteAssigned: 1
|
||||
|
|
@ -2612,12 +2614,12 @@ Transform:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4610263651717955089}
|
||||
m_LocalRotation: {x: -0, y: -0, z: 0.2588191, w: 0.9659258}
|
||||
m_LocalPosition: {x: -3.39, y: 2.67, z: 0}
|
||||
m_LocalPosition: {x: -1.94, y: 3.47, z: 0}
|
||||
m_LocalScale: {x: 1.5, y: 1.5, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 1575284730248154578}
|
||||
m_Father: {fileID: 5881063490390799054}
|
||||
m_Father: {fileID: 5699949445852837137}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!95 &8456601383015447979
|
||||
|
|
@ -2971,7 +2973,7 @@ SpriteRenderer:
|
|||
m_FlipX: 0
|
||||
m_FlipY: 0
|
||||
m_DrawMode: 0
|
||||
m_Size: {x: 0.26, y: 0.24}
|
||||
m_Size: {x: 0.31, y: 0.29}
|
||||
m_AdaptiveModeThreshold: 0.5
|
||||
m_SpriteTileMode: 0
|
||||
m_WasSpriteAssigned: 1
|
||||
|
|
@ -3172,7 +3174,7 @@ SpriteRenderer:
|
|||
m_FlipX: 0
|
||||
m_FlipY: 0
|
||||
m_DrawMode: 0
|
||||
m_Size: {x: 0.27, y: 0.27}
|
||||
m_Size: {x: 0.32, y: 0.32}
|
||||
m_AdaptiveModeThreshold: 0.5
|
||||
m_SpriteTileMode: 0
|
||||
m_WasSpriteAssigned: 1
|
||||
|
|
@ -3202,7 +3204,7 @@ Transform:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6068812224482644440}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0.041, y: -0.269, z: 0.03987269}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
|
|
@ -3256,7 +3258,7 @@ SpriteRenderer:
|
|||
m_FlipX: 0
|
||||
m_FlipY: 0
|
||||
m_DrawMode: 0
|
||||
m_Size: {x: 0.36, y: 0.4}
|
||||
m_Size: {x: 0.41, y: 0.45}
|
||||
m_AdaptiveModeThreshold: 0.5
|
||||
m_SpriteTileMode: 0
|
||||
m_WasSpriteAssigned: 1
|
||||
|
|
@ -3548,6 +3550,38 @@ SpriteRenderer:
|
|||
m_WasSpriteAssigned: 1
|
||||
m_MaskInteraction: 0
|
||||
m_SpriteSortPoint: 0
|
||||
--- !u!1 &6381972727448484663
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 8717251280108068553}
|
||||
m_Layer: 0
|
||||
m_Name: PivotR
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &8717251280108068553
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6381972727448484663}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: -1.45, y: -0.8, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 433795689448701314}
|
||||
m_Father: {fileID: 5881063490390799054}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &6404730572074135107
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -3572,7 +3606,7 @@ Transform:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6404730572074135107}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0.041, y: -0.269, z: 0.03987269}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
|
|
@ -3626,7 +3660,7 @@ SpriteRenderer:
|
|||
m_FlipX: 0
|
||||
m_FlipY: 0
|
||||
m_DrawMode: 0
|
||||
m_Size: {x: 0.36, y: 0.4}
|
||||
m_Size: {x: 0.41, y: 0.45}
|
||||
m_AdaptiveModeThreshold: 0.5
|
||||
m_SpriteTileMode: 0
|
||||
m_WasSpriteAssigned: 1
|
||||
|
|
@ -3730,8 +3764,8 @@ Transform:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6662233672750254776}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: -0.734, y: -0.805, z: 0.039872695}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: -0.734, y: -0.805, z: 0.03987269}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
|
|
@ -3784,7 +3818,7 @@ SpriteRenderer:
|
|||
m_FlipX: 0
|
||||
m_FlipY: 0
|
||||
m_DrawMode: 0
|
||||
m_Size: {x: 0.61, y: 0.57}
|
||||
m_Size: {x: 0.66, y: 0.62}
|
||||
m_AdaptiveModeThreshold: 0.5
|
||||
m_SpriteTileMode: 0
|
||||
m_WasSpriteAssigned: 1
|
||||
|
|
@ -4121,7 +4155,7 @@ SpriteRenderer:
|
|||
m_FlipX: 0
|
||||
m_FlipY: 0
|
||||
m_DrawMode: 0
|
||||
m_Size: {x: 0.33, y: 0.34}
|
||||
m_Size: {x: 0.38, y: 0.39}
|
||||
m_AdaptiveModeThreshold: 0.5
|
||||
m_SpriteTileMode: 0
|
||||
m_WasSpriteAssigned: 1
|
||||
|
|
@ -4527,11 +4561,43 @@ Transform:
|
|||
m_LocalScale: {x: 1.1111112, y: 1.1111112, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 2929667954241189041}
|
||||
- {fileID: 433795689448701314}
|
||||
- {fileID: 5699949445852837137}
|
||||
- {fileID: 8717251280108068553}
|
||||
m_Father: {fileID: 4470941884995114579}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &8511806274563078793
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 5699949445852837137}
|
||||
m_Layer: 0
|
||||
m_Name: PivotL
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &5699949445852837137
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8511806274563078793}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: -1.45, y: -0.8, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 2929667954241189041}
|
||||
m_Father: {fileID: 5881063490390799054}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &8627201407586870289
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -4610,7 +4676,7 @@ SpriteRenderer:
|
|||
m_FlipX: 0
|
||||
m_FlipY: 0
|
||||
m_DrawMode: 0
|
||||
m_Size: {x: 1.11, y: 1.11}
|
||||
m_Size: {x: 1.16, y: 1.16}
|
||||
m_AdaptiveModeThreshold: 0.5
|
||||
m_SpriteTileMode: 0
|
||||
m_WasSpriteAssigned: 1
|
||||
|
|
@ -4641,13 +4707,13 @@ Transform:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8974510991397761272}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0.3420201, w: 0.9396927}
|
||||
m_LocalPosition: {x: 1.16, y: 2.61, z: 0}
|
||||
m_LocalPosition: {x: 2.6100001, y: 3.41, z: 0}
|
||||
m_LocalScale: {x: 1.5, y: 1.5, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 2697637075176453146}
|
||||
m_Father: {fileID: 5881063490390799054}
|
||||
m_RootOrder: 1
|
||||
m_Father: {fileID: 8717251280108068553}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!95 &2672010817748250556
|
||||
Animator:
|
||||
|
|
@ -4748,7 +4814,7 @@ SpriteRenderer:
|
|||
m_FlipX: 0
|
||||
m_FlipY: 0
|
||||
m_DrawMode: 0
|
||||
m_Size: {x: 0.2, y: 0.21}
|
||||
m_Size: {x: 0.25, y: 0.26}
|
||||
m_AdaptiveModeThreshold: 0.5
|
||||
m_SpriteTileMode: 0
|
||||
m_WasSpriteAssigned: 1
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@ RenderTexture:
|
|||
m_DownscaleFallback: 0
|
||||
m_IsAlphaChannelOptional: 0
|
||||
serializedVersion: 5
|
||||
m_Width: 984
|
||||
m_Height: 554
|
||||
m_Width: 1034
|
||||
m_Height: 582
|
||||
m_AntiAliasing: 2
|
||||
m_MipCount: -1
|
||||
m_DepthStencilFormat: 92
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@ RenderTexture:
|
|||
m_DownscaleFallback: 0
|
||||
m_IsAlphaChannelOptional: 0
|
||||
serializedVersion: 5
|
||||
m_Width: 1476
|
||||
m_Height: 831
|
||||
m_Width: 1551
|
||||
m_Height: 873
|
||||
m_AntiAliasing: 1
|
||||
m_MipCount: -1
|
||||
m_DepthStencilFormat: 92
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
|
|
@ -8906,7 +8906,7 @@ MonoBehaviour:
|
|||
m_faceColor:
|
||||
serializedVersion: 2
|
||||
rgba: 4294967295
|
||||
m_fontSize: 14
|
||||
m_fontSize: 12.55
|
||||
m_fontSizeBase: 14.3
|
||||
m_fontWeight: 400
|
||||
m_enableAutoSizing: 1
|
||||
|
|
@ -14029,7 +14029,7 @@ MonoBehaviour:
|
|||
m_TargetGraphic: {fileID: 171581557}
|
||||
m_HandleRect: {fileID: 171581556}
|
||||
m_Direction: 2
|
||||
m_Value: 1
|
||||
m_Value: 0
|
||||
m_Size: 1
|
||||
m_NumberOfSteps: 0
|
||||
m_OnValueChanged:
|
||||
|
|
@ -16661,7 +16661,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: -50.000015}
|
||||
m_AnchoredPosition: {x: 0, y: -50}
|
||||
m_SizeDelta: {x: -48, y: -148}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &572765323
|
||||
|
|
@ -26850,7 +26850,7 @@ MonoBehaviour:
|
|||
m_TargetGraphic: {fileID: 1589389272}
|
||||
m_HandleRect: {fileID: 1589389271}
|
||||
m_Direction: 2
|
||||
m_Value: 1
|
||||
m_Value: 0
|
||||
m_Size: 1
|
||||
m_NumberOfSteps: 0
|
||||
m_OnValueChanged:
|
||||
|
|
@ -32707,7 +32707,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0.5}
|
||||
m_AnchorMax: {x: 1, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0, y: 146.61183}
|
||||
m_AnchoredPosition: {x: 0, y: 97.42857}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 1}
|
||||
--- !u!222 &1154875945
|
||||
|
|
@ -43455,8 +43455,8 @@ MonoBehaviour:
|
|||
m_TargetGraphic: {fileID: 1220118245}
|
||||
m_HandleRect: {fileID: 1220118244}
|
||||
m_Direction: 2
|
||||
m_Value: 1.000001
|
||||
m_Size: 0.81650156
|
||||
m_Value: 1.0000002
|
||||
m_Size: 0.40897956
|
||||
m_NumberOfSteps: 0
|
||||
m_OnValueChanged:
|
||||
m_PersistentCalls:
|
||||
|
|
|
|||
|
|
@ -106,6 +106,9 @@ namespace HeavenStudio.Games
|
|||
[SerializeField] Animator HaiBubbleR;
|
||||
[SerializeField] Animator BothBirdsAnim;
|
||||
|
||||
[SerializeField] Transform PivotL;
|
||||
[SerializeField] Transform PivotR;
|
||||
|
||||
bool ravenBop = true;
|
||||
bool vultureBop = true;
|
||||
|
||||
|
|
@ -166,6 +169,7 @@ namespace HeavenStudio.Games
|
|||
TonakaiyoOtonokoi,
|
||||
TorinikugaTorininkui,
|
||||
UmetteUmena,
|
||||
Muted,
|
||||
}
|
||||
|
||||
static readonly Dictionary<string, int> boingLengths = new() {
|
||||
|
|
@ -304,6 +308,10 @@ namespace HeavenStudio.Games
|
|||
|
||||
public void HaiJustL(PlayerActionEvent caller, float state)
|
||||
{
|
||||
// var euler = PivotL.eulerAngles;
|
||||
// euler.z = UnityEngine.Random.Range(0, 100);
|
||||
|
||||
|
||||
HaiBubbleL.DoScaledAnimationAsync("HaiL", 0.5f);
|
||||
HaiJustFull();
|
||||
}
|
||||
|
|
@ -402,5 +410,23 @@ namespace HeavenStudio.Games
|
|||
if (normalizedBeat >= 1f) isMoving = false;
|
||||
}
|
||||
}
|
||||
|
||||
public override void OnGameSwitch(double beat)
|
||||
{
|
||||
foreach(var entity in GameManager.instance.Beatmap.Entities)
|
||||
{
|
||||
if(entity.beat > beat) //the list is sorted based on the beat of the entity, so this should work fine.
|
||||
{
|
||||
break;
|
||||
}
|
||||
if(entity.datamodel != "manzai/pun" || entity.beat + entity.length <= beat) //check for dispenses that happen right before the switch
|
||||
{
|
||||
continue;
|
||||
}
|
||||
bool isOnGameSwitchBeat = entity.beat == beat;
|
||||
DoPun(entity.beat, entity["boing"], entity["pun"]);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 11 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 19 KiB After Width: | Height: | Size: 26 KiB |
Loading…
Reference in a new issue