jolly/jr-web #1106 【9/7】一括集金ボタンを集金できる建物がない時にグレースケール

Description

opened by wada at 2021-09-06T12:11:28; updated 2025-06-17T10:42:46

概要

一括集金ボタンを集金できる建物がない時にグレースケール #1066

Comment

#13410 by wada at 2021-09-06T12:12:28; updated 2021-09-06T12:12:28

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

wada change_title at 2021-09-06T12:12:44: 一括集金ボタンを集金できる建物がない時にグレースケール【9/7】一括集金ボタンを集金できる建物がない時にグレースケール

wada assign at 2021-09-06T12:12:58: Not assigned:wada

Comment

#13415 by iwamoto at 2021-09-06T14:18:57; updated 2021-09-06T14:18:57

@wada
こちら確認しました、もんだいないとおもいます

iwamoto add_label at 2021-09-06T14:19:01: 岩本 LGTM

Comment

#13419 by kouho at 2021-09-06T14:46:33; updated 2021-09-06T14:46:33

@wada
確認しました。問題ありません。

kouho add_label at 2021-09-06T14:46:38: 皇甫 LGTM

wada merge at 2021-09-07T18:40:16: 【9/7】一括集金ボタンを集金できる建物がない時にグレースケール

wada close at 2021-09-07T18:40:16: Close

wada refer at 2021-09-08T17:31:19: 1117:【9/10】リリース

Metadata

type	Pull Request
state	closed
opened by	wada
assigned	wada
registered	2021-09-06T12:11:28
updated	2025-06-17T10:42:46

Labels

レビュー待ちデベロップへマージ皇甫 LGTM

Pull Request

base	jolly/jr-web:develop
head	jolly/jr-web:bulk_collect_btn_grayscale
from	99ca8eb143109e4803b1ac6ab77b27f16a472f27
to	65ddd1ec1b1f8eb3cd0b323cf159f5941d3a10de

Commit range

base	`99ca8eb143109e4803b1ac6ab77b27f16a472f27`
head	`65ddd1ec1b1f8eb3cd0b323cf159f5941d3a10de`
base branch	jolly/jr-web:develop
head branch	jolly/jr-web:bulk_collect_btn_grayscale

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/define_y.inc`
modified	`lib/models/Shop_payment.php`
modified	`lib/models/shop/Base_item.php`
modified	`lib/models/shop/Gold_pack.php`
modified	`public_html/img/assortment/10150/head.jpg`
added	`public_html/img/assortment/10165/head.jpg`
added	`public_html/img/assortment/10165/spgacha_item_1.jpg`
added	`public_html/img/assortment/10165/spgacha_item_2.jpg`
added	`public_html/img/assortment/10165/spgacha_item_3.jpg`
added	`public_html/img/assortment/10166/spgacha_item_1.jpg`
added	`public_html/img/assortment/10166/spgacha_item_2.jpg`
added	`public_html/img/assortment/10166/spgacha_item_3.jpg`
added	`public_html/img/assortment/10167/spgacha_item_1.jpg`
added	`public_html/img/assortment/10167/spgacha_item_2.jpg`
added	`public_html/img/assortment/10167/spgacha_item_3.jpg`
added	`public_html/img/info_event/info_event_262_1.jpg`
added	`public_html/img/info_event/info_event_262_2.jpg`
added	`public_html/img/info_event/info_event_263_1.jpg`
added	`public_html/img/info_event/info_event_263_2.jpg`
added	`public_html/img/info_jrye/928/info3.jpg`
added	`public_html/img/item/120/10165.jpg`
added	`public_html/img/item/120/10166.jpg`
added	`public_html/img/item/120/10167.jpg`
added	`public_html/img/item/150/10165.jpg`
added	`public_html/img/item/150/10166.jpg`
added	`public_html/img/item/150/10167.jpg`
added	`public_html/img/item/60/10165.jpg`
added	`public_html/img/item/60/10166.jpg`
added	`public_html/img/item/60/10167.jpg`
added	`public_html/img/item/70/10165.jpg`
added	`public_html/img/item/70/10166.jpg`
added	`public_html/img/item/70/10167.jpg`
added	`public_html/img/shop/banner/gold_pack/45_start_1.jpg`
added	`public_html/img/shop/banner/gold_pack/45_start_2.jpg`
modified	`public_html/js/JOLLYROGER.js`
modified	`public_html/js/jr_main.min.js`

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