h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 16:25:32 +08:00
Code Issues Releases Wiki Activity
68,061 Commits 3 Branches 661 Tags 368 MiB
518dc17518
Commit Graph

462 Commits

Author SHA1 Message Date
Dean Herbert
0689d3845f Fix TestSceneHitExplosion not maintaining aspect ratio 2022-11-02 17:15:25 +09:00
Dean Herbert
c66064872a Fix DrawableHit test scene not showing rim hits correctly 2022-11-02 17:15:25 +09:00
Dan Balasescu
4342521bc1 Merge branch 'master' into stamina-available-fingers 2022-10-28 13:07:48 +09:00
Bartłomiej Dach
93e9b4a2c5
Add failing test case 2022-10-25 20:02:28 +02:00
Joppe27
bc57ef061e Add tests for DrawableHit and DrawableDrumRoll kiai flashing 2022-10-18 23:48:50 +02:00
Joppe27
2b5f12e4fb Mark existing Drawable test scenes as NUnit for reuse in kiai test scenes 2022-10-18 23:47:26 +02:00
Salman Ahmed
516e99df72 Add test coverage for flashlight mod 2022-10-14 02:38:43 +03:00
sw1tchbl4d3
9d45f1ec12 Fix code style 2022-10-07 22:08:12 +02:00
sw1tchbl4d3
f889f0df36 Add tests for the BarLineGenerator 2022-10-07 20:41:45 +02:00
Dean Herbert
072b64b8d4 Update all dependencies 2022-10-07 21:16:11 +09:00
vun
47781a8f94 Fix code inspect issues and SR test cases 2022-10-03 17:31:45 +08:00
sw1tchbl4d3
eae8916e76 Add test 2022-09-27 19:52:55 +02:00
Dean Herbert
65d1c40dd5 Remove remaining package references and replace with SQLitePCLRaw direct reference 
This may require further consideration for test and iOS projects.
 2022-09-15 16:58:58 +09:00
Dan Balasescu
6a371eba5f Fix namespace 2022-09-07 00:12:25 +09:00
Dan Balasescu
2ca63b5030 Add tests for all taiko judgements 2022-09-06 23:26:25 +09:00
Dan Balasescu
792b410c04 Merge branch 'master' into classic_drumrolls 2022-09-06 16:29:45 +09:00
sw1tchbl4d3
b185194d07 Apply comments by smoogi 2022-08-30 14:44:44 +02:00
Dean Herbert
4b72e55770 Fix various test scenes not adding EditorClock to the draw hierarchy 2022-08-26 18:08:43 +09:00
Dan Balasescu
136dcee3b5
Merge pull request #19571 from vunyunt/colour-encoding-2 
Rewrite of the colour skill & refactoring of difficulty calculation within osu!taiko
 2022-08-25 13:56:50 +09:00
