コミット1つにまとめてます。
まとめかた間違ってたらご教授お願いしますー
また、海賊船キャンセル機能も同時に必要になるかと
【7/8】造船キャンセル機能の追加 #6968
船大工のスゥ「船を強化してやるよ！」
誰？！
@noda
キャラベルlv1~25まで育てて問題なさそうでした。
マージしてもらって良いです。
確認ありがとうございます。
| base | c6252ff3822185af4ed971ae7712fc3f5df023ab |
|---|---|
| head | 02521d091e2075bd1fe3c89080024573c2d16d60 |
| base branch | jolly/jr-web:develop |
| head branch | jolly/jr-web:ship_strengthening_fla_272 |
| status | file |
|---|---|
| added | files/ship_strengthening/ship_max_level_fp.swf |
| added | files/ship_strengthening/ship_strengthening_1_fp.swf |
| added | files/ship_strengthening/ship_strengthening_2_fp.swf |
| added | files/ship_strengthening/ship_strengthening_3_fp.swf |
| added | files/ship_strengthening/ship_strengthening_4_fp.swf |
| added | files/ship_strengthening/ship_strengthening_5_fp.swf |
| added | fla/ship_strengthening/ship_max_level_fp.fla |
| added | fla/ship_strengthening/ship_max_level_sp.fla |
| added | fla/ship_strengthening/ship_max_level_sp.html |
| added | fla/ship_strengthening/ship_strengthening_1_fp.fla |
| added | fla/ship_strengthening/ship_strengthening_1_sp.fla |
| added | fla/ship_strengthening/ship_strengthening_1_sp.html |
| added | fla/ship_strengthening/ship_strengthening_2_fp.fla |
| added | fla/ship_strengthening/ship_strengthening_2_sp.fla |
| added | fla/ship_strengthening/ship_strengthening_2_sp.html |
| added | fla/ship_strengthening/ship_strengthening_3_fp.fla |
| added | fla/ship_strengthening/ship_strengthening_3_sp.fla |
| added | fla/ship_strengthening/ship_strengthening_3_sp.html |
| added | fla/ship_strengthening/ship_strengthening_4_fp.fla |
| added | fla/ship_strengthening/ship_strengthening_4_sp.fla |
| added | fla/ship_strengthening/ship_strengthening_4_sp.html |
| added | fla/ship_strengthening/ship_strengthening_5_fp.fla |
| added | fla/ship_strengthening/ship_strengthening_5_sp.fla |
| added | fla/ship_strengthening/ship_strengthening_5_sp.html |
| modified | lib/SubFunc.inc |
| added | lib/mobile/Ship__CustomExec.inc |
| added | lib/mobile/Ship__CustomLvMaxAnimation.inc |
| modified | lib/mobile/Ship__CustomResult.inc |
| added | lib/public/Ship-CustomExec.inc |
| added | lib/public/Ship-CustomLvMaxAnimation.inc |
| modified | lib/public/Ship-CustomResult.inc |
| modified | mobile_html/index.php |
| modified | mobile_html/template/Ship__CustomDetail.tpl |
| modified | mobile_html/template/Ship__CustomResult.tpl |
| added | public_html/images/ship_strengthening/_10057.jpg |
| added | public_html/images/ship_strengthening/_2_light01.png |
| added | public_html/images/ship_strengthening/_5_light01.png |
| added | public_html/images/ship_strengthening/balloon01.png |
| added | public_html/images/ship_strengthening/balloon02.png |
| added | public_html/images/ship_strengthening/bg01.jpg |
| added | public_html/images/ship_strengthening/bg02.jpg |
| added | public_html/images/ship_strengthening/bg03.jpg |
| added | public_html/images/ship_strengthening/chara01.png |
| added | public_html/images/ship_strengthening/chara02.png |
| added | public_html/images/ship_strengthening/chara03.png |
| added | public_html/images/ship_strengthening/chara04.png |
| added | public_html/images/ship_strengthening/chara05.png |
| added | public_html/images/ship_strengthening/chara06.png |
| added | public_html/images/ship_strengthening/chara07.png |
| added | public_html/images/ship_strengthening/door01.png |
| added | public_html/images/ship_strengthening/door02.jpg |
| added | public_html/images/ship_strengthening/flame_effect01.png |
| added | public_html/images/ship_strengthening/flame_effect01_02.png |
| added | public_html/images/ship_strengthening/flame_effect02.png |
| added | public_html/images/ship_strengthening/flame_effect02_02.png |
| added | public_html/images/ship_strengthening/frame01.png |
| added | public_html/images/ship_strengthening/frame02.png |
| added | public_html/images/ship_strengthening/frame03.png |
| added | public_html/images/ship_strengthening/hammer.png |
| added | public_html/images/ship_strengthening/paws.png |
| added | public_html/images/ship_strengthening/shell.png |
| added | public_html/images/ship_strengthening/skip.png |
| added | public_html/images/ship_strengthening/smoke.png |
| added | public_html/images/ship_strengthening/status01.png |
| added | public_html/images/ship_strengthening/status02.png |
| added | public_html/images/ship_strengthening/status03.png |
| added | public_html/images/ship_strengthening/status04.png |
| added | public_html/images/ship_strengthening/status05.png |
| added | public_html/images/ship_strengthening/text01.png |
| added | public_html/images/ship_strengthening/text02.png |
| added | public_html/images/ship_strengthening/text03.png |
| added | public_html/images/ship_strengthening/thunder01.png |
| added | public_html/images/ship_strengthening/thunder02.png |
| added | public_html/images/ship_strengthening/thunder03.png |
| added | public_html/images/ship_strengthening/thunder04.png |
| added | public_html/images/ship_strengthening/tool01.png |
| added | public_html/images/ship_strengthening/tool02.png |
| added | public_html/images/ship_strengthening/tool03.png |
| added | public_html/img/info/1129/Btn_back.jpg |
| added | public_html/img/info/1129/Btn_ship_01.jpg |
| added | public_html/img/info/1129/Btn_ship_01a.jpg |
| added | public_html/img/info/1129/Btn_ship_01b.jpg |
| added | public_html/img/info/1129/Btn_ship_01c.jpg |
| added | public_html/img/info/1129/Btn_ship_01d.jpg |
| added | public_html/img/info/1129/Btn_ship_02.jpg |
| added | public_html/img/info/1129/Btn_ship_02a.jpg |
| added | public_html/img/info/1129/Btn_ship_02b.jpg |
| added | public_html/img/info/1129/Btn_ship_02c.jpg |
| added | public_html/img/info/1129/Btn_ship_02d.jpg |
| added | public_html/img/info/1129/Btn_ship_03.jpg |
| added | public_html/img/info/1129/Btn_ship_03a.jpg |
| added | public_html/img/info/1129/Btn_ship_03b.jpg |
| added | public_html/img/info/1129/Btn_ship_03c.jpg |
| added | public_html/img/info/1129/Btn_ship_03d.jpg |
| added | public_html/img/info/1129/Btn_ship_04.jpg |
| added | public_html/img/info/1129/Btn_ship_04a.jpg |
| added | public_html/img/info/1129/Btn_ship_04b.jpg |
| added | public_html/img/info/1129/Btn_ship_04c.jpg |
| added | public_html/img/info/1129/Btn_ship_04d.jpg |
| added | public_html/img/info/1129/Btn_ship_05.jpg |
| added | public_html/img/info/1129/Btn_ship_05a.jpg |
| added | public_html/img/info/1129/Btn_ship_05b.jpg |
| added | public_html/img/info/1129/Btn_ship_06.jpg |
| added | public_html/img/info/1129/Btn_ship_06a.jpg |
| added | public_html/img/info/1129/Btn_ship_06b.jpg |
| added | public_html/img/info/1129/Btn_ship_06c.jpg |
| added | public_html/img/info/1129/Btn_ship_06d.jpg |
| added | public_html/img/info/1129/Btn_ship_07.jpg |
| added | public_html/img/info/1129/Btn_ship_07a.jpg |
| added | public_html/img/info/1129/Btn_ship_07b.jpg |
| added | public_html/img/info/1129/Btn_ship_07c.jpg |
| added | public_html/img/info/1129/Btn_ship_07d.jpg |
| added | public_html/img/info/1129/Btn_ship_08.jpg |
| added | public_html/img/info/1129/Btn_ship_08a.jpg |
| added | public_html/img/info/1129/Btn_ship_08b.jpg |
| added | public_html/img/info/1129/Btn_ship_08c.jpg |
| added | public_html/img/info/1129/Btn_ship_08d.jpg |
| added | public_html/img/info/1129/Btn_ship_09.jpg |
| added | public_html/img/info/1129/Btn_ship_09a.jpg |
| added | public_html/img/info/1129/Btn_ship_09b.jpg |
| added | public_html/img/info/1129/Btn_ship_09c.jpg |
| added | public_html/img/info/1129/Btn_ship_09d.jpg |
| added | public_html/img/info/1129/Btn_ship_10.jpg |
| added | public_html/img/info/1129/Btn_ship_10a.jpg |
| added | public_html/img/info/1129/Btn_ship_10b.jpg |
| added | public_html/img/info/1129/Btn_ship_10c.jpg |
| added | public_html/img/info/1129/Btn_ship_10d.jpg |
| added | public_html/img/info/1129/Btn_ship_11.jpg |
| added | public_html/img/info/1129/Btn_ship_11a.jpg |
| added | public_html/img/info/1129/Btn_ship_11b.jpg |
| added | public_html/img/info/1129/Btn_ship_11c.jpg |
| added | public_html/img/info/1129/Btn_ship_11d.jpg |
| added | public_html/img/info/1129/Btn_ship_12.jpg |
| added | public_html/img/info/1129/Btn_ship_12a.jpg |
| added | public_html/img/info/1129/Btn_ship_12b.jpg |
| added | public_html/img/info/1129/Btn_ship_12c.jpg |
| added | public_html/img/info/1129/Btn_ship_12d.jpg |
| added | public_html/img/info/1129/Btn_ship_13.jpg |
| added | public_html/img/info/1129/Btn_ship_13a.jpg |
| added | public_html/img/info/1129/Btn_ship_13b.jpg |
| added | public_html/img/info/1129/Btn_ship_13c.jpg |
| added | public_html/img/info/1129/Btn_ship_13info.jpg |
| added | public_html/img/info/1129/Btn_ship_14.jpg |
| added | public_html/img/info/1129/Btn_ship_14a.jpg |
| added | public_html/img/info/1129/Btn_ship_14b.jpg |
| added | public_html/img/info/1129/Btn_ship_14c.jpg |
| added | public_html/img/info/1129/Btn_ship_14d.jpg |
| added | public_html/img/info/1129/Btn_ship_14info.jpg |
| added | public_html/img/info/1129/Btn_ship_15.jpg |
| added | public_html/img/info/1129/Btn_ship_15a.jpg |
| added | public_html/img/info/1129/Btn_ship_15b.jpg |
| added | public_html/img/info/1129/Btn_ship_15c.jpg |
| added | public_html/img/info/1129/Btn_ship_comon01.jpg |
| added | public_html/img/info/1129/Obj_about.jpg |
| added | public_html/img/info/1129/Obj_line_01.jpg |
| added | public_html/img/info/1129/Obj_line_02.jpg |
| added | public_html/img/info/1129/Obj_tapplease.jpg |
| added | public_html/img/info/1129/Obj_type01.jpg |
| added | public_html/img/info/1129/Obj_type02.jpg |
| added | public_html/img/info/1129/Obj_type03.jpg |
| added | public_html/img/info/1129/Obj_type04.jpg |
| added | public_html/img/info/1129/Obj_type05.jpg |
| added | public_html/img/info/1129/Obj_type06.jpg |
| added | public_html/img/info/1129/Obj_type07.jpg |
| added | public_html/img/info/1129/Obj_type08.jpg |
| added | public_html/img/info/1129/Obj_type09.jpg |
| added | public_html/img/info/1129/Obj_type10.jpg |
| added | public_html/img/info/1129/Obj_type11.jpg |
| added | public_html/img/info/1129/Obj_type12.jpg |
| added | public_html/img/info/1129/Obj_type13.jpg |
| added | public_html/img/info/1129/Obj_type14.jpg |
| added | public_html/img/info/1129/Obj_type15.jpg |
| modified | public_html/img/info/1129/info7.jpg |
| added | public_html/img/info/1129/info_lvup.jpg |
| added | public_html/img/info/1129/m_Obj_about.jpg |
| added | public_html/img/info/1129/m_Obj_about02.jpg |
| added | public_html/img/info/1129/m_Obj_line_01.jpg |
| added | public_html/img/info/1129/m_Obj_line_02.jpg |
| modified | public_html/img/info/1129/m_info7.jpg |
| added | public_html/img/ship/ship_strengthening/_10057.jpg |
| added | public_html/img/ship/ship_strengthening/_2_light01.png |
| added | public_html/img/ship/ship_strengthening/_5_light01.png |
| added | public_html/img/ship/ship_strengthening/balloon01.png |
| added | public_html/img/ship/ship_strengthening/balloon02.png |
| added | public_html/img/ship/ship_strengthening/bg01.jpg |
| added | public_html/img/ship/ship_strengthening/bg02.jpg |
| added | public_html/img/ship/ship_strengthening/bg03.jpg |
| added | public_html/img/ship/ship_strengthening/chara01.png |
| added | public_html/img/ship/ship_strengthening/chara02.png |
| added | public_html/img/ship/ship_strengthening/chara03.png |
| added | public_html/img/ship/ship_strengthening/chara04.png |
| added | public_html/img/ship/ship_strengthening/chara05.png |
| added | public_html/img/ship/ship_strengthening/chara06.png |
| added | public_html/img/ship/ship_strengthening/chara07.png |
| added | public_html/img/ship/ship_strengthening/door01.png |
| added | public_html/img/ship/ship_strengthening/door02.jpg |
| added | public_html/img/ship/ship_strengthening/flame_effect01.png |
| added | public_html/img/ship/ship_strengthening/flame_effect01_02.png |
| added | public_html/img/ship/ship_strengthening/flame_effect02.png |
| added | public_html/img/ship/ship_strengthening/flame_effect02_02.png |
| added | public_html/img/ship/ship_strengthening/frame01.png |
| added | public_html/img/ship/ship_strengthening/frame02.png |
| added | public_html/img/ship/ship_strengthening/frame03.png |
| added | public_html/img/ship/ship_strengthening/hammer.png |
| added | public_html/img/ship/ship_strengthening/paws.png |
| added | public_html/img/ship/ship_strengthening/shell.png |
| added | public_html/img/ship/ship_strengthening/skip.png |
| added | public_html/img/ship/ship_strengthening/smoke.png |
| added | public_html/img/ship/ship_strengthening/status01.png |
| added | public_html/img/ship/ship_strengthening/status02.png |
| added | public_html/img/ship/ship_strengthening/status03.png |
| added | public_html/img/ship/ship_strengthening/status04.png |
| added | public_html/img/ship/ship_strengthening/status05.png |
| added | public_html/img/ship/ship_strengthening/text01.png |
| added | public_html/img/ship/ship_strengthening/text02.png |
| added | public_html/img/ship/ship_strengthening/text03.png |
| added | public_html/img/ship/ship_strengthening/thunder01.png |
| added | public_html/img/ship/ship_strengthening/thunder02.png |
| added | public_html/img/ship/ship_strengthening/thunder03.png |
| added | public_html/img/ship/ship_strengthening/thunder04.png |
| added | public_html/img/ship/ship_strengthening/tool01.png |
| added | public_html/img/ship/ship_strengthening/tool02.png |
| added | public_html/img/ship/ship_strengthening/tool03.png |
| modified | public_html/index.php |
| added | public_html/js/ship_strengthening/ship_max_level_sp.js |
| added | public_html/js/ship_strengthening/ship_strengthening_1_sp.js |
| added | public_html/js/ship_strengthening/ship_strengthening_2_sp.js |
| added | public_html/js/ship_strengthening/ship_strengthening_3_sp.js |
| added | public_html/js/ship_strengthening/ship_strengthening_4_sp.js |
| added | public_html/js/ship_strengthening/ship_strengthening_5_sp.js |
| added | public_html/template/Ship-CustomAnimation.tpl |
| modified | public_html/template/Ship-CustomDetail.tpl |
| added | public_html/template/Ship-CustomLvMaxAnimation.tpl |
| modified | public_html/template/Ship-CustomResult.tpl |
| modified | public_html/template/parts_yamada_footer.tpl |