【7/1】クリスマスガチャ復刻ガチャスキル #2028
【7/5】復刻クリスマスガチャ #2039
【7/11 12:00】リリース jolly/jrye-db#114
@kouho
確認お願いします。
@wada
確認OKですがラッシュのスキル修正を反映時にjs更新した際にこちらのPRでコンフリクトが起きるようになったようですので確認お願いいたします。
@kouho
ありがとうございます。masterマージしました。
| base | 4ba381521bc3f1c287c1e31b1655cea02cbae0e1 |
|---|---|
| head | 956f34f9966dfd31e05ccaa90d6aabca4a218eff |
| base branch | jolly/jr-web:master |
| head branch | jolly/jr-web:release_071112 |
| status | file |
|---|---|
| modified | lib/SkillFunc.inc |
| modified | lib/conf/class/SPGachaConfig.class.php |
| modified | lib/conf/define_y.inc |
| modified | lib/models/Banner.php |
| modified | lib/models/dao/master_gacha.php |
| modified | lib/models/gacha/SPGacha_manager.php |
| modified | lib/models/gacha/Simple_random.php |
| modified | lib/public/Bar-SPGacha.inc |
| modified | lib/public/Bar-SPGachaCheck.inc |
| modified | lib/public/Bar-SPGachaExec.inc |
| modified | lib/public/Bar-SPGachaResult.inc |
| modified | lib/public/Default.inc |
| modified | lib/public/Event.inc |
| added | public_html/img/gacha/262/gacha262_info.jpg |
| added | public_html/img/gacha/262/gacha262_title.jpg |
| added | public_html/img/gacha/262/gacha_result_top.jpg |
| added | public_html/img/gacha/262/slick_btn_2020_1.png |
| added | public_html/img/gacha/262/slick_btn_2020_2.png |
| added | public_html/img/gacha/262/slick_btn_2021_1.png |
| added | public_html/img/gacha/262/slick_btn_2021_2.png |
| added | public_html/img/gacha/gacha_coin_object262.png |
| modified | public_html/js/JOLLYROGER_battle.js |
| modified | public_html/js/jr_battle.min.js |
| modified | public_html/template/Bar-SPGachaCheck.tpl |
| modified | public_html/template/Bar-SPGachaResult.tpl |
| added | public_html/template/Bar-SPGacha_262.tpl |
| modified | public_html/template/Default.tpl |
| modified | public_html/template/Event.tpl |
| modified | public_html/template/Main.tpl |
| modified | public_html/template/Quest-Detail.tpl |
| modified | public_html/template/header_sp.tpl |