jolly/jr-web #4447 【12/26】初売り限定パック

Description

opened by wada at 2025-12-25T17:39:51; updated 2025-12-26T17:07:36

概要

仕様書

年末年始限定パック処理本家マージ

7544 【12/24】年末年始限定パック
7585 【12/28アップ】年末年始限定パックの結果で、一部カードが表示されていなかった

新規アイテム

デッキ編集のカード詳細表示を解放

【神格】光纏酒
【魔格】闇侵酒

DB更新内容

【12/26】初売り限定パック jolly/jrye-db#1291

TODO

[x] パック名、パック説明調整
[x] デプロイ
[x] 告知設定

Comment

#43682 by wada at 2025-12-25T17:40:13; updated 2025-12-25T17:40:13

@kouho
レビューおねがいします。

kouho add_label at 2025-12-26T16:27:07: 皇甫 LGTM

Comment

#43734 by kouho at 2025-12-26T16:27:36; updated 2025-12-26T16:27:36

@wada
動作部分確認しました。問題ないかと。

wada merge at 2025-12-26T17:01:30: 【12/26】初売り限定パック

wada close at 2025-12-26T17:01:30: Close

wada delete_branch at 2025-12-26T17:01:34: training_pack_0101

Metadata

type	Pull Request
state	closed
opened by	wada
assigned	wada
registered	2025-12-25T17:39:51
updated	2025-12-26T17:07:36

Labels

レビュー待ちマスタへマージ皇甫 LGTM

Pull Request

base	jolly/jr-web:master
head	jolly/jr-web:training_pack_0101
from	211f14d115c9f2a3d8947c2ce79b38de56bfe3de
to	e7a97db852e544af4e9181419a0e58898c014b97

Commit range

base	`211f14d115c9f2a3d8947c2ce79b38de56bfe3de`
head	`e7a97db852e544af4e9181419a0e58898c014b97`
base branch	jolly/jr-web:master
head branch	jolly/jr-web:training_pack_0101

View commits

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

Files changed97 filesView patch

