PR

【11/8】2020年7月分本家取り込み #1264

wada opened this at 2021-10-28T15:06:38; closed

Description

opened by wada at 2021-10-28T15:06:38; updated 2025-12-03T16:52:17

概要

【10/21】2020/7本家取り込み #1218
【10/26】造船キャンセル #1244
【11/4】船の最大ステータス表示 #1273

CREATE TABLE `team_lock` (
  `team_no` int(11) NOT NULL
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='ロック用テーブル';
ALTER TABLE `team_lock`
  ADD PRIMARY KEY (`team_no`);

TODO

リリース日確定後キャッシュ対応

wada change_title at 2021-10-28T15:06:51: 2020年7月分本家取り込み 【近日中】2020年7月分本家取り込み

Comment

#14792 by kouho at 2021-10-29T10:18:05; updated 2021-10-29T10:18:05

@wada
header_spのキャッシュ対応以外確認して問題ないです。

kouho add_label at 2021-10-29T10:18:09: 皇甫 LGTM

Comment

#14812 by iwamoto at 2021-10-29T12:05:00; updated 2021-10-29T12:05:00

@wada
確認しました。問題ないと思います。

iwamoto add_label at 2021-10-29T12:05:03: 岩本 LGTM
wada change_title at 2021-11-01T10:02:49: 【近日中】2020年7月分本家取り込み 【11/4】2020年7月分本家取り込み

Comment

#14850 by wada at 2021-11-01T10:03:08; updated 2021-11-01T10:03:08

@iwamoto @kouho
12時ごろリリース予定

wada change_title at 2021-11-04T09:45:36: 【11/4】2020年7月分本家取り込み 【11/8】2020年7月分本家取り込み

Comment

#15038 by wada at 2021-11-08T10:11:17; updated 2021-11-08T10:11:17

キャッシュ対応済、SQL対応済

wada merge at 2021-11-08T11:54:18: 【11/8】2020年7月分本家取り込み
wada close at 2021-11-08T11:54:18: Close

Commit range

basefa1be01065b11dd95ff39208c0a21075dcd39d6c
head407b7c58b666ebc61b182a2d78496ddfa6561dfa
base branchjolly/jr-web:master
head branchjolly/jr-web:release_rzst_2007

View commits

Commit details are loaded from Git when a dynamic archive server is running, or can be embedded with --include-commits.
Files changed145 filesView patch
statusfile
modifiedlib/SkillFunc.inc
modifiedlib/SubFunc.inc
modifiedlib/SubFunc_mission.inc
modifiedlib/ajax/ship_makeComposite.inc
modifiedlib/ajax/team_detail.inc
modifiedlib/class/controller/JrControllerCommerce.class.php
modifiedlib/conf/class/CastawayConfig.class.php
modifiedlib/conf/class/CollectMoneyConfig.class.php
modifiedlib/conf/class/OceanAreaConfig.class.php
modifiedlib/conf/define.inc
modifiedlib/public/Commerce-Default.inc
modifiedlib/public/Event.inc
modifiedlib/public/Ship-BreakCheck.inc
addedlib/public/Ship-BuildCancelCheck.inc
addedlib/public/Ship-BuildCancelResult.inc
modifiedlib/public/Ship-Default.inc
modifiedlib/public/Ship-Detail.inc
modifiedlib/public/Ship-LimitedShip.inc
modifiedlib/public/Ship-MakeComposite.inc
addedlib/public/Ship-MakeCompositeEndExec.inc
modifiedlib/public/Ship-SelectDetail.inc
modifiedpublic_html/css/design.css
addedpublic_html/images/shipbuilding_completed/_10011.jpg
addedpublic_html/images/shipbuilding_completed/balloon.png
addedpublic_html/images/shipbuilding_completed/bg_2.jpg
addedpublic_html/images/shipbuilding_completed/card_effect.png
addedpublic_html/images/shipbuilding_completed/chara/chara_01.png
addedpublic_html/images/shipbuilding_completed/chara/chara_02.png
addedpublic_html/images/shipbuilding_completed/chara/chara_03.png
addedpublic_html/images/shipbuilding_completed/chara/chara_04.png
addedpublic_html/images/shipbuilding_completed/chara/chara_05.png
addedpublic_html/images/shipbuilding_completed/chara/chara_06.png
addedpublic_html/images/shipbuilding_completed/chara/chara_07.png
addedpublic_html/images/shipbuilding_completed/chara/chara_08.png
addedpublic_html/images/shipbuilding_completed/round_light_2.png
addedpublic_html/images/shipbuilding_completed/su_chara_2.png
addedpublic_html/images/shipbuilding_completed/text_2.png
addedpublic_html/images/shipbuilding_started/_10011.jpg
addedpublic_html/images/shipbuilding_started/balloon.png
addedpublic_html/images/shipbuilding_started/bg.jpg
addedpublic_html/images/shipbuilding_started/catalog.png
addedpublic_html/images/shipbuilding_started/default_ship.png
addedpublic_html/images/shipbuilding_started/hammer.png
addedpublic_html/images/shipbuilding_started/num_time_sp_00.png
addedpublic_html/images/shipbuilding_started/num_time_sp_01.png
addedpublic_html/images/shipbuilding_started/num_time_sp_02.png
addedpublic_html/images/shipbuilding_started/num_time_sp_03.png
addedpublic_html/images/shipbuilding_started/num_time_sp_04.png
addedpublic_html/images/shipbuilding_started/num_time_sp_05.png
addedpublic_html/images/shipbuilding_started/num_time_sp_06.png
addedpublic_html/images/shipbuilding_started/num_time_sp_07.png
addedpublic_html/images/shipbuilding_started/num_time_sp_08.png
addedpublic_html/images/shipbuilding_started/num_time_sp_09.png
addedpublic_html/images/shipbuilding_started/num_time_text_sp.png
addedpublic_html/images/shipbuilding_started/round_light.png
addedpublic_html/images/shipbuilding_started/su_chara.png
addedpublic_html/images/shipbuilding_started/text_1.png
addedpublic_html/img/info_jrye/1065/info1.jpg
addedpublic_html/img/info_jrye/1065/info2.jpg
addedpublic_html/img/main/event_icon/ocean_area/team_monster9.png
addedpublic_html/img/money_item_get/anniversary/obon_bg_1.png
addedpublic_html/img/money_item_get/anniversary/obon_bg_2.png
addedpublic_html/img/money_item_get/anniversary/summer_bg_1.png
addedpublic_html/img/money_item_get/anniversary/summer_bg_2.png
addedpublic_html/img/money_item_get/anniversary/summer_fes_1_bg_1.png
addedpublic_html/img/money_item_get/anniversary/summer_fes_1_bg_2.png
addedpublic_html/img/money_item_get/anniversary/summer_fes_2_bg_1.png
addedpublic_html/img/money_item_get/anniversary/summer_fes_2_bg_2.png
addedpublic_html/img/money_item_get/newyear_eve/effect_obon_bg.png
addedpublic_html/img/money_item_get/newyear_eve/effect_ocean_bg.png
addedpublic_html/img/money_item_get/season_panda/l_panda_obon_1.png
addedpublic_html/img/money_item_get/season_panda/l_panda_obon_2.png
addedpublic_html/img/money_item_get/season_panda/l_panda_summer_fes_1_1.png
addedpublic_html/img/money_item_get/season_panda/l_panda_summer_fes_1_2.png
addedpublic_html/img/money_item_get/season_panda/l_panda_summer_fes_2_1.png
addedpublic_html/img/money_item_get/season_panda/l_panda_summer_fes_2_2.png
addedpublic_html/img/money_item_get/season_panda/r_panda_obon_1.png
addedpublic_html/img/money_item_get/season_panda/r_panda_obon_2.png
addedpublic_html/img/money_item_get/season_panda/r_panda_summer_fes_1_1.png
addedpublic_html/img/money_item_get/season_panda/r_panda_summer_fes_1_2.png
addedpublic_html/img/money_item_get/season_panda/r_panda_summer_fes_2_1.png
addedpublic_html/img/money_item_get/season_panda/r_panda_summer_fes_2_2.png
modifiedpublic_html/img/question/62.jpg
addedpublic_html/img/ship/shipbuilding_completed/_10011.jpg
addedpublic_html/img/ship/shipbuilding_completed/balloon.png
addedpublic_html/img/ship/shipbuilding_completed/bg_2.jpg
addedpublic_html/img/ship/shipbuilding_completed/card_effect.png
addedpublic_html/img/ship/shipbuilding_completed/chara/chara_01.png
addedpublic_html/img/ship/shipbuilding_completed/chara/chara_02.png
addedpublic_html/img/ship/shipbuilding_completed/chara/chara_03.png
addedpublic_html/img/ship/shipbuilding_completed/chara/chara_04.png
addedpublic_html/img/ship/shipbuilding_completed/chara/chara_05.png
addedpublic_html/img/ship/shipbuilding_completed/chara/chara_06.png
addedpublic_html/img/ship/shipbuilding_completed/chara/chara_07.png
addedpublic_html/img/ship/shipbuilding_completed/chara/chara_08.png
addedpublic_html/img/ship/shipbuilding_completed/round_light_2.png
addedpublic_html/img/ship/shipbuilding_completed/su_chara_2.png
addedpublic_html/img/ship/shipbuilding_completed/text_2.png
addedpublic_html/img/ship/shipbuilding_started/_10011.jpg
addedpublic_html/img/ship/shipbuilding_started/balloon.png
addedpublic_html/img/ship/shipbuilding_started/bg.jpg
addedpublic_html/img/ship/shipbuilding_started/catalog.png
addedpublic_html/img/ship/shipbuilding_started/default_ship.png
addedpublic_html/img/ship/shipbuilding_started/hammer.png
addedpublic_html/img/ship/shipbuilding_started/num_time_sp_00.png
addedpublic_html/img/ship/shipbuilding_started/num_time_sp_01.png
addedpublic_html/img/ship/shipbuilding_started/num_time_sp_02.png
addedpublic_html/img/ship/shipbuilding_started/num_time_sp_03.png
addedpublic_html/img/ship/shipbuilding_started/num_time_sp_04.png
addedpublic_html/img/ship/shipbuilding_started/num_time_sp_05.png
addedpublic_html/img/ship/shipbuilding_started/num_time_sp_06.png
addedpublic_html/img/ship/shipbuilding_started/num_time_sp_07.png
addedpublic_html/img/ship/shipbuilding_started/num_time_sp_08.png
addedpublic_html/img/ship/shipbuilding_started/num_time_sp_09.png
addedpublic_html/img/ship/shipbuilding_started/num_time_text_sp.png
addedpublic_html/img/ship/shipbuilding_started/round_light.png
addedpublic_html/img/ship/shipbuilding_started/su_chara.png
addedpublic_html/img/ship/shipbuilding_started/text_1.png
modifiedpublic_html/index.php
modifiedpublic_html/js/JOLLYROGER.js
modifiedpublic_html/js/JOLLYROGER_battle.js
modifiedpublic_html/js/JOLLYROGER_collect_ef.js
modifiedpublic_html/js/jr_battle.min.js
modifiedpublic_html/js/jr_collect_ef.min.js
modifiedpublic_html/js/jr_main.min.js
addedpublic_html/js/shipbuilding_completed/shipbuilding_completed_sp.js
addedpublic_html/js/shipbuilding_started/shipbuilding_started_sp.js
modifiedpublic_html/template/Commerce-Default.tpl
modifiedpublic_html/template/Event.tpl
modifiedpublic_html/template/OceanArea-Ranking.tpl
modifiedpublic_html/template/OceanArea-Shop.tpl
modifiedpublic_html/template/Ranking-DailyEventTeam.tpl
modifiedpublic_html/template/Ship-BreakCheck.tpl
addedpublic_html/template/Ship-BuildCancelCheck.tpl
addedpublic_html/template/Ship-BuildCancelResult.tpl
modifiedpublic_html/template/Ship-CustomAnimation.tpl
modifiedpublic_html/template/Ship-Default.tpl
modifiedpublic_html/template/Ship-Detail.tpl
modifiedpublic_html/template/Ship-LimitedShip.tpl
addedpublic_html/template/Ship-MakeCompositeAnimation.tpl
addedpublic_html/template/Ship-MakeCompositeEndAnimation.tpl
modifiedpublic_html/template/Ship-SelectDetail.tpl
modifiedpublic_html/template/header_sp.tpl
modifiedpublic_html/template/parts_dgame_footer.tpl
addedpublic_html/template/parts_ship_detail.tpl
Patch body is stored as a separate file to keep this page lightweight.