jolly/jr-web #3559 【6/19】復刻ガチャまつり

Description

opened by kouho at 2024-06-17T14:58:21; updated 2024-06-19T10:53:35

概要

モーガン
https://docs.google.com/spreadsheets/d/1K1rj3Ci1r8FDMamNZmWsBijPzfxobJtwllqAKHwrGU8/edit#gid=845389639

ショウ
https://docs.google.com/spreadsheets/d/1K1rj3Ci1r8FDMamNZmWsBijPzfxobJtwllqAKHwrGU8/edit#gid=1048055519

10連のおまけでドリンクSS~B までランダムで排出に対応　GachaReprintFestを利用

Comment

#35195 by kouho at 2024-06-17T14:58:31; updated 2024-06-17T14:58:31

@wada
レビューお願いいたします

Comment

#35210 by wada at 2024-06-17T19:10:40; updated 2024-06-17T19:10:40

@kouho
> public_html/img/gacha/430/gacha430_info.jpg
public_html/img/gacha/431/gacha431_info.jpg

転生と同じように、神魔降臨可能と表記しますか？

wada add_label at 2024-06-17T19:10:44: コメントあり

Comment

#35214 by kouho at 2024-06-18T10:50:47; updated 2024-06-18T11:00:36

@wada
確認ありがとうございます。以下対応いたしました。

lib/class/const/ItemConst.class.php
> 同じクラスのisItemPrivateDrinkは使用できませんか？

> lib/models/Gacha_payment.php
$gacha_master['gacha_id']ではなく$gacha_idを使用できませんか？

> lib/models/Gacha_payment.php
$this->gacha_masterではなく、$gacha_masterを使用できませんか？

> lib/models/Gacha_payment.php
typeの判定は定数を使用してください。

> public_html/template/Bar-GachaResultReprint3.tpl
こちらではガチャIDのチェックは不要ですか？

以下につきましては今回もそのままとのことでした。

> public_html/img/gacha/430/gacha430_info.jpg
public_html/img/gacha/431/gacha431_info.jpg

転生と同じように、神魔降臨可能と表記しますか？

また、通話でお伝えしました神魔降臨のためDateTimeUtil対応をResurrection.phpを更新しています。

Comment

#35215 by kouho at 2024-06-18T11:01:38; updated 2024-06-18T11:01:38

@wada
初回10連ガチャのガチャるボタン上の画像が誤っていましたので修正しました。

Comment

#35228 by wada at 2024-06-18T14:16:52; updated 2024-06-18T14:16:52

@kouho
確認OKです。

wada delete_label at 2024-06-18T14:16:55: コメントあり

wada add_label at 2024-06-18T14:16:56: 和田 LGTM

kouho merge at 2024-06-19T10:53:35: 【6/19】復刻ガチャまつり

kouho close at 2024-06-19T10:53:35: Close

commit comment

#246 by wada at 2024-06-17T18:46:13; lib/class/const/ItemConst.class.php / old:None new:247

625d47065f7060c1fbc576bfc6eccdef449cf8f6

@kouho
同じクラスのisItemPrivateDrinkは使用できませんか？

commit comment

#247 by wada at 2024-06-17T18:48:59; lib/models/Gacha_payment.php / old:None new:73

b297d017ca1a19000f6069cb36064d4f9cd3268e

@kouho
$gacha_master['gacha_id']ではなく$gacha_idを使用できませんか？

commit comment

#248 by wada at 2024-06-17T19:00:36; lib/models/Gacha_payment.php / old:None new:932

b297d017ca1a19000f6069cb36064d4f9cd3268e

@kouho
$this->gacha_masterではなく、$gacha_masterを使用できませんか？

commit comment

#249 by wada at 2024-06-17T19:01:08; lib/models/Gacha_payment.php / old:None new:933

b297d017ca1a19000f6069cb36064d4f9cd3268e

@kouho
typeの判定は定数を使用してください。

commit comment

#250 by wada at 2024-06-17T19:16:49; public_html/template/Bar-GachaResultReprint3.tpl / old:None new:599

b297d017ca1a19000f6069cb36064d4f9cd3268e

@kouho
こちらではガチャIDのチェックは不要ですか？

Metadata

type	Pull Request
state	closed
opened by	kouho
assigned	kouho
registered	2024-06-17T14:58:21
updated	2024-06-19T10:53:35

Labels

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

Pull Request

base	jolly/jr-web:master
head	jolly/jr-web:gacha_re_0619
from	65868d464e882c47255ba10d0d72ac74e87b09f7
to	625d47065f7060c1fbc576bfc6eccdef449cf8f6

Commit range

base	`65868d464e882c47255ba10d0d72ac74e87b09f7`
head	`625d47065f7060c1fbc576bfc6eccdef449cf8f6`
base branch	jolly/jr-web:master
head branch	jolly/jr-web:gacha_re_0619

View commits

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

Files changed57 filesView patch

