Description
【11/26】海戦の記憶（バトルの保存_ロック_共有) #273
チーム合併処理 修正 #439
Comment
確認後にマージ
・info_11w4
・battle_log_273
wada merge at 2020-11-26T17:30:26: 【11/26】リリース
wada close at 2020-11-26T17:30:26: Close
【11/26】海戦の記憶（バトルの保存_ロック_共有) #273
チーム合併処理 修正 #439
確認後にマージ
・info_11w4
・battle_log_273
| base | c76971be4414ce13a466a05db42266ea10708e9e |
|---|---|
| head | fe146dad3d53685eaf63fc875066c42997d6bd2c |
| base branch | jolly/jr-web:master |
| head branch | jolly/jr-web:release_1126 |
| status | file |
|---|---|
| modified | database/jrye.sql |
| modified | lib/SubFunc.inc |
| modified | lib/ajax/battle_player.inc |
| added | lib/class/battle/BattleArchiveManager.class.php |
| added | lib/class/battle/BattleArchiveManagerCpanel.class.php |
| added | lib/class/controller/JrControllerBattleArchive.class.php |
| modified | lib/class/controller/common/JrActionContent.class.php |
| modified | lib/class/rdo/schema/RdoTableSchema.class.php |
| added | lib/cpanel/m_user_battle_archive.inc |
| modified | lib/exec/team_merge_submit.inc |
| modified | lib/public/Battle-Result.inc |
| modified | lib/public/Battle.inc |
| modified | mobile_html/index.php |
| modified | public_html/ajax.php |
| added | public_html/img/battle/result/reward_btn_close_01.png |
| added | public_html/img/battle/result/reward_btn_close_02.png |
| added | public_html/img/battle/result/reward_btn_replay_01.png |
| added | public_html/img/battle/result/reward_btn_replay_02.png |
| added | public_html/img/battle/result/reward_btn_save_01.png |
| added | public_html/img/battle/result/reward_btn_save_02.png |
| added | public_html/img/battle_archive/btn_all_off.png |
| added | public_html/img/battle_archive/btn_all_on.png |
| added | public_html/img/battle_archive/btn_favorite_off.png |
| added | public_html/img/battle_archive/btn_favorite_off_01.png |
| added | public_html/img/battle_archive/btn_favorite_off_02.png |
| added | public_html/img/battle_archive/btn_favorite_on.png |
| added | public_html/img/battle_archive/btn_favorite_on_01.png |
| added | public_html/img/battle_archive/btn_favorite_on_02.png |
| added | public_html/img/battle_archive/tmb_1.jpg |
| added | public_html/img/battle_archive/tmb_2.jpg |
| added | public_html/img/battle_archive/tmb_3.jpg |
| added | public_html/img/battle_archive/tmb_4.jpg |
| added | public_html/img/battle_archive/tmb_5.jpg |
| added | public_html/img/battle_archive/tmb_6.jpg |
| added | public_html/img/friend/other_mainmenu_save_01.jpg |
| added | public_html/img/friend/other_mainmenu_save_02.jpg |
| added | public_html/img/info_event/info_event_82_1.jpg |
| added | public_html/img/info_event/info_event_82_2.jpg |
| modified | public_html/img/info_jrye/348/info2.png |
| modified | public_html/img/info_jrye/348/info3.png |
| modified | public_html/img/info_jrye/348/info6.png |
| deleted | public_html/img/info_jrye/348/info6_2.png |
| added | public_html/img/info_jrye/365/info1.jpg |
| added | public_html/img/info_jrye/365/info2.jpg |
| added | public_html/img/info_jrye/365/info3.jpg |
| modified | public_html/index.php |
| modified | public_html/js/JOLLYROGER.js |
| modified | public_html/js/JOLLYROGER_battle.js |
| modified | public_html/js/jquery_ex.js |
| modified | public_html/js/jr_battle.js |
| modified | public_html/js/jr_main.js |
| modified | public_html/template/Battle-Result.tpl |
| modified | public_html/template/Battle.tpl |
| modified | public_html/template/BattleArchive-Default.tpl |
| added | public_html/template/BattleArchive-Edit.tpl |
| modified | public_html/template/BattleArchive-Friend.tpl |
| modified | public_html/template/Commerce-Arrival.tpl |
| modified | public_html/template/Friend.tpl |
| modified | public_html/template/Shop.tpl |
| modified | public_html/template/header_sp.tpl |
| modified | public_html/template/parts_dgame_footer.tpl |