Description
概要
以下のリリースPRです
【11/9】SP建物取り壊し時注意文言の修正と判定を修正 #1296
テスト方法、確認した内容
sp_build_event_object ブランチの更新を取り込めているか
TODO
確認でき次第反映予定で、15:00の島テーマ開始までには反映予定。
以下のリリースPRです
【11/9】SP建物取り壊し時注意文言の修正と判定を修正 #1296
sp_build_event_object ブランチの更新を取り込めているか
確認でき次第反映予定で、15:00の島テーマ開始までには反映予定。
PRを作成間違えたのでクローズ
| base | 990fca84437b8ce1a557c1d0b2d99be517bb0673 |
|---|---|
| head | 70cbda1ee7c59a78032b6ddf64bb890388fa7436 |
| base branch | jolly/jr-web:master |
| head branch | jolly/jr-web:develop |
| status | file |
|---|---|
| added | island_img/island_20006.jpg |
| added | island_img/object_20006.png |
| added | island_img/object_999997_20006.png |
| added | island_img/object_event_0_20006.png |
| modified | lib/SubFunc.inc |
| modified | lib/ajax/build_imgBreak.inc |
| modified | lib/ajax/build_imgComposite.inc |
| modified | lib/ajax/build_selectBreak.inc |
| modified | lib/ajax/build_selectCheck.inc |
| modified | lib/ajax/build_selectDetail.inc |
| modified | lib/class/building/BuildingStorageManager.class.php |
| modified | lib/class/controller/JrControllerBuildingStorage.class.php |
| added | lib/conf/class/EventScheduleConfig.class.php |
| modified | lib/conf/class/GachaConfig.class.php |
| modified | lib/conf/define_y.inc |
| added | lib/exec/tool_event_schedule_insertion.inc |
| added | lib/exec/tool_event_schedule_insertion.sh |
| modified | lib/exec/tool_jrce_status.php |
| added | lib/models/dao/event_schedule.php |
| modified | lib/public/Ship-Detail.inc |
| added | public_html/img/gacha/148/banner_gacha148.jpg |
| added | public_html/img/gacha/148/banner_gacha148_2.jpg |
| deleted | public_html/img/gacha/148/banner_gacha148_reprint.jpg |
| modified | public_html/img/gacha/148/gacha148.jpg |
| modified | public_html/img/gacha/148/gacha148_2.jpg |
| modified | public_html/img/gacha/148/gacha148_card_info136.jpg |
| modified | public_html/img/gacha/148/gacha148_card_info154.jpg |
| modified | public_html/img/gacha/148/gacha148_card_info156.jpg |
| modified | public_html/img/gacha/148/gacha148_card_info164.jpg |
| modified | public_html/img/gacha/148/gacha148_info.jpg |
| modified | public_html/img/gacha/148/gacha148_info2.jpg |
| modified | public_html/img/gacha/148/gacha148_info3.jpg |
| added | public_html/img/gacha/148/gacha148_info4.jpg |
| modified | public_html/img/gacha/148/gacha148_title.jpg |
| added | public_html/img/gacha/148/gacha148_top.jpg |
| added | public_html/img/gacha/148/updateinfo1.jpg |
| added | public_html/img/gacha/179/banner_gacha179.jpg |
| added | public_html/img/gacha/179/banner_gacha179_2.jpg |
| deleted | public_html/img/gacha/179/banner_gacha179_reprint.jpg |
| modified | public_html/img/gacha/179/gacha179.jpg |
| modified | public_html/img/gacha/179/gacha179_2.jpg |
| modified | public_html/img/gacha/179/gacha179_card_info116.jpg |
| modified | public_html/img/gacha/179/gacha179_card_info188.jpg |
| modified | public_html/img/gacha/179/gacha179_card_info192.jpg |
| modified | public_html/img/gacha/179/gacha179_card_info271.jpg |
| modified | public_html/img/gacha/179/gacha179_info.jpg |
| modified | public_html/img/gacha/179/gacha179_info2.jpg |
| modified | public_html/img/gacha/179/gacha179_info3.jpg |
| added | public_html/img/gacha/179/gacha179_info4.jpg |
| modified | public_html/img/gacha/179/gacha179_title.jpg |
| added | public_html/img/gacha/179/gacha179_top.jpg |
| added | public_html/img/gacha/179/updateinfo1.jpg |
| added | public_html/img/info_event/info_event_305_1.jpg |
| added | public_html/img/info_event/info_event_305_2.jpg |
| added | public_html/img/info_event/info_event_306_1.jpg |
| added | public_html/img/info_event/info_event_306_2.jpg |
| added | public_html/img/info_jrye/1068/info_01.jpg |
| added | public_html/img/info_jrye/1068/info_02.jpg |
| added | public_html/img/info_jrye/1068/info_03.jpg |
| added | public_html/img/info_jrye/1068/info_04.jpg |
| added | public_html/img/info_jrye/1068/info_05.jpg |
| added | public_html/img/info_jrye/1068/info_06.jpg |
| added | public_html/img/island/60/object_20006.jpg |
| added | public_html/img/island/background/120/20006.jpg |
| added | public_html/img/island/background/20006.jpg |
| added | public_html/img/island/object/object_20006.png |
| modified | public_html/js/JOLLYROGER.js |
| modified | public_html/template/Build.tpl |
| modified | public_html/template/BuildingStorage-StoreConfirm.tpl |
| modified | public_html/template/parts_ship_detail.tpl |