Dean Herbert
d40d09a544 Rename method to be more specific and standardise setBeatmap calls 2022-08-17 23:03:39 +09:00
Dean Herbert
7d8fbc4dbc Refactor TestSceneDrawableTaikoMascot to read a bit better 2022-08-17 19:21:50 +09:00
Dan Balasescu
d686e841c5 Merge branch 'master' into colour-encoding-2 2022-08-15 20:56:50 +09:00
sw1tchbl4d3
e0426836c1 Make swells and drumrolls optional by default 2022-08-05 16:30:07 +02:00
Justin
e6761ef6b1
Merge branch 'master' into classic_drumrolls 2022-08-05 12:17:44 +00:00
Salman Ahmed
b32ff68a95 Enable NRT on taiko legacy skin transformer and tests 2022-07-30 09:43:51 +03:00
Salman Ahmed
40858c4cb7 Adjust existing test coverage 2022-07-30 09:32:39 +03:00
andy840119
3510c16566 Remove nullable disable annotation in the Taiko test case. 2022-07-27 22:31:48 +08:00
Justin
a4f3a0d201
Merge branch 'master' into classic_drumrolls 2022-07-24 18:33:04 +00:00
vun
17d418d319 Merge remote-tracking branch 'ppy/master' into colour-encoding-2 2022-07-22 16:31:28 +08:00
Dean Herbert
b604eb6262 Simplify implementation 2022-07-22 16:59:09 +09:00
Dean Herbert
b884ed2a3d Make test actually test drum behaviours 2022-07-22 16:39:26 +09:00
Dean Herbert
c32af3c041 Merge branch 'master' into hongaaronc/master 2022-07-22 15:55:38 +09:00
Salman Ahmed
28150dc15d Merge branch 'master' into taiko-target-classic-position 2022-07-18 20:45:29 +03:00
Jay L
77fa567453 Adjust tests 2022-07-17 14:56:25 +10:00
Dean Herbert
958c0fb390 Remove Appveyor.TestLogger 2022-07-11 15:01:16 +09:00
Dan Balasescu
6c2d02fefd Fix tests 2022-06-30 12:37:03 +09:00
Dean Herbert
31a447fda0 Update parameter discards 2022-06-24 21:26:19 +09:00
Bartłomiej Dach
09768cd740
Add test coverage 2022-06-24 13:43:02 +02:00
Bartłomiej Dach
26c5b59f6d
Replace usages of string.To{Lower,Upper}() 2022-06-24 11:57:45 +02:00
Dan Balasescu
f8830c6850 Automated #nullable processing 2022-06-17 16:37:17 +09:00
Dean Herbert
f3d4cd3f95 Fix various code inspection issues 2022-06-02 14:36:07 +09:00
Aaron Hong
ae996d1404 Add manual test scene for DrumTouchInputArea 2022-06-01 00:56:03 -07:00
Aaron Hong
f7a658450f Move DrawableTaikoRulesetTestScene's hardcoded beatmap to CreateBeatmap(..) method instead of load(..) method, so that the class is more extensible and reusable 2022-06-01 00:54:49 -07:00
Aaron Hong
2471c242b4 Merge branch 'master' of https://github.com/ppy/osu into ppy-master 2022-05-31 21:01:04 -07:00
Dan Balasescu
934bcaf82e Adjust tests 2022-05-17 09:10:52 +10:00
Dean Herbert
fecf92e16f Update libraries to latest versions 2022-05-11 19:54:59 +09:00
Dan Balasescu
494955aff1 Resolve inspection issues 2022-04-14 13:11:11 +09:00
Salman Ahmed
c1693e4387 Use LegacySkinPlayerTestScene instead of reimplementing 2022-04-07 00:13:56 +03:00
Salman Ahmed
16f626fb64 Add legacy classic taiko player test scene 2022-04-06 01:21:19 +03:00
Dan Balasescu
32e55e7d78 Merge branch 'master' into osu-diff-calc-max-combo 2022-03-31 15:08:08 +09:00
Aaron Hong
0f83308f7b Update osu!taiko TestSceneInputDrum with InputDrum changes for touch controls 2022-03-11 02:49:10 -08:00
Shivam
1a7a160f0a Update vscode launch.json files for all other projects 2022-02-25 14:28:54 +01:00
Dan Balasescu
567da9214e Merge branch 'master' into osu-diff-calc-max-combo 2022-02-18 18:35:24 +09:00
Dean Herbert
d79845fb1d Revert NUnit3TestAdaptor (again) 
Console output is still broken. See
https://github.com/ppy/osu/runs/5196023462?check_suite_focus=true.
 2022-02-15 17:06:34 +09:00
Dean Herbert
60153bb69d Update nuget packages to highest usable versions 
EF packages are intentionally pinned to 5.0.14 as higher versions no
longer support `netstandard2.1`, which we require for xamarin projects.
 2022-02-15 15:19:23 +09:00
