jolly/jr-web #1018 【8/4】リリース

Description

opened by wada at 2021-08-02T15:53:34; updated 2025-03-07T15:29:16

概要

【7/30】本家20/4月更新分の取り込み #972
【7/30 管理】紅玉・紅玉リカバリの消費数など #1000

ブランチ

web: release_0804
db: release_0804

TODO

カード画像はjr-rzstに存在するので、次回からはマージしません

Comment

#12652 by wada at 2021-08-02T15:56:27; updated 2021-08-02T15:56:27

@iwamoto @kouho
15時ごろリリース予定です。確認お願いします。
（特にアップデートはないのでユーザーが少ない時間帯にリリース）

wada delete_label at 2021-08-02T15:56:34: デベロップへマージ

wada add_label at 2021-08-02T15:56:34: マスタへマージ

Comment

#12658 by kouho at 2021-08-02T16:19:42; updated 2021-08-02T16:19:42

@wada
開発でレビュー時のものと違いがないことを確認しました。
js圧縮とhaader_spの更新対応が必要でしたらお願いいたします。

Comment

#12661 by wada at 2021-08-02T16:29:11; updated 2021-08-02T16:29:11

js圧縮しました。

Comment

#12667 by kouho at 2021-08-02T16:38:40; updated 2021-08-02T16:38:40

@wada
確認しました。OKです。

kouho add_label at 2021-08-02T16:38:44: 皇甫 LGTM

Comment

#12672 by iwamoto at 2021-08-02T17:35:02; updated 2021-08-02T17:35:02

@wada
確認しました。大丈夫と思います。

iwamoto add_label at 2021-08-02T17:35:09: 岩本 LGTM

wada delete_label at 2021-08-02T18:13:34: レビュー待ち

wada merge at 2021-08-04T14:56:04: 【8/4】リリース

wada close at 2021-08-04T14:56:04: Close

Metadata

type	Pull Request
state	closed
opened by	wada
assigned
registered	2021-08-02T15:53:34
updated	2025-03-07T15:29:16

Labels

マスタへマージ皇甫 LGTM

Pull Request

base	jolly/jr-web:master
head	jolly/jr-web:release_0804
from	b30f803c0b527c83740bc18ba2bc0dda1dbc862a
to	c69c0740c93978ec8a4a0a6c523394ce913076e7

Commit range

base	`b30f803c0b527c83740bc18ba2bc0dda1dbc862a`
head	`c69c0740c93978ec8a4a0a6c523394ce913076e7`
base branch	jolly/jr-web:master
head branch	jolly/jr-web:release_0804

View commits

Commit details are loaded from Git when a dynamic archive server is running, or can be embedded with --include-commits.

Files changed221 filesView patch

