Commit graph

733 commits

Author SHA1 Message Date
minenice55
9e3c90c093 joe prepare animation
- bg effect preview (buggy)
- adjusted path of hit items
- adjusted particle limits and spawning
- rain is now affected by wind
- cont. work on joe expressions

- animation helper sync scale now plays thru events properly
- adjusted timing windows
2022-08-07 19:40:06 -04:00
minenice55
d36111cef6 cooking pot lids fly off
- also fixes issues with fading shadow colours
- TODO: make fading bg texture colour more intuitive
2022-08-06 21:09:28 -04:00
minenice55
5f8899008d background colour fading
- also allows fading of shadow and background texture colours
2022-08-06 19:15:44 -04:00
minenice55
c9cffb15c2 facial expressions
- activated thru certain actions (NG input, special moves) or can be forced via entity
2022-08-05 22:37:06 -04:00
minenice55
bdc9900099 background particles, gradient 2022-08-05 21:19:18 -04:00
minenice55
55b0377680 recolourable shadows
- rework now has parity with the old version
2022-08-03 18:55:13 -04:00
minenice55
795fdf61d2 background effects, special move camera
- also removed all old karate man assets
2022-08-03 17:49:32 -04:00
minenice55
f2fedaf197 finish effect 2022-08-03 16:14:37 -04:00
minenice55
16f7862e7e particle adjust 2022-07-30 21:33:11 -04:00
minenice55
e49d9f0db5 kicks complete, start work on particles
- bg colour can now be changed
2022-07-30 21:16:48 -04:00
minenice55
996354946a hit effect start, kick charge 2022-07-29 22:25:48 -04:00
minenice55
28b5cc71d7 start work on kicks 2022-07-29 15:26:59 -04:00
minenice55
a1f7b0ea42 replace old karate man prefab with new one 2022-07-29 15:06:22 -04:00
minenice55
41d098ec1d add y-offset functionality to start position offset 2022-07-29 12:52:59 -04:00
minenice55
d478a55795 fully functional combo, several object types 2022-07-29 12:18:17 -04:00
minenice55
334a654b9b combo input 2022-07-28 22:09:48 -04:00
minenice55
39d3a136c5 start working on inputs
- InputType enum is now flags, can be combined together
2022-07-28 19:12:21 -04:00
minenice55
357e0b8f47 Merge branch 'master' into karate-man-2 2022-07-28 19:09:59 -04:00
minenice55
5a2860f752 Merge pull request #139 from ThatZeoMan/master
Track 5, along with QOL changes
2022-07-28 19:09:07 -04:00
ThatZeoMan
f34624e1d8 vfx flashes work again
thanks for the help, minenice
2022-07-28 18:07:19 -05:00
ThatZeoMan
e337fe650e Track 5 fully functional
also fixed karate man's Set Background Effects
2022-07-28 17:16:20 -05:00
minenice55
b85754c6d7 Merge branch 'master' into karate-man-2 2022-07-28 11:32:10 -04:00
ThatZeoMan
e2a677ebdf start gearing up for track 5
it is battery acid color (i will change it)

i probably did this wrong
2022-07-28 00:17:02 -05:00
minenice55
c45f0a34dc create classes 2022-07-27 18:35:18 -04:00
Mytiaoga
4a795d96f0 Update repo to latest 2022-07-27 17:04:02 +08:00
ThatZeoMan
9bca79b2a0 Update TramAndPauline.cs 2022-07-26 18:19:05 -05:00
ThatZeoMan
2f87a8edcb Merge branch 'megaminerjenny:master' into master 2022-07-26 19:05:32 -04:00
ThatZeoMan
755092c922 move flash to VFX 2022-07-26 18:04:02 -05:00
adianfiuef
8fca08c088 Tram&Pauline animation update 2022-07-26 14:14:28 -04:00
minenice55
52b4ce9f26 start karate man redo 2022-07-26 11:37:02 -04:00
minenice55
c4d77c2254 make dropdown properly update after auto-search 2022-07-26 08:54:59 -04:00
minenice55
8c40bae444 update joyshock gyro and touch states 2022-07-25 18:56:13 -04:00
minenice55
a47153f2f6 playstation controller lightbar colours
- fix controller feature flags not actually being flags
2022-07-25 18:36:32 -04:00
minenice55
379ad6163b move duplicate code to own method 2022-07-25 12:49:43 -04:00
adianfiuef
34a12a514c Tram&Pauline
Animation mostly done perfectly
2022-07-25 01:04:16 -07:00
Mytiaoga
c7b8404a6a Merge branch 'master' of https://github.com/Mytiaoga/HeavenStudio 2022-07-25 10:09:25 +08:00
Mytiaoga
2ca9cbbb1d First Contact, Tap Trial, Air Rally
First Contact
- Fixed a bug