Dean Herbert
5b30921cbf Merge branch 'master' into net6 2022-02-14 22:06:35 +09:00
Dean Herbert
176bb4a4e2 Update desktop projects to target .NET 6 2022-02-10 17:42:09 +09:00
Dan Balasescu
781cb9f18d Move HasPassed/HasFailed into GameplayState 2022-02-01 14:46:24 +09:00
Salman Ahmed
de0a7d8501 Migrate taiko editor saving test scene to EditorSavingTestScene 2022-01-26 07:57:46 +03:00
Henry Lin
44311c1f4e Add tests for diffcalc max combo 2022-01-23 11:25:22 +08:00
Dan Balasescu
3e5d29ed00
Merge pull request #16505 from peppy/remove-base-difficulty-usage 
Remove all usage of `BaseDifficulty` (and access `Difficulty` instead)
 2022-01-19 13:53:55 +09:00
Dan Balasescu
f6f44029e8
Merge pull request #16507 from peppy/more-ingore-rules 
Add some missing `IgnoredAttributes` to reduce automapper overhead
 2022-01-19 12:26:37 +09:00
Dean Herbert
96d07e20ed Revert nunit test adaptor version bump until console output bug is resolved 
Tests have started to output too much log content, causing viewing CI
failures to be painfully impossible. Roll back for now.

Fix may be related to
https://github.com/nunit/nunit3-vs-adapter/issues/941, although we don't
use filter.
 2022-01-19 02:18:58 +09:00
