6600 Commits

Author	SHA1	Message	Date
smoogipoo	ae022d7559	Show all items in dropdown, set global max height	2020-09-08 18:55:53 +09:00
smoogipoo	4962213cc4	Rename manage collections filter/text	2020-09-08 18:42:55 +09:00
Dan Balasescu	68f3a1ea9a	Merge branch 'master' into collection-database	2020-09-08 18:30:01 +09:00
smoogipoo	f581df47c8	Add "New collection..." item to dropdown	2020-09-08 18:25:09 +09:00
Dean Herbert	c3123bf117	Rename drag blueprint selection method for discoverability	2020-09-08 17:22:59 +09:00
smoogipoo	1260e30cde	Make ShowDragHandle into a bindable	2020-09-08 16:36:36 +09:00
smoogipoo	c2da3d9c84	Fix button input and tests	2020-09-08 14:36:38 +09:00
smoogipoo	8a3c8a6185	Show button when selected or preselected	2020-09-08 14:03:49 +09:00
smoogipoo	32e3f5d091	Adjust button styling	2020-09-08 13:45:26 +09:00
Dean Herbert	8b770626fa	Add missing '...' from some popup menu items	2020-09-08 12:18:08 +09:00
Dean Herbert	b15bbc882a	Move items up in menu	2020-09-08 12:04:35 +09:00
Dean Herbert	3e5ea6c42f	Change "Add to" to "Collections" ... Doesn't make send to be 'add to' when it can also remove	2020-09-08 12:00:00 +09:00
Dean Herbert	9e559cb9ac	Merge branch 'master' into editor-new-beatmap	2020-09-08 02:58:38 +09:00
smoogipoo	ca4423af74	Fix tests	2020-09-08 00:07:12 +09:00
smoogipoo	e37c04cb6d	Change back to solid icon	2020-09-08 00:04:03 +09:00
smoogipoo	a1214512bc	Add filter control tests	2020-09-07 23:57:49 +09:00
smoogipoo	98e9c4dc25	General refactorings	2020-09-07 21:08:48 +09:00
smoogipoo	c1d255a04c	Split filter control into separate class	2020-09-07 20:44:39 +09:00
smoogipoo	120dfd50a6	Fix collection names not updating in dropdown	2020-09-07 20:29:28 +09:00
smoogipoo	b91a376f0a	Split dropdown into separate file	2020-09-07 20:06:38 +09:00
smoogipoo	6cc4517600	Merge branch 'master' into collection-database	2020-09-07 20:03:11 +09:00
Dan Balasescu	f19d9a29c5	Merge pull request #10077 from peppy/editor-bpm-usability ... Improve usability of BPM modifying in timing setup view	2020-09-07 20:02:49 +09:00
Dean Herbert	6b50d44dde	Merge branch 'master' into editor-new-beatmap	2020-09-07 18:43:16 +09:00
Dean Herbert	4792b44911	Merge branch 'master' into editor-new-beatmap	2020-09-07 18:42:51 +09:00
Dean Herbert	1468b9589f	Increase max sane BPM value	2020-09-07 18:20:47 +09:00
Dean Herbert	98676af7bb	Move default declarations for readability	2020-09-07 18:18:50 +09:00
Dean Herbert	86512d6e8d	Add BPM entry textbox	2020-09-07 18:18:50 +09:00
Dean Herbert	6091714f15	Limit BPM entry via slider to a sane range	2020-09-07 18:18:50 +09:00
Dean Herbert	4680728b9c	Merge branch 'master' into update-dcc-exclusions	2020-09-07 18:01:44 +09:00
Dan Balasescu	476c325626	Merge branch 'master' into gameplay-disable-overlays	2020-09-07 15:34:02 +09:00
smoogipoo	9ab6d584d3	Merge branch 'master' into editor-new-beatmap	2020-09-07 14:30:41 +09:00
Dan Balasescu	e17ccdfe9f	Merge branch 'master' into combo-colors	2020-09-07 13:55:41 +09:00
Bartłomiej Dach	f138b92078	Merge branch 'master' into editor-new-beatmap	2020-09-06 18:24:02 +02:00
smoogipoo	4b4dd02942	Make collection name a bindable	2020-09-05 04:43:59 +09:00
smoogipoo	345fb9d8e0	Rename classes	2020-09-05 03:55:43 +09:00
smoogipoo	ebd11ae0b7	Add a collection management dialog	2020-09-05 03:52:07 +09:00
smoogipoo	1143d5d992	Update class exclusion for dynamic compilation	2020-09-04 20:41:08 +09:00
Dan Balasescu	743c888986	Merge branch 'master' into expose-wedge-icons	2020-09-04 16:22:14 +09:00
Dan Balasescu	b631430a5b	Merge pull request #10045 from peppy/add-info-wedge-icons ... Update and add missing beatmap statistic icons to info wedge	2020-09-04 16:22:01 +09:00
smoogipoo	4399f5976c	Fix global mods being retained by rooms	2020-09-04 15:20:55 +09:00
Dean Herbert	25e142965d	Strongly type and expose default beatmap information icon implementations for other rulesets	2020-09-04 15:01:32 +09:00
Dean Herbert	fba253f131	Take user argument in CreateNew method parameters	2020-09-04 13:17:43 +09:00
Dean Herbert	1f2f21e07a	Merge branch 'master' into editor-new-beatmap	2020-09-04 13:11:59 +09:00
Dean Herbert	cd253ab055	Further tweaks to get closer to design originals	2020-09-04 13:05:39 +09:00
Dean Herbert	d6b46936a0	Adjust sizing to match updated textures with less padding	2020-09-04 12:55:28 +09:00
Lucas A	82e314da59	Fix merge conflicts.	2020-09-03 21:56:47 +02:00
Dean Herbert	a99e7a1dc2	Merge branch 'master' into add-info-wedge-icons	2020-09-03 21:57:58 +09:00
Dan Balasescu	4d9a5f7ba8	Merge branch 'master' into update-icons	2020-09-03 20:19:51 +09:00
Dean Herbert	7a0c1411b6	Merge branch 'master' into timeshift-leaderboard-topscore	2020-09-03 18:11:04 +09:00
Dean Herbert	72cb65c22f	Update and add missing beatmap statistic icons to info wedge	2020-09-03 17:52:22 +09:00
Dean Herbert	942276d88f	Remove outdated SearchableList classes	2020-09-03 16:34:58 +09:00
Dean Herbert	4c011a88ce	Merge branch 'master' into update-framework	2020-09-03 15:08:18 +09:00
Dean Herbert	fe524ec491	Merge branch 'master' into update-framework	2020-09-03 14:58:32 +09:00
Dan Balasescu	cf89a6e1a4	Merge pull request #10043 from peppy/better-outro-music-fade ... Improve music fade on game exit	2020-09-03 14:24:46 +09:00
Dan Balasescu	84b3604192	Merge branch 'master' into game-overlay-activation-mode	2020-09-03 13:34:22 +09:00
Dean Herbert	d849f7f2b5	Use the local user's username when saving a new beatmap	2020-09-03 13:20:23 +09:00
Dean Herbert	e032844570	Start with a fresh beatmap when entering editor from main menu	2020-09-03 13:20:23 +09:00
Dean Herbert	2f42c57f4b	Add safeties to ensure the current track doesn't loop or change	2020-09-03 13:15:23 +09:00
Dean Herbert	547c8090e5	Improve game exit music fade	2020-09-03 13:15:23 +09:00
Lucas A	754274a146	Fix and add XMLDoc	2020-09-02 20:55:26 +02:00
Lucas A	3fc6a74fdf	Expose an immutable bindable in interface.	2020-09-02 19:55:46 +02:00
smoogipoo	fca0324264	Disallow being able to add dummy beatmap	2020-09-02 23:34:38 +09:00
smoogipoo	d83264f538	Add max height	2020-09-02 22:56:13 +09:00
smoogipoo	7fcbc3a814	Respond to changes in beatmap	2020-09-02 22:06:17 +09:00
smoogipoo	661eac8f1d	Add add/remove button to dropdown items	2020-09-02 22:03:38 +09:00
smoogipoo	02a908752f	Fix stackoverflow	2020-09-02 21:52:56 +09:00
smoogipoo	5ebead2bfd	Prevent ValueChanged binds to external bindable	2020-09-02 21:44:07 +09:00
smoogipoo	d363a5d164	Add basic ordering	2020-09-02 21:19:15 +09:00
smoogipoo	094ddecc95	Add dropdowns to carousel items	2020-09-02 21:08:31 +09:00
smoogipoo	6d5e155106	Change to BindableList to notify of changes	2020-09-02 20:44:26 +09:00
smoogipoo	9dde37fe40	Hook up collection filter	2020-09-02 20:25:42 +09:00
smoogipoo	bb090a55e0	Add dropdown to filter control	2020-09-02 20:25:25 +09:00
Dean Herbert	6a765d2d76	Add smooth fading between audio tracks on transition	2020-09-02 20:04:56 +09:00
Dean Herbert	c964e4036e	Merge branch 'master' into update-framework	2020-09-02 15:49:19 +09:00
Dean Herbert	249ae5df1b	Merge branch 'master' into beatmap-track-rework	2020-09-02 15:24:46 +09:00
smoogipoo	7a6e02c558	Allow null rank	2020-09-02 14:28:31 +09:00
Craftplacer	c2ade44656	Change types back	2020-09-01 17:58:06 +02:00
Craftplacer	9835d98942	Merge remote-tracking branch 'upstream/master' into combo-colors	2020-09-01 17:39:35 +02:00
smoogipoo	7e1844ed77	Fix track adjusments being reset incorrectly	2020-09-01 18:07:19 +09:00
smoogipoo	26b4226b55	Fix ModTimeRamp not working	2020-09-01 16:55:10 +09:00
Dan Balasescu	f08e7828da	Merge branch 'master' into beatmap-track-rework	2020-09-01 16:06:38 +09:00
smoogipoo	9e3b809cab	Rename to user_score to match API	2020-09-01 15:42:47 +09:00
Dean Herbert	d1f79a6a48	Fix potentially incorrect zoom level getting set on very short audio ... track	2020-09-01 15:41:36 +09:00
Dean Herbert	d45a1521a1	Update BindableList usages	2020-09-01 11:56:23 +09:00
Dean Herbert	44c02d7d58	Merge branch 'master' into wedge-star-difficulty	2020-09-01 09:33:28 +09:00
Bartłomiej Dach	876fd21230	Apply shear to right-anchored items	2020-08-31 19:31:47 +02:00
Bartłomiej Dach	2e2f26449d	Change anchoring to TopRight	2020-08-31 19:23:19 +02:00
Bartłomiej Dach	3ca2a7767a	Exclude misses and empty window hits from UR calculation	2020-08-31 14:29:37 +02:00
Bartłomiej Dach	3b22b891d1	Add failing test cases	2020-08-31 14:29:18 +02:00
smoogipoo	5e77e8cfcf	Reduce min size of chat	2020-08-31 20:21:57 +09:00
smoogipoo	61d580b6ba	Don't highlight top score	2020-08-31 20:17:23 +09:00
smoogipoo	8cf26979fb	Allow null user score	2020-08-31 20:16:28 +09:00
smoogipoo	6ed191786f	Add support for position	2020-08-31 20:01:59 +09:00
smoogipoo	77698ec31e	Add support for showing own top score in timeshift	2020-08-31 19:54:57 +09:00
smoogipoo	d1ceb81797	Rename request	2020-08-31 19:54:41 +09:00
smoogipoo	ed74c39b55	Move UserTopScoreContainer into base leaderboard	2020-08-31 19:54:22 +09:00
Bartłomiej Dach	88ae9ca91d	Merge branch 'master' into fix-unhide-hud-not-updating-stats	2020-08-31 11:48:19 +02:00
Dan Balasescu	cccf5b8a35	Merge pull request #10017 from peppy/fix-first-editor-scroll-wheel ... Fix first scroll wheel in editor incorrectly advancing twice	2020-08-31 18:32:34 +09:00
Lucas A	dd093f44d8	Cast base immutable bindable to mutable for testing purposes and make InitialOverlayActivationMode property protected	2020-08-31 11:26:55 +02:00
Dean Herbert	a171d0e292	Remove unused methods and classes	2020-08-31 18:14:22 +09:00
Bartłomiej Dach	7d273d631b	Do not show star difficulty on wedge if zero	2020-08-31 11:05:42 +02:00
Dean Herbert	bee01bdd38	Fix first scroll wheel in editor incorrectly advancing twice	2020-08-31 18:01:16 +09:00
Bartłomiej Dach	4736845318	Add spacing between star rating and beatmap status	2020-08-31 10:56:06 +02:00
smoogipoo	c3bfce6ccf	Add star rating to beatmap wedge	2020-08-31 15:03:41 +09:00
Dean Herbert	abdb991923	Hide misses from timing distribution graph	2020-08-31 14:15:47 +09:00
Craftplacer	db413686bb	Add BeatmapSkin to EditorBeatmap	2020-08-30 21:12:45 +02:00
Craftplacer	b39ec74bb8	Scope down to IBeatmapSkin in EditorChangeHandler	2020-08-30 16:07:06 +02:00
Craftplacer	f5c82d41eb	Remove if-cast	2020-08-30 16:06:48 +02:00
Craftplacer	00b68b050c	Merge remote-tracking branch 'upstream/master' into combo-colors	2020-08-30 10:16:38 +02:00
Lucas A	03b7c8b889	Remove unneeded access modifier.	2020-08-29 19:39:50 +02:00
Lucas A	8de7744b52	Add back disabling of overlays on exiting game.	2020-08-29 19:34:53 +02:00
Lucas A	ad223bc460	Make game bindable immutable.	2020-08-29 19:34:53 +02:00
Lucas A	5949a281fc	Make Introduce bindable property OverlayActivationMode in OsuScreen	2020-08-29 19:34:35 +02:00
Joehu	0a643fd5e5	Fix replay download button always being disabled when initial score's replay is unavailable	2020-08-29 09:33:01 -07:00
smoogipoo	c1838902a6	Add to more places	2020-08-28 22:51:48 +09:00
Dan Balasescu	4765f989b6	Merge branch 'master' into unstable-rate	2020-08-28 16:02:13 +09:00
Dan Balasescu	de222ddc24	Merge pull request #9984 from Poliwrath/lingering-circles ... Fix lingering small ring in circles! intro	2020-08-28 15:15:56 +09:00
Bartłomiej Dach	6846a245f4	Reapply lost anchoring fix	2020-08-27 20:51:28 +02:00
Bartłomiej Dach	ea1f07e311	Simplify/rename SimpleStatisticRow mess	2020-08-27 20:37:10 +02:00
Bartłomiej Dach	ce013ac9b4	Make statistic header optional	2020-08-27 20:18:53 +02:00
Bartłomiej Dach	f152e1b924	Revert IStatisticRow changes	2020-08-27 20:13:44 +02:00
Bartłomiej Dach	f8042e6fd3	Add fade to prevent jarring transitions	2020-08-26 22:34:28 +02:00
Bartłomiej Dach	c3197da3da	Adjust simple statistic item font sizes	2020-08-26 22:34:28 +02:00
Bartłomiej Dach	d81d538b7e	Move out row anchor/origin set to one central place	2020-08-26 22:34:27 +02:00
Bartłomiej Dach	5973e2ce4e	Add component for unstable rate statistic	2020-08-26 22:06:27 +02:00
Bartłomiej Dach	7c3368ecbe	Reintroduce SimpleStatisticRow as a data class	2020-08-26 19:33:33 +02:00
Bartłomiej Dach	f5e52c80b4	Rename {-> Drawable}SimpleStatisticRow	2020-08-26 19:25:59 +02:00
Bartłomiej Dach	927a2a3d2d	Introduce IStatisticRow interface	2020-08-26 19:19:42 +02:00
Poliwrath	edc15c965c	Update osu.Game/Screens/Menu/IntroSequence.cs ... Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>	2020-08-26 12:52:39 -04:00
Dean Herbert	f65991f31f	Revert some usages based on review feedback	2020-08-26 23:28:58 +09:00
Dean Herbert	b51db90147	Merge branch 'master' into beatmap-track-rework	2020-08-26 23:20:56 +09:00
Poliwrath	c50e495e03	fix lingering small ring in circles! intro	2020-08-26 02:49:55 -04:00
Bartłomiej Dach	f09f882cc7	Add component for displaying simple statistics on result screen	2020-08-25 22:51:40 +02:00
Bartłomiej Dach	29b4d98aac	Show retry/fail graph when either list is present	2020-08-24 20:41:50 +02:00
Bartłomiej Dach	cc6ae8e3bd	Fix crash if only one count list is received from API	2020-08-24 20:41:31 +02:00
Dean Herbert	dca307e933	Use beatmap directly in ReadyButton	2020-08-24 13:02:39 +09:00
Craftplacer	e6646b9877	Resolve review comments	2020-08-23 15:08:02 +02:00
Dean Herbert	122265ff0e	Revert non-track usage	2020-08-22 19:47:08 +09:00
Keijia	b5b2e523ad	change switch cases	2020-08-22 12:10:31 +03:00
Keijia	0b6185cd14	add "hp" filter keyword	2020-08-22 01:09:35 +03:00
Dean Herbert	f63d1ba612	Remove stray call to LoadTrack that was forgotten	2020-08-21 18:52:53 +09:00
Dean Herbert	1edafc39ba	Fix intro welcome playing double due to missing conditional	2020-08-21 18:33:24 +09:00
Dean Herbert	a47b8222b5	Restore multiplayer to use beatmap track	2020-08-21 17:11:29 +09:00
Dean Herbert	70697cf1a0	Restore remaining editor components to use Beatmap.Track	2020-08-21 17:11:29 +09:00
Dean Herbert	3b03116179	Remove unnecessary using statement	2020-08-21 16:45:59 +09:00
Dean Herbert	0ae460fb8f	Avoid beatmap load call in IntroScreen	2020-08-21 15:50:14 +09:00
Dean Herbert	f7e4feee34	Update remaining Player components to use WorkingBeatmap again	2020-08-21 15:25:57 +09:00
Dean Herbert	0b0ff62647	Switch timeline to use track directly from beatmap again	2020-08-21 14:49:34 +09:00
Dean Herbert	357fb3a10e	Merge branch 'master' into beatmap-track-rework	2020-08-21 12:53:09 +09:00
Dean Herbert	5714c761eb	Merge pull request #9768 from frenzibyte/allow-counter-customize-sprite-text ... Allow providing custom sprite text for RollingCounter<T>	2020-08-20 00:14:48 +09:00
Salman Ahmed	ee9fa11d14	Use With(s => ...) extension for better readability	2020-08-19 07:47:02 +03:00
Salman Ahmed	8f1a71c6b1	Remove counter sprite attributes for not being of any reasonable use	2020-08-19 07:44:45 +03:00
Dean Herbert	5ade1e8259	Merge branch 'master' into beatmap-track-rework	2020-08-18 13:03:49 +09:00
Dean Herbert	b969bc03e0	Add loading spinner while editor screen loads	2020-08-18 00:47:32 +09:00
Dean Herbert	93a8bc3d5a	Remove local reset method in GameplayClockContainer	2020-08-17 22:36:09 +09:00
Dean Herbert	d9debef156	Add explicit LoadTrack method	2020-08-17 15:38:16 +09:00
Dean Herbert	0c4aefb15e	Merge branch 'master' into beatmap-track-rework	2020-08-17 15:00:29 +09:00
Lucas A	589d4eeb52	Remove setting.	2020-08-16 17:18:40 +02:00
Dean Herbert	5d433c0b05	Fix a couple of new Resharper inspections	2020-08-16 23:11:29 +09:00
Dean Herbert	a6708c4286	Rename resolved variable in MainMenu	2020-08-16 23:04:54 +09:00
Dean Herbert	71f4e753f0	Merge branch 'master' into beatmap-track-rework	2020-08-16 22:35:32 +09:00
Craftplacer	cfd82104db	Minor changes and improvements	2020-08-16 01:00:28 +02:00
Craftplacer	48bdbb0cfb	Use existing field in Editor	2020-08-15 23:46:10 +02:00
Craftplacer	1448c9e381	Merge remote-tracking branch 'upstream/master' into combo-colors	2020-08-15 23:01:38 +02:00
Craftplacer	c4a7fac760	Add required parameters and other various changes	2020-08-15 22:03:24 +02:00
Bartłomiej Dach	a426ff1d5b	Refactor gameplay menu overlay to fix regression	2020-08-15 14:18:50 +02:00
Dean Herbert	e465afa280	Merge branch 'master' into beatmap-track-rework	2020-08-14 20:02:43 +09:00
Dan Balasescu	b7ae70ff96	Merge branch 'master' into fix-skinnable-sound-mute	2020-08-14 19:01:32 +09:00
Dan Balasescu	626cd4042f	Merge branch 'master' into delay-beatmap-load	2020-08-14 15:09:30 +09:00
smoogipoo	0500d82b5b	Fix playlist items sharing mod instances	2020-08-13 19:48:41 +09:00
Lucas A	84cb36b6a8	Defer subscriptions for updateOverlayActivationMode() to OnEntering()	2020-08-13 10:57:18 +02:00
Dean Herbert	99bea6b8e9	Add missing null check (player construction is potentially delayed now)	2020-08-13 12:52:35 +09:00
Dean Herbert	27cd9e119a	Delay beatmap load until after transition has finished ... Previously the beatmap would begin loading at the same time the `PlayerLoader` class was. This can cause a horribly visible series of stutters, especially when a storyboard is involved. Obviously we should be aiming to reduce the stutters via changes to the beatmap load process (such as incremental storyboard loading, `DrawableHitObject` pooling, etc.) but this improves user experience tenfold in the mean time.	2020-08-13 12:04:32 +09:00
Dean Herbert	429ad783cf	Merge branch 'update-framework' into beatmap-track-rework	2020-08-12 23:35:46 +09:00
Dean Herbert	05b06e7451	Merge branch 'master' into fix-skinnable-sound-mute	2020-08-12 22:01:04 +09:00
Craftplacer	69590113d6	Temporary changes	2020-08-12 06:40:21 +02:00
smoogipoo	c0031955c9	Update with further framework changes	2020-08-12 01:50:18 +09:00
smoogipoo	e47a1eb313	Use adjustable ITrack	2020-08-12 01:41:21 +09:00
smoogipoo	eec94e1f53	Make track not-null in GameplayClockContainer/FailAnimation	2020-08-12 00:51:43 +09:00
smoogipoo	070d71ec27	More cleanups	2020-08-12 00:48:38 +09:00
smoogipoo	7d35893ecd	Make MusicController non-nullable	2020-08-11 12:40:58 +09:00
smoogipoo	c66a14e9c5	Remove beatmap from FailAnimation	2020-08-11 12:37:48 +09:00
Dean Herbert	d1b106a3b5	Include mention of old releases in error message	2020-08-11 10:59:28 +09:00
Lucas A	f74e162bbc	Fix overlay activation mode being updated when player is not current screen.	2020-08-10 20:27:42 +02:00
Lucas A	052bb06c91	Add ability to open overlays during gameplay breaks.	2020-08-10 20:13:50 +02:00
Dean Herbert	365aae799e	Merge branch 'master' into fix-skinnable-sound-mute	2020-08-10 23:55:51 +09:00
Dean Herbert	1f84e54151	Improve messaging when timeshift token retrieval fails ... Obviously not a final solution, but should better help self-compiling (or unofficial package) users better understand why this is happening.	2020-08-10 20:16:16 +09:00
Bartłomiej Dach	9a09f97478	Extract constant to avoid double initial value spec	2020-08-08 21:21:30 +02:00
smoogipoo	e87f50f74f	Rename method	2020-08-07 22:31:41 +09:00
smoogipoo	b08ebe6f81	More inspections (rider is broken)	2020-08-07 21:14:45 +09:00
smoogipoo	961c6dab54	Fix more inspections	2020-08-07 21:08:03 +09:00
smoogipoo	5002d69f69	Update inspections	2020-08-07 20:51:56 +09:00
smoogipoo	61b632516e	Ensure CurrentTrack is never null	2020-08-07 19:43:16 +09:00
Dean Herbert	e3105fd4c8	Add more resilient logic for whether to avoid playing SkinnableSound on no volume	2020-08-06 19:16:26 +09:00
smoogipoo	f8279dab32	Refactor MainMenu	2020-08-06 18:54:14 +09:00
smoogipoo	ef689d943a	Fix intros playing incorrectly	2020-08-06 18:54:08 +09:00
smoogipoo	2e3ecf71c7	Pass track from Player to components	2020-08-06 18:31:08 +09:00
smoogipoo	c8ebbc8594	Remove MusicController from EditorClock	2020-08-06 18:19:55 +09:00
smoogipoo	f058f5e977	Fix incorrect value being set	2020-08-06 16:24:14 +09:00
smoogipoo	5c05fe3988	Expose track from MusicController	2020-08-06 16:24:14 +09:00