jolly/jr-web #1426 【12/27】ステップアップガチャ「イーリン」

Description

opened by iwamoto at 2021-12-24T18:01:13; updated 2026-05-29T14:39:04

概要

【1/6】ステップアップガチャ「イーリン」 #1395
web : gacha_0106
db : gacha_0106

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

下記項目の確認をお願い致します。
仕様と画像等に間違いがないか

## DB更新内容
・master_gacha
・master_gacha_item
・master_card
・master_card_skill
・master_composition_bonus
*覚醒合成ボーナスは +20 設定

TODO

Comment

#16228 by iwamoto at 2021-12-24T18:05:21; updated 2021-12-24T18:05:21

@wada @kouho
お手すきの際に、ご確認お願いします。

Comment

#16250 by kouho at 2021-12-27T11:33:04; updated 2021-12-27T11:33:04

@iwamoto
確認OKです

kouho add_label at 2021-12-27T11:33:07: 皇甫 LGTM

Comment

#16256 by wada at 2021-12-27T14:35:39; updated 2021-12-27T14:35:39

@iwamoto
確認しました。okです

wada add_label at 2021-12-27T14:35:42: 和田 LGTM

iwamoto merge at 2021-12-28T10:19:27: 【12/27】ステップアップガチャ「イーリン」

iwamoto close at 2021-12-28T10:19:27: Close

Metadata

type	Pull Request
state	closed
opened by	iwamoto
assigned	iwamoto
registered	2021-12-24T18:01:13
updated	2026-05-29T14:39:04

Labels

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

Pull Request

base	jolly/jr-web:develop
head	jolly/jr-web:gacha_0106
from	5a406f46d6ec3d9667c2ba52865b85c7a1817996
to	59890bbeb515c8cb73cc4af8417cbf34b4edabc5

Commit range

base	`5a406f46d6ec3d9667c2ba52865b85c7a1817996`
head	`59890bbeb515c8cb73cc4af8417cbf34b4edabc5`
base branch	jolly/jr-web:develop
head branch	jolly/jr-web:gacha_0106

View commits

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

Files changed206 filesView patch

