PR

10/7リリース #326

wada opened this at 2020-10-06T11:07:50; closed

Description

opened by wada at 2020-10-06T11:07:50; updated 2023-03-10T13:45:44

10/7 14:00リリース

修正

曜日を直接記述しない #200
レイドの蒼玉表記のグレイスケールを削除 #305
レイド5回攻撃後の蒼玉表示に期限付き追加 pr #328

アップデート

船の強化演出fla #272
船強化(キャラベルx4) #292
新パック販売 #329

Comment

#7597 by wada at 2020-10-06T11:16:04; updated 2020-10-06T11:16:04

@iwamoto
内容の確認お願いします。

Comment

#7601 by iwamoto at 2020-10-06T11:55:40; updated 2020-10-06T11:55:40

@wada
こちら問題ないと思います。

Comment

#7632 by wada at 2020-10-07T11:02:37; updated 2020-10-07T11:02:37

jsキャッシュ対応

wada merge at 2020-10-07T13:49:35: 10/7リリース
wada close at 2020-10-07T13:49:35: Close

Commit range

basea78ae4c1a18a0cf9e53f6f0404d047f8832ce173
head17d994df709642ccdf79052f9b9210504c5b19be
base branchjolly/jr-web:master
head branchjolly/jr-web:develop

View commits

