jolly/jr-web #702 【本日中】覇戦リーグ本戦

Description

opened by wada at 2021-03-29T13:40:29; updated 2024-04-08T17:48:20

仕様書
https://docs.google.com/spreadsheets/d/18PPB3afQ_amw-WwlDOgfeQAXqwjs30HW3zf1bX7Mui0/edit#gid=0

お知らせ設定
概要：529（予選と同じ）
結果：605

Comment

#10036 by wada at 2021-03-29T13:44:54; updated 2021-03-29T13:44:54

@kouho @iwamoto
今日の深夜にマッチングされるので、今日中にレビューをお願いします。

更新内容は以下のcommitです。
報酬画像設定: 09d815270f49d991429a6469256ff114663b9fff
覇戦リーグ本戦設定: 7588572c0aad461220795e5e7c583d625811e4e7

本戦の開催期間は予選更新時に設定済みですが、再度確認お願いします。
JackpotWarConfig.php final_start / final_end

Comment

#10040 by iwamoto at 2021-03-29T14:44:16; updated 2021-03-29T14:44:16

@wada
Aリーグは26~50位まで報酬と設定されていますが
下記画像は52位までになっています
!item_1_3

Comment

#10041 by iwamoto at 2021-03-29T14:45:06; updated 2021-03-29T14:45:06

また、この画像だけ【期限付き】部分が欠けてしまっています。
!item_3_3

Comment

#10042 by wada at 2021-03-29T15:11:05; updated 2021-03-29T15:11:05

@iwamoto
確認ありがとうございます。修正しました。

Comment

#10043 by kouho at 2021-03-29T15:23:39; updated 2021-03-29T15:25:04

@wada
取り急ぎ 09d815270f49d991429a6469256ff114663b9fff 内の画像について確認した分を送ります。

public_html/img/info_jrye/529/item_1_3.jpg
今回もAリーグは52位までなのでしょうか？

public_html/img/info_jrye/529/item_3_2.jpg
Cリーグ11-25位は仕様書ではサファティア×2になっていました。

public_html/img/info_jrye/529/item_4_3.jpg
Dリーグ30位以下→31位以下

Comment

#10044 by wada at 2021-03-29T15:53:19; updated 2021-03-29T15:53:19

@kouho
修正しました。確認お願いします。

Comment

#10045 by kouho at 2021-03-29T16:03:03; updated 2021-03-29T16:03:03

@wada
ありがとうございます。修正確認しました。問題ないかと思います。

kouho add_label at 2021-03-29T16:03:21: 皇甫 LGTM

Comment

#10047 by iwamoto at 2021-03-29T16:15:24; updated 2021-03-29T16:15:24

@wada
確認しました。

iwamoto add_label at 2021-03-29T16:15:28: 岩本 LGTM

Comment

#10055 by wada at 2021-03-29T17:03:37; updated 2021-03-29T17:03:37

確認ありがとうございます。マージします。

wada merge at 2021-03-29T17:03:46: 【本日中】覇戦リーグ本戦

wada close at 2021-03-29T17:03:46: Close

wada delete_label at 2021-03-29T17:04:04: レビュー待ち

Metadata

type	Pull Request
state	closed
opened by	wada
assigned
registered	2021-03-29T13:40:29
updated	2024-04-08T17:48:20

Labels

デベロップへマージ皇甫 LGTM

Pull Request

base	jolly/jr-web:develop
head	jolly/jr-web:war_0330
from	18991acbc0c213cb438340711d45a81a0ea193ce
to	39c70730cd1ef3408ba2dea43f763b94269ad850

base	`18991acbc0c213cb438340711d45a81a0ea193ce`
head	`39c70730cd1ef3408ba2dea43f763b94269ad850`
base branch	jolly/jr-web:develop
head branch	jolly/jr-web:war_0330

Files changed244 filesView patch

