PR

【8/30】本家5月分取り込み #1094

wada opened this at 2021-08-30T15:04:36; closed

Description

opened by wada at 2021-08-30T15:04:36; updated 2025-06-04T11:31:49

概要

【8/26】本家20年5月更新分の取り込み #1067

メニューへのお知らせアイコン追加のみお知らせ

web: release_083016
db: release_083016

Comment

#13298 by wada at 2021-08-30T15:05:58; updated 2021-08-30T15:05:58

@iwamoto @kouho
16時に本番デプロイします。余裕があれば目を通しておいてください。
js圧縮とキャッシュ対応済み。

Comment

#13308 by kouho at 2021-08-30T15:46:35; updated 2021-08-30T15:46:35

@wada
webブランチは以下以外で開発との差異がないことを確認しました。

  • js圧縮
  • お知らせメニュー追加告知画像

dbブランチのrelease_083016が見つかりませんが、確認しなくて大丈夫でしょうか?

Comment

#13309 by kouho at 2021-08-30T15:49:27; updated 2021-08-30T15:49:27

@wada
release_083016 も開発と差異がないことを確認しました。OKです。

Comment

#13314 by iwamoto at 2021-08-30T15:57:07; updated 2021-08-30T15:57:07

@wada
確認しました、問題ないと思います。

wada merge at 2021-08-30T16:04:56: 【8/30】本家5月分取り込み
wada close at 2021-08-30T16:04:56: Close

Commit range

base63948f0412bea93f2820b5c6611abc13648cd35e
head6f68f7192e7a0fc4a3221df6ab5f39a38a915e91
base branchjolly/jr-web:master
head branchjolly/jr-web:release_083016

View commits

Commit details are loaded from Git when a dynamic archive server is running, or can be embedded with --include-commits.
Files changed62 filesView patch
statusfile
modifiedlib/SkillFunc.inc
modifiedlib/SubFunc.inc
modifiedlib/ajax/main_default.inc
modifiedlib/conf/class/CollectMoneyConfig.class.php
modifiedlib/conf/class/JackpotWarConfig.class.php
modifiedlib/conf/define.inc
modifiedlib/conf/define_y.inc
modifiedlib/public/Main.inc
addedpublic_html/img/info_jrye/940/info1.jpg
modifiedpublic_html/img/main/event_info_board.png
addedpublic_html/img/main/event_info_window/arrow.png
addedpublic_html/img/main/event_info_window/battle_event/board_flag.png
addedpublic_html/img/main/event_info_window/daily_event/board_flag1.png
addedpublic_html/img/main/event_info_window/daily_event/board_flag2.png
addedpublic_html/img/main/event_info_window/daily_event/board_flag3.png
addedpublic_html/img/main/event_info_window/daily_event/board_flag4.png
addedpublic_html/img/main/event_info_window/jackpot/0.png
addedpublic_html/img/main/event_info_window/jackpot/1.png
addedpublic_html/img/main/event_info_window/jackpot/2.png
addedpublic_html/img/main/event_info_window/jackpot/3.png
addedpublic_html/img/main/event_info_window/jackpot/4.png
addedpublic_html/img/main/event_info_window/jackpot/5.png
addedpublic_html/img/main/event_info_window/jackpot/6.png
addedpublic_html/img/main/event_info_window/jackpot/A.png
addedpublic_html/img/main/event_info_window/jackpot/B.png
addedpublic_html/img/main/event_info_window/jackpot/C.png
addedpublic_html/img/main/event_info_window/jackpot/D.png
addedpublic_html/img/main/event_info_window/jackpot/board_flag.png
addedpublic_html/img/main/event_info_window/jackpot/event_logo.png
addedpublic_html/img/main/event_info_window/jackpot/mainframe.png
addedpublic_html/img/main/event_info_window/jackpot/monsterinfo.png
addedpublic_html/img/main/event_info_window/jackpot/status_resume.png
addedpublic_html/img/main/event_info_window/lamp_off.png
addedpublic_html/img/main/event_info_window/lamp_on.png
addedpublic_html/img/main/event_info_window/newisland/board_flag.png
addedpublic_html/img/main/event_info_window/raid/board_flag.png
addedpublic_html/img/money_item_get/bg_ef/june_bride_bg_1.png
addedpublic_html/img/money_item_get/bg_ef/june_bride_bg_2.png
addedpublic_html/img/money_item_get/bg_ef/rain_bg_1.png
addedpublic_html/img/money_item_get/bg_ef/rain_bg_2.png
addedpublic_html/img/money_item_get/season_panda/l_panda_bride_1.png
addedpublic_html/img/money_item_get/season_panda/l_panda_bride_2.png
addedpublic_html/img/money_item_get/season_panda/l_panda_bridegroom_1.png
addedpublic_html/img/money_item_get/season_panda/l_panda_bridegroom_2.png
addedpublic_html/img/money_item_get/season_panda/r_panda_bride_1.png
addedpublic_html/img/money_item_get/season_panda/r_panda_bride_2.png
addedpublic_html/img/money_item_get/season_panda/r_panda_bridegroom_1.png
addedpublic_html/img/money_item_get/season_panda/r_panda_bridegroom_2.png
addedpublic_html/img/sp_menu/d_spMenu12.png
addedpublic_html/img/sp_menu/d_spMenu12_2.png
modifiedpublic_html/js/JOLLYROGER.js
modifiedpublic_html/js/JOLLYROGER_battle.js
modifiedpublic_html/js/JOLLYROGER_func.js
modifiedpublic_html/js/dgame_footer.js
modifiedpublic_html/js/jr_battle.min.js
modifiedpublic_html/js/jr_func.min.js
modifiedpublic_html/js/jr_main.min.js
modifiedpublic_html/template/Main.tpl
modifiedpublic_html/template/Quest-TeamWarDetail.tpl
modifiedpublic_html/template/footer.tpl
modifiedpublic_html/template/footer_nolink.tpl
modifiedpublic_html/template/header_sp.tpl
Patch body is stored as a separate file to keep this page lightweight.