Description

opened by kouho at 2023-06-27T06:18:11; updated 2023-06-27T11:10:44

概要

【6/26】育成応援パック #2874
【6/23】メアリー育成キャンペーンと交換所 #2870

のリリース用PRです

DB更新

jolly/jrye-db#450

リリースメモ

[x] 告知　2358, 2359, 2369
[x] swf告知
[x] バナー登録
[x] カードステータスインポート
[x] 戦闘デモ

Comment

#28414 by kouho at 2023-06-27T06:32:56; updated 2023-06-27T06:32:56

@wada
念のため確認をお願いいたします

Comment

#28419 by wada at 2023-06-27T10:21:22; updated 2023-06-27T10:21:22

@kouho
確認OKです。

wada add_label at 2023-06-27T10:21:26: 和田 LGTM

kouho merge at 2023-06-27T11:01:34: 【6/27 12:00まで】メアリー育成キャンペーンと育成応援パックリリース

kouho close at 2023-06-27T11:01:34: Close

Metadata

type	Pull Request
state	closed
opened by	kouho
assigned	kouho
registered	2023-06-27T06:18:11
updated	2023-06-27T11:10:44

Labels

レビュー待ちマスタへマージ和田 LGTM

Pull Request

base	jolly/jr-web:master
head	jolly/jr-web:release_062712
from	1997d0219a52428b12108a3b5c32811383845067
to	996efcde144ba6d0949eb9ebff5be1e97c4c67a9

Commit range

base	`1997d0219a52428b12108a3b5c32811383845067`
head	`996efcde144ba6d0949eb9ebff5be1e97c4c67a9`
base branch	jolly/jr-web:master
head branch	jolly/jr-web:release_062712

View commits

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

Files changed80 filesView patch

status	file
modified	`lib/SkillFunc.inc`
modified	`lib/class/const/PresentNameConst.class.php`
modified	`lib/conf/class/SkillFriendConfig.class.php`
modified	`lib/conf/define.inc`
modified	`lib/conf/define_y.inc`
modified	`lib/models/Exchange_store.php`
modified	`lib/public/Demonstration-Battle.inc`
modified	`lib/public/Quest-Campaign.inc`
added	`public_html/img/assortment/10210/head.jpg`
added	`public_html/img/assortment/10210/spgacha_item_1.jpg`
added	`public_html/img/assortment/10210/spgacha_item_2.jpg`
added	`public_html/img/assortment/10210/spgacha_item_3.jpg`
added	`public_html/img/assortment/10211/spgacha_item_1.jpg`
added	`public_html/img/assortment/10211/spgacha_item_2.jpg`
added	`public_html/img/assortment/10211/spgacha_item_3.jpg`
added	`public_html/img/assortment/10212/spgacha_item_1.jpg`
added	`public_html/img/assortment/10212/spgacha_item_2.jpg`
added	`public_html/img/assortment/10212/spgacha_item_3.jpg`
added	`public_html/img/banner/Campaign/banner_campaign_quest_4_1.jpg`
added	`public_html/img/banner/Campaign/banner_campaign_quest_4_2.jpg`
added	`public_html/img/banner/Campaign/banner_campaign_quest_4_end_1.jpg`
added	`public_html/img/banner/Campaign/banner_campaign_quest_4_end_2.jpg`
added	`public_html/img/banner/Campaign/banner_exchange_store_2_1.jpg`
added	`public_html/img/banner/Campaign/banner_exchange_store_2_2.jpg`
added	`public_html/img/banner/Campaign/banner_item_pack_80_1.jpg`
added	`public_html/img/banner/Campaign/banner_item_pack_80_2.jpg`
modified	`public_html/img/card/120/159.jpg`
modified	`public_html/img/card/240/159.jpg`
modified	`public_html/img/card/26/159.jpg`
modified	`public_html/img/card/320/159.jpg`
modified	`public_html/img/card/640/159.jpg`
modified	`public_html/img/card/70/159.jpg`
modified	`public_html/img/card/70main/159.jpg`
modified	`public_html/img/card/battle/154/159.jpg`
modified	`public_html/img/card/battle/58/159.jpg`
added	`public_html/img/info_event/info_event_724_1.jpg`
added	`public_html/img/info_event/info_event_724_2.jpg`
added	`public_html/img/info_event/info_event_725_1.jpg`
added	`public_html/img/info_event/info_event_725_2.jpg`
added	`public_html/img/info_jrye/2359/info_1.jpg`
added	`public_html/img/info_jrye/2359/info_2.jpg`
added	`public_html/img/item/120/10210.jpg`
added	`public_html/img/item/120/10211.jpg`
added	`public_html/img/item/120/10212.jpg`
added	`public_html/img/item/120/1500032.jpg`
added	`public_html/img/item/120/98.jpg`
added	`public_html/img/item/120/99.jpg`
added	`public_html/img/item/150/10210.jpg`
added	`public_html/img/item/150/10211.jpg`
added	`public_html/img/item/150/10212.jpg`
added	`public_html/img/item/150/1500032.jpg`
added	`public_html/img/item/150/98.jpg`
added	`public_html/img/item/150/99.jpg`
added	`public_html/img/item/58/1500032.jpg`
added	`public_html/img/item/58/98.jpg`
added	`public_html/img/item/58/99.jpg`
added	`public_html/img/item/60/10210.jpg`
added	`public_html/img/item/60/10211.jpg`
added	`public_html/img/item/60/10212.jpg`
added	`public_html/img/item/60/1500032.jpg`
added	`public_html/img/item/60/98.jpg`
added	`public_html/img/item/60/99.jpg`
added	`public_html/img/item/70/10210.jpg`
added	`public_html/img/item/70/10211.jpg`
added	`public_html/img/item/70/10212.jpg`
added	`public_html/img/item/70/1500032.jpg`
added	`public_html/img/item/70/98.jpg`
added	`public_html/img/item/70/99.jpg`
modified	`public_html/img/mission/card/159.png`
added	`public_html/img/shop/banner/gold_pack/10210_start_1.jpg`
added	`public_html/img/shop/banner/gold_pack/10210_start_2.jpg`
modified	`public_html/js/JOLLYROGER.js`
modified	`public_html/js/jr_main.min.js`
modified	`public_html/template/ExchangeStore-ItemList.tpl`
modified	`public_html/template/Main.tpl`
modified	`public_html/template/Quest-Campaign.tpl`
modified	`public_html/template/Shop-GainSet.tpl`
modified	`public_html/template/Shop-GoldSet.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.