diff --git a/Assets/Resources/Games/samuraiSliceNtr.prefab b/Assets/Resources/Games/samuraiSliceNtr.prefab index 93561eac2..cf785adcc 100644 --- a/Assets/Resources/Games/samuraiSliceNtr.prefab +++ b/Assets/Resources/Games/samuraiSliceNtr.prefab @@ -253,7 +253,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 907170206961966871} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.5, y: 0.25, z: 0} + m_LocalPosition: {x: -0.5, y: 0.25, z: -0.001} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2024318448781453715} @@ -5565,7 +5565,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1465141136420999014} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 4.45, y: -6.2500005, z: 0} + m_LocalPosition: {x: 4.45, y: -6.2500005, z: 0.1} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6282202035828239264} @@ -5585,8 +5585,8 @@ MonoBehaviour: m_EditorClassIdentifier: curve: {fileID: 9026471934783822949} handleType: 0 - leftHandleLocalPosition: {x: -2.520605, y: 13.437961, z: -0.060546875} - rightHandleLocalPosition: {x: 2.520605, y: -13.437961, z: 0.060546875} + leftHandleLocalPosition: {x: -2.1442063, y: 13.031189, z: -0.24612674} + rightHandleLocalPosition: {x: 2.1442063, y: -13.031189, z: 0.24612674} --- !u!1 &1658320474579320115 GameObject: m_ObjectHideFlags: 0 @@ -10546,7 +10546,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &6530704449370969801 Transform: m_ObjectHideFlags: 0 @@ -10564,6 +10564,7 @@ Transform: - {fileID: 1151143911982550622} - {fileID: 2505954647570152314} - {fileID: 8272695428826935173} + - {fileID: 2800013509931204424} m_Father: {fileID: 6803714669671852684} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -10676,7 +10677,7 @@ Transform: m_GameObject: {fileID: 2644071208260666374} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 3, z: 1} + m_LocalScale: {x: 10, y: 10, z: 1} m_Children: [] m_Father: {fileID: 4578792811399118319} m_RootOrder: 4 @@ -10816,6 +10817,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 00eae865695fcff4e8ccadf976355847, type: 3} m_Name: m_EditorClassIdentifier: + SoundSequences: [] EligibleHits: [] scheduledInputs: [] firstEnable: 0 @@ -10830,6 +10832,7 @@ MonoBehaviour: NgLaunchCurve: {fileID: 8715086685139578075} DebrisLeftCurve: {fileID: 681199269563884239} DebrisRightCurve: {fileID: 6134167994079843062} + NgDebrisCurve: {fileID: 8755454903872010978} --- !u!1 &3625395986258989249 GameObject: m_ObjectHideFlags: 0 @@ -10854,7 +10857,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3625395986258989249} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.5, y: 0.25, z: 0} + m_LocalPosition: {x: 0.5, y: 0.25, z: -0.001} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 325321271260791431} @@ -10884,7 +10887,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3631265297008439238} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 1.5, y: -5.5, z: -4} + m_LocalPosition: {x: 2, y: -5.5, z: -9} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 973145912615694185} @@ -11154,6 +11157,53 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &4302608539052114858 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8955885138568379988} + - component: {fileID: 6434809315840102058} + m_Layer: 0 + m_Name: Point 0 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8955885138568379988 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4302608539052114858} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 1.69, y: 2, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 2800013509931204424} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &6434809315840102058 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4302608539052114858} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b0cca3244f403c24f819a870f31cdc29, type: 3} + m_Name: + m_EditorClassIdentifier: + curve: {fileID: 8755454903872010978} + handleType: 0 + leftHandleLocalPosition: {x: -0.5581093, y: -3.897297, z: -0} + rightHandleLocalPosition: {x: 0.5581093, y: 3.897297, z: 0} --- !u!1 &4322478051307581516 GameObject: m_ObjectHideFlags: 0 @@ -11566,7 +11616,7 @@ Transform: m_GameObject: {fileID: 4891380524077004048} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -1.425, y: -1.25, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 1.1, y: 1.1, z: 1} m_Children: - {fileID: 301531489915552307} - {fileID: 6181245624135669693} @@ -12149,6 +12199,59 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &5907947933468691510 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2800013509931204424} + - component: {fileID: 8755454903872010978} + m_Layer: 0 + m_Name: DebrisNG + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2800013509931204424 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5907947933468691510} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -2.45, y: -0.64, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 8955885138568379988} + - {fileID: 752280744562233315} + m_Father: {fileID: 6530704449370969801} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &8755454903872010978 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5907947933468691510} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 066a41e004f415b4eb74d5e61a2aadbe, type: 3} + m_Name: + m_EditorClassIdentifier: + curveColor: {r: 0, g: 1, b: 0, a: 1} + startPointColor: {r: 1, g: 0, b: 0, a: 1} + endPointColor: {r: 0, g: 0, b: 1, a: 1} + sampling: 25 + keyPoints: + - {fileID: 6434809315840102058} + - {fileID: 9023844645806813366} + normalizedTime: 0.75 --- !u!1 &6007774576877780481 GameObject: m_ObjectHideFlags: 0 @@ -13606,3 +13709,50 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &9074423555571807762 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 752280744562233315} + - component: {fileID: 9023844645806813366} + m_Layer: 0 + m_Name: Point 1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &752280744562233315 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9074423555571807762} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 2.4470143, y: -5.429279, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 2800013509931204424} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &9023844645806813366 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9074423555571807762} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b0cca3244f403c24f819a870f31cdc29, type: 3} + m_Name: + m_EditorClassIdentifier: + curve: {fileID: 8755454903872010978} + handleType: 0 + leftHandleLocalPosition: {x: -0.08864713, y: 8.091105, z: 0} + rightHandleLocalPosition: {x: 0.08864713, y: -8.091105, z: -0} diff --git a/Assets/Resources/Sprites/Games/KarateMan/karateman_cellshader.mat b/Assets/Resources/Sprites/Games/KarateMan/karateman_cellshader.mat index f46036edc..bf3237f7a 100644 --- a/Assets/Resources/Sprites/Games/KarateMan/karateman_cellshader.mat +++ b/Assets/Resources/Sprites/Games/KarateMan/karateman_cellshader.mat @@ -82,8 +82,8 @@ Material: m_Colors: - _AddColor: {r: 0, g: 0, b: 0, a: 0} - _Color: {r: 1, g: 1, b: 1, a: 1} - - _ColorAlpha: {r: 1, g: 0.8706616, b: 0.16639495, a: 1} + - _ColorAlpha: {r: 0.84705883, g: 0.8156863, b: 0.6901961, a: 1} - _ColorBravo: {r: 1, g: 0, b: 0, a: 1} - - _ColorDelta: {r: 0.81, g: 0.81, b: 0.81, a: 1} + - _ColorDelta: {r: 0.972549, g: 0.972549, b: 0.972549, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Resources/Sprites/Games/SamuraiSliceNtr/Anime/Launcher/Launch.anim b/Assets/Resources/Sprites/Games/SamuraiSliceNtr/Anime/Launcher/Launch.anim index 774420d36..4f4926a5d 100644 --- a/Assets/Resources/Sprites/Games/SamuraiSliceNtr/Anime/Launcher/Launch.anim +++ b/Assets/Resources/Sprites/Games/SamuraiSliceNtr/Anime/Launcher/Launch.anim @@ -113,7 +113,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0.06, y: 0.16, z: 0} + value: {x: 0.02, y: 0.17, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -122,7 +122,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.033333335 - value: {x: 0.04, y: 0.16, z: 0} + value: {x: 0.04, y: 0.17, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -131,7 +131,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.06666667 - value: {x: 0.06, y: 0.16, z: 0} + value: {x: 0.02, y: 0.17, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -140,7 +140,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.1 - value: {x: 0.04, y: 0.16, z: 0} + value: {x: -0.01, y: 0.15, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -558,7 +558,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.06 + value: 0.02 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -576,7 +576,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.06666667 - value: 0.06 + value: 0.02 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -585,7 +585,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.1 - value: 0.04 + value: -0.01 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -613,7 +613,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.16 + value: 0.17 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -622,7 +622,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.033333335 - value: 0.16 + value: 0.17 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -631,7 +631,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.06666667 - value: 0.16 + value: 0.17 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -640,7 +640,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.1 - value: 0.16 + value: 0.15 inSlope: Infinity outSlope: Infinity tangentMode: 103 diff --git a/Assets/Resources/Sprites/Games/SamuraiSliceNtr/ntr_samurai_bg.png b/Assets/Resources/Sprites/Games/SamuraiSliceNtr/ntr_samurai_bg.png index c491b4554..8ad03f0c3 100644 Binary files a/Assets/Resources/Sprites/Games/SamuraiSliceNtr/ntr_samurai_bg.png and b/Assets/Resources/Sprites/Games/SamuraiSliceNtr/ntr_samurai_bg.png differ diff --git a/Assets/Resources/Sprites/Games/SamuraiSliceNtr/ntr_samurai_bg.png.meta b/Assets/Resources/Sprites/Games/SamuraiSliceNtr/ntr_samurai_bg.png.meta index 89d1e57e1..f7ba3d5ae 100644 --- a/Assets/Resources/Sprites/Games/SamuraiSliceNtr/ntr_samurai_bg.png.meta +++ b/Assets/Resources/Sprites/Games/SamuraiSliceNtr/ntr_samurai_bg.png.meta @@ -106,7 +106,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 200 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -125,7 +125,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 4096 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 @@ -137,7 +137,7 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Standalone - maxTextureSize: 2048 + maxTextureSize: 4096 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 @@ -154,16 +154,16 @@ TextureImporter: name: wall rect: serializedVersion: 2 - x: 0 - y: 1696 - width: 2272 - height: 524 + x: 218 + y: 3061 + width: 4539 + height: 1031 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: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 8751e9733534ac5a0800000000000000 internalID: -6500309087461436040 @@ -175,16 +175,16 @@ TextureImporter: name: tile rect: serializedVersion: 2 - x: 575 - y: 1207 - width: 2173 - height: 135 + x: 195 + y: 4310 + width: 5513 + height: 330 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: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 7d318bea3f7e718b0800000000000000 internalID: -5181417812472097833 @@ -196,16 +196,16 @@ TextureImporter: name: tree rect: serializedVersion: 2 - x: 1998 - y: 19 - width: 501 - height: 1005 + x: 196 + y: 739 + width: 1058 + height: 2136 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: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 7dfa0c43af89c41f0800000000000000 internalID: -1059303611944620073 @@ -217,16 +217,16 @@ TextureImporter: name: treeBranch rect: serializedVersion: 2 - x: 548 - y: 468 - width: 220 - height: 327 + x: 1615 + y: 850 + width: 864 + height: 1339 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: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 2e65b454632fabc00800000000000000 internalID: 917311789028038370 @@ -238,16 +238,16 @@ TextureImporter: name: leaf00 rect: serializedVersion: 2 - x: 1053 - y: 553 - width: 498 - height: 254 + x: 3059 + y: 904 + width: 1369 + height: 690 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: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: c9a47a2ec7003b790800000000000000 internalID: -7515662816772666724 @@ -259,16 +259,16 @@ TextureImporter: name: leaf01 rect: serializedVersion: 2 - x: 1041 - y: 45 - width: 498 - height: 254 + x: 4781 + y: 852 + width: 598 + height: 305 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: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: c64ba8e649e518190800000000000000 internalID: -7961978674611571604 @@ -280,16 +280,16 @@ TextureImporter: name: leaf02 rect: serializedVersion: 2 - x: 424 - y: 45 - width: 498 - height: 254 + x: 4860 + y: 464 + width: 598 + height: 305 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: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: bf7e4c7ff7714e800800000000000000 internalID: 640662885378615291 @@ -301,16 +301,16 @@ TextureImporter: name: skyCol00 rect: serializedVersion: 2 - x: 0 - y: 4237 - width: 3405 - height: 763 + x: 41 + y: 4827 + width: 3867 + height: 1151 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: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 48ef78302172c95d0800000000000000 internalID: -3054523488941900156 @@ -322,16 +322,16 @@ TextureImporter: name: moon00 rect: serializedVersion: 2 - x: 0 - y: 983 - width: 361 - height: 359 + x: 3048 + y: 2037 + width: 712 + height: 712 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: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 2eb42c374337c84d0800000000000000 internalID: -3131000971811730462 @@ -343,16 +343,16 @@ TextureImporter: name: moon01 rect: serializedVersion: 2 - x: 4 - y: 502 - width: 359 - height: 361 + x: 3905 + y: 2037 + width: 711 + height: 712 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: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 27379967b29689ff0800000000000000 internalID: -29157762183629966 @@ -364,16 +364,16 @@ TextureImporter: name: moon02 rect: serializedVersion: 2 - x: 0 - y: 18 - width: 360 - height: 363 + x: 4785 + y: 2037 + width: 713 + height: 712 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: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 48cce3d8ca1335490800000000000000 internalID: -7758803115855393660 @@ -385,16 +385,16 @@ TextureImporter: name: particle00_0 rect: serializedVersion: 2 - x: 2950 - y: 1132 - width: 44 - height: 36 + x: 4793 + y: 1591 + width: 168 + height: 138 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: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 33ad2ca09f53bcfd0800000000000000 internalID: -2320701839235687885 @@ -406,16 +406,16 @@ TextureImporter: name: particle00_1 rect: serializedVersion: 2 - x: 3043 - y: 1132 - width: 39 - height: 29 + x: 5050 + y: 1591 + width: 157 + height: 117 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: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: b985370a3d8676e10800000000000000 internalID: 2190835001878337691 @@ -427,16 +427,16 @@ TextureImporter: name: particle00_2 rect: serializedVersion: 2 - x: 3124 - y: 1136 - width: 31 - height: 15 + x: 5298 + y: 1591 + width: 190 + height: 84 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: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 1f023e9e4ba4369b0800000000000000 internalID: -5088141013119983375 @@ -448,16 +448,16 @@ TextureImporter: name: particle01 rect: serializedVersion: 2 - x: 3141 - y: 1264 - width: 44 - height: 60 + x: 5090 + y: 1337 + width: 76 + height: 111 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: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: cb8017a7496182fa0800000000000000 internalID: -5825381291038537540 @@ -469,16 +469,16 @@ TextureImporter: name: particle02 rect: serializedVersion: 2 - x: 3060 - y: 1254 - width: 49 - height: 70 + x: 4811 + y: 1337 + width: 74 + height: 111 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: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 2dd247a322e6cac80800000000000000 internalID: -8310146119116771886 @@ -490,16 +490,16 @@ TextureImporter: name: particle03 rect: serializedVersion: 2 - x: 3151 - y: 1198 - width: 19 - height: 21 + x: 3781.2002 + y: 1437.6001 + width: 22.800001 + height: 25.2 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: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 753e310371c7a0000800000000000000 internalID: 2951188799808343 @@ -511,16 +511,16 @@ TextureImporter: name: particle04 rect: serializedVersion: 2 - x: 2921 - y: 1207 - width: 110 - height: 117 + x: 5274 + y: 1289 + width: 223 + height: 200 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: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 507eba9a0f4dc2120800000000000000 internalID: 2390519632330745605 @@ -533,15 +533,15 @@ TextureImporter: rect: serializedVersion: 2 x: 0 - y: 3268 - width: 3456 - height: 871 + y: 4892 + width: 4147 + height: 1045 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: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: b55f3c319486f6b60800000000000000 internalID: 7741520947546682715 @@ -554,15 +554,15 @@ TextureImporter: rect: serializedVersion: 2 x: 0 - y: 2355 - width: 3405 - height: 764 + y: 4933 + width: 4086 + height: 917 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: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: d5a792edc137def90800000000000000 internalID: -6922750484375045539 diff --git a/Assets/Resources/Sprites/Games/SamuraiSliceNtr/ntr_samurai_launcher.png b/Assets/Resources/Sprites/Games/SamuraiSliceNtr/ntr_samurai_launcher.png index 24050f69b..ba24849cb 100644 Binary files a/Assets/Resources/Sprites/Games/SamuraiSliceNtr/ntr_samurai_launcher.png and b/Assets/Resources/Sprites/Games/SamuraiSliceNtr/ntr_samurai_launcher.png differ diff --git a/Assets/Resources/Sprites/Games/SamuraiSliceNtr/ntr_samurai_launcher.png.meta b/Assets/Resources/Sprites/Games/SamuraiSliceNtr/ntr_samurai_launcher.png.meta index 99ae0889e..82cd70075 100644 --- a/Assets/Resources/Sprites/Games/SamuraiSliceNtr/ntr_samurai_launcher.png.meta +++ b/Assets/Resources/Sprites/Games/SamuraiSliceNtr/ntr_samurai_launcher.png.meta @@ -47,7 +47,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 + filterMode: 2 aniso: 1 mipBias: 0 wrapU: 1 @@ -61,7 +61,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 200 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -109,16 +109,16 @@ TextureImporter: name: launcherPivot rect: serializedVersion: 2 - x: 0 - y: 928 - width: 73 - height: 69 + x: 1340 + y: 1325 + width: 160 + height: 151 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: a7185d60c05421b40800000000000000 internalID: 5409462020381966714 @@ -130,16 +130,16 @@ TextureImporter: name: board00 rect: serializedVersion: 2 - x: 0 - y: 116 - width: 613 - height: 32 + x: 60 + y: 168 + width: 1106 + height: 54 alignment: 9 pivot: {x: 0.225, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: db7180a2917b93ea0800000000000000 internalID: -5892477318730344515 @@ -151,16 +151,16 @@ TextureImporter: name: board01 rect: serializedVersion: 2 - x: 0 - y: 208 - width: 612 - height: 169 + x: 69 + y: 1189 + width: 1088 + height: 297 alignment: 9 pivot: {x: 0.225, y: 0.85} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 05e3510969553a500800000000000000 internalID: 406262496544243280 @@ -172,16 +172,16 @@ TextureImporter: name: board02 rect: serializedVersion: 2 - x: 0 - y: 455 - width: 630 - height: 185 + x: 53 + y: 795 + width: 1120 + height: 324 alignment: 9 pivot: {x: 0.225, y: 0.15} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: a0b3e89b3544cae40800000000000000 internalID: 5668981157338692362 @@ -193,16 +193,16 @@ TextureImporter: name: board03 rect: serializedVersion: 2 - x: 0 - y: 699 - width: 624 - height: 181 + x: 80 + y: 313 + width: 1146 + height: 329 alignment: 9 pivot: {x: 0.225, y: 0.85} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 35661a3a52175a700800000000000000 internalID: 550970935895746131 diff --git a/Assets/Resources/Sprites/Games/SamuraiSliceNtr/ntr_samurai_man.png.meta b/Assets/Resources/Sprites/Games/SamuraiSliceNtr/ntr_samurai_man.png.meta index 86e37f856..64157e4e5 100644 --- a/Assets/Resources/Sprites/Games/SamuraiSliceNtr/ntr_samurai_man.png.meta +++ b/Assets/Resources/Sprites/Games/SamuraiSliceNtr/ntr_samurai_man.png.meta @@ -143,7 +143,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 4096 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 @@ -155,7 +155,7 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Standalone - maxTextureSize: 2048 + maxTextureSize: 4096 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 diff --git a/Assets/Resources/Sprites/Games/SamuraiSliceNtr/ntr_samurai_obj.png b/Assets/Resources/Sprites/Games/SamuraiSliceNtr/ntr_samurai_obj.png index beebf2ee3..2c6eeb2a2 100644 Binary files a/Assets/Resources/Sprites/Games/SamuraiSliceNtr/ntr_samurai_obj.png and b/Assets/Resources/Sprites/Games/SamuraiSliceNtr/ntr_samurai_obj.png differ diff --git a/Assets/Resources/Sprites/Games/SamuraiSliceNtr/ntr_samurai_obj.png.meta b/Assets/Resources/Sprites/Games/SamuraiSliceNtr/ntr_samurai_obj.png.meta index 13be7e8e8..71d3d9969 100644 --- a/Assets/Resources/Sprites/Games/SamuraiSliceNtr/ntr_samurai_obj.png.meta +++ b/Assets/Resources/Sprites/Games/SamuraiSliceNtr/ntr_samurai_obj.png.meta @@ -122,7 +122,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 4096 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 @@ -134,7 +134,7 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Standalone - maxTextureSize: 2048 + maxTextureSize: 4096 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 @@ -382,8 +382,8 @@ TextureImporter: name: child_body rect: serializedVersion: 2 - x: 191 - y: 902 + x: 264 + y: 888 width: 96 height: 91 alignment: 0 @@ -487,9 +487,9 @@ TextureImporter: name: child_head00 rect: serializedVersion: 2 - x: 0 - y: 897 - width: 135 + x: 18 + y: 876 + width: 133 height: 103 alignment: 0 pivot: {x: 0.5, y: 0.5} @@ -508,9 +508,9 @@ TextureImporter: name: child_head01 rect: serializedVersion: 2 - x: 1 - y: 753 - width: 134 + x: 15 + y: 715 + width: 136 height: 103 alignment: 0 pivot: {x: 0.5, y: 0.5} @@ -529,8 +529,8 @@ TextureImporter: name: child_tear rect: serializedVersion: 2 - x: 205 - y: 784 + x: 258 + y: 758 width: 22 height: 35 alignment: 0 diff --git a/Assets/Scripts/Games/SamuraiSliceNtr/NtrSamuraiChild.cs b/Assets/Scripts/Games/SamuraiSliceNtr/NtrSamuraiChild.cs index e44131c3b..ae08a51ec 100644 --- a/Assets/Scripts/Games/SamuraiSliceNtr/NtrSamuraiChild.cs +++ b/Assets/Scripts/Games/SamuraiSliceNtr/NtrSamuraiChild.cs @@ -4,6 +4,7 @@ using HeavenStudio.Util; using System; using System.Collections.Generic; using UnityEngine; +using UnityEngine.Rendering; namespace HeavenStudio.Games.Scripts_NtrSamurai { @@ -27,7 +28,7 @@ namespace HeavenStudio.Games.Scripts_NtrSamurai if (!isMain) { var cond = Conductor.instance; - float prog = Conductor.instance.GetPositionFromBeat(startBeat + 1f, 2f); + float prog = Conductor.instance.GetPositionFromBeat(startBeat + 1f, 4f); if (prog >= 0) { Walk(); diff --git a/Assets/Scripts/Games/SamuraiSliceNtr/NtrSamuraiObject.cs b/Assets/Scripts/Games/SamuraiSliceNtr/NtrSamuraiObject.cs index 71a8e8917..856c1ae66 100644 --- a/Assets/Scripts/Games/SamuraiSliceNtr/NtrSamuraiObject.cs +++ b/Assets/Scripts/Games/SamuraiSliceNtr/NtrSamuraiObject.cs @@ -106,8 +106,19 @@ namespace HeavenStudio.Games.Scripts_NtrSamurai { switch (flyProg) { + case -3: // near miss on board launch + flyPos = cond.GetPositionFromBeat(startBeat, 2f); + transform.position = currentCurve.GetPoint(flyPos); + transform.rotation = Quaternion.Euler(0, 0, transform.rotation.eulerAngles.z + (180f * Time.deltaTime)); + + if (flyPos > 1f) + { + GameObject.Destroy(gameObject); + return; + } + break; case -2: // being carried by a child - flyPos = cond.GetPositionFromBeat(startBeat + 2f, 2f); + flyPos = cond.GetPositionFromBeat(startBeat + 2f, 4f); if (heldPos == null || flyPos > 1f) { GameObject.Destroy(gameObject); @@ -130,6 +141,7 @@ namespace HeavenStudio.Games.Scripts_NtrSamurai secondHalf.heldPos = child.DebrisPosL; } flyProg = -2; + GetComponent().sortingOrder = 7; return; } break; @@ -247,6 +259,15 @@ namespace HeavenStudio.Games.Scripts_NtrSamurai public void LaunchSuccess(PlayerActionEvent caller, float state) { + if (state <= -1f || state >= 1f) + { + startBeat = launchProg.startBeat + 2f; + currentCurve = SamuraiSliceNtr.instance.NgLaunchCurve; + flyProg = -3; + Jukebox.PlayOneShotGame("samuraiSliceNtr/ntrSamurai_launchImpact", pitch: 2f); + launchProg.Disable(); + return; + } launchProg.Disable(); DoLaunch(); Jukebox.PlayOneShotGame("samuraiSliceNtr/ntrSamurai_launchImpact", pitch: UnityEngine.Random.Range(0.85f, 1.05f)); @@ -262,6 +283,15 @@ namespace HeavenStudio.Games.Scripts_NtrSamurai public void HitSuccess(PlayerActionEvent caller, float state) { + if (state <= -1f || state >= 1f) + { + startBeat = hitProg.startBeat + hitProg.timer; + currentCurve = SamuraiSliceNtr.instance.NgDebrisCurve; + flyProg = -3; + Jukebox.PlayOneShotGame("samuraiSliceNtr/ntrSamurai_ng"); + hitProg.Disable(); + return; + } flyProg = -1; hitProg.Disable(); if (UnityEngine.Random.Range(0f, 1f) >= 0.5f) diff --git a/Assets/Scripts/Games/SamuraiSliceNtr/SamuraiSliceNtr.cs b/Assets/Scripts/Games/SamuraiSliceNtr/SamuraiSliceNtr.cs index 930d452bd..58e3d9532 100644 --- a/Assets/Scripts/Games/SamuraiSliceNtr/SamuraiSliceNtr.cs +++ b/Assets/Scripts/Games/SamuraiSliceNtr/SamuraiSliceNtr.cs @@ -2,6 +2,7 @@ using HeavenStudio.Util; using System.Collections; using System.Collections.Generic; using UnityEngine; +using UnityEngine.Rendering; using DG.Tweening; using NaughtyBezierCurves; @@ -63,6 +64,7 @@ namespace HeavenStudio.Games public BezierCurve3D NgLaunchCurve; public BezierCurve3D DebrisLeftCurve; public BezierCurve3D DebrisRightCurve; + public BezierCurve3D NgDebrisCurve; //game scene public static SamuraiSliceNtr instance; @@ -144,6 +146,7 @@ namespace HeavenStudio.Games mobjDat.Bop(); mobj.SetActive(true); + mobj.GetComponent().sortingOrder = 7; return mobjDat; } diff --git a/Assets/StreamingAssets/StreamingAssets b/Assets/StreamingAssets/StreamingAssets index 81c9a0864..fe977b6c2 100644 Binary files a/Assets/StreamingAssets/StreamingAssets and b/Assets/StreamingAssets/StreamingAssets differ diff --git a/Assets/StreamingAssets/StreamingAssets.manifest b/Assets/StreamingAssets/StreamingAssets.manifest index 1e304ecc0..c37a1022b 100644 --- a/Assets/StreamingAssets/StreamingAssets.manifest +++ b/Assets/StreamingAssets/StreamingAssets.manifest @@ -1,5 +1,5 @@ ManifestFileVersion: 0 -CRC: 2483180215 +CRC: 2242645497 AssetBundleManifest: AssetBundleInfos: Info_0: diff --git a/Assets/StreamingAssets/karate/common b/Assets/StreamingAssets/karate/common index 097c309ae..4131bff0e 100644 Binary files a/Assets/StreamingAssets/karate/common and b/Assets/StreamingAssets/karate/common differ diff --git a/Assets/StreamingAssets/karate/common.manifest b/Assets/StreamingAssets/karate/common.manifest index b78ae019d..7f00e22b4 100644 --- a/Assets/StreamingAssets/karate/common.manifest +++ b/Assets/StreamingAssets/karate/common.manifest @@ -1,9 +1,9 @@ ManifestFileVersion: 0 -CRC: 229325513 +CRC: 2860754384 Hashes: AssetFileHash: serializedVersion: 2 - Hash: 069bce0dd25bdbc41e83dc4b09bd8143 + Hash: ca520b8e60b447d7c76fa7e61aa5b1ba TypeTreeHash: serializedVersion: 2 Hash: 98a6d4eb4172ec02b55d5f14afb2d5a8 diff --git a/Assets/StreamingAssets/ntrdj/common b/Assets/StreamingAssets/ntrdj/common index 13581fca1..a542858be 100644 Binary files a/Assets/StreamingAssets/ntrdj/common and b/Assets/StreamingAssets/ntrdj/common differ diff --git a/Assets/StreamingAssets/ntrdj/common.manifest b/Assets/StreamingAssets/ntrdj/common.manifest index 30bd83c9a..88d25f24a 100644 --- a/Assets/StreamingAssets/ntrdj/common.manifest +++ b/Assets/StreamingAssets/ntrdj/common.manifest @@ -1,9 +1,9 @@ ManifestFileVersion: 0 -CRC: 2301979922 +CRC: 1204495741 Hashes: AssetFileHash: serializedVersion: 2 - Hash: 74daac4e15aeb26555c25ea85b33b9f7 + Hash: 2dd423bc9f1eae6f6ebe51f1dc57b8b7 TypeTreeHash: serializedVersion: 2 Hash: b0396ee8cf677796daf23b65e38d1ad2 @@ -43,81 +43,90 @@ SerializeReferenceClassIdentifiers: - AssemblyName: Assembly-CSharp ClassName: HeavenStudio.Games.Minigame/Eligible Assets: -- Assets/Resources/Sfx/games/djSchool/letsGo2.ogg -- Assets/Resources/Sfx/games/djSchool/andStop1.ogg +- Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Boy/Boy.controller - Assets/Resources/Sfx/games/djSchool/breakCmonLoud2.ogg - Assets/Resources/Sfx/games/djSchool/ohYeahAlt1.ogg - Assets/Resources/Sfx/games/djSchool/checkItOut2.ogg - Assets/Resources/Sprites/Games/DJSchool/Animations/DJ Yellow/IdleBop.anim - Assets/Resources/Sprites/Games/DJSchool/Animations/Turntable/Student_Turntable_Swipe.anim - Assets/Resources/Sprites/Games/DJSchool/Animations/Student/Hold.anim -- Assets/Resources/Sprites/Games/DJSchool/Animations/DJ Yellow/Hey.anim - Assets/Resources/Sprites/Games/DJSchool/Animations/DJ Yellow/Scratcho2.anim - Assets/Resources/Sfx/games/djSchool/scratchoHey1.ogg -- Assets/Resources/Sfx/games/djSchool/checkItOut3.ogg -- Assets/Resources/Sprites/Games/DJSchool/Animations/DJ Yellow/DJ Yellow.controller -- Assets/Resources/Sfx/games/djSchool/checkItOut.ogg +- Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Student/Idle.anim - Assets/Resources/Sprites/Games/DJSchool/Animations/DJ Yellow/BreakCmon.anim -- Assets/Resources/Sfx/games/djSchool/checkItOut1.ogg +- Assets/Resources/Sprites/Games/DJSchool/Animations/DJ Yellow/DJ Yellow.controller - Assets/Resources/Sprites/Games/DJSchool/Animations/DJ Yellow/Scratcho.anim - Assets/Resources/Sprites/Games/DJSchool/slam.png - Assets/Resources/Sfx/games/djSchool/ohYeah1.ogg -- Assets/Resources/Sprites/Games/DJSchool/djYellow/djYellow_Torso.png -- Assets/Resources/Sfx/games/djSchool/breakCmonLoud1.ogg +- Assets/Resources/Sfx/games/djSchool/andStop2.ogg - Assets/Resources/Sfx/games/djSchool/recordStop.ogg - Assets/Resources/Sfx/games/djSchool/breakCmon2.ogg -- Assets/Resources/Sfx/games/djSchool/scratchoHey3.ogg - Assets/Resources/Sfx/games/djSchool/scratchoHeyLoud4.ogg -- Assets/Resources/Sfx/games/djSchool/andStop2.ogg +- Assets/Resources/Sfx/games/djSchool/breakCmonLoud1.ogg - Assets/Resources/Sfx/games/djSchool/ohYeahAlt.ogg +- Assets/Resources/Sprites/Games/DJSchool/table.png +- Assets/Resources/Sfx/games/djSchool/breakCmonAlt2.ogg +- Assets/Resources/Sfx/games/djSchool/letsGo1.ogg +- Assets/Resources/Sfx/games/djSchool/heyAlt.ogg +- Assets/Resources/Sprites/Games/DJSchool/Animations/FlashInverse.anim +- Assets/Resources/Sfx/games/djSchool/scratchoHeyAlt1.ogg +- Assets/Resources/Sfx/games/djSchool/scratchoHeyAlt3.ogg +- Assets/Resources/Sfx/games/djSchool/yay.ogg +- Assets/Resources/Sprites/Games/DJSchool/background.png +- Assets/Resources/Sprites/Games/DJSchool/Animations/flashInverse.controller +- Assets/Resources/Sprites/Games/DJSchool/turntable.png +- Assets/Resources/Sfx/games/djSchool/scratchoHeyAlt4.ogg +- Assets/Resources/Sfx/games/djSchool/ooh.ogg +- Assets/Resources/Sprites/Games/DJSchool/Animations/DJ Yellow/Hold.anim +- Assets/Resources/Sfx/games/djSchool/cheer.ogg +- Assets/Resources/Sprites/Games/DJSchool/Animations/Student/HoldBop.anim +- Assets/Resources/Sfx/games/djSchool/scratchoHeyLoud1.ogg +- Assets/Resources/Sfx/games/djSchool/letsGo2.ogg +- Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Student/IdleBop.anim +- Assets/Resources/Sfx/games/djSchool/andStop1.ogg +- Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Boy/IdleBop2.anim +- Assets/Resources/Sprites/Games/DJSchool/Animations/DJ Yellow/Hey.anim +- Assets/Resources/Sfx/games/djSchool/checkItOut3.ogg +- Assets/Resources/Sfx/games/djSchool/checkItOut.ogg +- Assets/Resources/Sfx/games/djSchool/checkItOut1.ogg +- Assets/Resources/Sprites/Games/DJSchool/djYellow/djYellow_Torso.png +- Assets/Resources/Sfx/games/djSchool/scratchoHey3.ogg +- Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Boy/Idle.anim +- Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Student/Hold.anim - Assets/Resources/Sfx/games/djSchool/ohYeahAlt3.ogg - Assets/Resources/Sprites/Games/DJSchool/djYellow/djYellow_Heads.png -- Assets/Resources/Sprites/Games/DJSchool/table.png - Assets/Resources/Sfx/games/djSchool/ohYeah.ogg - Assets/Resources/Sprites/Games/DJSchool/Animations/DJ Yellow/IdleBop2.anim - Assets/Resources/Sfx/games/djSchool/scratchoHeyLoud3.ogg - Assets/Resources/Sfx/games/djSchool/breakCmon1.ogg -- Assets/Resources/Sfx/games/djSchool/letsGo1.ogg -- Assets/Resources/Sfx/games/djSchool/heyAlt.ogg -- Assets/Resources/Sfx/games/djSchool/breakCmonAlt2.ogg -- Assets/Resources/Sfx/games/djSchool/oohAlt.ogg -- Assets/Resources/Sprites/Games/DJSchool/Animations/Student/Student.controller -- Assets/Resources/Sprites/Games/DJSchool/Animations/FlashInverse.anim - Assets/Resources/Sprites/Games/DJSchool/Animations/flash.controller -- Assets/Resources/Sfx/games/djSchool/scratchoHeyAlt1.ogg +- Assets/Resources/Sprites/Games/DJSchool/Animations/Student/Student.controller +- Assets/Resources/Sfx/games/djSchool/oohAlt.ogg - Assets/Resources/Sfx/games/djSchool/breakCmonAlt1.ogg -- Assets/Resources/Sfx/games/djSchool/scratchoHeyAlt3.ogg -- Assets/Resources/Sfx/games/djSchool/yay.ogg - Assets/Resources/Sprites/Games/DJSchool/Animations/Turntable/TurnTable.controller +- Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Student/HoldBop.anim - Assets/Resources/Sprites/Games/DJSchool/student.png - Assets/Resources/Sfx/games/djSchool/ohYeah2.ogg - Assets/Resources/Sprites/Games/DJSchool/Animations/Flash.anim -- Assets/Resources/Sprites/Games/DJSchool/background.png - Assets/Resources/Sfx/games/djSchool/heyLoud.ogg - Assets/Resources/Sfx/games/djSchool/scratchoHeyAlt2.ogg - Assets/Resources/Sfx/games/djSchool/scratchoHey4.ogg -- Assets/Resources/Sprites/Games/DJSchool/Animations/flashInverse.controller - Assets/Resources/Sfx/games/djSchool/recordSwipe.ogg - Assets/Resources/Games/djSchool.prefab -- Assets/Resources/Sprites/Games/DJSchool/turntable.png -- Assets/Resources/Sfx/games/djSchool/scratchoHeyAlt4.ogg - Assets/Resources/Sfx/games/djSchool/scratchoHey2.ogg - Assets/Resources/Sprites/Games/DJSchool/Animations/Turntable/TurnTable_Player.controller - Assets/Resources/Sprites/Games/DJSchool/flash.png - Assets/Resources/Sprites/Games/DJSchool/Animations/DJ Yellow/Idle.anim -- Assets/Resources/Sfx/games/djSchool/ooh.ogg - Assets/Resources/Sfx/games/djSchool/letsGo.ogg -- Assets/Resources/Sprites/Games/DJSchool/Animations/DJ Yellow/Hold.anim +- Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Student/Swipe.anim - Assets/Resources/Sfx/games/djSchool/ohYeahAlt2.ogg +- Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Student/Student.controller - Assets/Resources/Sprites/Games/DJSchool/Animations/DJ Yellow/HoldBop.anim - Assets/Resources/Sfx/games/djSchool/scratchoHeyLoud2.ogg - Assets/Resources/Sprites/Games/DJSchool/Animations/Student/Idle.anim - Assets/Resources/Sprites/Games/DJSchool/Animations/Student/Swipe.anim - Assets/Resources/Sprites/Games/DJSchool/Animations/Turntable/DJYellow_Turntable.anim -- Assets/Resources/Sfx/games/djSchool/cheer.ogg - Assets/Resources/Sfx/games/djSchool/oohLoud.ogg -- Assets/Resources/Sprites/Games/DJSchool/Animations/Student/HoldBop.anim - Assets/Resources/Sfx/games/djSchool/hey.ogg -- Assets/Resources/Sfx/games/djSchool/scratchoHeyLoud1.ogg - Assets/Resources/Sprites/Games/DJSchool/Animations/Student/IdleBop.anim Dependencies: [] diff --git a/Assets/StreamingAssets/ntridol/common b/Assets/StreamingAssets/ntridol/common index 090dbf47d..8ed85d85c 100644 Binary files a/Assets/StreamingAssets/ntridol/common and b/Assets/StreamingAssets/ntridol/common differ diff --git a/Assets/StreamingAssets/ntridol/common.manifest b/Assets/StreamingAssets/ntridol/common.manifest index 26e74afe9..7a2ce5b46 100644 --- a/Assets/StreamingAssets/ntridol/common.manifest +++ b/Assets/StreamingAssets/ntridol/common.manifest @@ -1,9 +1,9 @@ ManifestFileVersion: 0 -CRC: 2160738779 +CRC: 47635452 Hashes: AssetFileHash: serializedVersion: 2 - Hash: ad07dd4676edfbe5572d0236124a4350 + Hash: fa7d40aea94aec8235f3ce553fcce97a TypeTreeHash: serializedVersion: 2 Hash: 6c542f6873f7e3067be67f888d87c947 diff --git a/Assets/StreamingAssets/ntrsamurai/common b/Assets/StreamingAssets/ntrsamurai/common index c0ee0c263..429adf6af 100644 Binary files a/Assets/StreamingAssets/ntrsamurai/common and b/Assets/StreamingAssets/ntrsamurai/common differ diff --git a/Assets/StreamingAssets/ntrsamurai/common.manifest b/Assets/StreamingAssets/ntrsamurai/common.manifest index 20ea2e4a6..7cbe25c45 100644 --- a/Assets/StreamingAssets/ntrsamurai/common.manifest +++ b/Assets/StreamingAssets/ntrsamurai/common.manifest @@ -1,12 +1,12 @@ ManifestFileVersion: 0 -CRC: 1283939881 +CRC: 4046274216 Hashes: AssetFileHash: serializedVersion: 2 - Hash: d166274169e80ae349c4e66b396c95a6 + Hash: fbefce6855ad769437bbebae6d47090a TypeTreeHash: serializedVersion: 2 - Hash: 36c1544bd987dbffd607c6771ff240cf + Hash: c6f2fa553316a4075c6f2b9622a36b58 HashAppended: 0 ClassTypes: - Class: 1