ワドル育成パックのリリース用PRです。
js圧縮はwaddle_packブランチに含めていましたのでリリースブランチを作らずリリースします
9/22 12:00 開催なのでそれまでにリリース予定
https://git.dev.d-es.co.jp/gitbucket/jolly/jr-web/pull/2278
https://git.dev.d-es.co.jp/gitbucket/jolly/jrye-db/pull/177
余分な更新を含まないか
本番反映
・告知
・swf告知
・戦闘デモ
@wada
念の為確認お願いいたします
| base | 0c6170ca1e7994e2b8a9303a2a81e2ab81c61163 |
|---|---|
| head | 60ae17c19f9d71aa85fe796724cca01657b18ae5 |
| base branch | jolly/jr-web:master |
| head branch | jolly/jr-web:waddle_pack |
| status | file |
|---|---|
| modified | lib/SubFunc.inc |
| modified | lib/ajax/shop_payment.inc |
| modified | lib/ajax/shop_select.inc |
| modified | lib/conf/class/EventScheduleConfig.class.php |
| modified | lib/conf/define_y.inc |
| modified | lib/models/Banner.php |
| modified | lib/public/Card-Detail.inc |
| modified | lib/public/Shop-TrainingPack.inc |
| added | public_html/img/assortment/10185/aboutExpItem.jpg |
| added | public_html/img/assortment/10185/head.jpg |
| added | public_html/img/assortment/10185/info1.jpg |
| added | public_html/img/assortment/10185/info2.jpg |
| added | public_html/img/assortment/10185/info3.jpg |
| added | public_html/img/assortment/10185/trainingPack1_1.jpg |
| added | public_html/img/assortment/10185/trainingPack1_2.jpg |
| added | public_html/img/assortment/10185/trainingPack1_3.jpg |
| added | public_html/img/assortment/10185/trainingPack2_1.jpg |
| added | public_html/img/assortment/10185/trainingPack2_2.jpg |
| added | public_html/img/assortment/10185/trainingPack2_3.jpg |
| added | public_html/img/assortment/10185/trainingPack3_1.jpg |
| added | public_html/img/assortment/10185/trainingPack3_2.jpg |
| added | public_html/img/assortment/10185/trainingPack3_3.jpg |
| added | public_html/img/banner/Campaign/banner_training_pack_1_1.jpg |
| added | public_html/img/banner/Campaign/banner_training_pack_1_2.jpg |
| added | public_html/img/info_event/info_event_519_1.jpg |
| added | public_html/img/info_event/info_event_519_2.jpg |
| added | public_html/img/info_jrye/1732/info1.jpg |
| added | public_html/img/info_jrye/1732/info2.jpg |
| added | public_html/img/info_jrye/1732/info3.jpg |
| added | public_html/img/info_jrye/1732/info4.jpg |
| added | public_html/img/info_jrye/1732/info5.jpg |
| added | public_html/img/item/120/10185.jpg |
| added | public_html/img/item/120/10186.jpg |
| added | public_html/img/item/120/10187.jpg |
| added | public_html/img/item/150/10185.jpg |
| added | public_html/img/item/150/10186.jpg |
| added | public_html/img/item/150/10187.jpg |
| added | public_html/img/item/60/10185.jpg |
| added | public_html/img/item/60/10186.jpg |
| added | public_html/img/item/60/10187.jpg |
| added | public_html/img/item/70/10185.jpg |
| added | public_html/img/item/70/10186.jpg |
| added | public_html/img/item/70/10187.jpg |
| added | public_html/img/shop/banner/training_pack/10185_start_1.jpg |
| added | public_html/img/shop/banner/training_pack/10185_start_2.jpg |
| modified | public_html/js/JOLLYROGER.js |
| modified | public_html/js/jr_main.min.js |
| modified | public_html/template/Bar-PickupGacha.tpl |
| modified | public_html/template/Bar-PointGacha.tpl |
| modified | public_html/template/Bar-SetupGacha.tpl |
| modified | public_html/template/Card-Detail.tpl |
| modified | public_html/template/Card-StatusUp.tpl |
| modified | public_html/template/Composition-Check.tpl |
| modified | public_html/template/Main.tpl |
| modified | public_html/template/Shop-TrainingPack.tpl |
| modified | public_html/template/Shop.tpl |
| modified | public_html/template/header_sp.tpl |