【5/2】ヤマダゲームマラソン #2742
5/18に本番PFテストが実施されるので事前に本番マージ
テスト期間は、5/18~5/20に再設定
【5/18】ヤマダゲームマラソン jolly/jrye-db#406
@kouho
確認お願いします。
@wada
確認OKです
| base | feff8a5139630627cd3ba05f3dab7cad69180da3 |
|---|---|
| head | 48e2f7ea46a8f068c7b797d6a276ff349b31ca57 |
| base branch | jolly/jr-web:master |
| head branch | jolly/jr-web:yamada_game_marathon |
| status | file |
|---|---|
| modified | lib/SubFunc.inc |
| modified | lib/SubFunc_mission.inc |
| modified | lib/SubFunc_valhalla.inc |
| modified | lib/ajax/default_info.inc |
| added | lib/class/controller/JrControllerYamadaGame.class.php |
| modified | lib/class/platform/yamada/YamadaAPI.class.php |
| modified | lib/class/platform/yamada/YamadaPlatformService.class.php |
| modified | lib/class/platform/yamada/YamadaWithoutAPI.class.php |
| modified | lib/class/season_pass/SeasonPass.class.php |
| modified | lib/conf/class/EventScheduleConfig.class.php |
| modified | lib/models/Banner.php |
| modified | lib/models/Yamada_campaign.php |
| added | lib/models/Yamada_game_marathon.php |
| added | lib/models/dao/log_user_yamada_game_marathon.php |
| added | lib/models/dao/master_yamada_game_marathon.php |
| added | lib/models/dao/master_yamada_game_marathon_reward.php |
| added | lib/models/dao/user_yamada_game_marathon.php |
| modified | lib/public/Main.inc |
| modified | lib/public/Training-Result.inc |
| added | public_html/img/banner/Campaign/banner_yamada_game_marathon_1_1.jpg |
| added | public_html/img/banner/Campaign/banner_yamada_game_marathon_1_2.jpg |
| added | public_html/img/pf/yamada/banner_marathon_1.jpg |
| modified | public_html/index.php |
| added | public_html/template/YamadaGame-MarathonRewawrds.tpl |
| added | public_html/template/parts/parts_yamada_game_marathon_info_template.tpl |