jolly/jr-web #942 【7/14】デッキ編集リニューアル

Description

opened by iwamoto at 2021-07-14T09:48:56; updated 2024-12-23T11:56:00

デッキ編集リニューアル #903
conf解消 & header_sp 更新

Comment

#12132 by iwamoto at 2021-07-14T09:50:00; updated 2021-07-14T09:50:00

@wada @kouho
あげなおしました
conf解消 & header_spの更新を行いました。

Comment

#12136 by kouho at 2021-07-14T10:10:48; updated 2021-07-14T10:10:48

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

Comment

#12138 by wada at 2021-07-14T10:23:40; updated 2021-07-14T10:23:40

@iwamoto
確認しました。

iwamoto close_comment at 2021-07-15T12:31:42: header-sp.tplでconfしたため手動で反映しました。

Metadata

type	Pull Request
state	closed
opened by	iwamoto
assigned	iwamoto
registered	2021-07-14T09:48:56
updated	2024-12-23T11:56:00

Labels

マスタへマージ

Pull Request

base	jolly/jr-web:master
head	jolly/jr-web:release_0714
from	00b2729e40e9438236716944c8a5e7eea96b4036
to	eb2ef1c5463c2746ed88a6e6b8135c3b246d5c6f

Commit range

base	`00b2729e40e9438236716944c8a5e7eea96b4036`
head	`eb2ef1c5463c2746ed88a6e6b8135c3b246d5c6f`
base branch	jolly/jr-web:master
head branch	jolly/jr-web:release_0714

View commits

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

Files changed52 filesView patch

status	file
modified	`lib/SubFunc.inc`
added	`lib/class/card/UserCard.class.php`
added	`lib/class/card/UserDeckCard.class.php`
modified	`lib/class/const/CardConst.class.php`
modified	`lib/class/const/ItemConst.class.php`
added	`lib/class/controller/JrControllerDeck.class.php`
modified	`lib/class/controller/common/JrRequest.class.php`
modified	`lib/class/rdo/record/RdoRecord_UserInfo.class.php`
added	`lib/class/util/TypeUtil.class.php`
modified	`lib/conf/class/BattleEventConfig.class.php`
added	`lib/conf/class/GiantKillerConfig.class.php`
modified	`lib/conf/class/OceanAreaConfig.class.php`
modified	`lib/conf/class/RaidMonsterConfig.class.php`
modified	`lib/mobile/Deck__Recommend.inc`
modified	`lib/public/Deck-Copy.inc`
modified	`lib/public/Deck-DeckSelect.inc`
modified	`lib/public/Deck-DefaultSaveBattleDeck.inc`
modified	`lib/public/Deck-DefaultSaveDeck.inc`
modified	`lib/public/Deck-DefaultSaveRaidDeck.inc`
modified	`lib/public/Deck-DefaultSaveWarDeck.inc`
modified	`lib/public/Deck-Recommend.inc`
modified	`lib/public/Deck-Rename.inc`
modified	`lib/public/Deck-Reset.inc`
modified	`lib/public/Deck-SelectCard.inc`
modified	`lib/public/Deck-SelectMoveResult.inc`
modified	`lib/public/Deck-SelectRemove.inc`
modified	`mobile_html/template/Deck__Default.tpl`
modified	`public_html/ajax.php`
modified	`public_html/css/design.css`
added	`public_html/img/.DS_Store`
added	`public_html/img/commerce/modal/modal_bottm.png`
added	`public_html/img/commerce/modal/modal_close.png`
added	`public_html/img/commerce/modal/modal_close_on.png`
added	`public_html/img/commerce/modal/modal_middle.png`
added	`public_html/img/commerce/modal/modal_title.png`
added	`public_html/img/commerce/modal/modal_top.png`
added	`public_html/img/deck/.DS_Store`
added	`public_html/img/deck/renewal/.DS_Store`
modified	`public_html/index.php`
modified	`public_html/js/jquery_ex.js`
added	`public_html/template/Deck-CardDetail.tpl`
modified	`public_html/template/Deck-DefaultSaveWarDeck.tpl`
added	`public_html/template/Deck-Home.tpl`
added	`public_html/template/Deck-SelectChangeCard.tpl`
added	`public_html/template/Deck-ShipDetail.tpl`
modified	`public_html/template/Raid-DefaultMedal.tpl`
modified	`public_html/template/Raid-Vs.tpl`
modified	`public_html/template/TeamWar.tpl`
modified	`public_html/template/header_sp.tpl`
added	`public_html/template/parts_deck_common.tpl`
added	`public_html/template/parts_deck_replace_modal.tpl`
modified	`public_html/template/parts_raid_default.tpl`

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