status	file
modified	`cpanel_html/define_cpanel.inc`
added	`files/collect/money_collect_children_cs6.swf`
added	`files/collect/money_collect_mother_cs6.swf`
modified	`lib/SkillFunc.inc`
modified	`lib/SubFunc.inc`
modified	`lib/SubFunc_mission.inc`
modified	`lib/ajax/build_breaking.inc`
modified	`lib/ajax/build_building.inc`
modified	`lib/ajax/build_result.inc`
modified	`lib/ajax/mission_default.inc`
modified	`lib/class/controller/JrControllerBuild.class.php`
added	`lib/conf/class/BarBonusEventConfig.class.php`
modified	`lib/conf/class/CollectMoneyConfig.class.php`
modified	`lib/conf/class/OceanAreaConfig.class.php`
modified	`lib/conf/class/SpecialGachaConfig.class.php`
modified	`lib/conf/class/WeekdayLimitedItemConfig.class.php`
modified	`lib/conf/define.inc`
modified	`lib/conf/define_c.inc`
modified	`lib/conf/define_d.inc`
modified	`lib/conf/define_y.inc`
modified	`lib/cpanel/m_limited_quest_add_check.inc`
modified	`lib/cpanel/m_limited_quest_edit_check.inc`
modified	`lib/exec/define_exec.inc`
added	`lib/exec/tool_daily_mission_stamina.inc`
added	`lib/exec/tool_daily_mission_stamina.sh`
added	`lib/exec/tool_monthly_mission_stamina.inc`
added	`lib/exec/tool_monthly_mission_stamina.sh`
modified	`lib/public/Battle-Result.inc`
modified	`lib/public/Build-Info.inc`
modified	`lib/public/Card-SelectStrong.inc`
modified	`lib/public/Event-FestivalRewardExec.inc`
modified	`lib/public/Main.inc`
modified	`lib/public/Mission.inc`
modified	`lib/public/OceanArea-Default.inc`
modified	`lib/public/OceanArea-Shop.inc`
modified	`lib/public/OceanArea-ShopExec.inc`
modified	`lib/public/OceanArea-TeamMonsterDefault.inc`
modified	`lib/public/Shop-CardHolderPack.inc`
modified	`lib/public/ShowDown-Battle.inc`
modified	`public_html/img/battle/result/frameup.png`
added	`public_html/img/card/120/1334.jpg`
added	`public_html/img/card/120/1348.jpg`
added	`public_html/img/card/120/1349.jpg`
added	`public_html/img/card/120/1350.jpg`
added	`public_html/img/card/120/1351.jpg`
added	`public_html/img/card/120/307.jpg`
added	`public_html/img/card/240/1334.jpg`
added	`public_html/img/card/240/1348.jpg`
added	`public_html/img/card/240/1349.jpg`
added	`public_html/img/card/240/1350.jpg`
added	`public_html/img/card/240/1351.jpg`
added	`public_html/img/card/240/307.jpg`
added	`public_html/img/card/26/1334.jpg`
added	`public_html/img/card/26/1348.jpg`
added	`public_html/img/card/26/1350.jpg`
added	`public_html/img/card/26/1351.jpg`
added	`public_html/img/card/26/307.jpg`
added	`public_html/img/card/320/1334.jpg`
added	`public_html/img/card/320/1348.jpg`
added	`public_html/img/card/320/1349.jpg`
added	`public_html/img/card/320/1350.jpg`
added	`public_html/img/card/320/1351.jpg`
added	`public_html/img/card/320/307.jpg`
added	`public_html/img/card/640/1334.jpg`
added	`public_html/img/card/640/1348.jpg`
added	`public_html/img/card/640/1349.jpg`
added	`public_html/img/card/640/1350.jpg`
added	`public_html/img/card/640/1351.jpg`
added	`public_html/img/card/640/307.jpg`
added	`public_html/img/card/70/1334.jpg`
added	`public_html/img/card/70/1348.jpg`
added	`public_html/img/card/70/1349.jpg`
added	`public_html/img/card/70/1350.jpg`
added	`public_html/img/card/70/1351.jpg`
added	`public_html/img/card/70/307.jpg`
added	`public_html/img/card/70main/1334.jpg`
added	`public_html/img/card/70main/1348.jpg`
added	`public_html/img/card/70main/1350.jpg`
added	`public_html/img/card/70main/1351.jpg`
added	`public_html/img/card/70main/307.jpg`
added	`public_html/img/card/battle/154/1334.jpg`
added	`public_html/img/card/battle/154/1348.jpg`
added	`public_html/img/card/battle/154/1349.jpg`
added	`public_html/img/card/battle/154/1350.jpg`
added	`public_html/img/card/battle/154/1351.jpg`
added	`public_html/img/card/battle/154/307.jpg`
added	`public_html/img/card/battle/58/1334.jpg`
added	`public_html/img/card/battle/58/1348.jpg`
added	`public_html/img/card/battle/58/1349.jpg`
added	`public_html/img/card/battle/58/1350.jpg`
added	`public_html/img/card/battle/58/1351.jpg`
added	`public_html/img/card/battle/58/307.jpg`
added	`public_html/img/card/battle/raid/1349.jpg`
added	`public_html/img/item/120/1541.jpg`
added	`public_html/img/item/120/1547.jpg`
added	`public_html/img/item/120/1548.jpg`
added	`public_html/img/item/120/1549.jpg`
added	`public_html/img/item/120/1550.jpg`
added	`public_html/img/item/120/16179.jpg`
added	`public_html/img/item/120/16180.jpg`
added	`public_html/img/item/120/16181.jpg`
added	`public_html/img/item/120/16182.jpg`
added	`public_html/img/item/120/16183.jpg`
added	`public_html/img/item/120/16184.jpg`
added	`public_html/img/item/120/16185.jpg`
added	`public_html/img/item/120/16186.jpg`
added	`public_html/img/item/120/16187.jpg`
added	`public_html/img/item/120/16188.jpg`
added	`public_html/img/item/120/16189.jpg`
added	`public_html/img/item/120/16190.jpg`
added	`public_html/img/item/150/1541.jpg`
added	`public_html/img/item/150/1547.jpg`
added	`public_html/img/item/150/1548.jpg`
added	`public_html/img/item/150/1549.jpg`
added	`public_html/img/item/150/1550.jpg`
added	`public_html/img/item/150/16179.jpg`
added	`public_html/img/item/150/16180.jpg`
added	`public_html/img/item/150/16181.jpg`
added	`public_html/img/item/150/16182.jpg`
added	`public_html/img/item/150/16183.jpg`
added	`public_html/img/item/150/16184.jpg`
added	`public_html/img/item/150/16185.jpg`
added	`public_html/img/item/150/16186.jpg`
added	`public_html/img/item/150/16187.jpg`
added	`public_html/img/item/150/16188.jpg`
added	`public_html/img/item/150/16189.jpg`
added	`public_html/img/item/150/16190.jpg`
added	`public_html/img/item/58/1547.jpg`
added	`public_html/img/item/58/16179.jpg`
added	`public_html/img/item/58/16180.jpg`
added	`public_html/img/item/58/16181.jpg`
added	`public_html/img/item/58/16182.jpg`
added	`public_html/img/item/60/1541.jpg`
added	`public_html/img/item/60/1547.jpg`
added	`public_html/img/item/60/1548.jpg`
added	`public_html/img/item/60/1549.jpg`
added	`public_html/img/item/60/1550.jpg`
added	`public_html/img/item/60/16179.jpg`
added	`public_html/img/item/60/16180.jpg`
added	`public_html/img/item/60/16181.jpg`
added	`public_html/img/item/60/16182.jpg`
added	`public_html/img/item/60/16183.jpg`
added	`public_html/img/item/60/16184.jpg`
added	`public_html/img/item/60/16185.jpg`
added	`public_html/img/item/60/16186.jpg`
added	`public_html/img/item/60/16187.jpg`
added	`public_html/img/item/60/16188.jpg`
added	`public_html/img/item/60/16189.jpg`
added	`public_html/img/item/60/16190.jpg`
added	`public_html/img/item/70/1541.jpg`
added	`public_html/img/item/70/1547.jpg`
added	`public_html/img/item/70/1548.jpg`
added	`public_html/img/item/70/1549.jpg`
added	`public_html/img/item/70/1550.jpg`
added	`public_html/img/item/70/16179.jpg`
added	`public_html/img/item/70/16180.jpg`
added	`public_html/img/item/70/16181.jpg`
added	`public_html/img/item/70/16182.jpg`
added	`public_html/img/item/70/16183.jpg`
added	`public_html/img/item/70/16184.jpg`
added	`public_html/img/item/70/16185.jpg`
added	`public_html/img/item/70/16186.jpg`
added	`public_html/img/item/70/16187.jpg`
added	`public_html/img/item/70/16188.jpg`
added	`public_html/img/item/70/16189.jpg`
added	`public_html/img/item/70/16190.jpg`
added	`public_html/img/main/event_icon/ocean_area/team_monster7.png`
added	`public_html/img/mission/card/1334.png`
added	`public_html/img/mission/card/1348.png`
added	`public_html/img/mission/card/1350.png`
added	`public_html/img/mission/card/1351.png`
added	`public_html/img/mission/card/307.png`
added	`public_html/img/money_item_get/anniversary/children_bg_1.png`
added	`public_html/img/money_item_get/anniversary/children_bg_2.png`
added	`public_html/img/money_item_get/anniversary/mother_bg_1.png`
added	`public_html/img/money_item_get/anniversary/mother_bg_2.png`
added	`public_html/img/money_item_get/bg_ef/mother_bg_1.png`
added	`public_html/img/money_item_get/bg_ef/mother_bg_2.png`
added	`public_html/img/money_item_get/season_panda/l_panda_children_1.png`
added	`public_html/img/money_item_get/season_panda/l_panda_children_2.png`
added	`public_html/img/money_item_get/season_panda/l_panda_mother_1.png`
added	`public_html/img/money_item_get/season_panda/l_panda_mother_2.png`
added	`public_html/img/money_item_get/season_panda/r_panda_children_1.png`
added	`public_html/img/money_item_get/season_panda/r_panda_children_2.png`
added	`public_html/img/money_item_get/season_panda/r_panda_mother_1.png`
added	`public_html/img/money_item_get/season_panda/r_panda_mother_2.png`
added	`public_html/img/ocean_area/7/ab_extra.jpg`
added	`public_html/img/ocean_area/7/area_kouryakurank_header.jpg`
added	`public_html/img/ocean_area/7/areaitiran_header.jpg`
added	`public_html/img/ocean_area/7/cleaninghouse.jpg`
added	`public_html/img/ocean_area/7/count_killboss_header.jpg`
added	`public_html/img/ocean_area/7/ex_reward_bonus.jpg`
added	`public_html/img/ocean_area/7/header1.jpg`
added	`public_html/img/ocean_area/7/header2.jpg`
added	`public_html/img/ocean_area/7/m_ab_extra.jpg`
added	`public_html/img/ocean_area/7/m_area_kouryakurank_header.jpg`
added	`public_html/img/ocean_area/7/m_areaitiran_header.jpg`
added	`public_html/img/ocean_area/7/m_boss_battle_btn.jpg`
added	`public_html/img/ocean_area/7/m_cleaninghouse.jpg`
added	`public_html/img/ocean_area/7/m_count_killboss_header.jpg`
added	`public_html/img/ocean_area/7/m_ex_reward_bonus.jpg`
added	`public_html/img/ocean_area/7/m_header1.jpg`
added	`public_html/img/ocean_area/7/m_header2.jpg`
modified	`public_html/js/JOLLYROGER.js`
modified	`public_html/js/JOLLYROGER_battle.js`
modified	`public_html/js/jr_battle.min.js`
modified	`public_html/js/jr_main.min.js`
modified	`public_html/template/Bar-PickupGachaSP.tpl`
modified	`public_html/template/Battle-Result.tpl`
modified	`public_html/template/Build-Info.tpl`
modified	`public_html/template/Card-Detail.tpl`
modified	`public_html/template/Card-SelectStrong.tpl`
modified	`public_html/template/Commerce-Default.tpl`
modified	`public_html/template/Main.tpl`
modified	`public_html/template/Mission.tpl`
modified	`public_html/template/OceanArea-Default.tpl`
modified	`public_html/template/OceanArea-Shop.tpl`
modified	`public_html/template/OceanArea-TeamMonsterDefault.tpl`
modified	`public_html/template/Shop-CardHolderPack.tpl`
modified	`public_html/template/header_sp.tpl`
modified	`public_html/template/parts_castaway_ad.tpl`

Patch body is stored as a separate file to keep this page lightweight.