PR

【10/21】2020/7本家取り込み #1218

wada opened this at 2021-10-15T17:41:58; closed

Description

opened by wada at 2021-10-15T17:41:58; updated 2025-10-14T11:39:12

概要

jolly/jr-rzst#35

  • 天下無双のロック処理修正

tableの作成が必要、ヤマダでは未解放の箇所

  • 各種スキル追加
  • 一括集金演出追加

夏祭り、お盆

  • 造船アニメーション追加
  • イベントページに技玉バナー追加

ブランチ

web: rzst_2007
db: rzst_2007

テスト方法、確認した内容

テーブル作成

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 add_label at 2021-10-18T15:21:43: レビュー待ち
wada change_title at 2021-10-18T15:22:42: [WIP]2020/7本家取り込み 【10/21】2020/7本家取り込み

Comment

#14462 by wada at 2021-10-18T15:23:27; updated 2021-10-18T15:23:27

@iwamoto @kouho
レビューお願いします。

Comment

#14506 by iwamoto at 2021-10-20T16:03:29; updated 2021-10-20T16:03:29

@wada
造船完了のアニメーションに
出てくる海賊が未公開になっているものがありますが問題ないのでしょうか?
例: 光撃のジェラルト、不敵なるジャック・ミール

Comment

#14512 by kouho at 2021-10-20T18:21:50; updated 2021-10-20T18:21:50

@wada
確認しました。岩本さんも指摘されていますが、
public_html/images/shipbuilding_completed/chara フォルダの
chara_01.pngとchara_06.pngは既存キャラの転生後画像でゲーム内でこれまでも転生後画像を表示させたことがあるので大丈夫だと思いますが、chara_02.png chara_07.png chara_08.png は誰かわからないので表示させて良いか確認していただきたいです。

その他の項目は問題ないと思います。

Comment

#14514 by wada at 2021-10-20T18:35:45; updated 2021-10-20T18:35:45

確認ありがとうございます。
造船演出のキャラについて確認します。
港で出会った海賊と後日ガチャで出会うっていうの面白いんですけどね。

Comment

#14528 by wada at 2021-10-21T14:26:20; updated 2021-10-21T14:26:20

@iwamoto @kouho
造船演出のキャラを解放済の海賊だけにしました。
確認をお願いします。

Comment

#14531 by kouho at 2021-10-21T14:57:32; updated 2021-10-21T14:57:32

@wada
造船演出のキャラを解放済の海賊だけ対応確認しました。OKです。

kouho add_label at 2021-10-21T14:57:35: 皇甫 LGTM

Comment

#14534 by iwamoto at 2021-10-21T15:08:21; updated 2021-10-21T15:08:21

@wada
確認しました。
こちらで問題ないと思います。

iwamoto add_label at 2021-10-21T15:08:26: 岩本 LGTM
wada merge at 2021-10-22T09:49:31: 【10/21】2020/7本家取り込み
wada close at 2021-10-22T09:49:31: Close
wada refer at 2021-10-28T15:06:38: 1264:2020年7月分本家取り込み
wada refer at 2021-10-28T15:37:29: 1264:【近日中】2020年7月分本家取り込み
wada refer at 2021-11-01T10:24:14: 1264:【11/4】2020年7月分本家取り込み
wada refer at 2021-11-04T16:47:27: 1264:【11/8】2020年7月分本家取り込み

Commit range

base60fa133e8542df882be94be73c9eb8c52cd104ec
head01db2caa9f2d8fe5fee747b3a3e00549c4453f63
base branchjolly/jr-web:develop
head branchjolly/jr-web: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 changed121 filesView patch
statusfile
modifiedlib/SkillFunc.inc
modifiedlib/SubFunc.inc
modifiedlib/SubFunc_mission.inc
modifiedlib/ajax/ship_makeComposite.inc
modifiedlib/ajax/team_detail.inc
modifiedlib/conf/class/CastawayConfig.class.php
modifiedlib/conf/class/CollectMoneyConfig.class.php
modifiedlib/conf/class/OceanAreaConfig.class.php
modifiedlib/conf/define.inc
modifiedlib/public/Event.inc
modifiedlib/public/Ship-MakeComposite.inc
addedlib/public/Ship-MakeCompositeEndExec.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/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
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
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-CustomAnimation.tpl
addedpublic_html/template/Ship-MakeCompositeAnimation.tpl
addedpublic_html/template/Ship-MakeCompositeEndAnimation.tpl
modifiedpublic_html/template/parts_dgame_footer.tpl
Patch body is stored as a separate file to keep this page lightweight.