275 次代码提交 (fd7ee405-0242-4d94-9c0f-33cfa0b3e169)

作者 SHA1 备注 提交日期
GitHub a7acba25 Add a Yamato pipeline to run C# editmode tests. (#2773) 5 年前
GitHub bcf5b967 Add a standalone build test pipeline to Yamato to check for player script compilation errors. (#2779) 5 年前
GitHub 30ed1334 Switch to a stable tag on our bokken image. (#2799) 5 年前
Jonathan Harper ace7878c Use stable bokken image. (#2815) 5 年前
GitHub a6a84983 Add more editor versions for testing. (#2809) 5 年前
GitHub 6ba6f08c Merge 0.11.0 to develop (#2825) 5 年前
Anupam Bhatnagar d9910ee7 Merge branch 'develop' into develop-gpu-test 5 年前
GitHub fee8879f Use image ref instead of tags so we don't need to have different image tags for master/develop. (#2834) 5 年前
Chris Elion 691d21e6 Merge remote-tracking branch 'origin/develop' into try-tf2-support 5 年前
Jonathan Harper 8550679d Merge branch 'develop' into release-0.11.0 5 年前
GitHub e9dd195d [yamato] Set triggers for any PR against a target branch. (#2848) 5 年前
Chris Elion fca51de8 Merge remote-tracking branch 'origin/develop' into try-tf2-support 5 年前
Ervin Teng 987e0e3a Merge tf2 branch 5 年前
GitHub d4780a55 Merge pull request #3010 from Unity-Technologies/release-0.12.0-to-master 5 年前
GitHub 5e42ca24 Bump the official supported Unity version to 18.4. Fixes MLA-23 (#3121) 5 年前
GitHub e73c2bcb convert yamato tests to python (#3239) 5 年前
Ervin Teng 29f3330f Merge master into hotfix-0.13.1 5 年前
GitHub 0ff8f9af Create ML-Agents Package (#3267) 5 年前
Ervin Teng db249ceb Merge branch 'master' into develop-splitpolicyoptimizer 5 年前
GitHub e4394d2f Run training in yamato for a few steps (#3244) 5 年前
Ervin Teng d4ee7346 Merge commit 'f9c05a61d574305497789b5997f1ae3ea1b1ad3b' into develop-splitpolicyoptimizer 5 年前
GitHub 341acf83 [yamato] Use triggers to execute tests for specific changes. (#3439) 5 年前
Ervin Teng 5ef902bf Merge branch 'master' into develop-splitpolicyoptimizer 5 年前
Andrew Cohen e4d776c3 Merge branch 'master' into soccer-fives 5 年前
GitHub 472f9f0e Merge branch 'master' into develop-badEnvReturnCode 5 年前
Ervin Teng 1156b9b3 Merge branch 'develop-splitpolicyoptimizer' into develop-removeactionholder 5 年前
Anupam Bhatnagar e04fcd71 Merge branch 'master' into master-into-release-0.14.1 5 年前
GitHub b8b4ab4f Move protobuf generation tests to yamato. (#3506) 5 年前
Andrew Cohen de73baa9 Merge branch 'master' into soccer-fives 5 年前
GitHub 15d3b248 enable code coverage in Yamato (#3633) 5 年前
Andrew Cohen 53bea15c Merge branch 'master' into soccer-fives 5 年前
Andrew Cohen ac261e36 Merge branch 'master' into self-play-mutex 5 年前
GitHub e13c89f5 enforce min coverage % (#3642) 5 年前
Andrew Cohen eefc4811 Merge branch 'master' into self-play-mutex 5 年前
GitHub 0fba00ae cancel old CI (#3649) 5 年前
Andrew Cohen fb993986 Merge branch 'master' into self-play-mutex 5 年前
Andrew Cohen b42c9482 Merge branch 'self-play-mutex' into soccer-2v1 5 年前
GitHub 53ca3dc7 Test against older python and C# versions (#3689) 5 年前
GitHub 914c896c reuse built player in CI tests (#3709) 5 年前
Andrew Cohen 62c87031 Merge branch 'master' into self-play-mutex 5 年前
GitHub 9c7a68ea LL-API and gym yamato tests (#3714) 5 年前
Ervin Teng 06fa3d39 Merge branch 'master' into develop-sac-apex 5 年前
Anupam Bhatnagar 50e52d9c Merge branch 'master' into distributed-training 5 年前
Andrew Cohen 1b9c643b Merge branch 'master' into self-play-mutex 5 年前
GitHub 744ce3d2 Testing gym with basic environment (#3725) 5 年前
Andrew Cohen a870d453 Merge branch 'self-play-mutex' into soccer-2v1 5 年前
GitHub 078c6502 Make the DecisionRequester public and customizable. (#3716) 5 年前
GitHub aae58330 Merge branch 'master' into develop-add-inference-examples 5 年前
GitHub 7e3848fe [MLA-867] New integration tests for gym and llapi (#3757) 5 年前
Andrew Cohen 933d7b32 Merge branch 'self-play-mutex' into soccer-2v1 5 年前
Ervin Teng 5e980ec1 Merge branch 'master' into develop-sac-apex 5 年前
Andrew Cohen f41695b9 Merge branch 'soccer-2v1' into asymm-envs 5 年前
Andrew Cohen ed1bda98 Merge branch 'master' into soccer-2v1 5 年前
Andrew Cohen 4bc36520 Merge branch 'soccer-2v1' into asymm-envs 5 年前
Andrew Cohen 9bec75ee Merge branch 'master' into soccer-2v1 5 年前
GitHub 5e85c0ba update upm-ci-utils source (#3811) 5 年前
Andrew Cohen 185d4b35 Merge branch 'soccer-2v1' into asymm-envs 5 年前
Andrew Cohen b217f8bf Merge branch 'master' into soccer-2v1 5 年前
Andrew Cohen b4f52c88 Merge branch 'soccer-2v1' into asymm-envs 5 年前
GitHub 19604778 Add publish and promotion jobs for creating our c# package. Cleanup job definitions. (#3820) 5 年前
GitHub a9c0138f Only run mac package tests per commit, run all platforms nightly. (#3840) 5 年前
Arthur Juliani 212e2d1d Merge remote-tracking branch 'origin/master' into develop-add-fire 5 年前
Andrew Cohen 2c42f577 Merge branch 'master' into asymm-envs 5 年前
vincentpierre c34dd5b6 Merge branch 'master' into develop-gym-wrapper 5 年前
Chris Elion 34a26ac4 re-enable backwards compat tests 5 年前
Andrew Cohen a2f8319a Merge branch 'master' into asymm-envs 5 年前
GitHub fe2afc28 Merge pull request #3922 from Unity-Technologies/MLA-973-reenable-backcompat 5 年前
Arthur Juliani 89ad3020 Merge remote-tracking branch 'origin/master' into develop-add-fire 5 年前
GitHub 7314b3a3 Update yamato triggers to use expressions. (#3556) 5 年前
Arthur Juliani 2b3a6347 Merge remote-tracking branch 'origin/master' into develop-add-fire 5 年前
Christopher Goy df230969 fix artifactory url (#4246) 4 年前
Christopher Goy 9a4f0998 pip url fix (#4278) 4 年前
Christopher Goy a0b14d72 fix artifactory url (#4246) 4 年前
Christopher Goy 0f2ddceb Pass artifactory url for all pip calls in yamato (#4282) 4 年前
GitHub f7373172 Merge pull request #4385 from Unity-Technologies/release_2_verified-barracuda-1.0.2 4 年前
Christopher Goy ce41241d Use python3 command line. 4 年前
GitHub 627c771c Merge pull request #4395 from Unity-Technologies/release_2_verified-python3 4 年前
Christopher Goy 07ce366c fix artifactory url. 4 年前
Christopher Goy a92bafef Try hard coding the editor path. 4 年前
Christopher Goy 91dee3ef make sure windows uses the downloaded editor. 4 年前
Christopher Goy 2543fc41 fix liquid syntax. 4 年前
GitHub a9e4f85d Merge pull request #4396 from Unity-Technologies/release_2_verified-python3 4 年前
vincentpierre 6ddfe74f Merge branch 'master' into develop-gym-wrapper 5 年前
GitHub 26f10c4a Backport AcademyStepper fix in #4532 to verified branch (#4637) 4 年前
GitHub 041a8a6a Fix yamato promotion job (#4639) 4 年前
Andrew Cohen 59a60c1e Merge branch 'master' into asymm-envs 5 年前
Chris Elion 7f8258a8 update yamato tests from master 4 年前
Chris Elion 25a495d8 fix proto test, revert gym and llapi tests 4 年前
GitHub 8052ee6a update master to main, remove pylint check (#5031) 4 年前
GitHub ea26ba4f update to 1.0.8 (#5395) 4 年前
Chris Elion a954c907 remove 2018.4 from tests, make sure to user 2020.3 4 年前
Chris Elion 99132af1 test 2020.3 (not .2) 4 年前
Chris Elion 39d32433 use downloader in standalone build test 4 年前
Chris Elion 208bea12 remove trunk tests, fix version parsing in unit test 4 年前
Chris Elion 6acb0711 add 2018.4 back to package tests 4 年前
Andrew Cohen 21f871db Merge branch 'develop-constant-decay' into asymm-envs 5 年前
GitHub 59fb7aa5 ML-Agents Extensions package (#4105) 5 年前
Arthur Juliani 9724c9ac Merge master 5 年前
GitHub a28e2767 Update add-fire to latest master, including Policy refactor (#4263) 4 年前
GitHub af9abb6c [MLA-1009] observable performance tests (#4031) 4 年前
GitHub 7f0bb6bd Yamato inference tests (#4066) 4 年前
vincentpierre 599d7e9f Merging master 4 年前
GitHub 0e0daf47 [add-fire] Merge post-0.19.0 master into add-fire (#4328) 4 年前
GitHub 9d2e4268 Revert "[add-fire] Merge post-0.19.0 master into add-fire (#4328)" (#4330) 4 年前
GitHub 07acc84d Fix extension package tests (#4189) 4 年前
GitHub 050294ff fix job deps (#4230) 4 年前
GitHub 0e417912 use old yamato test config (#4231) 4 年前
GitHub e6094460 Revert "use old yamato test config" (#4233) 4 年前
GitHub 93487efd Run all package test types (#4232) 4 年前
GitHub 751c007d Merge pull request #4235 from Unity-Technologies/r4-master-resolve 4 年前
GitHub 6f9210d7 cherrypick yamato fixes to release_5_branch (#4290) 4 年前
GitHub 8b139814 Run coverage checks with python3 (#4245) 4 年前
GitHub fe838213 Run code coverage for extensions package (#4243) 4 年前
GitHub ab858cef fix artifactory url (#4246) 4 年前
Andrew Cohen d8c123a0 Merge branch 'master' into sensitivity 4 年前
GitHub 86ff4c4a pip url fix (#4278) 4 年前
GitHub 5bbaf9ad Pass artifactory url for all pip calls in yamato (#4282) 4 年前
Arthur Juliani 1a123641 Merge remote-tracking branch 'origin/master' into r5-master 4 年前
Andrew Cohen b3f1abe5 add --upgrade to pip to get newer downloader (#4338) 4 年前
Ervin Teng dc937d5c Merge branch 'master' into develop-add-fire-mm 4 年前
GitHub 1e76f8d0 Merge pull request #4331 from Unity-Technologies/develop-add-fire-mm2 4 年前
Ervin Teng 4ebccf97 Merge branch 'develop-add-fire' into develop-add-fire-sac-lst 4 年前
Andrew Cohen 598826fe Merge branch 'develop-add-fire' into develop-add-fire-bc 4 年前
Ruo-Ping Dong d3eb6c46 Merge branch 'develop-add-fire' into develop-add-fire-checkpoint 4 年前
GitHub 73f05eaa add --upgrade to pip to get newer downloader (#4338) 4 年前
Ruo-Ping Dong 523248be update 4 年前
GitHub ab8e5afa Release 6 fix nan (#4343) 4 年前
Anupam Bhatnagar abc1220f Merge branch 'master' into global-variables 4 年前
HH 8eaddb61 Merge branch 'master' into hh/develop/loco-walker-variable-speed 4 年前
Ervin Teng d65a9326 Merge branch 'master' into develop-add-fire-mm3 4 年前
GitHub bd6bcd2f Merge master and add Saver class for save/load checkpoints 4 年前
Ervin Teng 42e25b25 Merge branch 'develop-add-fire' into develop-add-fire-memoryclass 4 年前
HH d9962254 Merge branch 'master' into hh/develop/loco-walker-variable-speed 4 年前
GitHub 4393ce78 rerun upm tests for sporadic failures (#4437) 4 年前
GitHub fa30409e update tests to run on 2019.4 (#4451) 4 年前
Andrew Cohen 3997b14b Merge branch 'master' into develop-hybrid-actions 4 年前
GitHub 5bc169b4 Clean up AcademyFixedUpdateStepper when playmode changed (#4532) 4 年前
GitHub 1f9f1798 [Test] Make tests to compare compressed and non-compressed obs (#4547) 4 年前
GitHub eff5a484 [CI] use downloader, update versions (#4562) 4 年前
GitHub 730df949 Update yamato promotion job from templatee (#4566) 4 年前
GitHub def79ef0 [release 8] fix promotion job dependencies (#4567) 4 年前
Ruo-Ping Dong 7d42c559 Merge branch 'master' into r8_merge_to_master 4 年前
GitHub dc40c926 Merge release 8 back to master (#4570) 4 年前
Andrew Cohen e5f14400 Merge branch 'master' into develop-hybrid-actions-singleton 4 年前
GitHub 7a33b67a update barracuda version, enable tests for 2020.2 (#4571) 4 年前
Chris Elion 674540de try training tests on windows (breaks other tests) 4 年前
GitHub 5e5ff19b Barracuda inference for hybrid actions (#4611) 4 年前
Chris Elion d5427697 fix agent fields 4 年前
Chris Elion 226e33ac fix agent fields 4 年前
Chris Elion 94197525 job name and pip fixes 4 年前
Chris Elion 83402fcd fix installer on standalone 4 年前
Chris Elion 3aaebf46 fix python->python3 commands 4 年前
vincentpierre a3a9a56b Merge branch 'exp-multi-head-attention' into exp-bullet-hell 4 年前
Ruo-Ping Dong 9e08be87 Merge branch 'master' into release_9_branch_merge 4 年前
GitHub 88d3ec3e Merge master into hybrid actions staging branch (#4704) 4 年前
GitHub 23800f33 Merge branch 'master' into develop-action-spec 4 年前
GitHub 55017268 skip code coverage on trunk temporarily (#4673) 4 年前
GitHub b464678d Merge pull request #4682 from Unity-Technologies/r10-to-master 4 年前
Chris Elion 2501aed5 move everything except training tests to linux 4 年前
Andrew Cohen 498b1ee6 Merge branch 'develop-action-buffer' into develop-hybrid-actions-singleton 4 年前
Chris Elion 448b61ea switch builds that depend on standalone player back to mac 4 年前
Chris Elion a5435205 fix python install for standalone build 4 年前
Chris Elion 9f924081 build for linux, convert other tests 4 年前
Chris Elion fbf9a3be python3 everywhere 4 年前
Chris Elion 22bca2b0 fix names, fix python3 commands, build player on mac backcompat 4 年前
Chris Elion c85582bc stock image, nuget installed (I hope) 4 年前
Chris Elion 90026101 only one version for now 4 年前
Chris Elion 88fd0202 try brew again 4 年前
Chris Elion 5ef19213 setup venv in yamato commands 4 年前
Chris Elion 3f17b11f brew no update 4 年前
GitHub 464de88a Merge pull request #4792 from Unity-Technologies/proto-build-fixes 4 年前
Chris Elion 6ebb869f fix yaml (I hope) 4 年前
vincentpierre f3e2dc03 Merge branch 'master' into develop-att 4 年前
Chris Elion 25bd6c1d debug 4 年前
Chris Elion c16e7c50 && 4 年前
Chris Elion 9d6a4823 add path 4 年前
GitHub 85d97f92 Add upmNoDefaultPackages in CI (#4736) 4 年前
Chris Elion 07b5f688 quote PATH 4 年前
Chris Elion 76ebc20c Merge remote-tracking branch 'origin/master' into r12-to-master 4 年前
Chris Elion 74fa8952 multiline commands 4 年前
Chris Elion aa7fabff convert others, cleanup 4 年前
Chris Elion 4f882265 check for exact path to exe 4 年前
Ervin Teng 330fc1d0 Merge branch 'master' into develop-centralizedcritic-mm 4 年前
Ruo-Ping Dong 8ed14762 Merge branch 'develop-hybrid-actions-singleton' into develop-hybrid-actions-csharp 4 年前
GitHub 6e3dafc8 [CI] move as much as possible to linux (#4767) 4 年前
GitHub c54c402f run build job on bigger flavor (#4819) 4 年前
Chris Elion a65e43a6 go back to root before generating patch file 4 年前
GitHub 18b69b23 Switching to linux for proto gen, fix output paths (#4831) 4 年前
Chris Elion 127d3f46 run on linux 4 年前
GitHub ed15346c Merge pull request #4830 from Unity-Technologies/sensor-types-fix-proto-job 4 年前
GitHub 32877329 add generated files to test trigger (#4832) 4 年前
Ervin Teng aba633b2 Merge branch 'develop-attention-refactor' into develop-centralizedcritic-mm 4 年前
Ruo-Ping Dong 180d3e20 Merge branch 'develop-centralizedcritic-mm' into develop-cc-teammanager 4 年前
HH 0024a286 merge ervin's new stuff 4 年前
Andrew Cohen b0c02ee0 Merge branch 'develop-hybrid-actions-csharp' into develop-actionmodel-csharp 4 年前
GitHub 5a93fb6e Update artifactory URL. (#4858) 4 年前
GitHub fde883cb add backcompat job that I forgot before (#4862) 4 年前
brccabral 457fb612 Merge branch 'master' of https://github.com/Unity-Technologies/ml-agents 4 年前
GitHub 399f99e7 Initial implementation using IHeuristicProvider. (#4849) 4 年前
vincentpierre 396bc43c Merging master 4 年前
vincentpierre bcec7303 merging master 4 年前
GitHub d7f549f9 Run pytest on GPU (#4865) 4 年前
Arthur Juliani ff70c5c4 Merge branch 'master' into goal-conditioning-new 4 年前
GitHub 2fb87e4f Merge branch 'master' into reward-dist 4 年前
Ervin Teng b6f88d6d Merge branch 'develop-base-teammanager' into develop-agentprocessor-teammanager 4 年前
GitHub d56bf3a8 [yamato] drop 2020.1, reduce test variants, tighten triggers (#4936) 4 年前
Ruo-Ping Dong c87bce9e Merge branch 'master' into develop-base-teammanager 4 年前
Ervin Teng 219e773b Merge branch 'develop-fix-lstms' into develop-critic-op-lstm 4 年前
GitHub 7f70330b InputActuatorComponent to allow the generation of an action space from an InputActionAsset (#4881) (#4974) 4 年前
Christopher Goy 9cadfa7a Merge master -> release_13_branch-to-master 4 年前
vincentpierre e1b94b8b Merge branch 'master' into develop-var-len-obs-feature 4 年前
Andrew Cohen dc8e8494 Merge branch 'master' into develop-critic-optimizer 4 年前
Chris Elion e4f51ca7 Merge remote-tracking branch 'origin/master' into MLA-1734-demo-provider 4 年前
Ervin Teng d4438878 Merge branch 'develop-base-teammanager' into develop-agentprocessor-teammanager 4 年前
GitHub b89bb653 master -> main. (#5010) (#5044) 4 年前
GitHub b0719885 InputActuatorComponent to allow the generation of an action space from an InputActionAsset (#4881) 4 年前
GitHub 08b3e7f1 WebGL compile test (#4966) 4 年前
Chris Elion 49a27695 Merge remote-tracking branch 'origin/master' into MLA-1734-demo-provider 4 年前
Ervin Teng f409c40c Merge branch 'master' into develop-agentprocessor-teammanager 4 年前
Ervin Teng e46a86ad Merge branch 'master' into develop-superpush-int 4 年前
HH 15d512f9 Merge branch 'master' into hh/develop/dodgeball 4 年前
Ervin Teng 08db7c2f Merge branch 'develop-agentprocessor-teammanager' into develop-coma2-trainer-mm 4 年前
GitHub 260b367c master -> main. (#5010) 4 年前
HH 4c947151 Merge branch 'main' into hh/develop/dodgeball 4 年前
Arthur Juliani 06c147f8 Merge remote-tracking branch 'origin/main' into goal-conditioning-new 4 年前
GitHub bbe2d5cb run yamato tests on PRs that target v2-staging (#5026) 4 年前
Ervin Teng fd0dd35c Merge branch 'main' into develop-coma2-trainer 4 年前
Ervin Teng c8137dcd Merge branch 'main' into develop-superpush-int 4 年前
GitHub 85f8b40b Removing some scenes (#4997) 4 年前
GitHub f16ce486 Update v2-staging from main (March 15) (#5123) 4 年前
Christopher Goy 921ba4f0 Update v2-staging from main (March 15) (#5123) 4 年前
Christopher Goy fe83633e First crack at sample exports. 4 年前
GitHub d336e2eb Enable the exporting of unitypackage files from a list of curated scenes. (#5052) 4 年前
Christopher Goy 8acdd26a Remove automatic triggers. 4 年前
Christopher Goy ebe45056 Merge branch 'main' into release_14_branch-to-main 4 年前
Ervin Teng 8902c058 Merge branch 'main' into develop-coma2-trainer 4 年前
Chris Elion 970f1d40 Merge remote-tracking branch 'origin/v2-staging' into MLA-1634-ObservationSpec 4 年前
GitHub 67dbdad6 Automatically generate samples based on placement of mlagents-sample.json files in our examples. (#5077) 4 年前
Ervin Teng 1f026c70 Merge branch 'main' into develop-superpush-branch-cleanup 4 年前
Ervin Teng ce872033 Revert "Merge branch 'main' into develop-superpush-branch-cleanup" 4 年前
Andrew Cohen 9e77d7e1 Merge branch 'main' into develop-soccer-groupman 4 年前
GitHub 367f7a60 Make analytics module an optional dependency. (#5109) 4 年前
GitHub 04dd1c46 trigger test on merge (#5129) 4 年前
Ervin Teng 41dd16e8 Merge branch 'main' into release_15_mm 4 年前
Christopher Goy 0c22e504 run yamato tests on PRs that target v2-staging (#5026) 4 年前
Chris Elion 8d065978 cleanup: yamato triggers, changelog, docstrings 4 年前
Chris Elion 3600bd98 update package version 4 年前
Chris Elion cc0f952e update yamato tests for 2020.1 4 年前
GitHub 63437f95 Merge pull request #5167 from Unity-Technologies/MLA-1804-add-2021-tests 4 年前
Andrew Cohen 18be47e8 Merge branch 'main' into develop-soccer-groupman-mod 4 年前
GitHub 3d53ec5a Turns physics modules into optional dependencies. (#5112) 4 年前
Ruo-Ping Dong deeea398 Merge branch 'main' into ai-hw-2021 4 年前
GitHub efb4e1ff PR Feedback. (#5173) 4 年前
GitHub d9985904 fix typo in Yamato config. (#5176) 4 年前
vincentpierre d4716caa Merge branch 'main' into goal-conditioning-sensors-3 4 年前
GitHub b29b706c pin CI image version (#5250) 4 年前
Christopher Goy 69481f99 Add tests to make sure il2cpp works with fast training. 4 年前
Christopher Goy f61486c1 Fix yml. 4 年前
Christopher Goy a0d94cd7 download il2cpp component for editor. 4 年前
Christopher Goy 4cb0b172 install lld on linux. 4 年前
Christopher Goy e68baef3 Put lld in the right file. 4 年前
Christopher Goy 13384987 Add -y to install. 4 年前
GitHub 66fff729 Revert "pin CI image version (#5250)" (#5285) 4 年前
vincentpierre 1b032f73 [DO NOT MERGE] gpu testing for release 4 年前
GitHub 3aa36370 Run package tests with warn-as-error (#5290) 4 年前
GitHub 85e48d25 Run package tests with warn-as-error (#5290) (#5293) 4 年前
vincentpierre b99955d2 GPU stable 4 年前
GitHub 50a1e1a7 Test 2021.2 (#5329) 4 年前
Miguel Alonso Jr 4846cf0f Merge branch 'main' into develop-api-documentation-update 4 年前
Christopher Goy 0968daa8 Test 2021.2. 4 年前
GitHub 1302e6b1 limit trigger to this file (#5360) (#5361) 4 年前
GitHub 21969bcc Update triggers. (#5362) 4 年前
GitHub d12fe97a limit trigger to this file (#5360) 4 年前
Miguel Alonso Jr 97b7d5c6 Merge branch 'main' into develop-api-documentation-update 4 年前
GitHub 456c2341 [WIP] 2.0 verified to main (#5385) 4 年前