status	file
modified	`.gitignore`
modified	`lib/SubFunc.inc`
modified	`lib/SubFunc_mission.inc`
modified	`lib/ajax/areaItem_result.inc`
modified	`lib/ajax/item_result.inc`
modified	`lib/ajax/main_listGold.inc`
modified	`lib/class/const/PresentNameConst.class.php`
modified	`lib/conf/class/BuildEventItemConfig.class.php`
modified	`lib/conf/class/DailyEventConfig.class.php`
modified	`lib/conf/class/GachaConfig.class.php`
modified	`lib/conf/class/JackpotWarConfig.class.php`
modified	`lib/conf/class/MissionMonsterConfig.class.php`
modified	`lib/conf/class/NewIslandConfig.class.php`
modified	`lib/conf/class/NewIslandStageConfig.class.php`
modified	`lib/conf/class/RaidMonsterConfig.class.php`
modified	`lib/conf/define_y.inc`
modified	`lib/exec/cpanel_payment_user.php`
modified	`lib/exec/team_merge_submit.inc`
modified	`lib/exec/tool_event_newisland_present.inc`
modified	`lib/exec/tool_send_presents.php`
modified	`lib/models/Gacha_payment.php`
modified	`lib/models/raid/Attack_bonus.php`
modified	`lib/public/Bar-Gacha.inc`
modified	`lib/public/Bar-GachaCheck.inc`
modified	`lib/public/Bar-GachaRatio.inc`
modified	`lib/public/Bar-GachaResult.inc`
modified	`lib/public/Build-Info.inc`
modified	`lib/public/Card-Default.inc`
modified	`lib/public/Card-Detail.inc`
modified	`lib/public/Composition-Default.inc`
modified	`lib/public/Deck-DeckSelect.inc`
modified	`lib/public/Jewel-Result.inc`
modified	`lib/public/Privacy.inc`
modified	`lib/public/Raid-Default.inc`
modified	`public_html/img/banner/banner_skillball_gacha_start_1.jpg`
modified	`public_html/img/banner/banner_skillball_gacha_start_2.jpg`
added	`public_html/img/banner/jewel/dia_exchange_1.jpg`
added	`public_html/img/banner/jewel/dia_exchange_2.jpg`
added	`public_html/img/banner/jewel/dia_exchange_end_1.jpg`
added	`public_html/img/banner/jewel/dia_exchange_end_2.jpg`
added	`public_html/img/common/modal/1/modal_bottom.png`
added	`public_html/img/common/modal/1/modal_close.png`
added	`public_html/img/common/modal/1/modal_close_on.png`
added	`public_html/img/common/modal/1/modal_middle.png`
added	`public_html/img/common/modal/1/modal_title.png`
added	`public_html/img/common/modal/1/modal_top.png`
added	`public_html/img/deck/renewal/add_deck_result.jpg`
added	`public_html/img/deck/renewal/buttons/btn_auto.png`
added	`public_html/img/deck/renewal/buttons/btn_auto_b.png`
added	`public_html/img/deck/renewal/buttons/btn_big.png`
added	`public_html/img/deck/renewal/buttons/btn_big_b.png`
added	`public_html/img/deck/renewal/buttons/btn_breakthrough.png`
added	`public_html/img/deck/renewal/buttons/btn_breakthrough_b.png`
added	`public_html/img/deck/renewal/buttons/btn_breakthrough_g.png`
added	`public_html/img/deck/renewal/buttons/btn_card_change.png`
added	`public_html/img/deck/renewal/buttons/btn_card_change_b.png`
added	`public_html/img/deck/renewal/buttons/btn_card_change_s.png`
added	`public_html/img/deck/renewal/buttons/btn_card_change_s_b.png`
added	`public_html/img/deck/renewal/buttons/btn_change.png`
added	`public_html/img/deck/renewal/buttons/btn_change_b.png`
added	`public_html/img/deck/renewal/buttons/btn_composition.png`
added	`public_html/img/deck/renewal/buttons/btn_composition_b.png`
added	`public_html/img/deck/renewal/buttons/btn_composition_g.png`
added	`public_html/img/deck/renewal/buttons/btn_confirm.png`
added	`public_html/img/deck/renewal/buttons/btn_copy.png`
added	`public_html/img/deck/renewal/buttons/btn_copy_b.png`
added	`public_html/img/deck/renewal/buttons/btn_details.png`
added	`public_html/img/deck/renewal/buttons/btn_details_b.png`
added	`public_html/img/deck/renewal/buttons/btn_limitbreak.png`
added	`public_html/img/deck/renewal/buttons/btn_limitbreak_b.png`
added	`public_html/img/deck/renewal/buttons/btn_limitbreak_g.png`
added	`public_html/img/deck/renewal/buttons/btn_list.png`
added	`public_html/img/deck/renewal/buttons/btn_list_b.png`
added	`public_html/img/deck/renewal/buttons/btn_lvup.png`
added	`public_html/img/deck/renewal/buttons/btn_lvup_b.png`
added	`public_html/img/deck/renewal/buttons/btn_lvup_g.png`
added	`public_html/img/deck/renewal/buttons/btn_reincarnation.png`
added	`public_html/img/deck/renewal/buttons/btn_reincarnation_b.png`
added	`public_html/img/deck/renewal/buttons/btn_relocation.png`
added	`public_html/img/deck/renewal/buttons/btn_relocation_b.png`
added	`public_html/img/deck/renewal/buttons/btn_remove.png`
added	`public_html/img/deck/renewal/buttons/btn_remove_b.png`
added	`public_html/img/deck/renewal/buttons/btn_reset.png`
added	`public_html/img/deck/renewal/buttons/btn_reset_b.png`
added	`public_html/img/deck/renewal/buttons/btn_resurrection.png`
added	`public_html/img/deck/renewal/buttons/btn_resurrection_b.png`
added	`public_html/img/deck/renewal/buttons/btn_resurrection_g.png`
added	`public_html/img/deck/renewal/buttons/btn_ship_change.png`
added	`public_html/img/deck/renewal/buttons/btn_ship_change_b.png`
added	`public_html/img/deck/renewal/buttons/btn_ship_lvup.png`
added	`public_html/img/deck/renewal/buttons/btn_ship_lvup_b.png`
added	`public_html/img/deck/renewal/buttons/btn_ship_lvup_g.png`
added	`public_html/img/deck/renewal/buttons/btn_skin.png`
added	`public_html/img/deck/renewal/buttons/btn_skin_b.png`
added	`public_html/img/deck/renewal/buttons/btn_thumbnail.png`
added	`public_html/img/deck/renewal/buttons/btn_thumbnail_b.png`
added	`public_html/img/deck/renewal/buttons/btn_training.png`
added	`public_html/img/deck/renewal/buttons/btn_training_b.png`
added	`public_html/img/deck/renewal/buttons/btn_training_g.png`
added	`public_html/img/deck/renewal/combat_back.png`
added	`public_html/img/deck/renewal/deck_back1.png`
added	`public_html/img/deck/renewal/deck_back2.png`
added	`public_html/img/deck/renewal/deck_back3.png`
added	`public_html/img/deck/renewal/deck_back_b.jpg`
added	`public_html/img/deck/renewal/i_breakthrough_77.png`
added	`public_html/img/deck/renewal/i_breakthrough_78.png`
added	`public_html/img/deck/renewal/i_breakthrough_79.png`
added	`public_html/img/deck/renewal/i_breakthrough_80.png`
added	`public_html/img/deck/renewal/i_deck_after.png`
added	`public_html/img/deck/renewal/i_deck_before.png`
added	`public_html/img/deck/renewal/info_icon.png`
added	`public_html/img/deck/renewal/status_icon/gk.png`
added	`public_html/img/deck/renewal/status_icon/i_exp.png`
added	`public_html/img/deck/renewal/status_icon/st_attack.png`
added	`public_html/img/deck/renewal/status_icon/st_cost.png`
added	`public_html/img/deck/renewal/status_icon/st_hp.png`
added	`public_html/img/deck/renewal/status_icon/st_s_attack.png`
added	`public_html/img/deck/renewal/status_icon/st_s_cost.png`
added	`public_html/img/deck/renewal/status_icon/st_speed.png`
added	`public_html/img/deck/renewal/status_icon/trade.png`
added	`public_html/img/deck/renewal/t_deck.png`
added	`public_html/img/deck/renewal/t_ship_bottom.png`
added	`public_html/img/deck/renewal/t_ship_top.png`
added	`public_html/img/deck/renewal/t_threetop_bottom.png`
added	`public_html/img/deck/renewal/t_threetop_top.png`
added	`public_html/img/deck/renewal/tag_dack_set.png`
added	`public_html/img/deck/renewal/tag_paper_medium.jpg`
added	`public_html/img/deck/renewal/tag_paper_under.png`
added	`public_html/img/deck/renewal/tag_status.png`
added	`public_html/img/gacha/123/composition_bonus.jpg`
modified	`public_html/img/gacha/123/gacha123_card_info116.jpg`
modified	`public_html/img/gacha/123/gacha123_card_info188.jpg`
modified	`public_html/img/gacha/123/gacha123_card_info192.jpg`
deleted	`public_html/img/gacha/123/gacha123_card_info193.jpg`
deleted	`public_html/img/gacha/123/gacha123_card_info228.jpg`
deleted	`public_html/img/gacha/123/gacha123_card_info259.jpg`
deleted	`public_html/img/gacha/123/gacha123_card_info262.jpg`
modified	`public_html/img/gacha/123/gacha123_card_info271.jpg`
modified	`public_html/img/gacha/123/gacha123_info.jpg`
modified	`public_html/img/gacha/123/gacha123_info2.jpg`
modified	`public_html/img/gacha/123/gacha123_info3.jpg`
modified	`public_html/img/gacha/123/gacha123_info4.jpg`
deleted	`public_html/img/gacha/123/synthesis.jpg`
modified	`public_html/img/gacha/126/banner_gacha126.jpg`
modified	`public_html/img/gacha/126/banner_gacha126_2.jpg`
added	`public_html/img/gacha/126/composition_bonus.jpg`
modified	`public_html/img/gacha/126/gacha126.jpg`
modified	`public_html/img/gacha/126/gacha126_2.jpg`
modified	`public_html/img/gacha/126/gacha126_card_info193.jpg`
modified	`public_html/img/gacha/126/gacha126_card_info228.jpg`
modified	`public_html/img/gacha/126/gacha126_card_info259.jpg`
modified	`public_html/img/gacha/126/gacha126_card_info262.jpg`
modified	`public_html/img/gacha/126/gacha126_info.jpg`
modified	`public_html/img/gacha/126/gacha126_info2.jpg`
added	`public_html/img/gacha/126/gacha126_info3.jpg`
added	`public_html/img/gacha/126/gacha126_info4.jpg`
modified	`public_html/img/gacha/126/gacha126_title.jpg`
added	`public_html/img/gacha/126/gacha126_title2.jpg`
modified	`public_html/img/gacha/130/banner_gacha130.jpg`
modified	`public_html/img/gacha/130/banner_gacha130_2.jpg`
modified	`public_html/img/gacha/130/gacha130.jpg`
modified	`public_html/img/gacha/130/gacha130_2.jpg`
deleted	`public_html/img/gacha/130/gacha130_card_info18.jpg`
deleted	`public_html/img/gacha/130/gacha130_card_info23.jpg`
deleted	`public_html/img/gacha/130/gacha130_card_info71.jpg`
deleted	`public_html/img/gacha/130/gacha130_card_info93.jpg`
modified	`public_html/img/gacha/130/gacha130_info.jpg`
modified	`public_html/img/gacha/130/gacha130_info2.jpg`
modified	`public_html/img/gacha/130/gacha130_info3.jpg`
added	`public_html/img/gacha/130/gacha130_info4.jpg`
modified	`public_html/img/gacha/130/gacha130_title.jpg`
added	`public_html/img/gacha/130/gacha130_top.jpg`
added	`public_html/img/gacha/130/updateinfo1.jpg`
modified	`public_html/img/gacha/gacha_coin_object15.png`
added	`public_html/img/gacha/gacha_coin_object19.png`
modified	`public_html/img/gacha/special/item/item_7_5.jpg`
added	`public_html/img/icon/composition.png`
added	`public_html/img/info_event/info_event_133_1.jpg`
added	`public_html/img/info_event/info_event_133_2.jpg`
added	`public_html/img/info_jrye/529/item_1_1.jpg`
added	`public_html/img/info_jrye/529/item_1_2.jpg`
added	`public_html/img/info_jrye/529/item_1_3.jpg`
added	`public_html/img/info_jrye/529/item_2_1.jpg`
added	`public_html/img/info_jrye/529/item_2_2.jpg`
added	`public_html/img/info_jrye/529/item_2_3.jpg`
added	`public_html/img/info_jrye/529/item_3_1.jpg`
added	`public_html/img/info_jrye/529/item_3_2.jpg`
added	`public_html/img/info_jrye/529/item_3_3.jpg`
added	`public_html/img/info_jrye/529/item_4_1.jpg`
added	`public_html/img/info_jrye/529/item_4_2.jpg`
added	`public_html/img/info_jrye/529/item_4_3.jpg`
modified	`public_html/img/info_jrye/CharmInfo/126/info5.jpg`
added	`public_html/img/info_jrye/NewislandEventImg/islandbanner_head2.jpg`
added	`public_html/img/info_jrye/NewislandEventImg/islandbanner_info2.jpg`
added	`public_html/img/item/120/1902.jpg`
added	`public_html/img/item/150/1902.jpg`
added	`public_html/img/item/58/1902.jpg`
added	`public_html/img/item/60/1902.jpg`
added	`public_html/img/item/70/1902.jpg`
added	`public_html/img/login/loginbonus/beginner/beginner_login_116.jpg`
added	`public_html/img/login/loginbonus/beginner/beginner_login_259.jpg`
added	`public_html/img/login/loginbonus/beginner/beginner_login_present_7_116.jpg`
added	`public_html/img/login/loginbonus/beginner/beginner_login_present_7_259.jpg`
added	`public_html/img/mission/newisland/effect/event_no7/ef624.jpg`
added	`public_html/img/mission/newisland/effect/event_no7/ef628.png`
added	`public_html/img/mission/newisland/newisland_bar/event_no7/1.jpg`
added	`public_html/img/mission/newisland/newisland_bar/event_no7/2.jpg`
added	`public_html/img/mission/newisland/newisland_bar/event_no7/3.jpg`
added	`public_html/img/mission/newisland/newisland_bar/event_no7/4.jpg`
added	`public_html/img/mission/newisland/newisland_bar/event_no7/5.jpg`
added	`public_html/img/mission/newisland/newisland_bar/event_no7/mainpage_mission_btn_icon.png`
added	`public_html/img/mission/newisland/newisland_bar/event_no7/reward.png`
added	`public_html/img/ranking/event_island/info7.jpg`
added	`public_html/img/ranking/event_raid/info_raid14.jpg`
added	`public_html/img/temp_jewel/dia_exchange_info.jpg`
modified	`public_html/index.php`
modified	`public_html/js/JOLLYROGER.js`
modified	`public_html/js/JOLLYROGER_mission.js`
modified	`public_html/js/jr_main.js`
modified	`public_html/js/jr_mission.js`
modified	`public_html/template/AreaItem.tpl`
modified	`public_html/template/Bar-GachaCheckReprint3.tpl`
modified	`public_html/template/Bar-GachaRatio.tpl`
modified	`public_html/template/Bar-GachaRatioReprint.tpl`
modified	`public_html/template/Bar-GachaRatioSkillBallRank.tpl`
modified	`public_html/template/Bar-GachaReprint3.tpl`
modified	`public_html/template/Bar-GachaResultReprint3.tpl`
modified	`public_html/template/Bar-Gacha_old.tpl`
modified	`public_html/template/Bar-SkillBallGachaList.tpl`
modified	`public_html/template/Build-Info.tpl`
modified	`public_html/template/Card-Detail.tpl`
modified	`public_html/template/Composition-Check.tpl`
modified	`public_html/template/Composition-Default.tpl`
modified	`public_html/template/Deck-DeckSelect.tpl`
modified	`public_html/template/Jewel.tpl`
modified	`public_html/template/Main.tpl`
modified	`public_html/template/Mission.tpl`
modified	`public_html/template/Raid-DefaultMedal.tpl`
modified	`public_html/template/Raid-Vs.tpl`
modified	`public_html/template/header_sp.tpl`
added	`public_html/template/parts/parts_card_info_modal.tpl`
modified	`public_html/template/parts_raid_default.tpl`
modified	`tool/event/test_gacha.php`
modified	`tool/event/test_newisland_event.php`

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

【本日中】覇戦リーグ本戦 #702

Description

Comment

Comment

Comment

Comment

Comment

Comment

Comment

Comment

Comment

Commit range