jolly/jr-web #3555 【6/21 12:00】ドリンクガチャ

Description

opened by wada at 2024-06-14T19:13:53; updated 2024-06-20T11:13:26

概要

https://docs.google.com/spreadsheets/d/1uI_IaTGrnyVqlTkr9Wd4tHrwWa-YgTdoYMu7MkhHB9A/edit#gid=535212773

更新内容

シーズンチケット対応
1日1回割引

DB更新内容

【6/21 12:00】ドリンクガチャ jolly/jrye-db#770

テスト方法、確認した内容

テストした内容や、確認した内容を記載。

TODO

[x] 画像
[x] 新アイテム画像
[x] 1日1回50コイン画像
[x] ガチャページ調整

リリースTODO

[x] js圧縮
[x] dbデプロイ
[x] webデプロイ

wada change_title at 2024-06-17T09:28:28: [WIP]【6/21 12:00】ドリンクガチャ【6/21 12:00】ドリンクガチャ

wada add_label at 2024-06-17T09:28:31: レビュー待ち

Comment

#35183 by wada at 2024-06-17T09:28:38; updated 2024-06-17T09:28:38

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

Comment

#35246 by kouho at 2024-06-18T18:32:49; updated 2024-06-18T18:32:49

@wada
public_html/img/item/150/15125.jpg
フィオレンツィアの画像が古い画像なので修正をお願いいたします

kouho add_label at 2024-06-19T10:02:18: コメントあり

Comment

#35268 by wada at 2024-06-19T13:29:27; updated 2024-06-19T13:29:27

@kouho
ドリンク画像を修正しました。

Comment

#35269 by kouho at 2024-06-19T13:38:55; updated 2024-06-19T13:38:55

@wada
ありがとうございます。修正確認しました。確認OKです。

kouho add_label at 2024-06-19T13:38:59: 皇甫 LGTM

wada merge at 2024-06-20T11:09:21: 【6/21 12:00】ドリンクガチャ

wada close at 2024-06-20T11:09:21: Close

wada delete_branch at 2024-06-20T11:09:26: item_gacha_0621

Metadata

type	Pull Request
state	closed
opened by	wada
assigned	wada
registered	2024-06-14T19:13:53
updated	2024-06-20T11:13:26

Labels

レビュー待ちマスタへマージ皇甫 LGTMコメントあり

Pull Request

base	jolly/jr-web:master
head	jolly/jr-web:item_gacha_0621
from	c86b173179870c19efd348604c817faee75b1248
to	e2f32afeb1a443df0b9451b11d7b66af308a4047

Commit range

base	`c86b173179870c19efd348604c817faee75b1248`
head	`e2f32afeb1a443df0b9451b11d7b66af308a4047`
base branch	jolly/jr-web:master
head branch	jolly/jr-web:item_gacha_0621

View commits

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

Files changed63 filesView patch

status	file
modified	`lib/SubFunc.inc`
modified	`lib/class/const/GachaConst.class.php`
modified	`lib/conf/define_y.inc`
added	`lib/models/dao/master_item_gacha.php`
modified	`lib/public/Bar-DrinkItemGachaRatio.inc`
modified	`lib/public/Bar-GachaCheckDialogTicket.inc`
modified	`lib/public/Bar-ItemGacha.inc`
modified	`lib/public/Bar-ItemGachaCheck.inc`
modified	`lib/public/Bar-ItemGachaExec.inc`
modified	`lib/public/Bar-ItemGachaList.inc`
modified	`lib/public/Bar-ItemGachaResult.inc`
modified	`lib/public/Default.inc`
modified	`public_html/img/gacha/gacha_coin_object14.png`
added	`public_html/img/gacha/gacha_coin_object21.png`
added	`public_html/img/gacha/item/434/banner.jpg`
added	`public_html/img/gacha/item/434/banner_2.jpg`
added	`public_html/img/gacha/item/434/get_item_bottom.jpg`
added	`public_html/img/gacha/item/434/get_item_header.jpg`
added	`public_html/img/gacha/item/434/info1.jpg`
added	`public_html/img/gacha/item/434/info2_1.jpg`
added	`public_html/img/gacha/item/434/info2_2.jpg`
added	`public_html/img/gacha/item/434/info2_3.jpg`
added	`public_html/img/gacha/item/434/info2_4.jpg`
added	`public_html/img/gacha/item/434/info2_5.jpg`
added	`public_html/img/gacha/item/434/info3.jpg`
added	`public_html/img/gacha/item/434/info4.jpg`
added	`public_html/img/gacha/item/434/info5.jpg`
added	`public_html/img/gacha/item/434/item_gacha_banner.jpg`
added	`public_html/img/gacha/item/434/item_gacha_banner_2.jpg`
added	`public_html/img/info_event/info_event_1033_1.jpg`
added	`public_html/img/info_event/info_event_1033_2.jpg`
added	`public_html/img/info_jrye/3362/info1.jpg`
added	`public_html/img/info_jrye/3362/info2.jpg`
added	`public_html/img/info_jrye/3362/info3.jpg`
added	`public_html/img/info_jrye/3362/info4.jpg`
added	`public_html/img/info_jrye/3362/info5.jpg`
added	`public_html/img/info_jrye/3362/info6.jpg`
added	`public_html/img/item/120/1500096.jpg`
added	`public_html/img/item/120/1500097.jpg`
modified	`public_html/img/item/120/15125.jpg`
added	`public_html/img/item/120/16259.jpg`
added	`public_html/img/item/150/1500096.jpg`
added	`public_html/img/item/150/1500097.jpg`
modified	`public_html/img/item/150/15125.jpg`
added	`public_html/img/item/150/16259.jpg`
added	`public_html/img/item/60/1500096.jpg`
added	`public_html/img/item/60/1500097.jpg`
modified	`public_html/img/item/60/15125.jpg`
added	`public_html/img/item/60/16259.jpg`
added	`public_html/img/item/70/1500096.jpg`
added	`public_html/img/item/70/1500097.jpg`
modified	`public_html/img/item/70/15125.jpg`
added	`public_html/img/item/70/16259.jpg`
modified	`public_html/js/JOLLYROGER.js`
modified	`public_html/js/jr_main.min.js`
modified	`public_html/template/Bar-DrinkItemGacha.tpl`
modified	`public_html/template/Bar-GachaCheckDialogTicket.tpl`
modified	`public_html/template/Bar-ItemGacha.tpl`
modified	`public_html/template/Bar-ItemGachaCheck.tpl`
modified	`public_html/template/Bar-ItemGachaResult.tpl`
modified	`public_html/template/Default.tpl`
modified	`public_html/template/header_sp.tpl`
modified	`public_html/template/parts/parts_gacha_season_ticket_button.tpl`

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