Tap Trial
- All anims and input are implemented

Air Rally
- Initialization
2022-07-25 10:04:55 +08:00
Mytiaoga
07d12d7d90 Add files via upload 2022-07-25 10:04:43 +08:00
Mytiaoga
36a40ed74f Add files via upload 2022-07-25 10:03:01 +08:00
Mytiaoga
2e4e20a85a Add files via upload 2022-07-25 10:02:33 +08:00
minenice55
a695a4c221 dual joy-con support
- add controller icons in the controller selection menu
2022-07-24 18:38:00 -04:00
minenice55
96ac465200 add controller selection, auto-search
- fix bug in master volume control where the text input doesn't work
- fix bug in the Fan Club minigame where the player wouldn't jump when they were supposed to
2022-07-23 22:24:07 -04:00
minenice55
a45625ebd0 heavy rework of our input system
- implement the InputController abstract class, an adapter class for any HID interface to use common controller methods relevant to Heaven Studio
- implement InputKeyboard and InputJoyshock classes, for keyboard input and controllers driven by JoyShockLibrary respectively
- add Linux compile of JoyShockLibrary
2022-07-23 20:36:10 -04:00
minenice55
8df667bfec basic controller input from JSL
may need compiles for linux and mac
2022-07-19 18:50:35 -04:00
minenice55
d4edc0d8f6 Update Editor.unity 2022-07-17 18:26:21 -04:00
minenice55
2f68104a00 prepare controller settings menu 2022-07-17 18:25:54 -04:00
minenice55
ab722b722c update Fan Club character sheets to HD assets 2022-07-16 23:41:26 -04:00
minenice55
5657940b4b Merge pull request #135 from Mytiaoga/master
First Contact & Tap Trial Updates
2022-07-11 19:54:21 -04:00
Mytiaoga
167889d2e2 First Contact - Fixed bug for [lookAt] 2022-07-11 16:55:35 +08:00
Mytiaoga
2441d624dc First Contact - Toggle Live Bar beat
- On beat or Off beat live bar
2022-07-11 15:38:34 +08:00
Mytiaoga
2cc1d56f22 Add files via upload 2022-07-11 15:22:00 +08:00
Mytiaoga
667234a855 First Contact - slight change on Mission Control 2022-07-11 15:21:17 +08:00
Mytiaoga
949a23b4ae Add files via upload 2022-07-11 14:28:55 +08:00
Mytiaoga
dae152668d Current version pull
Updated First Contact anims
2022-07-11 14:22:12 +08:00
Mytiaoga
8caa566890 First Contact - Revert Offbeat to OnBeat Live 2022-07-11 14:06:30 +08:00
Mytiaoga
23e8a32a87 Merge branch 'master' of https://github.com/Mytiaoga/HeavenStudio 2022-07-11 13:54:26 +08:00
Mytiaoga
06f80bfb51 First Contact & Tap Trial
First Contact:
Live is now offbeat
[alienSuccess] code block is a bit smaller
Mission Control is now stretchable

