jolly/jr-web #119 【8/11】レイドイベント2

Description

opened by iwamoto at 2020-08-11T10:17:17; updated 2022-09-12T17:27:10

レイドイベントのリリース反映 #85

iwamoto merge at 2020-08-11T10:49:10: Merged by user

iwamoto close at 2020-08-11T10:49:10: Close

Metadata

type	Pull Request
state	closed
opened by	iwamoto
assigned
registered	2020-08-11T10:17:17
updated	2022-09-12T17:27:10

Pull Request

base	jolly/jr-web:master
head	jolly/jr-web:develop
from	f83e5224b7ef7bdac831655b2294a3eeda1cda7a
to	9a5de94c7cac5b82300c6cafee899bc1deff4e5d

Commit range

base	`f83e5224b7ef7bdac831655b2294a3eeda1cda7a`
head	`9a5de94c7cac5b82300c6cafee899bc1deff4e5d`
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 changed86 filesView patch

status	file
modified	`lib/SkillFunc.inc`
modified	`lib/SubFunc.inc`
modified	`lib/conf/class/JackpotWarConfig.class.php`
modified	`lib/conf/class/PresentItemConfig.class.php`
modified	`lib/conf/class/TeamWarConfig.class.php`
modified	`lib/conf/define_y.inc`
modified	`lib/exec/matching_team_battle.php`
modified	`lib/exec/team_battle_ranking.sh`
modified	`lib/exec/team_battle_ranking_event.php`
added	`public_html/img/banner/raid_banner_2_1.jpg`
added	`public_html/img/banner/raid_banner_2_2.jpg`
added	`public_html/img/banner/raid_banner_3_1.jpg`
added	`public_html/img/banner/raid_banner_3_2.jpg`
modified	`public_html/img/info_event/info_event_20_1.jpg`
modified	`public_html/img/info_event/info_event_20_2.jpg`
modified	`public_html/img/info_event/info_event_21_1.jpg`
modified	`public_html/img/info_event/info_event_21_2.jpg`
modified	`public_html/img/info_event/info_event_22_1.jpg`
modified	`public_html/img/info_event/info_event_22_2.jpg`
modified	`public_html/img/info_event/info_event_23_1.jpg`
modified	`public_html/img/info_event/info_event_23_2.jpg`
added	`public_html/img/info_jrye/121/info1.jpg`
added	`public_html/img/info_jrye/121/info2-2.jpg`
added	`public_html/img/info_jrye/121/info2-3.jpg`
added	`public_html/img/info_jrye/121/info2-3_c.jpg`
added	`public_html/img/info_jrye/121/info3.jpg`
added	`public_html/img/info_jrye/121/info4.jpg`
added	`public_html/img/info_jrye/121/info6-1.jpg`
added	`public_html/img/info_jrye/121/info6-2.jpg`
added	`public_html/img/info_jrye/121/info6.jpg`
added	`public_html/img/info_jrye/122/event_logo.png`
added	`public_html/img/info_jrye/122/info1.jpg`
added	`public_html/img/info_jrye/122/info10.jpg`
added	`public_html/img/info_jrye/122/info11.jpg`
added	`public_html/img/info_jrye/122/info2.jpg`
added	`public_html/img/info_jrye/122/info3_1.jpg`
added	`public_html/img/info_jrye/122/info7_2.jpg`
added	`public_html/img/info_jrye/122/info9.jpg`
added	`public_html/img/info_jrye/122/info_gk.jpg`
added	`public_html/img/info_jrye/122/itemrank1.png`
added	`public_html/img/info_jrye/122/itemrank2.png`
added	`public_html/img/info_jrye/122/reward_info.png`
added	`public_html/img/info_jrye/122/vs-reward1.jpg`
added	`public_html/img/info_jrye/122/vs-reward2.jpg`
added	`public_html/img/info_jrye/122/vs-reward3.jpg`
added	`public_html/img/info_jrye/128/item_1.jpg`
added	`public_html/img/info_jrye/128/item_2.jpg`
added	`public_html/img/info_jrye/128/item_3.jpg`
added	`public_html/img/info_jrye/128/item_4.jpg`
added	`public_html/img/info_jrye/JackpotWarInfo/127/info1_1.jpg`
added	`public_html/img/info_jrye/JackpotWarInfo/128/info1_.jpg`
modified	`public_html/img/info_jrye/JackpotWarInfo/129/info1.jpg`
added	`public_html/img/info_jrye/JackpotWarInfo/129/info10.jpg`
added	`public_html/img/info_jrye/JackpotWarInfo/129/info11.jpg`
added	`public_html/img/info_jrye/JackpotWarInfo/129/info11_2.jpg`
added	`public_html/img/info_jrye/JackpotWarInfo/129/info12.jpg`
added	`public_html/img/info_jrye/JackpotWarInfo/129/info13.jpg`
added	`public_html/img/info_jrye/JackpotWarInfo/129/info14.jpg`
added	`public_html/img/info_jrye/JackpotWarInfo/129/info1_4.jpg`
modified	`public_html/img/info_jrye/JackpotWarInfo/129/info2.jpg`
modified	`public_html/img/info_jrye/JackpotWarInfo/129/info3.jpg`
modified	`public_html/img/info_jrye/JackpotWarInfo/129/info4.jpg`
modified	`public_html/img/info_jrye/JackpotWarInfo/129/info5.jpg`
modified	`public_html/img/info_jrye/JackpotWarInfo/129/info6.jpg`
added	`public_html/img/info_jrye/JackpotWarInfo/129/info7.jpg`
added	`public_html/img/info_jrye/JackpotWarInfo/129/info8.jpg`
added	`public_html/img/info_jrye/JackpotWarInfo/129/info9.jpg`
modified	`public_html/img/info_jrye/JackpotWarInfo/common/info1.jpg`
added	`public_html/img/info_jrye/JackpotWarInfo/common/info1_.jpg`
added	`public_html/img/info_jrye/RaidEventImg/blue_end.jpg`
added	`public_html/img/info_jrye/RaidEventImg/info_combo_2.jpg`
added	`public_html/img/info_jrye/RaidEventImg/info_combo_3.jpg`
renamed	`public_html/img/info_jrye/90/info1.jpg -> public_html/img/info_jrye/RaidEventImg/info_point_top.jpg`
added	`public_html/img/info_jrye/RaidEventImg/info_point_top2.jpg`
added	`public_html/img/info_jrye/campaign_yamada/102/info1.png`
added	`public_html/img/main/event_icon/raid/70.png`
added	`public_html/img/main/event_icon/raid/70_rare.png`
added	`public_html/img/main/event_icon/raid/70_team.png`
added	`public_html/img/raid/point_item/26_1.png`
added	`public_html/img/raid/point_item/26_2.png`
added	`public_html/img/ranking/event_raid/info_raid3.jpg`
modified	`public_html/template/Deck-Default.tpl`
modified	`public_html/template/Raid-DefaultMedal.tpl`
modified	`public_html/template/Raid-Vs.tpl`
modified	`public_html/template/TeamWar-Result.tpl`
modified	`public_html/template/TeamWar.tpl`

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