jolly/jr-web #165 【8/21】 masterへマージ

Description

opened by iwamoto at 2020-08-21T14:47:23; updated 2022-10-12T16:13:27

・建築イベント
・日替わりイベント
・戦争キャンペーン

iwamoto add_label at 2020-08-21T14:57:20: event

iwamoto add_label at 2020-08-21T14:57:21: マスタへマージ

iwamoto change_milestone at 2020-08-21T14:57:26: No milestone:release_20200821

iwamoto assign at 2020-08-21T14:57:30: Not assigned:iwamoto

iwamoto merge at 2020-08-21T17:15:21: Merged by user

iwamoto close at 2020-08-21T17:15:21: Close

Metadata

type	Pull Request
state	closed
opened by	iwamoto
assigned	iwamoto
registered	2020-08-21T14:47:23
updated	2022-10-12T16:13:27

Labels

イベントマスタへマージ

Pull Request

base	jolly/jr-web:master
head	jolly/jr-web:develop
from	19fc0f1996132af98dedd326e79680511ac52702
to	d9b7086508f82d15e9807a4dc66511f7ddf057cb

Commit range

base	`19fc0f1996132af98dedd326e79680511ac52702`
head	`d9b7086508f82d15e9807a4dc66511f7ddf057cb`
base branch	jolly/jr-web:master
head branch	jolly/jr-web:develop

View commits

Commit details are loaded from Git when a dynamic archive server is running, or can be embedded with --include-commits.

Files changed58 filesView patch

status	file
added	`public_html/img/main/event_icon/daily_event/main_event_mimic2_day_1.png`
added	`public_html/img/main/event_icon/daily_event/main_event_mimic2_day_2.png`
modified	`public_html/img/main/event_icon/daily_event/main_event_mimic_day_1.png`
modified	`public_html/img/main/event_icon/daily_event/main_event_mimic_day_2.png`
added	`public_html/img/main/event_icon/daily_event/main_event_tearin2_day_2.png`
modified	`public_html/img/main/event_icon/daily_event/main_event_tearin_day_2.png`
modified	`public_html/img/main/event_info_window/daily_event/eventbutoon1.png`
added	`public_html/img/main/event_info_window/daily_event/eventbutoon1_2.png`
modified	`public_html/img/main/event_info_window/daily_event/eventbutoon4.png`
added	`public_html/img/main/event_info_window/daily_event/eventbutoon4_2.png`
added	`public_html/img/mainmenu/daily_event_mission_btn/mainmenu_mimic2_01_00.png`
added	`public_html/img/mainmenu/daily_event_mission_btn/mainmenu_mimic2_01_01.png`
added	`public_html/img/mainmenu/daily_event_mission_btn/mainmenu_mimic2_01_02.png`
added	`public_html/img/mainmenu/daily_event_mission_btn/mainmenu_mimic2_01_03.png`
added	`public_html/img/mainmenu/daily_event_mission_btn/mainmenu_mimic2_01_04.png`
added	`public_html/img/mainmenu/daily_event_mission_btn/mainmenu_mimic2_01_05.png`
added	`public_html/img/mainmenu/daily_event_mission_btn/mainmenu_mimic2_01_06.png`
added	`public_html/img/mainmenu/daily_event_mission_btn/mainmenu_mimic2_01_07.png`
added	`public_html/img/mainmenu/daily_event_mission_btn/mainmenu_mimic2_01_08.png`
added	`public_html/img/mainmenu/daily_event_mission_btn/mainmenu_mimic2_01_09.png`
added	`public_html/img/mainmenu/daily_event_mission_btn/mainmenu_mimic2_01_10.png`
modified	`public_html/img/mainmenu/daily_event_mission_btn/mainmenu_mimic_01_00.png`
modified	`public_html/img/mainmenu/daily_event_mission_btn/mainmenu_mimic_01_01.png`
modified	`public_html/img/mainmenu/daily_event_mission_btn/mainmenu_mimic_01_02.png`
modified	`public_html/img/mainmenu/daily_event_mission_btn/mainmenu_mimic_01_03.png`
modified	`public_html/img/mainmenu/daily_event_mission_btn/mainmenu_mimic_01_04.png`
modified	`public_html/img/mainmenu/daily_event_mission_btn/mainmenu_mimic_01_05.png`
modified	`public_html/img/mainmenu/daily_event_mission_btn/mainmenu_mimic_01_06.png`
modified	`public_html/img/mainmenu/daily_event_mission_btn/mainmenu_mimic_01_07.png`
modified	`public_html/img/mainmenu/daily_event_mission_btn/mainmenu_mimic_01_08.png`
modified	`public_html/img/mainmenu/daily_event_mission_btn/mainmenu_mimic_01_09.png`
modified	`public_html/img/mainmenu/daily_event_mission_btn/mainmenu_mimic_01_10.png`
added	`public_html/img/mainmenu/daily_event_mission_btn/mainmenu_tear2_01_00.png`
added	`public_html/img/mainmenu/daily_event_mission_btn/mainmenu_tear2_01_01.png`
added	`public_html/img/mainmenu/daily_event_mission_btn/mainmenu_tear2_01_02.png`
added	`public_html/img/mainmenu/daily_event_mission_btn/mainmenu_tear2_01_03.png`
added	`public_html/img/mainmenu/daily_event_mission_btn/mainmenu_tear2_01_04.png`
added	`public_html/img/mainmenu/daily_event_mission_btn/mainmenu_tear2_01_05.png`
added	`public_html/img/mainmenu/daily_event_mission_btn/mainmenu_tear2_01_06.png`
added	`public_html/img/mainmenu/daily_event_mission_btn/mainmenu_tear2_01_07.png`
added	`public_html/img/mainmenu/daily_event_mission_btn/mainmenu_tear2_01_08.png`
added	`public_html/img/mainmenu/daily_event_mission_btn/mainmenu_tear2_01_09.png`
added	`public_html/img/mainmenu/daily_event_mission_btn/mainmenu_tear2_01_10.png`
modified	`public_html/img/mainmenu/daily_event_mission_btn/mainmenu_tear_01_00.png`
modified	`public_html/img/mainmenu/daily_event_mission_btn/mainmenu_tear_01_01.png`
modified	`public_html/img/mainmenu/daily_event_mission_btn/mainmenu_tear_01_02.png`
modified	`public_html/img/mainmenu/daily_event_mission_btn/mainmenu_tear_01_03.png`
modified	`public_html/img/mainmenu/daily_event_mission_btn/mainmenu_tear_01_04.png`
modified	`public_html/img/mainmenu/daily_event_mission_btn/mainmenu_tear_01_05.png`
modified	`public_html/img/mainmenu/daily_event_mission_btn/mainmenu_tear_01_06.png`
modified	`public_html/img/mainmenu/daily_event_mission_btn/mainmenu_tear_01_07.png`
modified	`public_html/img/mainmenu/daily_event_mission_btn/mainmenu_tear_01_08.png`
modified	`public_html/img/mainmenu/daily_event_mission_btn/mainmenu_tear_01_09.png`
modified	`public_html/img/mainmenu/daily_event_mission_btn/mainmenu_tear_01_10.png`
modified	`public_html/js/JOLLYROGER.js`
modified	`public_html/js/jr_main.js`
modified	`public_html/template/AreaItem.tpl`
modified	`public_html/template/header_sp.tpl`

Patch body is stored as a separate file to keep this page lightweight.