Dean Herbert
67bf95bc91 Remove all usage of AuthorString 2022-01-18 23:30:40 +09:00
Dean Herbert
7f65f3a47f Remove all usage of BaseDifficulty (and access Difficulty instead) 2022-01-18 22:57:39 +09:00
Dean Herbert
1b62a685f3 Merge branch 'master' into realm-integration/score-and-beatmaps 2022-01-18 15:07:59 +09:00
Dean Herbert
125439d177 Update all (non-NET6) nuget packages 2022-01-18 11:09:26 +09:00
Dan Balasescu
34e99968d0 Resolve inspection 2022-01-17 14:06:50 +09:00
Bartłomiej Dach
632246a3b3
Add failing test scene 2022-01-16 17:04:59 +01:00
Dean Herbert
b5f670cc5b Add far too many fixes for ruleset non-nullable requirements 2022-01-12 23:24:11 +09:00
Dean Herbert
f9713b8895 Replace usage of TimeoutAttribute to fix beatmap conversion test failures 2022-01-04 11:51:41 +09:00
Joseph Madamba
7de43e3aba Fix most open compound words in identifiers being closed 2021-12-27 20:26:28 -08:00
Dean Herbert
e0629ba81c Update all dependencies 2021-11-20 13:31:10 +09:00
Dean Herbert
7c2e79f911 Update all simple cases of switching to IWorkingBeatmap 2021-11-17 20:56:57 +09:00
Dean Herbert
fabf253381 Update difficulty calculator tests to also use IWorkingBeatmap 2021-11-15 19:16:49 +09:00
Dean Herbert
369b4ba789 Update DifficultyCalculator to take an IRulesetInfo 2021-11-15 19:16:48 +09:00
Dean Herbert
51a353e12d Rename BeatmapInfo.Version to DifficultyName to match underlying interface 2021-11-11 17:20:53 +09:00
Bartłomiej Dach
d88fd1bfd7
Add failing test case 2021-11-08 13:23:24 +01:00
dependabot[bot]
7747fd5810
Bump Microsoft.NET.Test.Sdk from 16.11.0 to 17.0.0 
Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 16.11.0 to 17.0.0.
- [Release notes](https://github.com/microsoft/vstest/releases)
- [Commits](https://github.com/microsoft/vstest/compare/v16.11.0...v17.0.0)

---
updated-dependencies:
- dependency-name: Microsoft.NET.Test.Sdk
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-11-01 17:01:54 +00:00
Dean Herbert
95837990f3 Apply some second-pass inspections that appeared after previous changes 2021-10-27 13:09:30 +09:00
Dean Herbert
6944151486 Apply batch fixing of built-in types using var 2021-10-27 13:04:41 +09:00
Joseph Ireland
06a78d9729 fix taiko tests 2021-10-09 00:15:27 +01:00
Joseph Ireland
185bb9c122 change initial strain from 1 to 0 to allow simpler implementations 2021-10-07 09:30:18 +01:00
smoogipoo
f9d5abff8a Update with keybinding changes 2021-09-16 18:26:12 +09:00
dependabot[bot]
5a1eccd8e3
Bump Microsoft.NET.Test.Sdk from 16.10.0 to 16.11.0 
Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 16.10.0 to 16.11.0.
- [Release notes](https://github.com/microsoft/vstest/releases)
- [Commits](https://github.com/microsoft/vstest/compare/v16.10.0...v16.11.0)

---
updated-dependencies:
- dependency-name: Microsoft.NET.Test.Sdk
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-09-01 18:17:37 +00:00
Dean Herbert
8e0a04c4e5 Update taiko InputDrum to use new trigger logic 2021-08-25 16:56:44 +09:00
dependabot[bot]
0d3de488de
Bump NUnit3TestAdapter from 3.17.0 to 4.0.0 
Bumps [NUnit3TestAdapter](https://github.com/nunit/nunit3-vs-adapter) from 3.17.0 to 4.0.0.
- [Release notes](https://github.com/nunit/nunit3-vs-adapter/releases)
- [Commits](https://github.com/nunit/nunit3-vs-adapter/compare/V3.17...V4.0.0)

---
updated-dependencies:
- dependency-name: NUnit3TestAdapter
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-07-01 17:02:17 +00:00
Bartłomiej Dach
7bb27bfd0e Add test scene for hidden mod 2021-06-11 12:17:38 +02:00
Dean Herbert
5366e7f61e
Merge branch 'master' into remove-hud-component-lookup 2021-06-02 16:10:06 +09:00
Dean Herbert
f8ae70e562 Update existing function type rather than adding an override 2021-06-02 16:04:53 +09:00
dependabot[bot]
967a7c3db5
Bump Microsoft.NET.Test.Sdk from 16.9.4 to 16.10.0 
Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 16.9.4 to 16.10.0.
- [Release notes](https://github.com/microsoft/vstest/releases)
- [Commits](https://github.com/microsoft/vstest/compare/v16.9.4...v16.10.0)

---
updated-dependencies:
- dependency-name: Microsoft.NET.Test.Sdk
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-06-01 19:59:27 +00:00
Dean Herbert
ebfc24a499 Rename conflicting resources 2021-05-31 19:14:49 +09:00
Dean Herbert
b16d10bd95 Provide game-wide resources via IStorageResourceProvider 2021-05-31 18:57:47 +09:00
Dan Balasescu
ef81bdf63f
Merge branch 'master' into always-use-lifetime-entry 2021-05-18 20:10:12 +09:00
Bartłomiej Dach
483e0dd943 Pass placeholder hitobject instead of null 2021-05-15 00:09:34 +02:00
ekrctb
787bfd6bd0 Revert "Fix failing taiko tests" 
This reverts commit 971ca398
 2021-05-04 16:45:39 +09:00
ekrctb
971ca39826 Fix failing taiko tests 
Non-pooled DHO is now not eagerly loaded
 2021-04-29 14:38:01 +09:00
ekrctb
d262956146 Always use LifetimeEntry to manage hit objects in HitObjectContainer 
Previously, non-pooled DHOs were immediately added as children of the HOC when Add is called. Also, non-pooled DHOs were always attached to the HOC as children.
New behavior is that non-pooled DHOs are only added after CheckChildLifetime, and only attached to the HOC while the DHOs are alive.

- LifetimeManagementContainer inheritance of HOC is removed, as it is now all DHOs are "unmanaged" (previously `AddInternal(false)`).
- The signature of `Clear` is changed, and it is now always not disposing the children immediately.
 2021-04-29 14:38:01 +09:00
dependabot[bot]
1b3b07d6a9
Bump NUnit from 3.13.1 to 3.13.2 
Bumps [NUnit](https://github.com/nunit/nunit) from 3.13.1 to 3.13.2.
- [Release notes](https://github.com/nunit/nunit/releases)
- [Changelog](https://github.com/nunit/nunit/blob/v3.13.2/CHANGES.md)
- [Commits](https://github.com/nunit/nunit/compare/v3.13.1...v3.13.2)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-04-29 03:51:12 +00:00
ekrctb
3fbeadf318 Deprecate old overload of Apply 2021-04-21 14:32:37 +09:00
Dean Herbert
aa424165b3 Fix broken taiko test 2021-04-07 18:45:57 +09:00
Dan Balasescu
345779b19a
Merge branch 'master' into diffcalc/fix/clockrate-adjusted-decay 2021-04-02 20:58:29 +09:00
dependabot-preview[bot]
6a286c5e21
Bump Microsoft.NET.Test.Sdk from 16.9.1 to 16.9.4 
Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 16.9.1 to 16.9.4.
- [Release notes](https://github.com/microsoft/vstest/releases)
- [Commits](https://github.com/microsoft/vstest/compare/v16.9.1...v16.9.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2021-04-01 17:16:02 +00:00
smoogipoo
8438fce764 Merge branch 'master' into diffcalc/fix/clockrate-adjusted-decay 2021-03-26 11:47:38 +09:00
Bartłomiej Dach
a16c0641b2 Revert EF Core to version 2.2 
This reverts commit f3faad74d5, reversing
changes made to 712e7bc7bf.

Several issues arose after migrating to 5.0, including, but possibly not
limited to, performance regressions in song select, as well as failures
when attempting to save beatmaps after metadata changes in the editor.
 2021-03-21 11:05:15 +01:00
Dan Balasescu
f01ece8c8d
Merge branch 'master' into taiko-explosion-pooling 2021-03-18 19:43:42 +09:00
Dean Herbert
1573298e68 Update remaining package references to point to efcore5 2021-03-15 13:12:10 +09:00
Bartłomiej Dach
00306c0075 Adjust test code after explosion pooling changes 2021-03-14 16:15:33 +01:00
Bartłomiej Dach
8b74666cc3 Add support for pooling explosions in taiko 2021-03-14 16:15:33 +01:00
dependabot-preview[bot]
b03efd6940
Bump Microsoft.NET.Test.Sdk from 16.8.3 to 16.9.1 
Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 16.8.3 to 16.9.1.
- [Release notes](https://github.com/microsoft/vstest/releases)
- [Commits](https://github.com/microsoft/vstest/compare/v16.8.3...v16.9.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2021-03-02 00:43:45 +00:00
Samuel Cattini-Schultz
417bb07b36 Update tests with fixed diffcalc values 2021-02-20 20:23:49 +11:00
Samuel Cattini-Schultz
9d229a5ec2 Add tests for clockrate adjusted difficulty calculations 2021-02-20 16:27:58 +11:00
Dean Herbert
72b2123500 Update nunit in line with framework 2021-02-15 21:42:35 +09:00
Dean Herbert
1e99357a97 Update build configurations to net5.0 paths 2021-01-19 12:13:27 +09:00
Roman Kapustin
0ea4e221b2 Merge branch 'master' into net5.0 2021-01-14 14:02:51 +03:00
smoogipoo
22a0f99f35 Add failing test 2021-01-12 17:49:21 +09:00
dependabot-preview[bot]
0fd2e368c1
Bump Microsoft.NET.Test.Sdk from 16.8.0 to 16.8.3 
Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 16.8.0 to 16.8.3.
- [Release notes](https://github.com/microsoft/vstest/releases)
- [Commits](https://github.com/microsoft/vstest/compare/v16.8.0...v16.8.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2021-01-01 17:53:41 +00:00
Bartłomiej Dach
6e21806873 Adjust sample test to pass with pooling 2020-12-20 18:44:47 +01:00
Bartłomiej Dach
8b6bc09b8f Implement drum roll application 2020-12-20 16:26:16 +01:00
Bartłomiej Dach
e32b1c34ca Implement hit application 2020-12-20 16:26:16 +01:00
Bartłomiej Dach
232c0205b4 Refactor hit object application scene to work reliably 2020-12-20 16:01:01 +01:00
Bartłomiej Dach
5af1ac1b53 Rename TaikoStrong{-> able}HitObject 2020-12-14 21:46:02 +01:00
Bartłomiej Dach
7ba04a2cc3 Merge branch 'master' into taiko-strong-state-refactor 2020-12-14 21:44:50 +01:00
Bartłomiej Dach
d275418b25 Rename and simplify test 2020-12-13 23:17:26 +01:00
Bartłomiej Dach
ea09cbddc6 Register bar line pool & use in drawable ruleset 2020-12-13 22:31:33 +01:00
Bartłomiej Dach
c103c3691f Add test for bar line application 2020-12-13 22:31:33 +01:00
Bartłomiej Dach
44dd9a57a8 Add abstract hit object application test scene 2020-12-13 22:31:33 +01:00
Bartłomiej Dach
a8e86a20e1 Unify bar line types & prepare for pooling 2020-12-13 22:31:33 +01:00
Bartłomiej Dach
61c488cd5e Create HO-specific nested hit types 2020-12-13 13:08:32 +01:00
Bartłomiej Dach
f74567e8eb Introduce base class for hitobjects that can be strong 2020-12-13 12:36:39 +01:00
Bartłomiej Dach
1ddc896b76 Rename Strong{-> Nested}HitObject 2020-12-13 12:34:14 +01:00
Bartłomiej Dach
3a3b32186e Make height test steps work better 2020-12-13 00:30:41 +01:00
Bartłomiej Dach
43c0e2191d Apply local fix for strong/colour not being applied correctly 2020-12-13 00:30:41 +01:00
Bartłomiej Dach
76193e2217 Fix miss step not working 2020-12-13 00:30:41 +01:00
Bartłomiej Dach
34e7a36b38 Fix kiai hit steps not working correctly 2020-12-13 00:30:41 +01:00
Bartłomiej Dach
8292c746ea Leverage hitobject model for strong hit instead of creating own 2020-12-13 00:30:41 +01:00
Dean Herbert
53da137425
Merge branch 'master' into net5.0 2020-12-10 17:14:21 +09:00
ekrctb
c70b13ecc2 Adjust namespace 2020-12-07 12:30:25 +09:00
dependabot-preview[bot]
5772a0811c
Bump Microsoft.NET.Test.Sdk from 16.7.1 to 16.8.0 
Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 16.7.1 to 16.8.0.
- [Release notes](https://github.com/microsoft/vstest/releases)
- [Commits](https://github.com/microsoft/vstest/compare/v16.7.1...v16.8.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-12-02 00:56:09 +00:00
Roman Kapustin
3b600f0a7b Target net5.0 instead of netcoreapp3 2020-11-20 10:45:19 +03:00
ekrctb
a53b5ef8b9 Remove --no-restore from VSCode build tasks 2020-11-16 19:22:08 +09:00
Bartłomiej Dach
e9b5f54128 Cover mapping fully for taiko mods 2020-11-15 15:32:02 +01:00
Bartłomiej Dach
9899687bfe Rename existing method to allow for new one 2020-11-15 14:17:41 +01:00
Dean Herbert
e0dea4c941
Merge pull request #10775 from bdach/disable-kiai-explosion-on-legacy 2020-11-11 18:06:31 +09:00
Dean Herbert
8706b51b77
Merge pull request #10717 from smoogipoo/dho-apply 2020-11-11 10:54:24 +09:00
Bartłomiej Dach
35763a74fd Add test scene 2020-11-10 14:08:13 +01:00
smoogipoo
4ea823e4dc Fix test failures 2020-11-10 22:02:33 +09:00
kamp
ceb17764b1 Also replace / with - for args in other task.jsons 2020-11-07 01:09:21 +01:00
Dean Herbert
1a0171fb2d Fix tests specifying steps in their constructors 2020-10-02 18:23:18 +09:00
smoogipoo
f439c1afbc Make osu/taiko/catch use Ok+Great 2020-09-29 17:16:55 +09:00