Description
カードボーナスの再計算 #372
GOLDパック #376
wada merge at 2020-10-28T16:21:17: 10/28リリース
wada close at 2020-10-28T16:21:17: Close
カードボーナスの再計算 #372
GOLDパック #376
| base | bdcb77cbe967442057536b6da4d8ac51ab9da4cd |
|---|---|
| head | 7371608f24b4badc2fd690c986f98422af21310e |
| base branch | jolly/jr-web:master |
| head branch | jolly/jr-web:develop |
| status | file |
|---|---|
| modified | lib/SubFunc.inc |
| modified | lib/ajax/shop_payment.inc |
| modified | lib/conf/define_y.inc |
| added | lib/exec/tool_card_bonus_recalculation.php |
| modified | lib/models/Shop_payment.php |
| modified | lib/models/shop/Base_item.php |
| added | lib/models/shop/Gold_pack.php |
| modified | lib/models/shop/Item_factory.php |
| added | public_html/img/assortment/10150/head.jpg |
| added | public_html/img/assortment/10150/spgacha_item_1.jpg |
| added | public_html/img/assortment/10150/spgacha_item_2.jpg |
| added | public_html/img/assortment/10150/spgacha_item_3.jpg |
| added | public_html/img/assortment/10151/spgacha_item_1.jpg |
| added | public_html/img/assortment/10151/spgacha_item_2.jpg |
| added | public_html/img/assortment/10151/spgacha_item_3.jpg |
| added | public_html/img/assortment/10152/spgacha_item_1.jpg |
| added | public_html/img/assortment/10152/spgacha_item_2.jpg |
| added | public_html/img/assortment/10152/spgacha_item_3.jpg |
| added | public_html/img/info_event/info_event_70_1.jpg |
| added | public_html/img/info_event/info_event_70_2.jpg |
| added | public_html/img/item/120/10150.jpg |
| added | public_html/img/item/120/10151.jpg |
| added | public_html/img/item/120/10152.jpg |
| added | public_html/img/item/150/10150.jpg |
| added | public_html/img/item/150/10151.jpg |
| added | public_html/img/item/150/10152.jpg |
| added | public_html/img/item/60/10150.jpg |
| added | public_html/img/item/60/10151.jpg |
| added | public_html/img/item/60/10152.jpg |
| added | public_html/img/item/70/10150.jpg |
| added | public_html/img/item/70/10151.jpg |
| added | public_html/img/item/70/10152.jpg |
| added | public_html/img/shop/banner/gold_pack/41_end_1.jpg |
| added | public_html/img/shop/banner/gold_pack/41_end_2.jpg |
| added | public_html/img/shop/banner/gold_pack/41_start_1.jpg |
| added | public_html/img/shop/banner/gold_pack/41_start_2.jpg |
| modified | public_html/js/JOLLYROGER.js |
| modified | public_html/js/jr_main.js |
| modified | public_html/template/Maintenance__Default.tpl |
| modified | public_html/template/Shop-GoldSet.tpl |
| modified | public_html/template/Shop.tpl |
| modified | public_html/template/header_sp.tpl |