jolly/jr-web #685 【3/23】リリース

Description

opened by wada at 2021-03-22T15:55:47; updated 2024-03-18T11:46:24

12:00リリース予定
【3/23】復刻プレミアムガチャロロノア #674
【3/23】カード詳細モーダル #677

dbブランチ
・release_0323

Comment

#9881 by wada at 2021-03-23T10:29:12; updated 2021-03-23T10:32:27

リリース手順 #688

wada merge at 2021-03-23T10:44:44: 【3/23】リリース

wada close at 2021-03-23T10:44:44: Close

Metadata

type	Pull Request
state	closed
opened by	wada
assigned
registered	2021-03-22T15:55:47
updated	2024-03-18T11:46:24

Labels

マスタへマージ

Pull Request

base	jolly/jr-web:master
head	jolly/jr-web:release_0323
from	94282d61b8bfe8e8a61cc18c24262da90d697367
to	64fd05477a7b026f53ad33693f9efe8927e0fb80

Commit range

base	`94282d61b8bfe8e8a61cc18c24262da90d697367`
head	`64fd05477a7b026f53ad33693f9efe8927e0fb80`
base branch	jolly/jr-web:master
head branch	jolly/jr-web:release_0323

View commits

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

Files changed120 filesView patch

status	file
modified	`lib/conf/class/GachaConfig.class.php`
modified	`lib/models/Gacha_payment.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`
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`
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/ranking/event_raid/info_raid14.jpg`
modified	`public_html/index.php`
modified	`public_html/template/Bar-GachaCheckReprint3.tpl`
modified	`public_html/template/Bar-GachaRatioReprint.tpl`
modified	`public_html/template/Bar-GachaReprint3.tpl`
modified	`public_html/template/Bar-GachaResultReprint3.tpl`
added	`public_html/template/parts/parts_card_info_modal.tpl`

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