jolly/jr-web #875 【6/15】リリース

Description

opened by wada at 2021-06-14T13:58:18; updated 2024-10-15T10:44:21

【6/15】1周年：アイテムパック #853
【6/15】1周年：ログインボーナス #850
【6/15】1周年：ベルガチャDXにおまけ #841
1周年：酒場特別客

web: release_0615
db: release_0615

wada merge at 2021-06-15T11:10:02: 【6/15】リリース

wada close at 2021-06-15T11:10:02: Close

Metadata

type	Pull Request
state	closed
opened by	wada
assigned	wada
registered	2021-06-14T13:58:18
updated	2024-10-15T10:44:21

Labels

マスタへマージ

Pull Request

base	jolly/jr-web:master
head	jolly/jr-web:release_0615
from	185159593b7440adeb192e96a009d2d206c7bfce
to	3e6b85a2cbc9695823ba2b20971844d80454cc4e

Commit range

base	`185159593b7440adeb192e96a009d2d206c7bfce`
head	`3e6b85a2cbc9695823ba2b20971844d80454cc4e`
base branch	jolly/jr-web:master
head branch	jolly/jr-web:release_0615

View commits

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

Files changed101 filesView patch

status	file
modified	`lib/SubFunc.inc`
modified	`lib/ajax/default_info.inc`
modified	`lib/class/const/PresentNameConst.class.php`
modified	`lib/conf/class/BellGachaDxConfig.class.php`
modified	`lib/conf/class/LoginBonusConfig.class.php`
modified	`lib/conf/define_y.inc`
added	`lib/models/Login_bonus.php`
added	`lib/models/dao/anniversary_login_bonus.php`
modified	`lib/public/Anniversary-Animation.inc`
modified	`lib/public/Anniversary-Login.inc`
modified	`lib/public/Bar-GachaResultFree.inc`
modified	`lib/public/Main.inc`
added	`public_html/img/assortment/10161/head.jpg`
added	`public_html/img/assortment/10161/spgacha_item_1.jpg`
added	`public_html/img/assortment/10161/spgacha_item_2.jpg`
added	`public_html/img/assortment/10161/spgacha_item_3.jpg`
added	`public_html/img/assortment/10162/spgacha_item_1.jpg`
added	`public_html/img/assortment/10162/spgacha_item_2.jpg`
added	`public_html/img/assortment/10162/spgacha_item_3.jpg`
added	`public_html/img/assortment/10163/spgacha_item_1.jpg`
added	`public_html/img/assortment/10163/spgacha_item_2.jpg`
added	`public_html/img/assortment/10163/spgacha_item_3.jpg`
added	`public_html/img/item/120/10161.jpg`
added	`public_html/img/item/120/10162.jpg`
added	`public_html/img/item/120/10163.jpg`
added	`public_html/img/item/150/10161.jpg`
added	`public_html/img/item/150/10162.jpg`
added	`public_html/img/item/150/10163.jpg`
added	`public_html/img/item/60/10161.jpg`
added	`public_html/img/item/60/10162.jpg`
added	`public_html/img/item/60/10163.jpg`
added	`public_html/img/item/70/10161.jpg`
added	`public_html/img/item/70/10162.jpg`
added	`public_html/img/item/70/10163.jpg`
added	`public_html/img/login/anniversary/1th_anniversary_login_bonus/_1_seira01.png`
added	`public_html/img/login/anniversary/1th_anniversary_login_bonus/_1_seira02.png`
added	`public_html/img/login/anniversary/1th_anniversary_login_bonus/_1_tokupan01.png`
added	`public_html/img/login/anniversary/1th_anniversary_login_bonus/_1_tokupan02.png`
added	`public_html/img/login/anniversary/1th_anniversary_login_bonus/_1anniversary_rogo_sp.png`
added	`public_html/img/login/anniversary/1th_anniversary_login_bonus/bg01.jpg`
added	`public_html/img/login/anniversary/1th_anniversary_login_bonus/bg02.jpg`
added	`public_html/img/login/anniversary/1th_anniversary_login_bonus/bg03.jpg`
added	`public_html/img/login/anniversary/1th_anniversary_login_bonus/nyakka.png`
added	`public_html/img/login/anniversary/1th_anniversary_login_bonus/party_popper.png`
added	`public_html/img/login/anniversary/1th_anniversary_login_bonus/stage_curtain.png`
added	`public_html/img/login/anniversary/1th_anniversary_login_bonus/wadoru.png`
added	`public_html/img/login/loginbonus/6/login_anniversary_1-1.jpg`
added	`public_html/img/login/loginbonus/6/login_anniversary_1-2.jpg`
added	`public_html/img/login/loginbonus/6/login_anniversary_1-3.jpg`
added	`public_html/img/login/loginbonus/6/login_anniversary_10-1.jpg`
added	`public_html/img/login/loginbonus/6/login_anniversary_10-2.jpg`
added	`public_html/img/login/loginbonus/6/login_anniversary_10-3.jpg`
added	`public_html/img/login/loginbonus/6/login_anniversary_2-1.jpg`
added	`public_html/img/login/loginbonus/6/login_anniversary_2-2.jpg`
added	`public_html/img/login/loginbonus/6/login_anniversary_2-3.jpg`
added	`public_html/img/login/loginbonus/6/login_anniversary_3-1.jpg`
added	`public_html/img/login/loginbonus/6/login_anniversary_3-2.jpg`
added	`public_html/img/login/loginbonus/6/login_anniversary_3-3.jpg`
added	`public_html/img/login/loginbonus/6/login_anniversary_4-1.jpg`
added	`public_html/img/login/loginbonus/6/login_anniversary_4-2.jpg`
added	`public_html/img/login/loginbonus/6/login_anniversary_4-3.jpg`
added	`public_html/img/login/loginbonus/6/login_anniversary_5-1.jpg`
added	`public_html/img/login/loginbonus/6/login_anniversary_5-2.jpg`
added	`public_html/img/login/loginbonus/6/login_anniversary_5-3.jpg`
added	`public_html/img/login/loginbonus/6/login_anniversary_6-1.jpg`
added	`public_html/img/login/loginbonus/6/login_anniversary_6-2.jpg`
added	`public_html/img/login/loginbonus/6/login_anniversary_6-3.jpg`
added	`public_html/img/login/loginbonus/6/login_anniversary_7-1.jpg`
added	`public_html/img/login/loginbonus/6/login_anniversary_7-2.jpg`
added	`public_html/img/login/loginbonus/6/login_anniversary_7-3.jpg`
added	`public_html/img/login/loginbonus/6/login_anniversary_8-1.jpg`
added	`public_html/img/login/loginbonus/6/login_anniversary_8-2.jpg`
added	`public_html/img/login/loginbonus/6/login_anniversary_8-3.jpg`
added	`public_html/img/login/loginbonus/6/login_anniversary_9-1.jpg`
added	`public_html/img/login/loginbonus/6/login_anniversary_9-2.jpg`
added	`public_html/img/login/loginbonus/6/login_anniversary_9-3.jpg`
deleted	`public_html/img/login/loginbonus/6/login_bonus_1.jpg`
deleted	`public_html/img/login/loginbonus/6/login_bonus_10.jpg`
deleted	`public_html/img/login/loginbonus/6/login_bonus_11.jpg`
deleted	`public_html/img/login/loginbonus/6/login_bonus_12.jpg`
deleted	`public_html/img/login/loginbonus/6/login_bonus_13.jpg`
deleted	`public_html/img/login/loginbonus/6/login_bonus_14.jpg`
deleted	`public_html/img/login/loginbonus/6/login_bonus_2.jpg`
deleted	`public_html/img/login/loginbonus/6/login_bonus_3.jpg`
deleted	`public_html/img/login/loginbonus/6/login_bonus_4.jpg`
deleted	`public_html/img/login/loginbonus/6/login_bonus_5.jpg`
deleted	`public_html/img/login/loginbonus/6/login_bonus_6.jpg`
deleted	`public_html/img/login/loginbonus/6/login_bonus_7.jpg`
deleted	`public_html/img/login/loginbonus/6/login_bonus_8.jpg`
deleted	`public_html/img/login/loginbonus/6/login_bonus_9.jpg`
added	`public_html/img/shop/banner/59_end_1.jpg`
added	`public_html/img/shop/banner/59_end_2.jpg`
added	`public_html/img/shop/banner/59_start_1.jpg`
added	`public_html/img/shop/banner/59_start_2.jpg`
modified	`public_html/template/Anniversary-Animation.tpl`
modified	`public_html/template/Anniversary-Login.tpl`
modified	`public_html/template/Bar-Default.tpl`
modified	`public_html/template/Bar-GachaResultFreeHigh.tpl`
modified	`public_html/template/parts_Default-Info__727_1.tpl`
modified	`public_html/template/parts_Default-Info__727_2.tpl`
modified	`public_html/template/parts_Default-Info__727_3.tpl`

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