jolly/jr-web #3986 【3/31】覚醒合成祭り

Description

opened by wada at 2025-03-25T19:00:39; updated 2025-04-03T12:40:59

カウントの条件追加
・それに伴う画像と表示の修正
一部報酬変更

wada change_title at 2025-03-27T14:23:50: [WIP]【3/28】覚醒合成祭り【3/31】覚醒合成祭り

wada add_label at 2025-03-27T14:24:09: レビュー待ち

#39658 by wada at 2025-03-27T14:26:14; updated 2025-03-27T14:26:14

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

kouho add_label at 2025-04-02T11:43:53: 皇甫 LGTM

#39793 by kouho at 2025-04-02T11:44:01; updated 2025-04-02T11:44:09

@wada
確認OKです

wada merge at 2025-04-02T14:40:39: 【3/31】覚醒合成祭り

wada close at 2025-04-02T14:40:39: Close

wada delete_branch at 2025-04-02T14:40:43: festival_comp_0403

kouho commit at 2025-04-03T12:40:59: Merge pull request #3986 from jolly/festival_comp_0403 【3/31】覚醒合成祭り d35feeeb1dd332f850f6147bce22d2e7fef9644b

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

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

Files changed14 filesView patch

status	file
modified	`lib/SubFunc.inc`
modified	`lib/conf/class/FestivalCompositionConfig.class.php`
modified	`public_html/img/festival_composition/1/header.png`
modified	`public_html/img/festival_composition/1/reward5_1.png`
modified	`public_html/img/festival_composition/1/reward5_2.png`
modified	`public_html/img/festival_composition/1/reward5_3.png`
added	`public_html/img/info_jrye/4399/info1.jpg`
added	`public_html/img/info_jrye/4399/info2.jpg`
added	`public_html/img/info_jrye/4399/info3.jpg`
added	`public_html/img/info_jrye/4399/info4.jpg`
added	`public_html/img/info_jrye/4399/info5.jpg`
modified	`public_html/template/Composition-Check.tpl`
modified	`public_html/template/Composition-Report.tpl`
modified	`public_html/template/FestivalComposition-Default.tpl`

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