Tap Trial
- Started working on coding the inputs
- Animated monkey (tap, double, and triple (incomplete))
2022-07-11 13:53:25 +08:00
minenice55
2ba10e9fae Merge pull request #131 from saladplainzone/master
Space Dance - Initial Implementation
2022-07-10 19:32:21 -04:00
saladplainzone
840aa4d630 First Contact - General Refinements (Anims, LIVE text) 2022-07-10 16:28:29 -07:00
saladplainzone
6283eda6d3 Merge remote-tracking branch 'upstream/master' 2022-07-10 14:56:09 -07:00
minenice55
ab7b2f680c update credits text 2022-07-10 17:55:06 -04:00
minenice55
ffcccdb6b9 missing fit to song 2022-07-10 17:45:59 -04:00
minenice55
fbeab5f0ad add cursor toggle, master volume 2022-07-10 17:39:14 -04:00
saladplainzone
8d5b344085 Space Dance - Input Changes 2022-07-09 23:32:58 -07:00
minenice55
0f1eb77988 add tabs system to editor settings 2022-07-09 23:22:59 -04:00
ThatZeoMan
98c4b6d425 Unified minigame titles 2022-07-09 22:02:59 -05:00
ThatZeoMan
f59a3ed04f Further simplified Coin Toss
Also added 3 new color attributes: colorD, colorE, and colorF
2022-07-09 21:42:28 -05:00
ThatZeoMan
51c0eb0725 Combined Coin Toss's "Set XXXXground color" into one
also renamed "Hit3" to "HitX"
2022-07-09 21:20:30 -05:00
minenice55
53f48c64e7 settings resolution changer 2022-07-08 22:11:55 -04:00
minenice55
19f0009c55 prep settings menu for real 2022-07-08 18:49:15 -04:00
minenice55
70c5216690 fix layer 4 not being usable at certain window sizes 2022-07-08 17:58:58 -04:00
minenice55
7adc281618 fix issue with param disabling 2022-07-08 16:20:39 -04:00
minenice55
576807ad4f property scrolling 2022-07-08 16:11:51 -04:00
minenice55
4df82e709a duplicating entities can now be undone / redone 2022-07-08 12:50:23 -04:00
minenice55
f83e70b2cb Merge pull request #128 from Mytiaoga/master
First Contact & DJ School updates
2022-07-08 10:58:07 -04:00
minenice55
5b58308a34 fix dj school assetbundle 2022-07-08 10:57:42 -04:00
minenice55
fe13ca5baa remove old files 2022-07-08 10:38:13 -04:00
minenice55
9f72fece18 Merge branch 'master' into pr/128 2022-07-08 10:36:30 -04:00
Mytiaoga
311bda5fd3 Updated Inputs for some minigames
First Contact & DJ School has their inputs methods updated
2022-07-08 13:27:10 +08:00
minenice55
13ca36d95e make copying use deep copies lol 2022-07-04 13:09:23 -04:00
minenice55
0edd2d005b copy entities, prep settings menu 2022-07-04 12:57:19 -04:00
minenice55
7f3876f1ec fully functional snap change menu 2022-07-04 11:29:19 -04:00
minenice55
b54194ebb8 spawn tempo changes on load 2022-07-04 10:28:40 -04:00
Mytiaoga
38cb7049fa First Contact - Updated Input Manager
Also changed the game icon w/ mask
2022-07-03 16:42:18 +08:00
minenice55
77dd0fd3e4 get stuff ready for canary 2022-07-01 22:31:58 -04:00
minenice55
58dd43e67b event scroll fixes 2022-07-01 22:29:16 -04:00
minenice55
94a1e225e9 selecting crap works properly now 2022-07-01 22:03:15 -04:00
minenice55
f31b328f1a event selection doesn't go offscreen anymore
github copilot is insane it wrote half of the code in this commit lmao
2022-06-30 15:51:13 -04:00
minenice55
157a4749d7 Merge branch 'master' into responsive-editor 2022-06-30 14:48:48 -04:00
minenice55
27a928712f editor fully scaleable 2022-06-29 21:58:21 -04:00
Mytiaoga
51da1cca1d First Contact - Game Icon 2022-06-29 13:40:09 +08:00
Mytiaoga
8177507642 First Contact - Re-initialization 2022-06-29 13:37:14 +08:00
minenice55
77ce9cb06d Update Editor.unity 2022-06-28 18:55:28 -04:00
minenice55
dc111b80b9 make game selection scroll not suck 2022-06-28 18:51:19 -04:00
minenice55
e3edd01be3 tempo change: clamp on scroll 2022-06-28 16:58:23 -04:00
minenice55
5d62518e3a fix missing reference errors in tooltip 2022-06-28 16:09:41 -04:00
minenice55
a53176a1fd fix tooltip with scaled window 2022-06-28 15:57:32 -04:00
saladplainzone
8d2b4a5f67 Space Dance - Sound Effects
lets fucking sit down
2022-06-27 09:07:27 -07:00
saladplainzone
f4da37b406 Crop Stomp Spritesheet Update, Space Dance Anim Tweaks 2022-06-26 17:59:27 -07:00
minenice55
ea978489b6 prep dialog stuff 2022-06-26 19:18:03 -04:00
minenice55
6e4cfb6dc5 basic layout ok 2022-06-26 18:24:45 -04:00
minenice55
10b5be926a wip editor responsive scaling 2022-06-26 17:37:30 -04:00
saladplainzone
8e81332709 Space Dance - More Animations 2022-06-26 00:36:32 -07:00
saladplainzone
a52c6d2001 Space Dance - Initial Prefab Setup 2022-06-25 23:48:14 -07:00
minenice55
5a4dda5fc7 Move stray somen file to its folder 2022-06-26 00:27:23 -04:00
minenice55
8195b1fc88 Pajama Party: no awake can be interrupted by other cues 2022-06-26 00:16:37 -04:00
minenice55
2cf836b2ca trim Trick on the Class sfx, fix Pajama party sprites 2022-06-25 23:38:40 -04:00
minenice55
1da1382c9b Add quad inflation to SpritesheetScaler 2022-06-25 22:35:43 -04:00
minenice55
cb0d903b51 Merge pull request #117 from minenice55/game-mobTrick
Minigames: Trick on the Class & Rhythm Somen
2022-06-24 01:20:43 -04:00
minenice55
0019c84ee8 Game scroll and other adjustments
add icons to Rhythm Somen, Trick on the Class
adjust bg colour of Rhythm Tweezers, Karate Man
2022-06-24 00:51:22 -04:00
saladplainzone
f515129f83 Rhythm Somen - Okay I did it again He's alive now 2022-06-23 23:25:34 -04:00
saladplainzone
05cd5b514f Rhythm Somen - Done Except Eating But I'm Fine With It For Now 2022-06-23 23:22:06 -04:00
saladplainzone
2289eb6f0b Rhythm Somen - Basic Setup, Cues
No inputs yet, but I figure this is big enough I can push it just to be safe
2022-06-23 23:20:43 -04:00
minenice55
8195e16d54 Update Dodge.anim 2022-06-23 22:45:10 -04:00
minenice55
87f2f00dc6 Add new icons 2022-06-23 22:41:21 -04:00
minenice55
101e2eb251 Trick on the Class: basic functionality complete 2022-06-23 21:28:17 -04:00
huantian
57e72611c9 Fix ScheduleInput docstring (#114) 2022-06-23 17:05:27 -07:00
huantian
49d949be1e Fix Tram and Pauline file locations (#113) 2022-06-23 17:05:19 -07:00
adianfiuef
a7aa5df9e5 Tram&Pauline (#111)
* Tram&Pauline

Update

* Tram&Pauline

guys I have the update and I putted it all in the right folders

* Tram&Pauline

Hey put everything in the right folders
2022-06-23 12:45:19 -07:00
adianfiuef
66fc9d26bd Tram&Pauline
Hey put everything in the right folders
2022-06-22 22:52:52 -07:00
adianfiuef
2c03fcd104 Merge branch 'master' of https://github.com/adianfiuef/HeavenStudio 2022-06-22 22:46:39 -07:00
adianfiuef
36495ed731 Tram&Pauline
guys I have the update and I putted it all in the right folders
2022-06-22 22:46:27 -07:00
minenice55
581f317316 Update Throw.anim 2022-06-22 18:52:35 -04:00
minenice55
642842bbaa Trick on the Class: player / girl animations done 2022-06-22 18:42:22 -04:00
minenice55
1f9b558220 Merge branch 'master' into game-mobTrick 2022-06-22 16:23:15 -04:00
huantian
3b65aec32f Convert Starpelly.OS.Windows to be platform agnostic. (#106) 2022-06-22 12:55:12 -07:00
minenice55
380e9dc1ca Trick on the Class: update prefab with new assets 2022-06-19 23:26:19 -04:00
minenice55
3a9af801ec Trick on the Class: update 2mo old code 2022-06-19 22:29:21 -04:00
minenice55
ed79c7e4fd Merge branch 'master' into game-mobTrick 2022-06-19 21:47:42 -04:00
minenice55
ae017fdeef Various small additions and changes (#105)
* Fan Club: spotlight effects

* new icons for Pajama Party, Karate Man

* Editor: make context use Rodin font

* idem for entities

* Blue Bear: import HQ texture

* Pajama Party: option to sleep forever

* Space Soccer: option to mute the dispense sound
2022-06-17 23:31:19 -07:00
minenice55
342f3d6771 Icon Improvement Concept & Resizeable Window (#104)
* Editor: mostly PoC icon effects

* slightly more responsive selection

* resizeable window

game camera still doesn't letterbox properly, will need a bit more work

* letterbox both in editor and in fullscreen

* restore camera rects when returning to editor
2022-06-13 22:24:41 -07:00
minenice55
b660b4dcbd Allow games to load assets from AssetBundles (#102)
* Loading improvements: prepwork for loading from assetbundles

* note for sfx

* cleaner code

* correct type

* put loaded assetbundle in the minigame data instead

also lays groundwork for future localization stuff

* add samurai slice gold, coin toss assetbundles

* very messy "already loaded" checks

* make Dj School load from assetbundle
2022-06-12 12:32:00 -07:00
saladplainzone
3f926920e4 Rhythm Somen - Initial Commit, Prefab Setup (#99)
Somen moment
2022-06-11 13:40:27 -07:00
Jellirby
b15a4c6f0c Launch Party Prefab Setup (#97)
This commit includes all the necessary things to get started with Launch Party (base color sprites, prefab, background, and a loader class script). Anyone is welcome to finish it
2022-06-10 09:50:39 -07:00
minenice55
8b8560eb3f I shouldn't be coding at midnight (#96)
* Fix Sheets issue 11

* Textboxes: Fix unicode glyphs sometimes not displaying

* Fan Club: fix order of operation bug

* Conductor: refactor ReportBeat

this fixes issues with using crop stomp alongside tempo changes

* Built to Scale (Gold): temporarily disable post-processing

game renders very incorrectly due to the post processing effects
will need someone who knows what they're doing in that field to fix it proper

* marked some assets for deletion

* I'm dumb and left in debug prints

* peabrain moment

VERY IMPORTANT FIX

* Make this not loop
2022-06-08 23:46:51 -07:00
minenice55
37eb45ec6d Small Bugfixes (#95)
* Fix Sheets issue 11

* Textboxes: Fix unicode glyphs sometimes not displaying

* Fan Club: fix order of operation bug

* Conductor: refactor ReportBeat

this fixes issues with using crop stomp alongside tempo changes

* Built to Scale (Gold): temporarily disable post-processing

game renders very incorrectly due to the post processing effects
will need someone who knows what they're doing in that field to fix it proper

* marked some assets for deletion

* I'm dumb and left in debug prints
2022-06-08 20:35:15 -07:00
minenice55
c3a227cf0f Textboxes: adjustments (#93)
- button glyphs now have softer outlines
- corrected the mixup between the East and West face buttons
- added glyphs for shoulder buttons
- added set of custom emoji
2022-06-07 16:27:21 -07:00
minenice55
a824040f59 Tempo changes restored (#92)
* Prepwork for seeking + tempo change fixes

TODO: make playing after seeking function (I'll need help with the offset stuff so if anyone can push to this branch please do)

* functions to get the beat from a song position

will need more testing but I think it works well enough to get into prod
thanks @wooningcharithri#7419 for the psuedo-code
2022-06-06 09:54:57 -07:00
minenice55
a3fb579c6d Animation speed helpers, stop on remix end (#91) 2022-06-06 09:54:49 -07:00
minenice55
057bdf7fe5 Gameplay: Timing windows use a "smart" BPM scaling system (#86)
* Game: Pajama Party

* Pajama Party: bg setup, Mako jump

* Pajama Party: mako jumping

* Pajama Party: prep landing anim references

* Pajama Party: several anims, improved 3d scene

* Pajama Party: bg cleanup

* Pajama Party: Mako sleeping anims

* Pajama Party: All Mako anims, add sounds to fs

* Pajama Party: prep monkey prefab

* Pajama Party: thrown pillow, prep sequences

* Pajama Party: make embarrassed catch not loop

whoops

* Pajama Party: sound adjust, prefab work

* Pajama Party: monkey spawning, basic jumping

* Pajama Party: jump sequence

no input detection or landing yet

* Pajama Party: anims override

* Pajama Party: jump cue functional

comes with improvements and bugfixes to PlayerActionEvent

* Pajama Party: sleep cue functional

* Pajama Party: some notes

* PlayerActionEvent: more bugfixes

* Pajama Party: fully functional throw cue

* Pajama Party: start animating sleep cue

* Pajama Party: feature-complete

* Pajama Party: unfuck layering

* Pajama Party: icon

also adds Fan Club's concept icon

* Pajama Party: cues while unloaded

* inverse-scale timing windows based on speed

* Fan Club: move to new input system

* Fan Club: allow forced animations during calls

* Crop Stomp: fix camera shake regression
2022-06-03 20:15:56 -07:00
Saraistupid
9b9bfea627 Fix Importing Music files on Linux (#89)
* fix importing music files on linux

* oops
2022-06-03 20:15:45 -07:00
Saraistupid
6b70f7c342 Merge UI Folders (#88) 2022-06-03 20:15:24 -07:00
minenice55
fc07f80b4f Feature: Textboxes and other text-related features (#90)
* Textboxes: setup prefab

* Textboxes: basic functionality finished

* Textbox: scaling

* Textbox: open captions

* Textbox: res edits

* Textbox: song artist

* Textbox: closed captions

* Textbox: fix not being able to use multiple text events

* I/O: save / load remixes using UTF-8 encoding

* Textboxes: stop editor shortcuts while typing
2022-06-03 20:15:05 -07:00
minenice55
022cbad1d6 Minigame: Pajama Party (#84)
* Game: Pajama Party

* Pajama Party: bg setup, Mako jump

* Pajama Party: mako jumping

* Pajama Party: prep landing anim references

* Pajama Party: several anims, improved 3d scene

* Pajama Party: bg cleanup

* Pajama Party: Mako sleeping anims

* Pajama Party: All Mako anims, add sounds to fs

* Pajama Party: prep monkey prefab

* Pajama Party: thrown pillow, prep sequences

* Pajama Party: make embarrassed catch not loop

whoops

* Pajama Party: sound adjust, prefab work

* Pajama Party: monkey spawning, basic jumping

* Pajama Party: jump sequence

no input detection or landing yet

* Pajama Party: anims override

* Pajama Party: jump cue functional

comes with improvements and bugfixes to PlayerActionEvent

* Pajama Party: sleep cue functional

* Pajama Party: some notes

* PlayerActionEvent: more bugfixes

* Pajama Party: fully functional throw cue

* Pajama Party: start animating sleep cue

* Pajama Party: feature-complete

* Pajama Party: unfuck layering

* Pajama Party: icon

also adds Fan Club's concept icon

* Pajama Party: cues while unloaded
2022-05-27 19:40:16 -07:00
minenice55
4ace832a11 Global Camera Movement (#80)
* Global Camera: move Spaceball to new system

* Global Camera: holy shit I'm done already?????
2022-05-15 22:29:39 -07:00
minenice55
2453f9a48b Minigame: Samurai Slice (Gold) (#79)
* Game: Samurai Slice (DS)

initial scene setup

* Samurai Slice (Gold) - Start animations

* Samurai Slice (Gold) - Finish core samurai animations

* Samurai Slice (Gold) - Basic interactions

* Samurai Slice (Gold): object prep

* Samurai Slice (Gold): object type setup

* Samurai Slice (Gold): object paths

* Samurai Slice (Gold): prep for other objects

* Samurai Slice (Gold): prep fish

* Samurai Slice (Gold): Objects complete

* Samurai Slice (Gold): dinero

quiero cien vbucks

* Samurai Slice (Gold): polish cash, slicing anim

* Samurai Slice (Gold): child catching

* Samurai Slice (Gold): feature complete
2022-05-15 22:29:26 -07:00
Saraistupid
8de2364cf7 Linux Music Support™️ (#78)
* A little warning about audio

* Create Linux.meta

* Create libVorbisPlugin.so.meta

* Linux audio support maybe?

* Update README.md
2022-05-11 14:02:57 -07:00
Jenny Crowe
9b99d73ec9 Meta files moment 2022-05-07 14:32:47 -07:00
Jenny Crowe
60b5602050 Merge branch 'master' into master 2022-05-07 14:28:49 -07:00
Jenny Crowe
784b9e886e Merge pull request #76 from Pengu12345/alternate_input_system
Separation of input detection in it's own class + Addition of Coin Toss
2022-05-07 14:19:15 -07:00