diff --git a/Assets/Resources/Games/lumbearjack.prefab b/Assets/Resources/Games/lumbearjack.prefab index fb27e43f1..568823733 100644 --- a/Assets/Resources/Games/lumbearjack.prefab +++ b/Assets/Resources/Games/lumbearjack.prefab @@ -49833,7 +49833,7 @@ ParticleSystem: serializedVersion: 8 lengthInSec: 1 simulationSpeed: 1.3 - stopAction: 0 + stopAction: 2 cullingMode: 0 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} @@ -89523,8 +89523,11 @@ MonoBehaviour: - {fileID: 8283341335121478951} - {fileID: 5014475820465334175} - {fileID: 2113061933880518983} + - {fileID: 2435876523110919876} + - {fileID: 7768958504194675045} _catRightObjectsBig: - {fileID: 6887175643397659595} + - {fileID: 7728221743046620761} _catRightObjectsHuge: - {fileID: 7195153636254270523} - {fileID: 8599624938353215766} @@ -89536,8 +89539,11 @@ MonoBehaviour: - {fileID: 6549654297430473285} - {fileID: 7892457053171669245} - {fileID: 3837707130267555365} + - {fileID: 710623323569033638} + - {fileID: 4882392886731861511} _catLeftObjectsBig: - {fileID: 8612418700374271145} + - {fileID: 4850786185656895803} _catLeftObjectsHuge: - {fileID: 5461475411022461785} - {fileID: 6866122181738215028} @@ -89562,8 +89568,11 @@ MonoBehaviour: _canCutParticle: {fileID: 1336100976886091474} _batCutParticle: {fileID: 7676651234050664727} _broomCutParticle: {fileID: 3425449467504233482} + _barrelCutParticle: {fileID: 6958357087204247169} + _bookCutParticle: {fileID: 6395514551374626793} _bigLogHitParticle: {fileID: 2595403706729425131} _bigLogCutParticle: {fileID: 77225483305886520} + _bigBallCutParticle: {fileID: 5490876845924851989} _hugeLogHitParticle: {fileID: 4465514175500312505} _hugeLogCutParticle: {fileID: 132537577928216743} _freezerChipParticle: {fileID: 173406299863492919} @@ -298056,7 +298065,7 @@ ParticleSystem: serializedVersion: 8 lengthInSec: 1 simulationSpeed: 1.3 - stopAction: 0 + stopAction: 2 cullingMode: 0 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} @@ -327896,7 +327905,7 @@ ParticleSystem: serializedVersion: 8 lengthInSec: 1 simulationSpeed: 1.5 - stopAction: 0 + stopAction: 2 cullingMode: 0 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} @@ -342777,7 +342786,7 @@ ParticleSystem: serializedVersion: 8 lengthInSec: 1 simulationSpeed: 1.5 - stopAction: 0 + stopAction: 2 cullingMode: 0 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} @@ -347911,6 +347920,11 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3} +--- !u!1 &710623323569033638 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 176919748635312773, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3} + m_PrefabInstance: {fileID: 839973794089554723} + m_PrefabAsset: {fileID: 0} --- !u!1 &3837707130267555365 stripped GameObject: m_CorrespondingSourceObject: {fileID: 4533552499156354310, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3} @@ -347921,6 +347935,16 @@ Animator: m_CorrespondingSourceObject: {fileID: 4387471827645615244, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3} m_PrefabInstance: {fileID: 839973794089554723} m_PrefabAsset: {fileID: 0} +--- !u!1 &4850786185656895803 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5258335070249015832, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3} + m_PrefabInstance: {fileID: 839973794089554723} + m_PrefabAsset: {fileID: 0} +--- !u!1 &4882392886731861511 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5217861902521318692, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3} + m_PrefabInstance: {fileID: 839973794089554723} + m_PrefabAsset: {fileID: 0} --- !u!1 &5461475411022461785 stripped GameObject: m_CorrespondingSourceObject: {fileID: 4639588617581127802, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3} @@ -348286,6 +348310,11 @@ Animator: m_CorrespondingSourceObject: {fileID: 4387471827645615244, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3} m_PrefabInstance: {fileID: 2574215485148474433} m_PrefabAsset: {fileID: 0} +--- !u!1 &2435876523110919876 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 176919748635312773, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3} + m_PrefabInstance: {fileID: 2574215485148474433} + m_PrefabAsset: {fileID: 0} --- !u!1 &4673486003957519203 stripped GameObject: m_CorrespondingSourceObject: {fileID: 7161565195996790562, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3} @@ -348317,6 +348346,16 @@ GameObject: m_CorrespondingSourceObject: {fileID: 4639588617581127802, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3} m_PrefabInstance: {fileID: 2574215485148474433} m_PrefabAsset: {fileID: 0} +--- !u!1 &7728221743046620761 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5258335070249015832, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3} + m_PrefabInstance: {fileID: 2574215485148474433} + m_PrefabAsset: {fileID: 0} +--- !u!1 &7768958504194675045 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5217861902521318692, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3} + m_PrefabInstance: {fileID: 2574215485148474433} + m_PrefabAsset: {fileID: 0} --- !u!1 &8283341335121478951 stripped GameObject: m_CorrespondingSourceObject: {fileID: 5858378645934729574, guid: e2e08f4bea037a14da41e5490ce6d393, type: 3} diff --git a/Assets/Resources/Prefabs/Games/Lumbearjack/BigObject.prefab b/Assets/Resources/Prefabs/Games/Lumbearjack/BigObject.prefab index bfc6b6a5c..89817c546 100644 --- a/Assets/Resources/Prefabs/Games/Lumbearjack/BigObject.prefab +++ b/Assets/Resources/Prefabs/Games/Lumbearjack/BigObject.prefab @@ -135,6 +135,8 @@ MonoBehaviour: m_EditorClassIdentifier: _logSR: {fileID: 8098522755323641548} _logCutSprite: {fileID: 192267312, guid: 8e17e4341f5f44e44b892a9c0cacc5ba, type: 3} + _ballSR: {fileID: 6319426971838379636} + _ballCutSprite: {fileID: 1488283434, guid: fcfd407e5f13b65499ef59b3777db34c, type: 3} --- !u!114 &-6887511602651794248 MonoBehaviour: m_ObjectHideFlags: 0 @@ -155,6 +157,7 @@ MonoBehaviour: _pivotSingle: {fileID: 0} _objectsToMove: - {fileID: 7773712820662594969} + - {fileID: 3276180286662469811} --- !u!1 &3051440580972758910 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Prefabs/Games/Lumbearjack/Cat.prefab b/Assets/Resources/Prefabs/Games/Lumbearjack/Cat.prefab index 389795e5b..83faa80a1 100644 --- a/Assets/Resources/Prefabs/Games/Lumbearjack/Cat.prefab +++ b/Assets/Resources/Prefabs/Games/Lumbearjack/Cat.prefab @@ -84,6 +84,90 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &176919748635312773 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9048807838789443178} + - component: {fileID: 4710379390982647645} + m_Layer: 0 + m_Name: barrel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &9048807838789443178 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 176919748635312773} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.14, y: -1.19, z: 0} + m_LocalScale: {x: 0.5710666, y: 0.5710666, z: 0.5710666} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8855434573853191878} + m_RootOrder: 9 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &4710379390982647645 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 176919748635312773} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 870da61114af4f245993dd3c88b446ea, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 70 + m_Sprite: {fileID: 1528129769, guid: fcfd407e5f13b65499ef59b3777db34c, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 3.26, y: 3.8} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &448050475756096169 GameObject: m_ObjectHideFlags: 0 @@ -881,6 +965,9 @@ Transform: - {fileID: 1489891351633342076} - {fileID: 9142406924768657724} - {fileID: 8591551953226593321} + - {fileID: 2511601079143808627} + - {fileID: 9048807838789443178} + - {fileID: 2110928556779588321} m_Father: {fileID: 1829052152680050499} m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -968,6 +1055,174 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &5217861902521318692 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2511601079143808627} + - component: {fileID: 6897785443092035358} + m_Layer: 0 + m_Name: book + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &2511601079143808627 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5217861902521318692} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.12, y: -1.12, z: 0} + m_LocalScale: {x: 0.5710666, y: 0.5710666, z: 0.5710666} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8855434573853191878} + m_RootOrder: 8 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &6897785443092035358 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5217861902521318692} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 70 + m_Sprite: {fileID: 355021811, guid: fcfd407e5f13b65499ef59b3777db34c, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 3.4, y: 4} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &5258335070249015832 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2110928556779588321} + - component: {fileID: 1672865066760193550} + m_Layer: 0 + m_Name: bigBall + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &2110928556779588321 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5258335070249015832} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.13, y: -1.29, z: 0} + m_LocalScale: {x: 0.5710666, y: 0.5710666, z: 0.5710666} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8855434573853191878} + m_RootOrder: 10 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1672865066760193550 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5258335070249015832} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 70 + m_Sprite: {fileID: -231943651, guid: fcfd407e5f13b65499ef59b3777db34c, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 3.44, y: 3.43} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &5858378645934729574 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Prefabs/Games/Lumbearjack/SmallObject.prefab b/Assets/Resources/Prefabs/Games/Lumbearjack/SmallObject.prefab index 34c402a87..9c13763aa 100644 --- a/Assets/Resources/Prefabs/Games/Lumbearjack/SmallObject.prefab +++ b/Assets/Resources/Prefabs/Games/Lumbearjack/SmallObject.prefab @@ -240,7 +240,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 0 + m_SortingOrder: 70 m_Sprite: {fileID: 1528129769, guid: fcfd407e5f13b65499ef59b3777db34c, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -540,6 +540,8 @@ MonoBehaviour: _can: {fileID: 719662512238027404} _bat: {fileID: 954934415611220420} _broom: {fileID: 5920352441626343011} + _barrel: {fileID: 945793470800833460} + _book: {fileID: 827378469899036997} --- !u!114 &-490977370071357320 MonoBehaviour: m_ObjectHideFlags: 0 @@ -563,6 +565,8 @@ MonoBehaviour: - {fileID: 2854676978937244060} - {fileID: 2941363410568922942} - {fileID: 4398076241187744673} + - {fileID: 8903405614003022742} + - {fileID: 568406762171179254} --- !u!1 &7082049777098498031 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Sfx/games/lumbearjack/barrelCut.ogg b/Assets/Resources/Sfx/games/lumbearjack/barrelCut.ogg new file mode 100644 index 000000000..4a4bc7352 Binary files /dev/null and b/Assets/Resources/Sfx/games/lumbearjack/barrelCut.ogg differ diff --git a/Assets/Resources/Sfx/games/lumbearjack/barrelCut.ogg.meta b/Assets/Resources/Sfx/games/lumbearjack/barrelCut.ogg.meta new file mode 100644 index 000000000..0c44eff7d --- /dev/null +++ b/Assets/Resources/Sfx/games/lumbearjack/barrelCut.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: f19ed2cf3c0b554488e844029f80fe3a +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 0 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: karate/common + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/lumbearjack/bigBallCut.wav b/Assets/Resources/Sfx/games/lumbearjack/bigBallCut.wav new file mode 100644 index 000000000..d954bf30e Binary files /dev/null and b/Assets/Resources/Sfx/games/lumbearjack/bigBallCut.wav differ diff --git a/Assets/Resources/Sfx/games/lumbearjack/bigBallCut.wav.meta b/Assets/Resources/Sfx/games/lumbearjack/bigBallCut.wav.meta new file mode 100644 index 000000000..b33aca086 --- /dev/null +++ b/Assets/Resources/Sfx/games/lumbearjack/bigBallCut.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: d96bfa4b2dac9844eb9ab0b49955e9ea +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 0 + 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/lumbearjack/bigBallHit.wav b/Assets/Resources/Sfx/games/lumbearjack/bigBallHit.wav new file mode 100644 index 000000000..89196f892 Binary files /dev/null and b/Assets/Resources/Sfx/games/lumbearjack/bigBallHit.wav differ diff --git a/Assets/Resources/Sfx/games/lumbearjack/bigBallHit.wav.meta b/Assets/Resources/Sfx/games/lumbearjack/bigBallHit.wav.meta new file mode 100644 index 000000000..33dd88bf3 --- /dev/null +++ b/Assets/Resources/Sfx/games/lumbearjack/bigBallHit.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 51f76054669c4d545bee03c57d760200 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 0 + 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/lumbearjack/bigBallPut.wav b/Assets/Resources/Sfx/games/lumbearjack/bigBallPut.wav new file mode 100644 index 000000000..c77f079e2 Binary files /dev/null and b/Assets/Resources/Sfx/games/lumbearjack/bigBallPut.wav differ diff --git a/Assets/Resources/Sfx/games/lumbearjack/bigBallPut.wav.meta b/Assets/Resources/Sfx/games/lumbearjack/bigBallPut.wav.meta new file mode 100644 index 000000000..b0bc3c31c --- /dev/null +++ b/Assets/Resources/Sfx/games/lumbearjack/bigBallPut.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 9133183170d166046bda2cc6dec77d00 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 0 + 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/lumbearjack/bombCut.ogg b/Assets/Resources/Sfx/games/lumbearjack/bombCut.ogg new file mode 100644 index 000000000..3f14ab6d4 Binary files /dev/null and b/Assets/Resources/Sfx/games/lumbearjack/bombCut.ogg differ diff --git a/Assets/Resources/Sfx/games/lumbearjack/bombCut.ogg.meta b/Assets/Resources/Sfx/games/lumbearjack/bombCut.ogg.meta new file mode 100644 index 000000000..ef1755944 --- /dev/null +++ b/Assets/Resources/Sfx/games/lumbearjack/bombCut.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 13131b6dbaad2044c8c176c12a07ec6e +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 0 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: karate/common + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/lumbearjack/bookCut.ogg b/Assets/Resources/Sfx/games/lumbearjack/bookCut.ogg new file mode 100644 index 000000000..e2bf607c8 Binary files /dev/null and b/Assets/Resources/Sfx/games/lumbearjack/bookCut.ogg differ diff --git a/Assets/Resources/Sfx/games/lumbearjack/bookCut.ogg.meta b/Assets/Resources/Sfx/games/lumbearjack/bookCut.ogg.meta new file mode 100644 index 000000000..70097bf8a --- /dev/null +++ b/Assets/Resources/Sfx/games/lumbearjack/bookCut.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 81eca61b10360334cabfb1a793889007 +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: rvlbooks/common + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/lumbearjack/bookPut.ogg b/Assets/Resources/Sfx/games/lumbearjack/bookPut.ogg new file mode 100644 index 000000000..7af7c6829 Binary files /dev/null and b/Assets/Resources/Sfx/games/lumbearjack/bookPut.ogg differ diff --git a/Assets/Resources/Sfx/games/lumbearjack/bookPut.ogg.meta b/Assets/Resources/Sfx/games/lumbearjack/bookPut.ogg.meta new file mode 100644 index 000000000..2d3c2edfe --- /dev/null +++ b/Assets/Resources/Sfx/games/lumbearjack/bookPut.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: e8b3d4313de714c419df7bb8518d5d28 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 0 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: rvlbooks/common + assetBundleVariant: diff --git a/Assets/Scripts/Games/LumBEARjack/LBJBigObject.cs b/Assets/Scripts/Games/LumBEARjack/LBJBigObject.cs index 0ed9bfd0f..dc4c6e654 100644 --- a/Assets/Scripts/Games/LumBEARjack/LBJBigObject.cs +++ b/Assets/Scripts/Games/LumBEARjack/LBJBigObject.cs @@ -11,6 +11,8 @@ namespace HeavenStudio.Games.Scripts_LumBEARjack [Header("Components")] [SerializeField] private SpriteRenderer _logSR; [SerializeField] private Sprite _logCutSprite; + [SerializeField] private SpriteRenderer _ballSR; + [SerializeField] private Sprite _ballCutSprite; private LBJBear _bear; private LBJObjectRotate _rotateObject; @@ -26,6 +28,8 @@ namespace HeavenStudio.Games.Scripts_LumBEARjack private void Awake() { _rotateObject = GetComponent(); + _logSR.gameObject.SetActive(false); + _ballSR.gameObject.SetActive(false); } public void Init(LBJBear bear, double beat, double length, LumBEARjack.BigType type, bool right, double startUpBeat = -1) @@ -36,11 +40,23 @@ namespace HeavenStudio.Games.Scripts_LumBEARjack _rotationBeat = beat + (length / 4 * 2); _rotationLength = length / 4; + + switch (_type) + { + case LumBEARjack.BigType.log: + _logSR.gameObject.SetActive(true); + break; + case LumBEARjack.BigType.bigBall: + _ballSR.gameObject.SetActive(true); + break; + } + if (startUpBeat <= beat + (length / 4 * 2)) _hitActionEvent = LumBEARjack.instance.ScheduleInput(beat, length / 4 * 2, Minigame.InputAction_BasicPress, JustHit, Miss, Blank); else { _rotationBeat = beat + (length / 4 * 3); _logSR.sprite = _logCutSprite; + _ballSR.sprite = _ballCutSprite; } _cutActionEvent = LumBEARjack.instance.ScheduleInput(beat, length / 4 * 3, Minigame.InputAction_BasicPress, JustCut, Miss, Blank); Update(); @@ -79,12 +95,14 @@ namespace HeavenStudio.Games.Scripts_LumBEARjack string hitSound = _type switch { LumBEARjack.BigType.log => "bigLogHit", + LumBEARjack.BigType.bigBall => "bigBallHit", _ => throw new System.NotImplementedException(), }; SoundByte.PlayOneShotGame("lumbearjack/" + hitSound); _bear.CutMid(); _rotationBeat = _cutActionEvent.startBeat + _cutActionEvent.timer; _logSR.sprite = _logCutSprite; + _ballSR.sprite = _ballCutSprite; } private void JustCut(PlayerActionEvent caller, float state) @@ -103,6 +121,7 @@ namespace HeavenStudio.Games.Scripts_LumBEARjack string cutSound = _type switch { LumBEARjack.BigType.log => "bigLogCut", + LumBEARjack.BigType.bigBall => "bigBallCut", _ => throw new System.NotImplementedException(), }; SoundByte.PlayOneShotGame("lumbearjack/" + cutSound); @@ -121,6 +140,7 @@ namespace HeavenStudio.Games.Scripts_LumBEARjack SpriteRenderer sr = _type switch { LumBEARjack.BigType.log => _logSR, + LumBEARjack.BigType.bigBall => _ballSR, _ => throw new System.NotImplementedException(), }; LumBEARjack.instance.ActivateMissEffect(sr.transform, sr); diff --git a/Assets/Scripts/Games/LumBEARjack/LBJSmallObject.cs b/Assets/Scripts/Games/LumBEARjack/LBJSmallObject.cs index 46416d738..774ec662d 100644 --- a/Assets/Scripts/Games/LumBEARjack/LBJSmallObject.cs +++ b/Assets/Scripts/Games/LumBEARjack/LBJSmallObject.cs @@ -13,6 +13,8 @@ namespace HeavenStudio.Games.Scripts_LumBEARjack [SerializeField] private GameObject _can; [SerializeField] private GameObject _bat; [SerializeField] private GameObject _broom; + [SerializeField] private GameObject _barrel; + [SerializeField] private GameObject _book; private LBJBear _bear; private LBJObjectRotate _rotateObject; @@ -31,6 +33,8 @@ namespace HeavenStudio.Games.Scripts_LumBEARjack _can.SetActive(false); _bat.SetActive(false); _broom.SetActive(false); + _barrel.SetActive(false); + _book.SetActive(false); _rotateObject = GetComponent(); } @@ -55,6 +59,12 @@ namespace HeavenStudio.Games.Scripts_LumBEARjack case LumBEARjack.SmallType.broom: _broom.SetActive(true); break; + case LumBEARjack.SmallType.barrel: + _barrel.SetActive(true); + break; + case LumBEARjack.SmallType.book: + _book.SetActive(true); + break; default: break; } @@ -100,6 +110,8 @@ namespace HeavenStudio.Games.Scripts_LumBEARjack LumBEARjack.SmallType.can => "canCut", LumBEARjack.SmallType.bat => "batCut", LumBEARjack.SmallType.broom => "broomCut", + LumBEARjack.SmallType.barrel => "barrelCut", + LumBEARjack.SmallType.book => "bookCut", _ => throw new System.NotImplementedException() }; SoundByte.PlayOneShotGame("lumbearjack/" + cutSound); @@ -133,6 +145,8 @@ namespace HeavenStudio.Games.Scripts_LumBEARjack LumBEARjack.SmallType.can => _can.GetComponent(), LumBEARjack.SmallType.bat => _bat.GetComponent(), LumBEARjack.SmallType.broom => _broom.GetComponent(), + LumBEARjack.SmallType.barrel => _barrel.GetComponent(), + LumBEARjack.SmallType.book => _book.GetComponent(), _ => throw new System.NotImplementedException(), }; LumBEARjack.instance.ActivateMissEffect(sr.transform, sr); diff --git a/Assets/Scripts/Games/LumBEARjack/LumBEARjack.cs b/Assets/Scripts/Games/LumBEARjack/LumBEARjack.cs index 6921a47d2..9e8746b98 100644 --- a/Assets/Scripts/Games/LumBEARjack/LumBEARjack.cs +++ b/Assets/Scripts/Games/LumBEARjack/LumBEARjack.cs @@ -246,12 +246,15 @@ namespace HeavenStudio.Games log, can, bat, - broom + broom, + barrel, + book } public enum BigType { - log + log, + bigBall } public enum HugeType @@ -322,8 +325,13 @@ namespace HeavenStudio.Games [SerializeField] private ParticleSystem _canCutParticle; [SerializeField] private ParticleSystem _batCutParticle; [SerializeField] private ParticleSystem _broomCutParticle; + [SerializeField] private ParticleSystem _barrelCutParticle; + [SerializeField] private ParticleSystem _bookCutParticle; + [SerializeField] private ParticleSystem _bigLogHitParticle; [SerializeField] private ParticleSystem _bigLogCutParticle; + [SerializeField] private ParticleSystem _bigBallCutParticle; + [SerializeField] private ParticleSystem _hugeLogHitParticle; [SerializeField] private ParticleSystem _hugeLogCutParticle; [SerializeField] private ParticleSystem _freezerChipParticle; @@ -795,6 +803,7 @@ namespace HeavenStudio.Games { case SmallType.bat: case SmallType.log: + case SmallType.barrel: sounds.Add(new("lumbearjack/smallLogPut", beat + (length / 3))); break; case SmallType.can: @@ -803,6 +812,9 @@ namespace HeavenStudio.Games case SmallType.broom: sounds.Add(new("lumbearjack/broomPut", beat + (length / 3))); break; + case SmallType.book: + sounds.Add(new("lumbearjack/bookPut", beat + (length / 3))); + break; default: break; } @@ -822,6 +834,9 @@ namespace HeavenStudio.Games case BigType.log: sounds.Add(new("lumbearjack/bigLogPut", beat + (length / 4))); break; + case BigType.bigBall: + sounds.Add(new("lumbearjack/bigBallPut", beat + (length / 4))); + break; default: break; } @@ -1104,6 +1119,14 @@ namespace HeavenStudio.Games ParticleSystem spawnedParticle3 = Instantiate(_broomCutParticle, _particleCutPoint); spawnedParticle3.PlayScaledAsyncAllChildren(0.5f); break; + case SmallType.barrel: + ParticleSystem spawnedParticle4 = Instantiate(_barrelCutParticle, _particleCutPoint); + spawnedParticle4.PlayScaledAsyncAllChildren(0.5f); + break; + case SmallType.book: + ParticleSystem spawnedParticle5 = Instantiate(_bookCutParticle, _particleCutPoint); + spawnedParticle5.PlayScaledAsyncAllChildren(0.5f); + break; } } @@ -1115,6 +1138,11 @@ namespace HeavenStudio.Games ParticleSystem spawnedParticle = Instantiate(hit ? _bigLogHitParticle : _bigLogCutParticle, hit ? _particleHitPoint : _particleCutPoint); spawnedParticle.PlayScaledAsyncAllChildren(0.5f); break; + case BigType.bigBall: + if (hit) break; + ParticleSystem spawnedParticle2 = Instantiate(_bigBallCutParticle, _particleCutPoint); + spawnedParticle2.PlayScaledAsyncAllChildren(0.5f); + break; } }