status	file
modified	`lib/conf/define_y.inc`
modified	`lib/models/Gacha_payment.php`
modified	`lib/models/Resurrection.php`
modified	`lib/models/gacha/Reprint_fes.php`
modified	`lib/public/Bar-Gacha.inc`
modified	`lib/public/Bar-GachaResult.inc`
added	`public_html/img/gacha/430/banner_gacha430.jpg`
added	`public_html/img/gacha/430/banner_gacha430_2.jpg`
added	`public_html/img/gacha/430/etc_lineup.jpg`
added	`public_html/img/gacha/430/gacha430.jpg`
added	`public_html/img/gacha/430/gacha430_2.jpg`
added	`public_html/img/gacha/430/gacha430_drink.jpg`
added	`public_html/img/gacha/430/gacha430_info.jpg`
added	`public_html/img/gacha/430/gacha430_info2.jpg`
added	`public_html/img/gacha/430/gacha430_info3.jpg`
added	`public_html/img/gacha/430/gacha430_info4.jpg`
added	`public_html/img/gacha/430/gacha430_info5.jpg`
added	`public_html/img/gacha/430/gacha430_title.jpg`
added	`public_html/img/gacha/430/gacha430_top.jpg`
added	`public_html/img/gacha/431/banner_gacha431.jpg`
added	`public_html/img/gacha/431/banner_gacha431_2.jpg`
added	`public_html/img/gacha/431/etc_lineup.jpg`
added	`public_html/img/gacha/431/gacha431.jpg`
added	`public_html/img/gacha/431/gacha431_2.jpg`
added	`public_html/img/gacha/431/gacha431_drink.jpg`
added	`public_html/img/gacha/431/gacha431_info.jpg`
added	`public_html/img/gacha/431/gacha431_info2.jpg`
added	`public_html/img/gacha/431/gacha431_info3.jpg`
added	`public_html/img/gacha/431/gacha431_info4.jpg`
added	`public_html/img/gacha/431/gacha431_info5.jpg`
added	`public_html/img/gacha/431/gacha431_title.jpg`
added	`public_html/img/gacha/431/gacha431_top.jpg`
added	`public_html/img/info_event/info_event_1036_1.jpg`
added	`public_html/img/info_event/info_event_1036_2.jpg`
added	`public_html/img/info_event/info_event_1037_1.jpg`
added	`public_html/img/info_event/info_event_1037_2.jpg`
added	`public_html/img/info_jrye/3374/info1.jpg`
added	`public_html/img/info_jrye/3374/info2.jpg`
added	`public_html/img/info_jrye/3374/info3.jpg`
added	`public_html/img/info_jrye/3374/info4.jpg`
added	`public_html/img/info_jrye/3374/info5.jpg`
added	`public_html/img/info_jrye/3377/info1.jpg`
added	`public_html/img/info_jrye/3377/info2.jpg`
added	`public_html/img/info_jrye/3377/info3.jpg`
added	`public_html/img/info_jrye/3377/info4.jpg`
added	`public_html/img/info_jrye/3377/info5.jpg`
added	`public_html/img/info_jrye/3377/info6.jpg`
added	`public_html/img/info_jrye/3377/info7.jpg`
added	`public_html/img/info_jrye/3378/info1.jpg`
added	`public_html/img/info_jrye/3378/info2.jpg`
added	`public_html/img/info_jrye/3378/info3.jpg`
added	`public_html/img/info_jrye/3378/info4.jpg`
added	`public_html/img/info_jrye/3378/info5.jpg`
added	`public_html/img/info_jrye/3378/info6.jpg`
added	`public_html/img/info_jrye/3378/info7.jpg`
modified	`public_html/template/Bar-GachaReprint3.tpl`
modified	`public_html/template/Bar-GachaResultReprint3.tpl`

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

Review comment

#246 by wada at 2024-06-17T18:46:13; lib/class/const/ItemConst.class.php / old:None new:247

625d47065f7060c1fbc576bfc6eccdef449cf8f6

@kouho
同じクラスのisItemPrivateDrinkは使用できませんか？

Review comment

#247 by wada at 2024-06-17T18:48:59; lib/models/Gacha_payment.php / old:None new:73

b297d017ca1a19000f6069cb36064d4f9cd3268e

@kouho
$gacha_master['gacha_id']ではなく$gacha_idを使用できませんか？

Review comment

#248 by wada at 2024-06-17T19:00:36; lib/models/Gacha_payment.php / old:None new:932

b297d017ca1a19000f6069cb36064d4f9cd3268e

@kouho
$this->gacha_masterではなく、$gacha_masterを使用できませんか？

Review comment

#249 by wada at 2024-06-17T19:01:08; lib/models/Gacha_payment.php / old:None new:933

b297d017ca1a19000f6069cb36064d4f9cd3268e

@kouho
typeの判定は定数を使用してください。

Review comment

#250 by wada at 2024-06-17T19:16:49; public_html/template/Bar-GachaResultReprint3.tpl / old:None new:599

b297d017ca1a19000f6069cb36064d4f9cd3268e

@kouho
こちらではガチャIDのチェックは不要ですか？