Description
概要
【8/26】本家20年5月更新分の取り込み #1067
メニューへのお知らせアイコン追加のみお知らせ
web: release_083016
db: release_083016【8/26】本家20年5月更新分の取り込み #1067
メニューへのお知らせアイコン追加のみお知らせ
web: release_083016
db: release_083016@iwamoto @kouho
16時に本番デプロイします。余裕があれば目を通しておいてください。
js圧縮とキャッシュ対応済み。
@wada
webブランチは以下以外で開発との差異がないことを確認しました。
dbブランチのrelease_083016が見つかりませんが、確認しなくて大丈夫でしょうか?
@wada
release_083016 も開発と差異がないことを確認しました。OKです。
@wada
確認しました、問題ないと思います。
| base | 63948f0412bea93f2820b5c6611abc13648cd35e |
|---|---|
| head | 6f68f7192e7a0fc4a3221df6ab5f39a38a915e91 |
| base branch | jolly/jr-web:master |
| head branch | jolly/jr-web:release_083016 |
| status | file |
|---|---|
| modified | lib/SkillFunc.inc |
| modified | lib/SubFunc.inc |
| modified | lib/ajax/main_default.inc |
| modified | lib/conf/class/CollectMoneyConfig.class.php |
| modified | lib/conf/class/JackpotWarConfig.class.php |
| modified | lib/conf/define.inc |
| modified | lib/conf/define_y.inc |
| modified | lib/public/Main.inc |
| added | public_html/img/info_jrye/940/info1.jpg |
| modified | public_html/img/main/event_info_board.png |
| added | public_html/img/main/event_info_window/arrow.png |
| added | public_html/img/main/event_info_window/battle_event/board_flag.png |
| added | public_html/img/main/event_info_window/daily_event/board_flag1.png |
| added | public_html/img/main/event_info_window/daily_event/board_flag2.png |
| added | public_html/img/main/event_info_window/daily_event/board_flag3.png |
| added | public_html/img/main/event_info_window/daily_event/board_flag4.png |
| added | public_html/img/main/event_info_window/jackpot/0.png |
| added | public_html/img/main/event_info_window/jackpot/1.png |
| added | public_html/img/main/event_info_window/jackpot/2.png |
| added | public_html/img/main/event_info_window/jackpot/3.png |
| added | public_html/img/main/event_info_window/jackpot/4.png |
| added | public_html/img/main/event_info_window/jackpot/5.png |
| added | public_html/img/main/event_info_window/jackpot/6.png |
| added | public_html/img/main/event_info_window/jackpot/A.png |
| added | public_html/img/main/event_info_window/jackpot/B.png |
| added | public_html/img/main/event_info_window/jackpot/C.png |
| added | public_html/img/main/event_info_window/jackpot/D.png |
| added | public_html/img/main/event_info_window/jackpot/board_flag.png |
| added | public_html/img/main/event_info_window/jackpot/event_logo.png |
| added | public_html/img/main/event_info_window/jackpot/mainframe.png |
| added | public_html/img/main/event_info_window/jackpot/monsterinfo.png |
| added | public_html/img/main/event_info_window/jackpot/status_resume.png |
| added | public_html/img/main/event_info_window/lamp_off.png |
| added | public_html/img/main/event_info_window/lamp_on.png |
| added | public_html/img/main/event_info_window/newisland/board_flag.png |
| added | public_html/img/main/event_info_window/raid/board_flag.png |
| added | public_html/img/money_item_get/bg_ef/june_bride_bg_1.png |
| added | public_html/img/money_item_get/bg_ef/june_bride_bg_2.png |
| added | public_html/img/money_item_get/bg_ef/rain_bg_1.png |
| added | public_html/img/money_item_get/bg_ef/rain_bg_2.png |
| added | public_html/img/money_item_get/season_panda/l_panda_bride_1.png |
| added | public_html/img/money_item_get/season_panda/l_panda_bride_2.png |
| added | public_html/img/money_item_get/season_panda/l_panda_bridegroom_1.png |
| added | public_html/img/money_item_get/season_panda/l_panda_bridegroom_2.png |
| added | public_html/img/money_item_get/season_panda/r_panda_bride_1.png |
| added | public_html/img/money_item_get/season_panda/r_panda_bride_2.png |
| added | public_html/img/money_item_get/season_panda/r_panda_bridegroom_1.png |
| added | public_html/img/money_item_get/season_panda/r_panda_bridegroom_2.png |
| added | public_html/img/sp_menu/d_spMenu12.png |
| added | public_html/img/sp_menu/d_spMenu12_2.png |
| modified | public_html/js/JOLLYROGER.js |
| modified | public_html/js/JOLLYROGER_battle.js |
| modified | public_html/js/JOLLYROGER_func.js |
| modified | public_html/js/dgame_footer.js |
| modified | public_html/js/jr_battle.min.js |
| modified | public_html/js/jr_func.min.js |
| modified | public_html/js/jr_main.min.js |
| modified | public_html/template/Main.tpl |
| modified | public_html/template/Quest-TeamWarDetail.tpl |
| modified | public_html/template/footer.tpl |
| modified | public_html/template/footer_nolink.tpl |
| modified | public_html/template/header_sp.tpl |