status	file
modified	`lib/SkillFunc.inc`
modified	`lib/SubFunc.inc`
modified	`lib/ajax/item_result.inc`
modified	`lib/conf/class/GachaConfig.class.php`
modified	`lib/conf/class/OmikujiConfig.class.php`
modified	`lib/conf/class/SPGachaConfig.class.php`
modified	`lib/conf/define_y.inc`
added	`lib/models/gacha/NewYear_random.php`
modified	`lib/models/gacha/SPGacha_manager.php`
modified	`lib/public/Bar-GachaCheckDialogTicket.inc`
modified	`lib/public/Bar-SPGacha.inc`
modified	`lib/public/Bar-SPGachaCheck.inc`
modified	`lib/public/Bar-SPGachaExec.inc`
modified	`lib/public/Bar-SPGachaResult.inc`
added	`public_html/img/gacha/161/banner_gacha161.jpg`
added	`public_html/img/gacha/161/banner_gacha161_2.jpg`
deleted	`public_html/img/gacha/161/banner_gacha161_reprint.jpg`
modified	`public_html/img/gacha/161/gacha161.jpg`
modified	`public_html/img/gacha/161/gacha161_2.jpg`
modified	`public_html/img/gacha/161/gacha161_card_info130.jpg`
modified	`public_html/img/gacha/161/gacha161_card_info157.jpg`
modified	`public_html/img/gacha/161/gacha161_card_info165.jpg`
modified	`public_html/img/gacha/161/gacha161_card_info185.jpg`
modified	`public_html/img/gacha/161/gacha161_info.jpg`
modified	`public_html/img/gacha/161/gacha161_info2.jpg`
modified	`public_html/img/gacha/161/gacha161_info3.jpg`
added	`public_html/img/gacha/161/gacha161_info4.jpg`
modified	`public_html/img/gacha/161/gacha161_title.jpg`
added	`public_html/img/gacha/161/gacha161_top.jpg`
added	`public_html/img/gacha/161/updateinfo1.jpg`
added	`public_html/img/gacha/188/banner_gacha188.jpg`
added	`public_html/img/gacha/188/banner_gacha188_2.jpg`
deleted	`public_html/img/gacha/188/banner_gacha188_reprint.jpg`
modified	`public_html/img/gacha/188/gacha188.jpg`
modified	`public_html/img/gacha/188/gacha188_2.jpg`
modified	`public_html/img/gacha/188/gacha188_card_info186.jpg`
modified	`public_html/img/gacha/188/gacha188_card_info223.jpg`
modified	`public_html/img/gacha/188/gacha188_card_info232.jpg`
modified	`public_html/img/gacha/188/gacha188_card_info273.jpg`
modified	`public_html/img/gacha/188/gacha188_info.jpg`
modified	`public_html/img/gacha/188/gacha188_info2.jpg`
modified	`public_html/img/gacha/188/gacha188_info3.jpg`
added	`public_html/img/gacha/188/gacha188_info4.jpg`
modified	`public_html/img/gacha/188/gacha188_title.jpg`
added	`public_html/img/gacha/188/gacha188_top.jpg`
added	`public_html/img/gacha/188/updateinfo1.jpg`
added	`public_html/img/gacha/205/banner_gacha205.jpg`
added	`public_html/img/gacha/205/banner_gacha205_2.jpg`
deleted	`public_html/img/gacha/205/banner_gacha205_reprint.jpg`
modified	`public_html/img/gacha/205/gacha205.jpg`
modified	`public_html/img/gacha/205/gacha205_2.jpg`
modified	`public_html/img/gacha/205/gacha205_card_info239.jpg`
modified	`public_html/img/gacha/205/gacha205_card_info261.jpg`
modified	`public_html/img/gacha/205/gacha205_card_info264.jpg`
modified	`public_html/img/gacha/205/gacha205_card_info295.jpg`
modified	`public_html/img/gacha/205/gacha205_info.jpg`
modified	`public_html/img/gacha/205/gacha205_info2.jpg`
modified	`public_html/img/gacha/205/gacha205_info3.jpg`
added	`public_html/img/gacha/205/gacha205_info4.jpg`
modified	`public_html/img/gacha/205/gacha205_title.jpg`
added	`public_html/img/gacha/205/gacha205_top.jpg`
added	`public_html/img/gacha/205/updateinfo1.jpg`
added	`public_html/img/gacha/211/banner_gacha211.jpg`
added	`public_html/img/gacha/211/banner_gacha211_2.jpg`
deleted	`public_html/img/gacha/211/banner_gacha211_reprint.jpg`
modified	`public_html/img/gacha/211/gacha211.jpg`
modified	`public_html/img/gacha/211/gacha211_2.jpg`
deleted	`public_html/img/gacha/211/gacha211_bg.jpg`
modified	`public_html/img/gacha/211/gacha211_card_info221.jpg`
modified	`public_html/img/gacha/211/gacha211_card_info241.jpg`
modified	`public_html/img/gacha/211/gacha211_card_info278.jpg`
modified	`public_html/img/gacha/211/gacha211_card_info97.jpg`
modified	`public_html/img/gacha/211/gacha211_info.jpg`
modified	`public_html/img/gacha/211/gacha211_info2.jpg`
modified	`public_html/img/gacha/211/gacha211_info3.jpg`
added	`public_html/img/gacha/211/gacha211_info4.jpg`
modified	`public_html/img/gacha/211/gacha211_title.jpg`
added	`public_html/img/gacha/211/gacha211_top.jpg`
added	`public_html/img/gacha/211/updateinfo1.jpg`
added	`public_html/img/gacha/223/banner_gacha223.jpg`
added	`public_html/img/gacha/223/banner_gacha223_2.jpg`
deleted	`public_html/img/gacha/223/banner_gacha223_reprint.jpg`
modified	`public_html/img/gacha/223/gacha223.jpg`
modified	`public_html/img/gacha/223/gacha223_2.jpg`
deleted	`public_html/img/gacha/223/gacha223_bg.jpg`
deleted	`public_html/img/gacha/223/gacha223_card_info116.jpg`
deleted	`public_html/img/gacha/223/gacha223_card_info188.jpg`
deleted	`public_html/img/gacha/223/gacha223_card_info192.jpg`
deleted	`public_html/img/gacha/223/gacha223_card_info271.jpg`
deleted	`public_html/img/gacha/223/gacha223_info.jpg`
added	`public_html/img/gacha/223/gacha223_info1.jpg`
modified	`public_html/img/gacha/223/gacha223_info2.jpg`
modified	`public_html/img/gacha/223/gacha223_info3.jpg`
added	`public_html/img/gacha/223/gacha223_info4.jpg`
added	`public_html/img/gacha/223/gacha223_info5.jpg`
added	`public_html/img/gacha/223/gacha223_info6.jpg`
added	`public_html/img/gacha/223/gacha223_info7.jpg`
added	`public_html/img/gacha/223/gacha223_info8_01.jpg`
added	`public_html/img/gacha/223/gacha223_info8_02.jpg`
added	`public_html/img/gacha/223/gacha223_info8_03.jpg`
modified	`public_html/img/gacha/223/gacha223_title.jpg`
added	`public_html/img/gacha/223/gacha_result_top.jpg`
modified	`public_html/img/gacha/224/banner_gacha224.jpg`
modified	`public_html/img/gacha/224/banner_gacha224_2.jpg`
modified	`public_html/img/gacha/224/gacha224.jpg`
modified	`public_html/img/gacha/224/gacha224_2.jpg`
deleted	`public_html/img/gacha/224/gacha224_card_info506.jpg`
deleted	`public_html/img/gacha/224/gacha224_card_info554.jpg`
deleted	`public_html/img/gacha/224/gacha224_card_info603.jpg`
deleted	`public_html/img/gacha/224/gacha224_card_info607.jpg`
deleted	`public_html/img/gacha/224/gacha224_info.jpg`
added	`public_html/img/gacha/224/gacha224_info1.jpg`
modified	`public_html/img/gacha/224/gacha224_info2.jpg`
modified	`public_html/img/gacha/224/gacha224_info3.jpg`
modified	`public_html/img/gacha/224/gacha224_info4.jpg`
added	`public_html/img/gacha/224/gacha224_info5.jpg`
added	`public_html/img/gacha/224/gacha224_info6.jpg`
added	`public_html/img/gacha/224/gacha224_info7.jpg`
added	`public_html/img/gacha/224/gacha224_info8_01.jpg`
added	`public_html/img/gacha/224/gacha224_info8_02.jpg`
added	`public_html/img/gacha/224/gacha224_info8_03.jpg`
modified	`public_html/img/gacha/224/gacha224_title.jpg`
deleted	`public_html/img/gacha/224/gacha224_title2.jpg`
added	`public_html/img/gacha/224/gacha_result_top.jpg`
modified	`public_html/img/gacha/225/banner_gacha225.jpg`
modified	`public_html/img/gacha/225/banner_gacha225_2.jpg`
added	`public_html/img/gacha/225/composition_bonus.jpg`
modified	`public_html/img/gacha/225/gacha225.jpg`
modified	`public_html/img/gacha/225/gacha225_2.jpg`
deleted	`public_html/img/gacha/225/gacha225_card_info193.jpg`
deleted	`public_html/img/gacha/225/gacha225_card_info228.jpg`
deleted	`public_html/img/gacha/225/gacha225_card_info259.jpg`
deleted	`public_html/img/gacha/225/gacha225_card_info262.jpg`
added	`public_html/img/gacha/225/gacha225_card_info506.jpg`
added	`public_html/img/gacha/225/gacha225_card_info554.jpg`
added	`public_html/img/gacha/225/gacha225_card_info603.jpg`
added	`public_html/img/gacha/225/gacha225_card_info607.jpg`
modified	`public_html/img/gacha/225/gacha225_info.jpg`
modified	`public_html/img/gacha/225/gacha225_info2.jpg`
modified	`public_html/img/gacha/225/gacha225_info3.jpg`
modified	`public_html/img/gacha/225/gacha225_info4.jpg`
modified	`public_html/img/gacha/225/gacha225_title.jpg`
modified	`public_html/img/gacha/225/gacha225_title2.jpg`
added	`public_html/img/gacha/check_ticket_5.jpg`
added	`public_html/img/gacha/gacha_coin_object223.png`
added	`public_html/img/gacha/gacha_coin_object223_1.png`
added	`public_html/img/gacha/gacha_coin_object223_2.png`
added	`public_html/img/gacha/gacha_coin_object224.png`
added	`public_html/img/gacha/gacha_coin_object224_1.png`
added	`public_html/img/gacha/gacha_coin_object224_2.png`
added	`public_html/img/info_event/info_event_339_1.jpg`
added	`public_html/img/info_event/info_event_339_2.jpg`
added	`public_html/img/info_jrye/CharmInfo/225/info2-2.jpg`
added	`public_html/img/info_jrye/CharmInfo/225/info2.jpg`
added	`public_html/img/info_jrye/CharmInfo/225/info3-2.jpg`
added	`public_html/img/info_jrye/CharmInfo/225/info3.jpg`
added	`public_html/img/info_jrye/CharmInfo/225/info4-2.jpg`
added	`public_html/img/info_jrye/CharmInfo/225/info4.jpg`
added	`public_html/img/info_jrye/CharmInfo/225/info5-2.jpg`
added	`public_html/img/info_jrye/CharmInfo/225/info5.jpg`
added	`public_html/img/item/120/1905.jpg`
added	`public_html/img/item/120/1906.jpg`
added	`public_html/img/item/120/1907.jpg`
added	`public_html/img/item/120/1908.jpg`
added	`public_html/img/item/120/89.jpg`
added	`public_html/img/item/120/90.jpg`
added	`public_html/img/item/150/1905.jpg`
added	`public_html/img/item/150/1906.jpg`
added	`public_html/img/item/150/1907.jpg`
added	`public_html/img/item/150/1908.jpg`
added	`public_html/img/item/150/89.jpg`
added	`public_html/img/item/150/90.jpg`
added	`public_html/img/item/58/1905.jpg`
added	`public_html/img/item/58/1906.jpg`
added	`public_html/img/item/58/1907.jpg`
added	`public_html/img/item/58/1908.jpg`
added	`public_html/img/item/58/89.jpg`
added	`public_html/img/item/58/90.jpg`
added	`public_html/img/item/60/1905.jpg`
added	`public_html/img/item/60/1906.jpg`
added	`public_html/img/item/60/1907.jpg`
added	`public_html/img/item/60/1908.jpg`
added	`public_html/img/item/60/89.jpg`
added	`public_html/img/item/60/90.jpg`
added	`public_html/img/item/70/1905.jpg`
added	`public_html/img/item/70/1906.jpg`
added	`public_html/img/item/70/1907.jpg`
added	`public_html/img/item/70/1908.jpg`
added	`public_html/img/item/70/89.jpg`
added	`public_html/img/item/70/90.jpg`
added	`public_html/img/item/limited_gacha_ticket/120/5.jpg`
added	`public_html/img/item/limited_gacha_ticket/150/5.jpg`
added	`public_html/img/item/limited_gacha_ticket/58/5.jpg`
added	`public_html/img/item/limited_gacha_ticket/60/5.jpg`
added	`public_html/img/item/limited_gacha_ticket/70/5.jpg`
added	`public_html/img/login/loginbonus/beginner/beginner_login_607.jpg`
added	`public_html/img/login/loginbonus/beginner/beginner_login_present_7_607.jpg`
modified	`public_html/js/JOLLYROGER.js`
modified	`public_html/js/JOLLYROGER_battle.js`
modified	`public_html/js/jr_battle.min.js`
modified	`public_html/js/jr_main.min.js`
modified	`public_html/template/Bar-SPGachaCheck.tpl`
modified	`public_html/template/Bar-SPGachaResult.tpl`
added	`public_html/template/Bar-SPGacha_223.tpl`
added	`public_html/template/Bar-SPGacha_224.tpl`
modified	`public_html/template/Item.tpl`

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