Commit details are loaded from Git when a dynamic archive server is running, or can be embedded with --include-commits.
Files changed267 filesView patch
statusfile
addedfiles/ship_strengthening/ship_max_level_fp.swf
addedfiles/ship_strengthening/ship_strengthening_1_fp.swf
addedfiles/ship_strengthening/ship_strengthening_2_fp.swf
addedfiles/ship_strengthening/ship_strengthening_3_fp.swf
addedfiles/ship_strengthening/ship_strengthening_4_fp.swf
addedfiles/ship_strengthening/ship_strengthening_5_fp.swf
addedfla/ship_strengthening/ship_max_level_fp.fla
addedfla/ship_strengthening/ship_max_level_sp.fla
addedfla/ship_strengthening/ship_max_level_sp.html
addedfla/ship_strengthening/ship_strengthening_1_fp.fla
addedfla/ship_strengthening/ship_strengthening_1_sp.fla
addedfla/ship_strengthening/ship_strengthening_1_sp.html
addedfla/ship_strengthening/ship_strengthening_2_fp.fla
addedfla/ship_strengthening/ship_strengthening_2_sp.fla
addedfla/ship_strengthening/ship_strengthening_2_sp.html
addedfla/ship_strengthening/ship_strengthening_3_fp.fla
addedfla/ship_strengthening/ship_strengthening_3_sp.fla
addedfla/ship_strengthening/ship_strengthening_3_sp.html
addedfla/ship_strengthening/ship_strengthening_4_fp.fla
addedfla/ship_strengthening/ship_strengthening_4_sp.fla
addedfla/ship_strengthening/ship_strengthening_4_sp.html
addedfla/ship_strengthening/ship_strengthening_5_fp.fla
addedfla/ship_strengthening/ship_strengthening_5_sp.fla
addedfla/ship_strengthening/ship_strengthening_5_sp.html
modifiedlib/SubFunc.inc
modifiedlib/ajax/shop_payment.inc
modifiedlib/class/const/PresentNameConst.class.php
modifiedlib/conf/class/WeekdayLimitedItemConfig.class.php
modifiedlib/conf/define_y.inc
modifiedlib/exec/tool_send_presents.php
addedlib/mobile/Ship__CustomExec.inc
addedlib/mobile/Ship__CustomLvMaxAnimation.inc
modifiedlib/mobile/Ship__CustomResult.inc
modifiedlib/public/Main.inc
modifiedlib/public/Raid-AttackEnd.inc
modifiedlib/public/Raid-Default.inc
modifiedlib/public/Raid-Vs.inc
addedlib/public/Ship-CustomExec.inc
addedlib/public/Ship-CustomLvMaxAnimation.inc
modifiedlib/public/Ship-CustomResult.inc
modifiedmobile_html/index.php
modifiedmobile_html/template/Ship__CustomDetail.tpl
modifiedmobile_html/template/Ship__CustomResult.tpl
addedpublic_html/images/ship_strengthening/_10057.jpg
addedpublic_html/images/ship_strengthening/_2_light01.png
addedpublic_html/images/ship_strengthening/_5_light01.png
addedpublic_html/images/ship_strengthening/balloon01.png
addedpublic_html/images/ship_strengthening/balloon02.png
addedpublic_html/images/ship_strengthening/bg01.jpg
addedpublic_html/images/ship_strengthening/bg02.jpg
addedpublic_html/images/ship_strengthening/bg03.jpg
addedpublic_html/images/ship_strengthening/chara01.png
addedpublic_html/images/ship_strengthening/chara02.png
addedpublic_html/images/ship_strengthening/chara03.png
addedpublic_html/images/ship_strengthening/chara04.png
addedpublic_html/images/ship_strengthening/chara05.png
addedpublic_html/images/ship_strengthening/chara06.png
addedpublic_html/images/ship_strengthening/chara07.png
addedpublic_html/images/ship_strengthening/door01.png
addedpublic_html/images/ship_strengthening/door02.jpg
addedpublic_html/images/ship_strengthening/flame_effect01.png
addedpublic_html/images/ship_strengthening/flame_effect01_02.png
addedpublic_html/images/ship_strengthening/flame_effect02.png
addedpublic_html/images/ship_strengthening/flame_effect02_02.png
addedpublic_html/images/ship_strengthening/frame01.png
addedpublic_html/images/ship_strengthening/frame02.png
addedpublic_html/images/ship_strengthening/frame03.png
addedpublic_html/images/ship_strengthening/hammer.png
addedpublic_html/images/ship_strengthening/paws.png
addedpublic_html/images/ship_strengthening/shell.png
addedpublic_html/images/ship_strengthening/skip.png
addedpublic_html/images/ship_strengthening/smoke.png
addedpublic_html/images/ship_strengthening/status01.png
addedpublic_html/images/ship_strengthening/status02.png
addedpublic_html/images/ship_strengthening/status03.png
addedpublic_html/images/ship_strengthening/status04.png
addedpublic_html/images/ship_strengthening/status05.png
addedpublic_html/images/ship_strengthening/text01.png
addedpublic_html/images/ship_strengthening/text02.png
addedpublic_html/images/ship_strengthening/text03.png
addedpublic_html/images/ship_strengthening/thunder01.png
addedpublic_html/images/ship_strengthening/thunder02.png
addedpublic_html/images/ship_strengthening/thunder03.png
addedpublic_html/images/ship_strengthening/thunder04.png
addedpublic_html/images/ship_strengthening/tool01.png
addedpublic_html/images/ship_strengthening/tool02.png
addedpublic_html/images/ship_strengthening/tool03.png
addedpublic_html/img/assortment/10149/head.jpg
addedpublic_html/img/assortment/10149/spgacha_item8_1.jpg
addedpublic_html/img/assortment/10149/spgacha_item8_2.jpg
addedpublic_html/img/assortment/10149/spgacha_item8_3.jpg
addedpublic_html/img/info/1129/Btn_back.jpg
addedpublic_html/img/info/1129/Btn_ship_01.jpg
addedpublic_html/img/info/1129/Btn_ship_01a.jpg
addedpublic_html/img/info/1129/Btn_ship_01b.jpg
addedpublic_html/img/info/1129/Btn_ship_01c.jpg
addedpublic_html/img/info/1129/Btn_ship_01d.jpg
addedpublic_html/img/info/1129/Btn_ship_02.jpg
addedpublic_html/img/info/1129/Btn_ship_02a.jpg
addedpublic_html/img/info/1129/Btn_ship_02b.jpg
addedpublic_html/img/info/1129/Btn_ship_02c.jpg
addedpublic_html/img/info/1129/Btn_ship_02d.jpg
addedpublic_html/img/info/1129/Btn_ship_03.jpg
addedpublic_html/img/info/1129/Btn_ship_03a.jpg
addedpublic_html/img/info/1129/Btn_ship_03b.jpg
addedpublic_html/img/info/1129/Btn_ship_03c.jpg
addedpublic_html/img/info/1129/Btn_ship_03d.jpg
addedpublic_html/img/info/1129/Btn_ship_04.jpg
addedpublic_html/img/info/1129/Btn_ship_04a.jpg
addedpublic_html/img/info/1129/Btn_ship_04b.jpg
addedpublic_html/img/info/1129/Btn_ship_04c.jpg
addedpublic_html/img/info/1129/Btn_ship_04d.jpg
addedpublic_html/img/info/1129/Btn_ship_05.jpg
addedpublic_html/img/info/1129/Btn_ship_05a.jpg
addedpublic_html/img/info/1129/Btn_ship_05b.jpg
addedpublic_html/img/info/1129/Btn_ship_06.jpg
addedpublic_html/img/info/1129/Btn_ship_06a.jpg
addedpublic_html/img/info/1129/Btn_ship_06b.jpg
addedpublic_html/img/info/1129/Btn_ship_06c.jpg
addedpublic_html/img/info/1129/Btn_ship_06d.jpg
addedpublic_html/img/info/1129/Btn_ship_07.jpg
addedpublic_html/img/info/1129/Btn_ship_07a.jpg
addedpublic_html/img/info/1129/Btn_ship_07b.jpg
addedpublic_html/img/info/1129/Btn_ship_07c.jpg
addedpublic_html/img/info/1129/Btn_ship_07d.jpg
addedpublic_html/img/info/1129/Btn_ship_08.jpg
addedpublic_html/img/info/1129/Btn_ship_08a.jpg
addedpublic_html/img/info/1129/Btn_ship_08b.jpg
addedpublic_html/img/info/1129/Btn_ship_08c.jpg
addedpublic_html/img/info/1129/Btn_ship_08d.jpg
addedpublic_html/img/info/1129/Btn_ship_09.jpg
addedpublic_html/img/info/1129/Btn_ship_09a.jpg
addedpublic_html/img/info/1129/Btn_ship_09b.jpg
addedpublic_html/img/info/1129/Btn_ship_09c.jpg
addedpublic_html/img/info/1129/Btn_ship_09d.jpg
addedpublic_html/img/info/1129/Btn_ship_10.jpg
addedpublic_html/img/info/1129/Btn_ship_10a.jpg
addedpublic_html/img/info/1129/Btn_ship_10b.jpg
addedpublic_html/img/info/1129/Btn_ship_10c.jpg
addedpublic_html/img/info/1129/Btn_ship_10d.jpg
addedpublic_html/img/info/1129/Btn_ship_11.jpg
addedpublic_html/img/info/1129/Btn_ship_11a.jpg
addedpublic_html/img/info/1129/Btn_ship_11b.jpg
addedpublic_html/img/info/1129/Btn_ship_11c.jpg
addedpublic_html/img/info/1129/Btn_ship_11d.jpg
addedpublic_html/img/info/1129/Btn_ship_12.jpg
addedpublic_html/img/info/1129/Btn_ship_12a.jpg
addedpublic_html/img/info/1129/Btn_ship_12b.jpg
addedpublic_html/img/info/1129/Btn_ship_12c.jpg
addedpublic_html/img/info/1129/Btn_ship_12d.jpg
addedpublic_html/img/info/1129/Btn_ship_13.jpg
addedpublic_html/img/info/1129/Btn_ship_13a.jpg
addedpublic_html/img/info/1129/Btn_ship_13b.jpg
addedpublic_html/img/info/1129/Btn_ship_13c.jpg
addedpublic_html/img/info/1129/Btn_ship_13info.jpg
addedpublic_html/img/info/1129/Btn_ship_14.jpg
addedpublic_html/img/info/1129/Btn_ship_14a.jpg
addedpublic_html/img/info/1129/Btn_ship_14b.jpg
addedpublic_html/img/info/1129/Btn_ship_14c.jpg
addedpublic_html/img/info/1129/Btn_ship_14d.jpg
addedpublic_html/img/info/1129/Btn_ship_14info.jpg
addedpublic_html/img/info/1129/Btn_ship_15.jpg
addedpublic_html/img/info/1129/Btn_ship_15a.jpg
addedpublic_html/img/info/1129/Btn_ship_15b.jpg
addedpublic_html/img/info/1129/Btn_ship_15c.jpg
addedpublic_html/img/info/1129/Btn_ship_comon01.jpg
addedpublic_html/img/info/1129/Obj_about.jpg
addedpublic_html/img/info/1129/Obj_line_01.jpg
addedpublic_html/img/info/1129/Obj_line_02.jpg
addedpublic_html/img/info/1129/Obj_tapplease.jpg
addedpublic_html/img/info/1129/Obj_type01.jpg
addedpublic_html/img/info/1129/Obj_type02.jpg
addedpublic_html/img/info/1129/Obj_type03.jpg
addedpublic_html/img/info/1129/Obj_type04.jpg
addedpublic_html/img/info/1129/Obj_type05.jpg
addedpublic_html/img/info/1129/Obj_type06.jpg
addedpublic_html/img/info/1129/Obj_type07.jpg
addedpublic_html/img/info/1129/Obj_type08.jpg
addedpublic_html/img/info/1129/Obj_type09.jpg
addedpublic_html/img/info/1129/Obj_type10.jpg
addedpublic_html/img/info/1129/Obj_type11.jpg
addedpublic_html/img/info/1129/Obj_type12.jpg
addedpublic_html/img/info/1129/Obj_type13.jpg
addedpublic_html/img/info/1129/Obj_type14.jpg
addedpublic_html/img/info/1129/Obj_type15.jpg
modifiedpublic_html/img/info/1129/info7.jpg
addedpublic_html/img/info/1129/info_lvup.jpg
addedpublic_html/img/info/1129/m_Obj_about.jpg
addedpublic_html/img/info/1129/m_Obj_about02.jpg
addedpublic_html/img/info/1129/m_Obj_line_01.jpg
addedpublic_html/img/info/1129/m_Obj_line_02.jpg
modifiedpublic_html/img/info/1129/m_info7.jpg
addedpublic_html/img/item/120/10149.jpg
addedpublic_html/img/item/150/10149.jpg
addedpublic_html/img/item/60/10149.jpg
addedpublic_html/img/item/70/10149.jpg
addedpublic_html/img/ship/ship_strengthening/_10057.jpg
addedpublic_html/img/ship/ship_strengthening/_2_light01.png
addedpublic_html/img/ship/ship_strengthening/_5_light01.png
addedpublic_html/img/ship/ship_strengthening/balloon01.png
addedpublic_html/img/ship/ship_strengthening/balloon02.png
addedpublic_html/img/ship/ship_strengthening/bg01.jpg
addedpublic_html/img/ship/ship_strengthening/bg02.jpg
addedpublic_html/img/ship/ship_strengthening/bg03.jpg
addedpublic_html/img/ship/ship_strengthening/chara01.png
addedpublic_html/img/ship/ship_strengthening/chara02.png
addedpublic_html/img/ship/ship_strengthening/chara03.png
addedpublic_html/img/ship/ship_strengthening/chara04.png
addedpublic_html/img/ship/ship_strengthening/chara05.png
addedpublic_html/img/ship/ship_strengthening/chara06.png
addedpublic_html/img/ship/ship_strengthening/chara07.png
addedpublic_html/img/ship/ship_strengthening/door01.png
addedpublic_html/img/ship/ship_strengthening/door02.jpg
addedpublic_html/img/ship/ship_strengthening/flame_effect01.png
addedpublic_html/img/ship/ship_strengthening/flame_effect01_02.png
addedpublic_html/img/ship/ship_strengthening/flame_effect02.png
addedpublic_html/img/ship/ship_strengthening/flame_effect02_02.png
addedpublic_html/img/ship/ship_strengthening/frame01.png
addedpublic_html/img/ship/ship_strengthening/frame02.png
addedpublic_html/img/ship/ship_strengthening/frame03.png
addedpublic_html/img/ship/ship_strengthening/hammer.png
addedpublic_html/img/ship/ship_strengthening/paws.png
addedpublic_html/img/ship/ship_strengthening/shell.png
addedpublic_html/img/ship/ship_strengthening/skip.png
addedpublic_html/img/ship/ship_strengthening/smoke.png
addedpublic_html/img/ship/ship_strengthening/status01.png
addedpublic_html/img/ship/ship_strengthening/status02.png
addedpublic_html/img/ship/ship_strengthening/status03.png
addedpublic_html/img/ship/ship_strengthening/status04.png
addedpublic_html/img/ship/ship_strengthening/status05.png
addedpublic_html/img/ship/ship_strengthening/text01.png
addedpublic_html/img/ship/ship_strengthening/text02.png
addedpublic_html/img/ship/ship_strengthening/text03.png
addedpublic_html/img/ship/ship_strengthening/thunder01.png
addedpublic_html/img/ship/ship_strengthening/thunder02.png
addedpublic_html/img/ship/ship_strengthening/thunder03.png
addedpublic_html/img/ship/ship_strengthening/thunder04.png
addedpublic_html/img/ship/ship_strengthening/tool01.png
addedpublic_html/img/ship/ship_strengthening/tool02.png
addedpublic_html/img/ship/ship_strengthening/tool03.png
deletedpublic_html/img/shop/banner/53_end_1.jpg
deletedpublic_html/img/shop/banner/53_end_2.jpg
deletedpublic_html/img/shop/banner/53_start_1.jpg
deletedpublic_html/img/shop/banner/53_start_2.jpg
addedpublic_html/img/shop/banner/54_end_1.jpg
addedpublic_html/img/shop/banner/54_end_2.jpg
addedpublic_html/img/shop/banner/54_start_1.jpg
addedpublic_html/img/shop/banner/54_start_2.jpg
modifiedpublic_html/index.php
modifiedpublic_html/js/JOLLYROGER.js
modifiedpublic_html/js/jr_main.js
addedpublic_html/js/ship_strengthening/ship_max_level_sp.js
addedpublic_html/js/ship_strengthening/ship_strengthening_1_sp.js
addedpublic_html/js/ship_strengthening/ship_strengthening_2_sp.js
addedpublic_html/js/ship_strengthening/ship_strengthening_3_sp.js
addedpublic_html/js/ship_strengthening/ship_strengthening_4_sp.js
addedpublic_html/js/ship_strengthening/ship_strengthening_5_sp.js
modifiedpublic_html/template/Main.tpl
modifiedpublic_html/template/Raid-AttackEnd.tpl
addedpublic_html/template/Ship-CustomAnimation.tpl
modifiedpublic_html/template/Ship-CustomDetail.tpl
addedpublic_html/template/Ship-CustomLvMaxAnimation.tpl
modifiedpublic_html/template/Ship-CustomResult.tpl
modifiedpublic_html/template/TeamWar-Result.tpl
modifiedpublic_html/template/header_sp.tpl
modifiedpublic_html/template/parts_raid_default.tpl
modifiedpublic_html/template/parts_yamada_footer.tpl
Patch body is stored as a separate file to keep this page lightweight.