status	file
modified	`cpanel_html/index.php`
modified	`cpanel_html/template/m_master_training_pack_register_check.tpl`
modified	`cpanel_html/template/m_shop_item.tpl`
added	`cpanel_html/template/m_shop_item_random_item_list.tpl`
modified	`lib/SubFunc.inc`
modified	`lib/ajax/shop_payment.inc`
modified	`lib/conf/define_gesoten.inc`
modified	`lib/conf/define_y.inc`
modified	`lib/cpanel/m_master_training_pack_register_check.inc`
modified	`lib/cpanel/m_shop_item.inc`
added	`lib/cpanel/m_shop_item_random_item_list.inc`
modified	`lib/models/Shop_payment.php`
modified	`lib/models/shop/Training_pack.php`
added	`lib/public/Shop-TrainingPackList.inc`
modified	`lib/public/Shop.inc`
added	`public_html/img/assortment/10356/head.jpg`
added	`public_html/img/assortment/10356/info1.jpg`
added	`public_html/img/assortment/10356/trainingPack1_1.jpg`
added	`public_html/img/assortment/10356/trainingPack1_2.jpg`
added	`public_html/img/assortment/10356/trainingPack1_3.jpg`
added	`public_html/img/assortment/10356/trainingPack2_1.jpg`
added	`public_html/img/assortment/10356/trainingPack2_2.jpg`
added	`public_html/img/assortment/10356/trainingPack2_3.jpg`
added	`public_html/img/assortment/10356/trainingPack3_1.jpg`
added	`public_html/img/assortment/10356/trainingPack3_2.jpg`
added	`public_html/img/assortment/10356/trainingPack3_3.jpg`
added	`public_html/img/assortment/10359/head.jpg`
added	`public_html/img/assortment/10359/info1.jpg`
added	`public_html/img/assortment/10359/trainingPack1_1.jpg`
added	`public_html/img/assortment/10359/trainingPack1_2.jpg`
added	`public_html/img/assortment/10359/trainingPack1_3.jpg`
added	`public_html/img/assortment/10359/trainingPack2_1.jpg`
added	`public_html/img/assortment/10359/trainingPack2_2.jpg`
added	`public_html/img/assortment/10359/trainingPack2_3.jpg`
added	`public_html/img/assortment/10359/trainingPack3_1.jpg`
added	`public_html/img/assortment/10359/trainingPack3_2.jpg`
added	`public_html/img/assortment/10359/trainingPack3_3.jpg`
added	`public_html/img/banner/shop/banner_training_pack_10356_1.jpg`
added	`public_html/img/banner/shop/banner_training_pack_10356_2.jpg`
added	`public_html/img/banner/shop/banner_training_pack_10359_1.jpg`
added	`public_html/img/banner/shop/banner_training_pack_10359_2.jpg`
added	`public_html/img/info_event/info_event_1689_1.jpg`
added	`public_html/img/info_event/info_event_1689_2.jpg`
added	`public_html/img/info_jrye/5306/info1.jpg`
added	`public_html/img/info_jrye/5306/info2.jpg`
added	`public_html/img/info_jrye/5306/info3.jpg`
added	`public_html/img/info_jrye/5306/info4.jpg`
added	`public_html/img/info_jrye/5306/info5.jpg`
added	`public_html/img/info_jrye/5306/info6.jpg`
added	`public_html/img/info_jrye/5306/info7.jpg`
added	`public_html/img/info_jrye/5306/info8.jpg`
added	`public_html/img/item/120/10356.jpg`
added	`public_html/img/item/120/10357.jpg`
added	`public_html/img/item/120/10358.jpg`
added	`public_html/img/item/120/10359.jpg`
added	`public_html/img/item/120/10360.jpg`
added	`public_html/img/item/120/10361.jpg`
added	`public_html/img/item/120/219.jpg`
added	`public_html/img/item/120/220.jpg`
added	`public_html/img/item/150/10356.jpg`
added	`public_html/img/item/150/10357.jpg`
added	`public_html/img/item/150/10358.jpg`
added	`public_html/img/item/150/10359.jpg`
added	`public_html/img/item/150/10360.jpg`
added	`public_html/img/item/150/10361.jpg`
added	`public_html/img/item/150/219.jpg`
added	`public_html/img/item/150/220.jpg`
added	`public_html/img/item/60/10356.jpg`
added	`public_html/img/item/60/10357.jpg`
added	`public_html/img/item/60/10358.jpg`
added	`public_html/img/item/60/10359.jpg`
added	`public_html/img/item/60/10360.jpg`
added	`public_html/img/item/60/10361.jpg`
added	`public_html/img/item/60/219.jpg`
added	`public_html/img/item/60/220.jpg`
added	`public_html/img/item/70/10356.jpg`
added	`public_html/img/item/70/10357.jpg`
added	`public_html/img/item/70/10358.jpg`
added	`public_html/img/item/70/10359.jpg`
added	`public_html/img/item/70/10360.jpg`
added	`public_html/img/item/70/10361.jpg`
added	`public_html/img/item/70/219.jpg`
added	`public_html/img/item/70/220.jpg`
added	`public_html/img/shop/banner/training_pack/10356_start_1.jpg`
added	`public_html/img/shop/banner/training_pack/10356_start_2.jpg`
added	`public_html/img/shop/banner/training_pack/10359_start_1.jpg`
added	`public_html/img/shop/banner/training_pack/10359_start_2.jpg`
modified	`public_html/index.php`
modified	`public_html/js/JOLLYROGER.js`
modified	`public_html/js/jr_main.min.js`
modified	`public_html/payment_response.php`
modified	`public_html/template/Deck-CardDetail.tpl`
modified	`public_html/template/OceanArea-DeckCardDetail.tpl`
modified	`public_html/template/Shop-TrainingPack.tpl`
added	`public_html/template/Shop-TrainingPackList.tpl`
modified	`public_html/template/Shop.tpl`
modified	`public_html/template/header_sp.tpl`

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