レイドのアタックブースト処理 #658
冒険中のskipボタンの動作 #595
この２つを反映予定
*お知らせ用の画像も含まれています
@wada
@kouho
念のため確認をお願いします。
お知らせ用の画像等も含まれてますが、そのままいこうとおもいます
@iwamoto
確認しました。こちらからは問題ないと思います。
| base | ab9f5cc281198acc891fc7833ad010a74feb40c1 |
|---|---|
| head | 68d2be2a7e24eae9ead24b5e93986a68f1faab4b |
| base branch | jolly/jr-web:master |
| head branch | jolly/jr-web:release_fix_0317 |
| status | file |
|---|---|
| modified | .gitignore |
| modified | lib/models/raid/Attack_bonus.php |
| modified | lib/public/Raid-Default.inc |
| added | public_html/img/info_event/info_event_147_1.jpg |
| added | public_html/img/info_event/info_event_147_2.jpg |
| added | public_html/img/info_event/info_event_148_1.jpg |
| added | public_html/img/info_event/info_event_148_2.jpg |
| added | public_html/img/info_jrye/576/info1.jpg |
| added | public_html/img/info_jrye/576/info2.jpg |
| added | public_html/img/info_jrye/576/info3.jpg |
| added | public_html/img/info_jrye/576/info4-1.jpg |
| added | public_html/img/info_jrye/576/info4-2.jpg |
| added | public_html/img/info_jrye/576/info4-3.jpg |
| added | public_html/img/info_jrye/576/info4-4.jpg |
| added | public_html/img/info_jrye/577/event_logo.png |
| added | public_html/img/info_jrye/577/info1.jpg |
| added | public_html/img/info_jrye/577/info2-1.jpg |
| added | public_html/img/info_jrye/577/info2.jpg |
| added | public_html/img/info_jrye/577/info5_2.jpg |
| added | public_html/img/info_jrye/577/info6_5.jpg |
| added | public_html/img/info_jrye/577/info7_2.jpg |
| added | public_html/img/info_jrye/577/itemrank1.png |
| added | public_html/img/info_jrye/577/itemrank2.png |
| added | public_html/img/info_jrye/577/itemrank3.png |
| added | public_html/img/info_jrye/578/info3-1.jpg |
| added | public_html/img/info_jrye/578/info4.jpg |
| added | public_html/img/info_jrye/578/vs-reward1.jpg |
| added | public_html/img/info_jrye/578/vs-reward2.jpg |
| added | public_html/img/info_jrye/578/vs-reward3.jpg |
| modified | public_html/js/JOLLYROGER_mission.js |
| modified | public_html/js/jr_mission.js |
| modified | public_html/template/Raid-DefaultMedal.tpl |
| modified | public_html/template/Raid-Vs.tpl |
| modified | public_html/template/header_sp.tpl |
| modified | public_html/template/parts_raid_default.tpl |