diff --git a/Assets/Resources/Fonts/rodin/FOT-Rodin Pro B SDF Dynamic_Outline.asset b/Assets/Resources/Fonts/rodin/FOT-Rodin Pro B SDF Dynamic_Outline.asset index 8b19b2377..fa729cc62 100644 --- a/Assets/Resources/Fonts/rodin/FOT-Rodin Pro B SDF Dynamic_Outline.asset +++ b/Assets/Resources/Fonts/rodin/FOT-Rodin Pro B SDF Dynamic_Outline.asset @@ -366,6 +366,10 @@ MonoBehaviour: m_LigatureGlyphID: 8031 - m_ComponentGlyphIDs: 2c0000002c000000 m_LigatureGlyphID: 7611 + - m_ComponentGlyphIDs: 19000000100000001200000012000000 + m_LigatureGlyphID: 9817 + - m_ComponentGlyphIDs: 19000000100000001a000000 + m_LigatureGlyphID: 9805 m_GlyphPairAdjustmentRecords: - m_FirstAdjustmentRecord: m_GlyphIndex: 79 diff --git a/Assets/Resources/Games/manzai.prefab b/Assets/Resources/Games/manzai.prefab index 0f117d742..e0f6c778e 100644 --- a/Assets/Resources/Games/manzai.prefab +++ b/Assets/Resources/Games/manzai.prefab @@ -30,7 +30,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1146595349693182952} - m_RootOrder: 9 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &5488546955818747212 SpriteRenderer: @@ -109,12 +109,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 155599222334457783} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -1.079, y: 0.039, z: 0.039872695} + m_LocalPosition: {x: -0.343, y: -0.12600002, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1146595349693182952} - m_RootOrder: 8 + m_Father: {fileID: 8890160900398855816} + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &753177016481497927 SpriteRenderer: @@ -362,6 +362,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5721729477846433201} + - component: {fileID: 7204459476474823181} m_Layer: 0 m_Name: Raven m_TagString: Untagged @@ -381,18 +382,33 @@ Transform: m_LocalScale: {x: 2.2, y: 2.2, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 4407522145098898300} - - {fileID: 9072905668223034893} + - {fileID: 785840404966787129} - {fileID: 2312516982777118322} - {fileID: 4417841991947308916} - - {fileID: 340213147309419467} - - {fileID: 7085288914498013887} - - {fileID: 9086017139883859381} - - {fileID: 8558047857510069096} - - {fileID: 5498443208902086084} m_Father: {fileID: 7879640242725009620} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!95 &7204459476474823181 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 791308303991502948} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 110ce32674918f94aa44d84037b57b49, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!1 &905643803221489564 GameObject: m_ObjectHideFlags: 0 @@ -417,13 +433,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 905643803221489564} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.049, y: 0.09, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.049000006, y: 0.09000001, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 5721729477846433201} - m_RootOrder: 8 + m_Father: {fileID: 785840404966787129} + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &7720144923643927560 SpriteRenderer: @@ -501,13 +517,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1706033228364720357} - m_LocalRotation: {x: 0, y: 0, z: -0.034899585, w: 0.99939084} - m_LocalPosition: {x: -0.221, y: -0.23, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0.034899585, w: 0.99939084} + m_LocalPosition: {x: -0.22100005, y: -0.23000002, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 5721729477846433201} - m_RootOrder: 5 + m_Father: {fileID: 785840404966787129} + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: -4} --- !u!212 &1196118124198466542 SpriteRenderer: @@ -585,13 +601,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1907603498476385181} - m_LocalRotation: {x: 0, y: 0, z: 0.16504757, w: 0.9862857} - m_LocalPosition: {x: 0.159, y: 0.123, z: 0} + m_LocalRotation: {x: -0, y: -0, z: 0.16504757, w: 0.9862857} + m_LocalPosition: {x: 0.15900005, y: 0.12300001, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 5721729477846433201} - m_RootOrder: 6 + m_Father: {fileID: 785840404966787129} + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 19} --- !u!212 &4509079954323329728 SpriteRenderer: @@ -675,7 +691,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1146595349693182952} - m_RootOrder: 10 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &8631519135799821123 SpriteRenderer: @@ -754,7 +770,7 @@ Transform: 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.045, z: 0.039872695} + m_LocalPosition: {x: -0.597, y: -0.045000006, z: 0.039872695} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -922,12 +938,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2193238691728528804} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: -0.004, z: 0} + m_LocalPosition: {x: 0, y: -0.0040000137, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 5721729477846433201} - m_RootOrder: 4 + m_Father: {fileID: 785840404966787129} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &8093640504867093171 SpriteRenderer: @@ -1090,11 +1106,11 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2309429148931903035} m_LocalRotation: {x: -0, y: -0, z: 0.043619405, w: 0.9990483} - m_LocalPosition: {x: 0.21800001, y: -0.23480001, z: 0} + m_LocalPosition: {x: 0.21799998, y: -0.23480004, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 5721729477846433201} + m_Father: {fileID: 785840404966787129} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 5} --- !u!212 &5632370197210945586 @@ -1242,6 +1258,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1146595349693182952} + - component: {fileID: 6900698675499260864} m_Layer: 0 m_Name: Vulture m_TagString: Untagged @@ -1266,16 +1283,34 @@ Transform: - {fileID: 5673475170201331750} - {fileID: 7651922943596580305} - {fileID: 2581635908525945968} - - {fileID: 5252743504259929056} - - {fileID: 8327409654553525714} - - {fileID: 4578997645091009277} - - {fileID: 8544289701685236321} + - {fileID: 8890160900398855816} - {fileID: 6817664634703666735} - {fileID: 2214701733368068481} - {fileID: 3153783865440649635} m_Father: {fileID: 7879640242725009620} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!95 &6900698675499260864 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2731808410480165808} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: cc76176ecb2de3e438c9adb54b5ce327, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!1 &2865555280204165258 GameObject: m_ObjectHideFlags: 0 @@ -1411,6 +1446,8 @@ MonoBehaviour: m_EditorClassIdentifier: SoundSequences: [] scheduledInputs: [] + VultureAnim: {fileID: 6900698675499260864} + RavenAnim: {fileID: 7204459476474823181} --- !u!1 &3161037767898396668 GameObject: m_ObjectHideFlags: 0 @@ -1495,6 +1532,41 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &3221213095628071392 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8890160900398855816} + m_Layer: 0 + m_Name: FULL HEAD + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8890160900398855816 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + 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_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 5252743504259929056} + - {fileID: 8327409654553525714} + - {fileID: 4578997645091009277} + - {fileID: 8544289701685236321} + m_Father: {fileID: 1146595349693182952} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &3320705533238057540 GameObject: m_ObjectHideFlags: 0 @@ -1525,7 +1597,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5721729477846433201} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &958121852501050216 SpriteRenderer: @@ -1604,12 +1676,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3501959605278480633} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.247, y: -0.016, z: 0} + m_LocalPosition: {x: 0.24700002, y: -0.016, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 5721729477846433201} - m_RootOrder: 7 + m_Father: {fileID: 785840404966787129} + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &7953867923793165913 SpriteRenderer: @@ -1855,13 +1927,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3907370651963578647} - m_LocalRotation: {x: 0, y: 0, z: -0.2376859, w: 0.97134215} - m_LocalPosition: {x: -0.982, y: 0.26, z: 0.039872695} + m_LocalRotation: {x: -0, y: -0, z: -0.2376859, w: 0.97134215} + m_LocalPosition: {x: -0.24599999, y: 0.09499997, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1146595349693182952} - m_RootOrder: 7 + m_Father: {fileID: 8890160900398855816} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: -27.5} --- !u!212 &475427977316541724 SpriteRenderer: @@ -2083,6 +2155,44 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &4163383029712983319 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 785840404966787129} + m_Layer: 0 + m_Name: FULL HEAD + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &785840404966787129 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4163383029712983319} + 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: 4407522145098898300} + - {fileID: 9072905668223034893} + - {fileID: 340213147309419467} + - {fileID: 7085288914498013887} + - {fileID: 9086017139883859381} + - {fileID: 8558047857510069096} + - {fileID: 5498443208902086084} + m_Father: {fileID: 5721729477846433201} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &4233649577911354511 GameObject: m_ObjectHideFlags: 0 @@ -2276,12 +2386,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4499874797347744792} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.736, y: 0.165, z: 0.039872695} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1146595349693182952} - m_RootOrder: 5 + m_Father: {fileID: 8890160900398855816} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &2584941191411704798 SpriteRenderer: @@ -2612,11 +2722,11 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5503195547294079681} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.2352, y: -0.339, z: 0} + m_LocalPosition: {x: -0.23520005, y: -0.33900002, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 5721729477846433201} + m_Father: {fileID: 785840404966787129} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &4654800394274707723 @@ -2986,7 +3096,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1146595349693182952} - m_RootOrder: 11 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &2034863541472239214 SpriteRenderer: @@ -3064,8 +3174,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6491076149254200282} 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_LocalPosition: {x: 0.15, y: 0, z: -1.5} + m_LocalScale: {x: 0.85, y: 0.85, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1145748648927483639} @@ -3396,7 +3506,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5721729477846433201} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &3373874199624659607 SpriteRenderer: @@ -3931,12 +4041,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8982233006656975795} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.709, y: 0.197, z: 0.039872695} + m_LocalPosition: {x: 0.02699989, y: 0.03200002, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1146595349693182952} - m_RootOrder: 6 + m_Father: {fileID: 8890160900398855816} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &1214010035305930866 SpriteRenderer: diff --git a/Assets/Resources/Sfx/games/manzai.meta b/Assets/Resources/Sfx/games/manzai.meta new file mode 100644 index 000000000..dc0357b31 --- /dev/null +++ b/Assets/Resources/Sfx/games/manzai.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f4d2a354185c16541a66d89491cb04ac +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/manzai/boing.ogg b/Assets/Resources/Sfx/games/manzai/boing.ogg new file mode 100644 index 000000000..7cd14b369 Binary files /dev/null and b/Assets/Resources/Sfx/games/manzai/boing.ogg differ diff --git a/Assets/Resources/Sfx/games/manzai/boing.ogg.meta b/Assets/Resources/Sfx/games/manzai/boing.ogg.meta new file mode 100644 index 000000000..e655bfc1f --- /dev/null +++ b/Assets/Resources/Sfx/games/manzai/boing.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: dd1a99f60526aca42921f511f772b743 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/manzai/futongaFuttonda.ogg b/Assets/Resources/Sfx/games/manzai/futongaFuttonda.ogg new file mode 100644 index 000000000..3eedd6610 Binary files /dev/null and b/Assets/Resources/Sfx/games/manzai/futongaFuttonda.ogg differ diff --git a/Assets/Resources/Sfx/games/manzai/futongaFuttonda.ogg.meta b/Assets/Resources/Sfx/games/manzai/futongaFuttonda.ogg.meta new file mode 100644 index 000000000..8ed86abeb --- /dev/null +++ b/Assets/Resources/Sfx/games/manzai/futongaFuttonda.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 8be9143a5c0e3c44f8d685b65c3bb298 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/manzai/futongaFuttondaBoing.ogg b/Assets/Resources/Sfx/games/manzai/futongaFuttondaBoing.ogg new file mode 100644 index 000000000..17eb57e1d Binary files /dev/null and b/Assets/Resources/Sfx/games/manzai/futongaFuttondaBoing.ogg differ diff --git a/Assets/Resources/Sfx/games/manzai/futongaFuttondaBoing.ogg.meta b/Assets/Resources/Sfx/games/manzai/futongaFuttondaBoing.ogg.meta new file mode 100644 index 000000000..eadc8ce16 --- /dev/null +++ b/Assets/Resources/Sfx/games/manzai/futongaFuttondaBoing.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: cd8ed62daf8b41b47a28ed245f659a6c +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/manzai/hai.ogg b/Assets/Resources/Sfx/games/manzai/hai.ogg new file mode 100644 index 000000000..87b009bc8 Binary files /dev/null and b/Assets/Resources/Sfx/games/manzai/hai.ogg differ diff --git a/Assets/Resources/Sfx/games/manzai/hai.ogg.meta b/Assets/Resources/Sfx/games/manzai/hai.ogg.meta new file mode 100644 index 000000000..53585599c --- /dev/null +++ b/Assets/Resources/Sfx/games/manzai/hai.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 2cf55d9eb34ca8e419001d0ee54093bd +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/manzai/haiAccent.ogg b/Assets/Resources/Sfx/games/manzai/haiAccent.ogg new file mode 100644 index 000000000..891ae4064 Binary files /dev/null and b/Assets/Resources/Sfx/games/manzai/haiAccent.ogg differ diff --git a/Assets/Resources/Sfx/games/manzai/haiAccent.ogg.meta b/Assets/Resources/Sfx/games/manzai/haiAccent.ogg.meta new file mode 100644 index 000000000..c27777378 --- /dev/null +++ b/Assets/Resources/Sfx/games/manzai/haiAccent.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 636ae20a3bd94f14088158a310ff7fd1 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/Manzai/Animations/Raven.meta b/Assets/Resources/Sprites/Games/Manzai/Animations/Raven.meta new file mode 100644 index 000000000..aa4811bbc --- /dev/null +++ b/Assets/Resources/Sprites/Games/Manzai/Animations/Raven.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9d6b1656cc70cef44b660fbb317319eb +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/Manzai/Animations/Raven/RavenAnim.controller b/Assets/Resources/Sprites/Games/Manzai/Animations/Raven/RavenAnim.controller new file mode 100644 index 000000000..e98f40e36 --- /dev/null +++ b/Assets/Resources/Sprites/Games/Manzai/Animations/Raven/RavenAnim.controller @@ -0,0 +1,130 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-7585022878786334990 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Idle + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 0} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &-2577233876775715669 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Bop + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 53a79190202ceab479312acb774248cc, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: RavenAnim + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 2491412138162078166} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1107 &2491412138162078166 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: -7585022878786334990} + m_Position: {x: 170, y: 230, z: 0} + - serializedVersion: 1 + m_State: {fileID: 4234874975108550669} + m_Position: {x: 400, y: 100, z: 0} + - serializedVersion: 1 + m_State: {fileID: -2577233876775715669} + m_Position: {x: 400, y: 200, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: -7585022878786334990} +--- !u!1102 &4234874975108550669 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Talk + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 04e64baf8cb2c8f48903bb66e3edc726, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: diff --git a/Assets/Resources/Sprites/Games/Manzai/Animations/Raven/RavenAnim.controller.meta b/Assets/Resources/Sprites/Games/Manzai/Animations/Raven/RavenAnim.controller.meta new file mode 100644 index 000000000..ed1efc389 --- /dev/null +++ b/Assets/Resources/Sprites/Games/Manzai/Animations/Raven/RavenAnim.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 110ce32674918f94aa44d84037b57b49 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/Manzai/Animations/Raven/RavenBop.anim b/Assets/Resources/Sprites/Games/Manzai/Animations/Raven/RavenBop.anim new file mode 100644 index 000000000..594f79578 --- /dev/null +++ b/Assets/Resources/Sprites/Games/Manzai/Animations/Raven/RavenBop.anim @@ -0,0 +1,169 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: RavenBop + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: -0.05, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.083333336 + value: {x: 0, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: FULL HEAD + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 3700796843 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.083333336 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.083333336 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: FULL HEAD + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -0.05 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.083333336 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: FULL HEAD + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.083333336 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: FULL HEAD + classID: 4 + script: {fileID: 0} + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Resources/Sprites/Games/Manzai/Animations/Raven/RavenBop.anim.meta b/Assets/Resources/Sprites/Games/Manzai/Animations/Raven/RavenBop.anim.meta new file mode 100644 index 000000000..d53f80f05 --- /dev/null +++ b/Assets/Resources/Sprites/Games/Manzai/Animations/Raven/RavenBop.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 53a79190202ceab479312acb774248cc +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/Manzai/Animations/Raven/RavenTalk.anim b/Assets/Resources/Sprites/Games/Manzai/Animations/Raven/RavenTalk.anim new file mode 100644 index 000000000..906cc3bda --- /dev/null +++ b/Assets/Resources/Sprites/Games/Manzai/Animations/Raven/RavenTalk.anim @@ -0,0 +1,71 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: RavenTalk + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 242865903, guid: ee620cf28d1d86b49b7c0e22e8630d09, type: 3} + - time: 0.083333336 + value: {fileID: -126349652, guid: ee620cf28d1d86b49b7c0e22e8630d09, type: 3} + attribute: m_Sprite + path: FULL HEAD/Beak + classID: 212 + script: {fileID: 0} + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 848800724 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 242865903, guid: ee620cf28d1d86b49b7c0e22e8630d09, type: 3} + - {fileID: -126349652, guid: ee620cf28d1d86b49b7c0e22e8630d09, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.1 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Resources/Sprites/Games/Manzai/Animations/Raven/RavenTalk.anim.meta b/Assets/Resources/Sprites/Games/Manzai/Animations/Raven/RavenTalk.anim.meta new file mode 100644 index 000000000..f8357c9cd --- /dev/null +++ b/Assets/Resources/Sprites/Games/Manzai/Animations/Raven/RavenTalk.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 04e64baf8cb2c8f48903bb66e3edc726 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/Manzai/Animations/Vulture.meta b/Assets/Resources/Sprites/Games/Manzai/Animations/Vulture.meta new file mode 100644 index 000000000..5f4910084 --- /dev/null +++ b/Assets/Resources/Sprites/Games/Manzai/Animations/Vulture.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 64007230b9f3b84428fbd53e28271df7 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/Manzai/Animations/Vulture/VultureAnim.controller b/Assets/Resources/Sprites/Games/Manzai/Animations/Vulture/VultureAnim.controller new file mode 100644 index 000000000..14fa4a00e --- /dev/null +++ b/Assets/Resources/Sprites/Games/Manzai/Animations/Vulture/VultureAnim.controller @@ -0,0 +1,130 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-3411817078048662773 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Talk + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 3cbfe5840d263aa4499d4a6db2eca4ba, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: VultureAnim + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 998994199012730098} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1107 &998994199012730098 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 2953236341079870852} + m_Position: {x: 120, y: 200, z: 0} + - serializedVersion: 1 + m_State: {fileID: 7503363691817900677} + m_Position: {x: 400, y: 200, z: 0} + - serializedVersion: 1 + m_State: {fileID: -3411817078048662773} + m_Position: {x: 400, y: 100, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 2953236341079870852} +--- !u!1102 &2953236341079870852 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Idle + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 0} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &7503363691817900677 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Bop + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: a185f791c70d6054f93e0318825200ad, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: diff --git a/Assets/Resources/Sprites/Games/Manzai/Animations/Vulture/VultureAnim.controller.meta b/Assets/Resources/Sprites/Games/Manzai/Animations/Vulture/VultureAnim.controller.meta new file mode 100644 index 000000000..d26c66b7f --- /dev/null +++ b/Assets/Resources/Sprites/Games/Manzai/Animations/Vulture/VultureAnim.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: cc76176ecb2de3e438c9adb54b5ce327 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/Manzai/Animations/Vulture/VultureBop.anim b/Assets/Resources/Sprites/Games/Manzai/Animations/Vulture/VultureBop.anim new file mode 100644 index 000000000..3914e9ab5 --- /dev/null +++ b/Assets/Resources/Sprites/Games/Manzai/Animations/Vulture/VultureBop.anim @@ -0,0 +1,169 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: VultureBop + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: -0.736, y: 0.1, z: 0.03987269} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.083333336 + value: {x: -0.736, y: 0.165, z: 0.03987269} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: FULL HEAD + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 3700796843 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.083333336 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -0.736 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.083333336 + value: -0.736 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: FULL HEAD + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.083333336 + value: 0.165 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: FULL HEAD + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.03987269 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.083333336 + value: 0.03987269 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: FULL HEAD + classID: 4 + script: {fileID: 0} + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Resources/Sprites/Games/Manzai/Animations/Vulture/VultureBop.anim.meta b/Assets/Resources/Sprites/Games/Manzai/Animations/Vulture/VultureBop.anim.meta new file mode 100644 index 000000000..5479ac2cf --- /dev/null +++ b/Assets/Resources/Sprites/Games/Manzai/Animations/Vulture/VultureBop.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a185f791c70d6054f93e0318825200ad +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/Manzai/Animations/Vulture/VultureTalk.anim b/Assets/Resources/Sprites/Games/Manzai/Animations/Vulture/VultureTalk.anim new file mode 100644 index 000000000..0512708ad --- /dev/null +++ b/Assets/Resources/Sprites/Games/Manzai/Animations/Vulture/VultureTalk.anim @@ -0,0 +1,71 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: VultureTalk + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 1492920022, guid: ee620cf28d1d86b49b7c0e22e8630d09, type: 3} + - time: 0.083333336 + value: {fileID: 1855868972, guid: ee620cf28d1d86b49b7c0e22e8630d09, type: 3} + attribute: m_Sprite + path: FULL HEAD/Beak + classID: 212 + script: {fileID: 0} + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 848800724 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 1492920022, guid: ee620cf28d1d86b49b7c0e22e8630d09, type: 3} + - {fileID: 1855868972, guid: ee620cf28d1d86b49b7c0e22e8630d09, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.1 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Resources/Sprites/Games/Manzai/Animations/Vulture/VultureTalk.anim.meta b/Assets/Resources/Sprites/Games/Manzai/Animations/Vulture/VultureTalk.anim.meta new file mode 100644 index 000000000..ecf761f9e --- /dev/null +++ b/Assets/Resources/Sprites/Games/Manzai/Animations/Vulture/VultureTalk.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3cbfe5840d263aa4499d4a6db2eca4ba +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Editor.unity b/Assets/Scenes/Editor.unity index ad9bec1c8..64c5b6b79 100644 --- a/Assets/Scenes/Editor.unity +++ b/Assets/Scenes/Editor.unity @@ -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: 89.2652} + m_AnchoredPosition: {x: 0, y: 89.265305} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!222 &1154875945 diff --git a/Assets/Scripts/Games/Manzai/Manzai.cs b/Assets/Scripts/Games/Manzai/Manzai.cs index 100d0edb0..c3645df74 100644 --- a/Assets/Scripts/Games/Manzai/Manzai.cs +++ b/Assets/Scripts/Games/Manzai/Manzai.cs @@ -15,16 +15,37 @@ namespace HeavenStudio.Games.Loaders { return new Minigame("manzai", "Manzai", "554899", false, false, new List() { - new GameAction("Bop", "Bop") + new GameAction("bop", "Bop") { - //function = delegate {}, + function = delegate { Manzai.instance.Bop(); }, resizable = true, parameters = new List() { - new Param("toggle", true, "Enable Bopping", "Whether to bop to the beat or not"), - new Param("auto", false, "Enable Bopping (Auto)", "Whether to bop to the beat or not automatically"), + new Param("who", Manzai.WhoBops.Both, "Who Bops?", "Which bird bops"), + new Param("auto", false, "Automatic?", "Whether to bop to the beat or not automatically"), } }, + new GameAction("pun", "Pun") + { + function = delegate { Manzai.instance.DoPun(eventCaller.currentEntity.beat); }, + defaultLength = 4, + parameters = new List() + { + new Param("boing", Manzai.BoingType.Normal, "Pun Type", "Will Kosuke mess up his pun?"), + new Param("random", true, "Random Voiceline", "Use a random pun?", new List() + { + new Param.CollapseParam((x, _) => !(bool)x, new string[] { "pun" }), + new Param.CollapseParam((x, _) => (bool)x, new string[] { "unused" }) + }), + new Param("pun", Manzai.Puns.FutongaFuttonda, "Which Pun?", "Which pun will Kosuke say?"), + new Param("unused", false, "Include Unused", "Will unused puns be picked?"), + } + }, + new GameAction("customBoing", "Custom Boing") + { + //function = delegate {}, + defaultLength = 0.5f, + }, }); } } @@ -35,5 +56,114 @@ namespace HeavenStudio.Games //using Scripts_DogNinja; public class Manzai : Minigame { + struct SfxDef + { + public string sfx; + public double[] timings; + public SfxDef (string sfx, double[] timings) + { + this.sfx = sfx; + this.timings = timings; + } + } + + static readonly List sfxDefs = new() + { + new("futongaFuttonda", new double[] {}), + }; + + + [SerializeField] Animator VultureAnim; + [SerializeField] Animator RavenAnim; + + + public enum WhoBops + { + None, + Kasuke, + Kosuke, + Both, + } + + public enum BoingType + { + Normal, + Boing, + Random, + } + + public enum Puns + { + AichiniAichinna, + AmmeteAmena, + ChainaniNichaina, + DenwariDenwa, //short animation + FutongaFuttonda, + HiromegaHirameida, + IkagariKatta, + IkugawaIkura, //short animation (boing unused) + KaeruBurikaeru, + KarewaKare, + KouchagaKouchou, + KusagaKusai, //short animation (boing unused) + MegaminiwaMegane, + MikangaMikannai, + NekogaNekoronda, + OkanewaOkkane, + OkurezeKitteOkure, + OmochinoKimochi, + OmoinoHokaOmoi, + PuringaTappurin, + RakudawaRakugana, + RoukadaKatarouka, + SaiyoMinasai, + SakanaKanaMasakana, + SarugaSaru, //short animation (boing unused) + ShaiinniNanariNashain_Unused, //fully unused + SuikawaYasuika, + TaigaTabetaina, + TaininiKittai, + TaiyoGamiTaiyou, + ToiletNiIttoire, + TonakaiyoOtonokoi, + TorinikugaTorininkui, + UmetteUmena, + } + + + public static Manzai instance; + + + public void Awake() + { + instance = this; + } + + public void Bop() + { + VultureAnim.DoScaledAnimationAsync("Bop", 0.5f); + RavenAnim.DoScaledAnimationAsync("Bop", 0.5f); + } + public void DoPun(double beat) + { + SoundByte.PlayOneShotGame("manzai/"+sfxDefs[0].sfx); + ScheduleInput(beat, 2.5f, InputAction_BasicPress, HaiJust, HaiMiss, Nothing); + ScheduleInput(beat, 3.0f, InputAction_BasicPress, HaiJust, HaiMiss, Nothing); + } + public void HaiJust(PlayerActionEvent caller, float state) + { + SoundByte.PlayOneShotGame("manzai/hai"); + SoundByte.PlayOneShotGame("manzai/haiAccent"); + RavenAnim.DoScaledAnimationAsync("Talk", 0.5f); + } + public void HaiMiss(PlayerActionEvent caller) + { + SoundByte.PlayOneShotGame("manzai/hai"); + RavenAnim.DoScaledAnimationAsync("Talk", 0.5f); + } + public void Nothing(PlayerActionEvent caller) + { + + } } }