jolly/jr-web #107 【8/6】バトルイベント

Description

opened by iwamoto at 2020-08-06T15:34:04; updated 2023-01-31T15:16:01

バトルイベント 2 リリース

iwamoto add_label at 2020-08-06T15:34:38: マスタへマージ

iwamoto add_label at 2020-08-06T15:34:41: event

iwamoto change_milestone at 2020-08-06T15:34:46: No milestone:release_battle_event_2

iwamoto change_title at 2020-08-06T15:36:49: Develop 【8/6】バトルイベント_2 反映

iwamoto close_comment at 2020-08-06T16:47:42: 対応済みになります

iwamoto assign at 2020-08-06T16:48:46: Not assigned:iwamoto

Metadata

type	Pull Request
state	closed
opened by	iwamoto
assigned	iwamoto
registered	2020-08-06T15:34:04
updated	2023-01-31T15:16:01
milestone	release_battle_event_2

Labels

イベントマスタへマージ

Pull Request

base	jolly/jr-web:master
head	jolly/jr-web:develop
from	b39a76835cbc64609866cd05360bf75090e09af8
to	b2da6f9c24a4e24c5d3d269f3b71b8a259869df2

Commit range

base	`b39a76835cbc64609866cd05360bf75090e09af8`
head	`b2da6f9c24a4e24c5d3d269f3b71b8a259869df2`
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 changed65 filesView patch

status	file
modified	`lib/SubFunc.inc`
modified	`lib/SubFunc_mission.inc`
modified	`lib/ajax/battle_player.inc`
modified	`lib/conf/class/BattleEventConfig.class.php`
added	`lib/conf/class/PresentItemConfig.class.php`
modified	`lib/conf/define_y.inc`
modified	`lib/cpanel/m_raid_skill_list_import.inc`
modified	`lib/exec/cpanel_team_merge.inc`
modified	`lib/exec/cpanel_team_merge.sh`
modified	`lib/exec/event_item_change_gold.inc`
modified	`lib/exec/team_merge_submit.inc`
modified	`lib/exec/team_merge_submit.sh`
modified	`lib/exec/tool_delete_battle_event_log.inc`
modified	`lib/exec/tool_event_newisland_point.inc`
modified	`lib/exec/tool_event_newisland_present.inc`
modified	`lib/public/Main.inc`
deleted	`public_html/img/info/527/m_info1.jpg`
deleted	`public_html/img/info/527/m_info2.jpg`
deleted	`public_html/img/info/527/m_info3.jpg`
deleted	`public_html/img/info/527/m_info4.jpg`
deleted	`public_html/img/info/527/m_info5.jpg`
deleted	`public_html/img/info/527/m_info6.jpg`
modified	`public_html/img/info_event/info_event_17_1.jpg`
modified	`public_html/img/info_event/info_event_17_2.jpg`
modified	`public_html/img/info_event/info_event_18_1.jpg`
modified	`public_html/img/info_event/info_event_18_2.jpg`
modified	`public_html/img/info_event/info_event_19_1.jpg`
modified	`public_html/img/info_event/info_event_19_2.jpg`
added	`public_html/img/info_jrye/115/info1.jpg`
added	`public_html/img/info_jrye/115/info1_end.jpg`
added	`public_html/img/info_jrye/115/info2.jpg`
added	`public_html/img/info_jrye/115/info3.jpg`
added	`public_html/img/info_jrye/115/info4.jpg`
added	`public_html/img/info_jrye/116/shop.jpg`
added	`public_html/img/info_jrye/117/info1.jpg`
added	`public_html/img/info_jrye/117/info2.jpg`
added	`public_html/img/info_jrye/117/info3.jpg`
added	`public_html/img/info_jrye/117/info4.jpg`
added	`public_html/img/info_jrye/JackpotWarInfo/127/info1.jpg`
added	`public_html/img/info_jrye/JackpotWarInfo/127/info2.jpg`
added	`public_html/img/info_jrye/JackpotWarInfo/128/info1.jpg`
renamed	`public_html/img/info/1524/info4.jpg -> public_html/img/info_jrye/JackpotWarInfo/129/info1.jpg`
renamed	`public_html/img/info/1524/info5.jpg -> public_html/img/info_jrye/JackpotWarInfo/129/info2.jpg`
renamed	`public_html/img/info/1524/info7.jpg -> public_html/img/info_jrye/JackpotWarInfo/129/info3.jpg`
renamed	`public_html/img/info/1524/info8.jpg -> public_html/img/info_jrye/JackpotWarInfo/129/info4.jpg`
renamed	`public_html/img/info/1524/info10.jpg -> public_html/img/info_jrye/JackpotWarInfo/129/info5.jpg`
renamed	`public_html/img/info/1524/info11.jpg -> public_html/img/info_jrye/JackpotWarInfo/129/info6.jpg`
added	`public_html/img/info_jrye/JackpotWarInfo/130/info1.jpg`
added	`public_html/img/info_jrye/JackpotWarInfo/130/info2.jpg`
added	`public_html/img/info_jrye/JackpotWarInfo/130/info3.jpg`
added	`public_html/img/info_jrye/JackpotWarInfo/130/info4.jpg`
added	`public_html/img/info_jrye/JackpotWarInfo/common/info1.jpg`
renamed	`public_html/img/info/4069/info9_2.jpg -> public_html/img/info_jrye/RaidEventImg/info_combo_1.jpg`
added	`public_html/img/info_jrye/campaign_yamada/132/info1.png`
added	`public_html/img/info_jrye/campaign_yamada/21/banner.jpg`
added	`public_html/img/info_jrye/campaign_yamada/21/info1.jpg`
added	`public_html/img/info_jrye/common/synopsis.jpg`
added	`public_html/img/item/composition/list/2.jpg`
added	`public_html/img/item/composition/list/3.jpg`
added	`public_html/img/item/composition/list/4.jpg`
added	`public_html/img/ranking/event_battle/info2.jpg`
modified	`public_html/js/JOLLYROGER_battle.js`
modified	`public_html/js/jr_battle.js`
modified	`public_html/template/Mission.tpl`
modified	`public_html/template/header_sp.tpl`

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