Description
【12/28】レイドイベント #486
【12/28】正月ガチャ #487
【12/28】冒険中モンスター追加 #488
冒険中モンスターが11時リリースなのでその前にリリースが必要
wada merge at 2020-12-28T10:31:41: 【12/28】リリース
wada close at 2020-12-28T10:31:41: Close
【12/28】レイドイベント #486
【12/28】正月ガチャ #487
【12/28】冒険中モンスター追加 #488
冒険中モンスターが11時リリースなのでその前にリリースが必要
| base | 83f590e23fb0c9a22cb90980918d55546df0dfe1 |
|---|---|
| head | 16a85073933a0a4ffa1dde96053cd425b626699e |
| base branch | jolly/jr-web:master |
| head branch | jolly/jr-web:release_20201228 |
| status | file |
|---|---|
| modified | database/jrye.sql |
| modified | lib/SubFunc.inc |
| modified | lib/SubFunc_mission.inc |
| modified | lib/ajax/battle_player.inc |
| modified | lib/ajax/card_itemResult.inc |
| modified | lib/ajax/item_result.inc |
| modified | lib/conf/class/MissionRareMonsterConfig.class.php |
| modified | lib/conf/class/OmikujiConfig.class.php |
| modified | lib/conf/class/RaidMonsterConfig.class.php |
| modified | lib/conf/class/SPGachaConfig.class.php |
| modified | lib/conf/define_y.inc |
| modified | lib/exec/matching_raid_battle_new.php |
| modified | lib/models/Powerup_item.php |
| modified | lib/models/gacha/Season_random.php |
| modified | lib/public/Bar-SPGachaExec.inc |
| modified | lib/public/Bar-SPGachaRatio.inc |
| added | lib/public/Battle-ResultRaid.inc |
| modified | lib/public/Card-Default.inc |
| modified | lib/public/Card-Detail.inc |
| modified | lib/public/Raid-Battle.inc |
| modified | lib/public/Raid-BattleVs.inc |
| modified | lib/public/Raid-GetMedalVs.inc |
| added | public_html/img/battle/result/bg_raid.jpg |
| added | public_html/img/battle/result/defeated.png |
| added | public_html/img/battle/result/frame1_1.png |
| added | public_html/img/battle/result/frame1_2.png |
| added | public_html/img/battle/result/frame2.png |
| added | public_html/img/battle/result/hpguage_raid.png |
| added | public_html/img/battle/result/hpguagelv_raid.png |
| added | public_html/img/battle/result/num_battleresult.png |
| added | public_html/img/card/120/1433.jpg |
| added | public_html/img/card/240/1433.jpg |
| added | public_html/img/card/26/1433.jpg |
| added | public_html/img/card/320/1433.jpg |
| added | public_html/img/card/640/1433.jpg |
| added | public_html/img/card/70/1433.jpg |
| added | public_html/img/card/70main/1433.jpg |
| added | public_html/img/card/battle/154/1433.jpg |
| added | public_html/img/card/battle/58/1433.jpg |
| added | public_html/img/gacha/106/banner_gacha106.jpg |
| modified | public_html/img/gacha/106/banner_gacha106_2.jpg |
| modified | public_html/img/gacha/106/gacha106.jpg |
| modified | public_html/img/gacha/106/gacha106_2.jpg |
| modified | public_html/img/gacha/106/gacha106_info1.jpg |
| modified | public_html/img/gacha/106/gacha106_info2.jpg |
| added | public_html/img/gacha/106/gacha106_info3.jpg |
| added | public_html/img/gacha/106/gacha106_info4.jpg |
| added | public_html/img/gacha/106/gacha106_info5.jpg |
| added | public_html/img/gacha/106/gacha106_info6.jpg |
| added | public_html/img/gacha/106/gacha106_title.jpg |
| added | public_html/img/gacha/106/gacha_result_footer.png |
| added | public_html/img/gacha/106/gacha_result_top.jpg |
| added | public_html/img/gacha/gacha_coin_object106.png |
| added | public_html/img/info_jrye/417/event_logo.png |
| added | public_html/img/info_jrye/418/vs-reward1.jpg |
| added | public_html/img/info_jrye/418/vs-reward2.jpg |
| added | public_html/img/info_jrye/418/vs-reward3.jpg |
| added | public_html/img/info_jrye/campaign_yamada/425/info1.jpg |
| added | public_html/img/item/120/1901.jpg |
| modified | public_html/img/item/120/64.jpg |
| modified | public_html/img/item/120/67.jpg |
| added | public_html/img/item/150/1901.jpg |
| modified | public_html/img/item/150/64.jpg |
| modified | public_html/img/item/150/67.jpg |
| added | public_html/img/item/58/1901.jpg |
| modified | public_html/img/item/58/64.jpg |
| modified | public_html/img/item/58/67.jpg |
| added | public_html/img/item/60/1901.jpg |
| modified | public_html/img/item/60/64.jpg |
| modified | public_html/img/item/60/67.jpg |
| added | public_html/img/item/70/1901.jpg |
| modified | public_html/img/item/70/64.jpg |
| modified | public_html/img/item/70/67.jpg |
| added | public_html/img/main/r_mons_mission/appear01.png |
| added | public_html/img/main/r_mons_mission/appear02.png |
| added | public_html/img/mission/card/1433.png |
| added | public_html/img/ranking/event_raid/info_raid10.jpg |
| modified | public_html/index.php |
| modified | public_html/js/JOLLYROGER.js |
| modified | public_html/js/JOLLYROGER_battle.js |
| modified | public_html/js/jr_battle.js |
| modified | public_html/js/jr_main.js |
| modified | public_html/template/Bar-SPGachaList.tpl |
| modified | public_html/template/Bar-SPGachaRatio.tpl |
| modified | public_html/template/Bar-SPGachaResult.tpl |
| modified | public_html/template/Bar-SPGacha_106.tpl |
| added | public_html/template/Battle-ResultRaid.tpl |
| modified | public_html/template/Card-Detail.tpl |
| modified | public_html/template/Card.tpl |
| modified | public_html/template/Item.tpl |
| modified | public_html/template/Main.tpl |
| modified | public_html/template/Raid-GetMedalVs.tpl |
| modified | public_html/template/header_sp.tpl |