jolly/jr-web #1442 【1/7】リリース

Description

opened by wada at 2022-01-07T09:51:26; updated 2022-01-07T14:33:27

概要

【1/5】勝利の証が3倍キャンペーン #1431

wada assign at 2022-01-07T09:51:37: Not assigned:wada

Comment

#16417 by kouho at 2022-01-07T10:57:58; updated 2022-01-07T10:57:58

@wada
確認OKです

kouho add_label at 2022-01-07T10:58:09: 皇甫 LGTM

iwamoto add_label at 2022-01-07T11:54:35: 岩本 LGTM

Comment

#16426 by iwamoto at 2022-01-07T11:54:40; updated 2022-01-07T11:54:40

@wada
確認しました。問題ないと思います。

Comment

#16429 by wada at 2022-01-07T12:13:14; updated 2022-01-07T12:13:14

db更新すると強化スキル情報が解放されてしまうので、dbは当日更新します。

Comment

#16430 by kouho at 2022-01-07T12:26:56; updated 2022-01-07T12:26:56

確かに。db更新についてかしこまりました。よろしくお願いいたします。

wada merge at 2022-01-07T14:33:27: 【1/7】リリース

wada close at 2022-01-07T14:33:27: Close

Metadata

type	Pull Request
state	closed
opened by	wada
assigned	wada
registered	2022-01-07T09:51:26
updated	2022-01-07T14:33:27

Labels

マスタへマージ皇甫 LGTM

Pull Request

base	jolly/jr-web:master
head	jolly/jr-web:release_0107
from	d5a345e1b1966d6382859127047817bdb6ae7e17
to	fc338e7543700b7f812867f087315c01faefa4a4

Commit range

base	`d5a345e1b1966d6382859127047817bdb6ae7e17`
head	`fc338e7543700b7f812867f087315c01faefa4a4`
base branch	jolly/jr-web:master
head branch	jolly/jr-web:release_0107

View commits

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

Files changed36 filesView patch

status	file
modified	`lib/conf/class/CardPieceConfig.class.php`
modified	`lib/models/Card_piece.php`
modified	`lib/models/Pirate_store.php`
modified	`lib/public/CardPieceShop-Default.inc`
added	`public_html/img/banner/Campaign/banner_card_piece_2.png`
added	`public_html/img/card_piece/card_detail/401_1.png`
added	`public_html/img/card_piece/card_detail/401_2.png`
added	`public_html/img/card_piece/card_detail/402_1.png`
added	`public_html/img/card_piece/card_detail/402_2.png`
added	`public_html/img/card_piece/icon/106.png`
added	`public_html/img/card_piece/icon/107.png`
added	`public_html/img/card_piece/shop/cp_banner_2.png`
added	`public_html/img/info_jrye/1190/info1.jpg`
added	`public_html/img/info_jrye/1190/info2.jpg`
added	`public_html/img/info_jrye/1190/info3.jpg`
added	`public_html/img/info_jrye/1190/info4.jpg`
added	`public_html/img/info_jrye/1190/info5.jpg`
added	`public_html/img/info_jrye/1190/info6.jpg`
added	`public_html/img/info_jrye/1193/info1.jpg`
added	`public_html/img/info_jrye/1193/info2.jpg`
added	`public_html/img/info_jrye/1193/info3.jpg`
added	`public_html/img/info_jrye/1193/info4.jpg`
added	`public_html/img/item/card_piece/120/106.jpg`
added	`public_html/img/item/card_piece/120/107.jpg`
added	`public_html/img/item/card_piece/150/106.jpg`
added	`public_html/img/item/card_piece/150/107.jpg`
added	`public_html/img/item/card_piece/58/106.jpg`
added	`public_html/img/item/card_piece/58/107.jpg`
added	`public_html/img/item/card_piece/60/106.jpg`
added	`public_html/img/item/card_piece/60/107.jpg`
added	`public_html/img/item/card_piece/70/106.jpg`
added	`public_html/img/item/card_piece/70/107.jpg`
modified	`public_html/js/JOLLYROGER.js`
modified	`public_html/js/jr_main.min.js`
modified	`public_html/template/CardPieceShop-Default.tpl`
modified	`public_html/template/header_sp.tpl`

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