管理画面
・戦闘デモインポート
・限定クエストインポート
・カードデータインポート
・お知らせ公開
・イベントバナー更新
web/db
・カード系設定 #797
・勝利の証設定 #794
・コラボガチャ #807
・ログインボーナス、スタンプ #818
・限定クエスト #820
・お知らせ画像
| base | 18c8abfbb39ad03bf508ce599c8da312a1051ae1 |
|---|---|
| head | 239d2a3695ccc73f01e7e14c3b42d74a24b72b1e |
| base branch | jolly/jr-web:master |
| head branch | jolly/jr-web:release_yamato |
| status | file |
|---|---|
| modified | files/battle/battle.swf |
| modified | files/battle/battle_light.swf |
| modified | files/battle/battle_raid.swf |
| modified | files/teamWar/teamWar.swf |
| added | fla/special_gacha/yamato_gacha_sp.fla |
| added | fla/special_gacha/yamato_gacha_sp.html |
| added | fla/special_gacha/yamato_gacha_sp.swf |
| modified | fla/チーム戦争/teamWar.fla |
| modified | fla/バトル/as/func.as |
| modified | fla/バトル/battle.swf |
| modified | fla/バトル/battle_light.swf |
| modified | fla/レイドボスバトル/as/func.as |
| modified | fla/レイドボスバトル/battle_raid.swf |
| modified | lib/SkillFunc.inc |
| modified | lib/SubFunc.inc |
| modified | lib/conf/class/CardPieceConfig.class.php |
| modified | lib/conf/class/LimitedStampConfig.class.php |
| modified | lib/conf/class/LoginBonusConfig.class.php |
| modified | lib/conf/class/SPGachaConfig.class.php |
| added | lib/conf/class/ShipBuildListConfig.class.php |
| added | lib/conf/class/SkillFriendConfig.class.php |
| modified | lib/conf/class/TeamWarConfig.class.php |
| modified | lib/conf/define.inc |
| modified | lib/conf/define_y.inc |
| modified | lib/mobile/Battle__Player.inc |
| modified | lib/mobile/CardPieceShop__CardDetail.inc |
| modified | lib/mobile/CardPieceShop__Check.inc |
| modified | lib/mobile/CardPieceShop__Default.inc |
| modified | lib/mobile/CardPieceShop__Result.inc |
| modified | lib/mobile/Help__SkillSearch.inc |
| modified | lib/mobile/Present__Default.inc |
| modified | lib/mobile/Present__History.inc |
| modified | lib/mobile/Ship__Default.inc |
| modified | lib/mobile/Ship__LimitedShip.inc |
| modified | lib/mobile/Ship__MakeComposite.inc |
| modified | lib/mobile/Ship__SelectDetail.inc |
| modified | lib/mobile/TeamWar__swf.inc |
| modified | lib/models/Card_piece.php |
| added | lib/models/gacha/Collab_random.php |
| modified | lib/models/gacha/SPGacha_manager.php |
| modified | lib/public/Bar-GachaRatio.inc |
| modified | lib/public/Bar-SPGacha.inc |
| modified | lib/public/Bar-SPGachaCheck.inc |
| modified | lib/public/Bar-SPGachaExec.inc |
| modified | lib/public/Bar-SPGachaList.inc |
| modified | lib/public/Bar-SPGachaResult.inc |
| modified | lib/public/CardPieceShop-Default.inc |
| modified | lib/public/Help-SkillSearch.inc |
| modified | lib/public/Quest-Clear.inc |
| modified | lib/public/Quest-Default.inc |
| modified | lib/public/Quest-Detail.inc |
| modified | lib/public/Ship-Default.inc |
| modified | lib/public/Ship-MakeComposite.inc |
| modified | mobile_html/template/CardPieceShop__CardDetail.tpl |
| modified | mobile_html/template/CardPieceShop__Check.tpl |
| modified | mobile_html/template/CardPieceShop__Default.tpl |
| modified | mobile_html/template/CardPieceShop__Result.tpl |
| added | public_html/images/collaboration_yamato/bg.jpg |
| added | public_html/images/collaboration_yamato/effect01.png |
| added | public_html/images/collaboration_yamato/effect02.png |
| added | public_html/images/collaboration_yamato/effect03.png |
| added | public_html/images/collaboration_yamato/effect04.png |
| added | public_html/images/collaboration_yamato/effect05.png |
| added | public_html/images/collaboration_yamato/effect06.png |
| added | public_html/images/collaboration_yamato/effect08.png |
| added | public_html/images/collaboration_yamato/rogo.png |
| added | public_html/images/collaboration_yamato/spark_1.png |
| added | public_html/images/collaboration_yamato/spark_2.png |
| added | public_html/images/collaboration_yamato/thunder01.png |
| added | public_html/images/collaboration_yamato/thunder02.png |
| added | public_html/images/collaboration_yamato/thunder03.png |
| added | public_html/images/collaboration_yamato/thunder04.png |
| added | public_html/img/battle/skill_no2384_ef/effect01.png |
| added | public_html/img/battle/skill_no2384_ef/effect02.png |
| added | public_html/img/battle/skill_no2384_ef/effect03.png |
| added | public_html/img/battle/skill_no2384_ef/effect04.png |
| added | public_html/img/battle/skill_no2384_ef/effect05.png |
| added | public_html/img/battle/skill_no2384_ef/effect06.png |
| added | public_html/img/battle/skill_no2384_ef/effect07.png |
| added | public_html/img/battle/skill_no2384_ef/spark_1.png |
| added | public_html/img/battle/skill_no2384_ef/spark_2.png |
| added | public_html/img/battle/skill_no2384_ef/text_1.png |
| added | public_html/img/battle/skill_no2384_ef/text_2.png |
| added | public_html/img/battle/skill_no2384_ef/text_3.png |
| added | public_html/img/battle/skill_no2384_ef/thunder01.png |
| added | public_html/img/battle/skill_no2384_ef/thunder02.png |
| added | public_html/img/battle/skill_no2384_ef/thunder03.png |
| added | public_html/img/battle/skill_no2384_ef/thunder04.png |
| added | public_html/img/card/120/10063.jpg |
| added | public_html/img/card/120/10064.jpg |
| added | public_html/img/card/120/1492.jpg |
| added | public_html/img/card/120/1493.jpg |
| added | public_html/img/card/120/1494.jpg |
| added | public_html/img/card/120/1495.jpg |
| added | public_html/img/card/240/10063.jpg |
| added | public_html/img/card/240/10064.jpg |
| added | public_html/img/card/240/1492.jpg |
| added | public_html/img/card/240/1493.jpg |
| added | public_html/img/card/240/1494.jpg |
| added | public_html/img/card/240/1495.jpg |
| added | public_html/img/card/26/10063.jpg |
| added | public_html/img/card/26/10064.jpg |
| added | public_html/img/card/26/1492.jpg |
| added | public_html/img/card/26/1493.jpg |
| added | public_html/img/card/26/1494.jpg |
| added | public_html/img/card/26/1495.jpg |
| added | public_html/img/card/320/10063.jpg |
| added | public_html/img/card/320/10064.jpg |
| added | public_html/img/card/320/1492.jpg |
| added | public_html/img/card/320/1493.jpg |
| added | public_html/img/card/320/1494.jpg |
| added | public_html/img/card/320/1495.jpg |
| added | public_html/img/card/640/10063.jpg |
| added | public_html/img/card/640/10064.jpg |
| added | public_html/img/card/640/1492.jpg |
| added | public_html/img/card/640/1493.jpg |
| added | public_html/img/card/640/1494.jpg |
| added | public_html/img/card/640/1495.jpg |
| added | public_html/img/card/70/10063.jpg |
| added | public_html/img/card/70/10064.jpg |
| added | public_html/img/card/70/1492.jpg |
| added | public_html/img/card/70/1493.jpg |
| added | public_html/img/card/70/1494.jpg |
| added | public_html/img/card/70/1495.jpg |
| added | public_html/img/card/70main/10063.jpg |
| added | public_html/img/card/70main/10064.jpg |
| added | public_html/img/card/70main/1492.jpg |
| added | public_html/img/card/70main/1493.jpg |
| added | public_html/img/card/70main/1494.jpg |
| added | public_html/img/card/70main/1495.jpg |
| added | public_html/img/card/battle/154/10063.jpg |
| added | public_html/img/card/battle/154/10064.jpg |
| added | public_html/img/card/battle/154/1492.jpg |
| added | public_html/img/card/battle/154/1493.jpg |
| added | public_html/img/card/battle/154/1494.jpg |
| added | public_html/img/card/battle/154/1495.jpg |
| added | public_html/img/card/battle/58/10063.jpg |
| added | public_html/img/card/battle/58/10064.jpg |
| added | public_html/img/card/battle/58/1492.jpg |
| added | public_html/img/card/battle/58/1493.jpg |
| added | public_html/img/card/battle/58/1494.jpg |
| added | public_html/img/card/battle/58/1495.jpg |
| added | public_html/img/card/battle_result/ship_10063.png |
| added | public_html/img/card/battle_result/ship_10064.png |
| added | public_html/img/card_piece/card_detail/10063_1.png |
| added | public_html/img/card_piece/card_detail/10063_2.png |
| added | public_html/img/card_piece/card_detail/10064_1.png |
| added | public_html/img/card_piece/card_detail/10064_2.png |
| modified | public_html/img/card_piece/card_detail/553_1.png |
| renamed | public_html/img/card_piece/shop/icon/1.png -> public_html/img/card_piece/icon/1.png |
| added | public_html/img/card_piece/icon/7.png |
| added | public_html/img/card_piece/icon/8.png |
| renamed | public_html/img/card_piece/shop/icon/general.png -> public_html/img/card_piece/icon/general.png |
| renamed | public_html/img/card_piece/shop/icon/general2.png -> public_html/img/card_piece/icon/general2.png |
| added | public_html/img/card_piece/shop/limited.png |
| added | public_html/img/card_piece/shop/paper_limit_time.png |
| modified | public_html/img/gacha/117/banner_gacha117.jpg |
| modified | public_html/img/gacha/117/banner_gacha117_2.jpg |
| modified | public_html/img/gacha/117/gacha117.jpg |
| modified | public_html/img/gacha/117/gacha117_2.jpg |
| deleted | public_html/img/gacha/117/gacha117_bg.jpg |
| deleted | public_html/img/gacha/117/gacha117_card_info158.jpg |
| deleted | public_html/img/gacha/117/gacha117_card_info159.jpg |
| deleted | public_html/img/gacha/117/gacha117_card_info160.jpg |
| deleted | public_html/img/gacha/117/gacha117_card_info161.jpg |
| deleted | public_html/img/gacha/117/gacha117_info.jpg |
| added | public_html/img/gacha/117/gacha117_info1.jpg |
| added | public_html/img/gacha/117/gacha117_info2.jpg |
| added | public_html/img/gacha/117/gacha117_info3.jpg |
| added | public_html/img/gacha/117/gacha117_info4.jpg |
| added | public_html/img/gacha/117/gacha117_info5.jpg |
| added | public_html/img/gacha/117/gacha117_info6.jpg |
| modified | public_html/img/gacha/117/gacha117_title.jpg |
| added | public_html/img/gacha/117/gacha117_top.jpg |
| added | public_html/img/gacha/117/gacha_page_03.jpg |
| added | public_html/img/gacha/117/gacha_result_footer.png |
| added | public_html/img/gacha/117/gacha_result_top.jpg |
| added | public_html/img/gacha/check_ticket_2.jpg |
| added | public_html/img/gacha/gacha_coin_object117.png |
| added | public_html/img/gacha/gacha_coin_object117_1.png |
| added | public_html/img/gacha/special/collaboration_yamato/bg.jpg |
| added | public_html/img/gacha/special/collaboration_yamato/effect01.png |
| added | public_html/img/gacha/special/collaboration_yamato/effect02.png |
| added | public_html/img/gacha/special/collaboration_yamato/effect03.png |
| added | public_html/img/gacha/special/collaboration_yamato/effect04.png |
| added | public_html/img/gacha/special/collaboration_yamato/effect05.png |
| added | public_html/img/gacha/special/collaboration_yamato/effect06.png |
| added | public_html/img/gacha/special/collaboration_yamato/effect08.png |
| added | public_html/img/gacha/special/collaboration_yamato/rogo.png |
| added | public_html/img/gacha/special/collaboration_yamato/spark_1.png |
| added | public_html/img/gacha/special/collaboration_yamato/spark_2.png |
| added | public_html/img/gacha/special/collaboration_yamato/thunder01.png |
| added | public_html/img/gacha/special/collaboration_yamato/thunder02.png |
| added | public_html/img/gacha/special/collaboration_yamato/thunder03.png |
| added | public_html/img/gacha/special/collaboration_yamato/thunder04.png |
| added | public_html/img/gacha/special/item/item_6_2.jpg |
| added | public_html/img/info_event/info_event_196_1.jpg |
| added | public_html/img/info_event/info_event_196_2.jpg |
| added | public_html/img/info_jrye/723/info1.jpg |
| added | public_html/img/info_jrye/SkillBallInfo/721/info1.jpg |
| added | public_html/img/info_jrye/SkillBallInfo/721/info3-1.jpg |
| added | public_html/img/info_jrye/SkillBallInfo/721/info3-2.jpg |
| added | public_html/img/info_jrye/SkillBallInfo/721/info3-3.jpg |
| added | public_html/img/info_jrye/SkillBallInfo/721/info3.jpg |
| added | public_html/img/info_jrye/SkillBallInfo/721/info4-1.jpg |
| added | public_html/img/info_jrye/SkillBallInfo/721/info4-2.jpg |
| added | public_html/img/info_jrye/SkillBallInfo/721/info4-3.jpg |
| added | public_html/img/item/card_piece/120/7.jpg |
| added | public_html/img/item/card_piece/120/8.jpg |
| added | public_html/img/item/card_piece/150/7.jpg |
| added | public_html/img/item/card_piece/150/8.jpg |
| added | public_html/img/item/card_piece/58/7.jpg |
| added | public_html/img/item/card_piece/58/8.jpg |
| added | public_html/img/item/card_piece/60/7.jpg |
| added | public_html/img/item/card_piece/60/8.jpg |
| added | public_html/img/item/card_piece/70/7.jpg |
| added | public_html/img/item/card_piece/70/8.jpg |
| modified | public_html/img/item/limited_gacha_ticket/120/2.jpg |
| modified | public_html/img/item/limited_gacha_ticket/150/2.jpg |
| modified | public_html/img/item/limited_gacha_ticket/58/2.jpg |
| modified | public_html/img/item/limited_gacha_ticket/60/2.jpg |
| modified | public_html/img/item/limited_gacha_ticket/70/2.jpg |
| deleted | public_html/img/login/loginbonus/5/login_anniversary_1-1.jpg |
| deleted | public_html/img/login/loginbonus/5/login_anniversary_10-1.jpg |
| deleted | public_html/img/login/loginbonus/5/login_anniversary_11-1.jpg |
| deleted | public_html/img/login/loginbonus/5/login_anniversary_2-1.jpg |
| deleted | public_html/img/login/loginbonus/5/login_anniversary_2-2.jpg |
| deleted | public_html/img/login/loginbonus/5/login_anniversary_3-1.jpg |
| deleted | public_html/img/login/loginbonus/5/login_anniversary_3-2.jpg |
| deleted | public_html/img/login/loginbonus/5/login_anniversary_4-1.jpg |
| deleted | public_html/img/login/loginbonus/5/login_anniversary_5-1.jpg |
| deleted | public_html/img/login/loginbonus/5/login_anniversary_5-2.jpg |
| deleted | public_html/img/login/loginbonus/5/login_anniversary_6-1.jpg |
| deleted | public_html/img/login/loginbonus/5/login_anniversary_6-2.jpg |
| deleted | public_html/img/login/loginbonus/5/login_anniversary_7-1.jpg |
| deleted | public_html/img/login/loginbonus/5/login_anniversary_8-1.jpg |
| deleted | public_html/img/login/loginbonus/5/login_anniversary_9-1.jpg |
| added | public_html/img/login/loginbonus/5/login_bonus_1.jpg |
| added | public_html/img/login/loginbonus/5/login_bonus_2.jpg |
| added | public_html/img/login/loginbonus/5/login_bonus_3.jpg |
| added | public_html/img/login/loginbonus/5/login_bonus_4.jpg |
| added | public_html/img/login/loginbonus/5/login_bonus_5.jpg |
| added | public_html/img/main/st_icon_1004.gif |
| added | public_html/img/main/st_icon_1005.gif |
| added | public_html/img/material/120/1004.jpg |
| added | public_html/img/material/120/1005.jpg |
| added | public_html/img/material/150/1004.jpg |
| added | public_html/img/material/150/1005.jpg |
| added | public_html/img/material/60/1004.jpg |
| added | public_html/img/material/60/1005.jpg |
| added | public_html/img/material/70/1004.jpg |
| added | public_html/img/material/70/1005.jpg |
| added | public_html/img/mission/card/1492.png |
| added | public_html/img/mission/card/1493.png |
| added | public_html/img/mission/card/1494.png |
| added | public_html/img/mission/card/1495.png |
| added | public_html/img/team/stamp/66.png |
| added | public_html/img/team/stamp/67.png |
| added | public_html/img/team/stamp/68.png |
| added | public_html/img/team/stamp/69.png |
| added | public_html/img/team/tw_enemyship_10063_left.png |
| added | public_html/img/team/tw_enemyship_10063_right.png |
| added | public_html/img/team/tw_enemyship_10064_left.png |
| added | public_html/img/team/tw_enemyship_10064_right.png |
| added | public_html/img/team/tw_ship_10063_left.png |
| added | public_html/img/team/tw_ship_10063_right.png |
| added | public_html/img/team/tw_ship_10064_left.png |
| added | public_html/img/team/tw_ship_10064_right.png |
| added | public_html/img/temp_quest/quest_title_yamato.jpg |
| modified | public_html/js/JOLLYROGER.js |
| modified | public_html/js/JOLLYROGER_battle.js |
| added | public_html/js/gacha_animation_js/yamato_gacha_sp.js |
| modified | public_html/js/jr_battle.min.js |
| modified | public_html/js/jr_main.min.js |
| modified | public_html/template/Bar-GachaExec.tpl |
| modified | public_html/template/Bar-GachaRatioReprint.tpl |
| modified | public_html/template/Bar-SPGachaAnimation.tpl |
| modified | public_html/template/Bar-SPGachaCheck.tpl |
| modified | public_html/template/Bar-SPGachaList.tpl |
| added | public_html/template/Bar-SPGachaList_117.tpl |
| modified | public_html/template/Bar-SPGachaResult.tpl |
| added | public_html/template/Bar-SPGacha_117.tpl |
| modified | public_html/template/Bar-SpecialGachaAnimation.tpl |
| modified | public_html/template/Battle.tpl |
| modified | public_html/template/CardPieceShop-Default.tpl |
| modified | public_html/template/Quest-Clear.tpl |
| modified | public_html/template/Quest-Default.tpl |
| modified | public_html/template/Quest-Detail.tpl |
| modified | public_html/template/Ship-Detail.tpl |
| modified | public_html/template/header_sp.tpl |
| added | public_html/template/parts_cardpiece_info_modal.tpl |
| added | tool/debug/reset_anniv_last_login.php |
| added | tool/debug/yamada_develop.sh |