jolly/jr-web #291 期限付きアイテム実装

Description

opened by wada at 2020-09-25T17:34:02; updated 2023-02-02T17:00:15

issue #279

期限付き蒼玉回復、懐中時計の追加

期限付き蒼玉追加によるレイドページのレイアウト調整

通常レイド（戦闘中、戦闘後）
チーム対抗レイド（戦闘中、戦闘後）

マスタの設定が必要

php bin/csv2mysql.php jrye csv/master_item.csv

wada change_title at 2020-09-25T17:42:34: [WIP]期限付きアイテム実装期限付きアイテム実装

Comment

#7377 by wada at 2020-09-25T17:43:06; updated 2020-09-25T17:43:28

@iwamoto
レビューお願いします。
とりあえずアプリ側だけ

wada add_label at 2020-09-25T17:43:10: レビュー待ち

Comment

#7386 by iwamoto at 2020-09-27T15:43:31; updated 2020-09-27T15:43:31

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

wada merge at 2020-09-28T09:12:39: 期限付きアイテム実装

wada close at 2020-09-28T09:12:39: Close

Metadata

type	Pull Request
state	closed
opened by	wada
assigned
registered	2020-09-25T17:34:02
updated	2023-02-02T17:00:15

Labels

レビュー待ちデベロップへマージ

Pull Request

base	jolly/jr-web:develop
head	jolly/jr-web:limited_item_279
from	4bc8e4fb7cb1a146c41bc77b51e312ab6efc0f1c
to	84535d60eaad2fd63a526259ead74eff5147db12

Commit range

base	`4bc8e4fb7cb1a146c41bc77b51e312ab6efc0f1c`
head	`84535d60eaad2fd63a526259ead74eff5147db12`
base branch	jolly/jr-web:develop
head branch	jolly/jr-web:limited_item_279

View commits

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

Files changed203 filesView patch

status	file
modified	`cpanel_html/index.php`
modified	`cpanel_html/template/header.tpl`
modified	`cpanel_html/template/m_item_count.tpl`
added	`cpanel_html/template/m_memcached_debug_default.tpl`
modified	`lib/SubFunc.inc`
modified	`lib/ajax/build_breaking.inc`
modified	`lib/ajax/build_building.inc`
modified	`lib/ajax/build_result.inc`
modified	`lib/ajax/item_result.inc`
modified	`lib/ajax/main_default.inc`
modified	`lib/ajax/main_defaultQuickGoldCollectExec.inc`
modified	`lib/class/const/ItemConst.class.php`
modified	`lib/class/controller/JrControllerBuild.class.php`
modified	`lib/class/controller/JrControllerBuildingStorage.class.php`
added	`lib/class/controller/JrControllerRaidBlueBallSummon.class.php`
added	`lib/class/vsraid/RaidBlueBallSummonManager.class.php`
modified	`lib/class/weekday_limited_item/WeekdayLimitedItemManager.class.php`
modified	`lib/conf/class/WeekdayLimitedItemConfig.class.php`
modified	`lib/cpanel/ajax/m_item_count_ajax.inc`
modified	`lib/cpanel/m_item_count.inc`
added	`lib/cpanel/m_memcached_debug.inc`
modified	`lib/mobile/Item__Result.inc`
modified	`lib/mobile/Item__Select.inc`
modified	`lib/mobile/QuickGoldCollect__Exec.inc`
modified	`lib/mobile/Team__RaidMonster.inc`
modified	`lib/mobile/Team__RaidMonsterVs.inc`
modified	`lib/public/Item.inc`
modified	`lib/public/Main.inc`
modified	`lib/public/Raid-Default.inc`
modified	`lib/public/Raid-Vs.inc`
modified	`mobile_html/index.php`
modified	`mobile_html/template/Item__Result.tpl`
modified	`mobile_html/template/Main__Default.tpl`
modified	`mobile_html/template/QuickGoldCollect__Default.tpl`
added	`mobile_html/template/RaidBlueBallSummon__Check.tpl`
added	`mobile_html/template/RaidBlueBallSummon__Result.tpl`
modified	`mobile_html/template/Team__RaidMonsterMedal.tpl`
modified	`mobile_html/template/Team__RaidMonsterVs.tpl`
added	`public_html/img/item/120/206.jpg`
added	`public_html/img/item/120/207.jpg`
added	`public_html/img/item/150/206.jpg`
added	`public_html/img/item/150/207.jpg`
added	`public_html/img/item/58/206.jpg`
added	`public_html/img/item/58/207.jpg`
added	`public_html/img/item/60/206.jpg`
added	`public_html/img/item/60/207.jpg`
added	`public_html/img/item/70/206.jpg`
added	`public_html/img/item/70/207.jpg`
added	`public_html/img/main/event_info_window/raid/raid_win_item.png`
modified	`public_html/img/main/event_info_window/raid/status_background.png`
added	`public_html/img/raid/20200819/atk_bonus/atk_bonus_btn.png`
added	`public_html/img/raid/20200819/atk_bonus/atk_bonus_text.png`
added	`public_html/img/raid/20200819/atk_bonus/atk_bonus_title.png`
added	`public_html/img/raid/20200819/atk_bst/atk_bst_1_off.png`
added	`public_html/img/raid/20200819/atk_bst/atk_bst_1_on.png`
added	`public_html/img/raid/20200819/atk_bst/atk_bst_2_off.png`
added	`public_html/img/raid/20200819/atk_bst/atk_bst_2_on.png`
added	`public_html/img/raid/20200819/atk_bst/atkbst_bar.png`
added	`public_html/img/raid/20200819/atk_bst/atkbst_title.png`
added	`public_html/img/raid/20200819/atk_bst/bst_1.png`
added	`public_html/img/raid/20200819/atk_bst/bst_2.png`
added	`public_html/img/raid/20200819/atk_bst/bst_3.png`
added	`public_html/img/raid/20200819/atk_bst/bst_4.png`
added	`public_html/img/raid/20200819/clock.png`
added	`public_html/img/raid/20200819/dmg_frame1.png`
added	`public_html/img/raid/20200819/dmg_frame2.png`
added	`public_html/img/raid/20200819/five_atk_1.jpg`
added	`public_html/img/raid/20200819/five_atk_2.jpg`
added	`public_html/img/raid/20200819/five_atk_3.jpg`
added	`public_html/img/raid/20200819/frame1.jpg`
added	`public_html/img/raid/20200819/lv.png`
added	`public_html/img/raid/20200819/rare/rr_reward_btn.png`
added	`public_html/img/raid/20200819/rare/rr_reward_text.png`
added	`public_html/img/raid/20200819/rare/rr_reward_title.png`
added	`public_html/img/raid/20200819/spd_break/flag.png`
added	`public_html/img/raid/20200819/spd_break/spd_break_active.png`
added	`public_html/img/raid/20200819/spd_break/spd_btn_off.png`
added	`public_html/img/raid/20200819/spd_break/spd_btn_on.png`
added	`public_html/img/raid/20200819/spd_break/spd_title.png`
added	`public_html/img/raid/20200819/spd_break_per/sp_0.png`
added	`public_html/img/raid/20200819/spd_break_per/sp_1.png`
added	`public_html/img/raid/20200819/spd_break_per/sp_10.png`
added	`public_html/img/raid/20200819/spd_break_per/sp_100.png`
added	`public_html/img/raid/20200819/spd_break_per/sp_11.png`
added	`public_html/img/raid/20200819/spd_break_per/sp_12.png`
added	`public_html/img/raid/20200819/spd_break_per/sp_13.png`
added	`public_html/img/raid/20200819/spd_break_per/sp_14.png`
added	`public_html/img/raid/20200819/spd_break_per/sp_15.png`
added	`public_html/img/raid/20200819/spd_break_per/sp_16.png`
added	`public_html/img/raid/20200819/spd_break_per/sp_17.png`
added	`public_html/img/raid/20200819/spd_break_per/sp_18.png`
added	`public_html/img/raid/20200819/spd_break_per/sp_19.png`
added	`public_html/img/raid/20200819/spd_break_per/sp_2.png`
added	`public_html/img/raid/20200819/spd_break_per/sp_20.png`
added	`public_html/img/raid/20200819/spd_break_per/sp_21.png`
added	`public_html/img/raid/20200819/spd_break_per/sp_22.png`
added	`public_html/img/raid/20200819/spd_break_per/sp_23.png`
added	`public_html/img/raid/20200819/spd_break_per/sp_24.png`
added	`public_html/img/raid/20200819/spd_break_per/sp_25.png`
added	`public_html/img/raid/20200819/spd_break_per/sp_26.png`
added	`public_html/img/raid/20200819/spd_break_per/sp_27.png`
added	`public_html/img/raid/20200819/spd_break_per/sp_28.png`
added	`public_html/img/raid/20200819/spd_break_per/sp_29.png`
added	`public_html/img/raid/20200819/spd_break_per/sp_3.png`
added	`public_html/img/raid/20200819/spd_break_per/sp_30.png`
added	`public_html/img/raid/20200819/spd_break_per/sp_31.png`
added	`public_html/img/raid/20200819/spd_break_per/sp_32.png`
added	`public_html/img/raid/20200819/spd_break_per/sp_33.png`
added	`public_html/img/raid/20200819/spd_break_per/sp_34.png`
added	`public_html/img/raid/20200819/spd_break_per/sp_35.png`
added	`public_html/img/raid/20200819/spd_break_per/sp_36.png`
added	`public_html/img/raid/20200819/spd_break_per/sp_37.png`
added	`public_html/img/raid/20200819/spd_break_per/sp_38.png`
added	`public_html/img/raid/20200819/spd_break_per/sp_39.png`
added	`public_html/img/raid/20200819/spd_break_per/sp_4.png`
added	`public_html/img/raid/20200819/spd_break_per/sp_40.png`
added	`public_html/img/raid/20200819/spd_break_per/sp_41.png`
added	`public_html/img/raid/20200819/spd_break_per/sp_42.png`
added	`public_html/img/raid/20200819/spd_break_per/sp_43.png`
added	`public_html/img/raid/20200819/spd_break_per/sp_44.png`
added	`public_html/img/raid/20200819/spd_break_per/sp_45.png`
added	`public_html/img/raid/20200819/spd_break_per/sp_46.png`
added	`public_html/img/raid/20200819/spd_break_per/sp_47.png`
added	`public_html/img/raid/20200819/spd_break_per/sp_48.png`
added	`public_html/img/raid/20200819/spd_break_per/sp_49.png`
added	`public_html/img/raid/20200819/spd_break_per/sp_5.png`
added	`public_html/img/raid/20200819/spd_break_per/sp_50.png`
added	`public_html/img/raid/20200819/spd_break_per/sp_51.png`
added	`public_html/img/raid/20200819/spd_break_per/sp_52.png`
added	`public_html/img/raid/20200819/spd_break_per/sp_53.png`
added	`public_html/img/raid/20200819/spd_break_per/sp_54.png`
added	`public_html/img/raid/20200819/spd_break_per/sp_55.png`
added	`public_html/img/raid/20200819/spd_break_per/sp_56.png`
added	`public_html/img/raid/20200819/spd_break_per/sp_57.png`
added	`public_html/img/raid/20200819/spd_break_per/sp_58.png`
added	`public_html/img/raid/20200819/spd_break_per/sp_59.png`
added	`public_html/img/raid/20200819/spd_break_per/sp_6.png`
added	`public_html/img/raid/20200819/spd_break_per/sp_60.png`
added	`public_html/img/raid/20200819/spd_break_per/sp_61.png`
added	`public_html/img/raid/20200819/spd_break_per/sp_62.png`
added	`public_html/img/raid/20200819/spd_break_per/sp_63.png`
added	`public_html/img/raid/20200819/spd_break_per/sp_64.png`
added	`public_html/img/raid/20200819/spd_break_per/sp_65.png`
added	`public_html/img/raid/20200819/spd_break_per/sp_66.png`
added	`public_html/img/raid/20200819/spd_break_per/sp_67.png`
added	`public_html/img/raid/20200819/spd_break_per/sp_68.png`
added	`public_html/img/raid/20200819/spd_break_per/sp_69.png`
added	`public_html/img/raid/20200819/spd_break_per/sp_7.png`
added	`public_html/img/raid/20200819/spd_break_per/sp_70.png`
added	`public_html/img/raid/20200819/spd_break_per/sp_71.png`
added	`public_html/img/raid/20200819/spd_break_per/sp_72.png`
added	`public_html/img/raid/20200819/spd_break_per/sp_73.png`
added	`public_html/img/raid/20200819/spd_break_per/sp_74.png`
added	`public_html/img/raid/20200819/spd_break_per/sp_75.png`
added	`public_html/img/raid/20200819/spd_break_per/sp_76.png`
added	`public_html/img/raid/20200819/spd_break_per/sp_77.png`
added	`public_html/img/raid/20200819/spd_break_per/sp_78.png`
added	`public_html/img/raid/20200819/spd_break_per/sp_79.png`
added	`public_html/img/raid/20200819/spd_break_per/sp_8.png`
added	`public_html/img/raid/20200819/spd_break_per/sp_80.png`
added	`public_html/img/raid/20200819/spd_break_per/sp_81.png`
added	`public_html/img/raid/20200819/spd_break_per/sp_82.png`
added	`public_html/img/raid/20200819/spd_break_per/sp_83.png`
added	`public_html/img/raid/20200819/spd_break_per/sp_84.png`
added	`public_html/img/raid/20200819/spd_break_per/sp_85.png`
added	`public_html/img/raid/20200819/spd_break_per/sp_86.png`
added	`public_html/img/raid/20200819/spd_break_per/sp_87.png`
added	`public_html/img/raid/20200819/spd_break_per/sp_88.png`
added	`public_html/img/raid/20200819/spd_break_per/sp_89.png`
added	`public_html/img/raid/20200819/spd_break_per/sp_9.png`
added	`public_html/img/raid/20200819/spd_break_per/sp_90.png`
added	`public_html/img/raid/20200819/spd_break_per/sp_91.png`
added	`public_html/img/raid/20200819/spd_break_per/sp_92.png`
added	`public_html/img/raid/20200819/spd_break_per/sp_93.png`
added	`public_html/img/raid/20200819/spd_break_per/sp_94.png`
added	`public_html/img/raid/20200819/spd_break_per/sp_95.png`
added	`public_html/img/raid/20200819/spd_break_per/sp_96.png`
added	`public_html/img/raid/20200819/spd_break_per/sp_97.png`
added	`public_html/img/raid/20200819/spd_break_per/sp_98.png`
added	`public_html/img/raid/20200819/spd_break_per/sp_99.png`
added	`public_html/img/raid/20200819/tr_battle_state/inferior.png`
added	`public_html/img/raid/20200819/tr_battle_state/logbutton1.png`
added	`public_html/img/raid/20200819/tr_battle_state/logbutton2.png`
added	`public_html/img/raid/20200819/tr_battle_state/superior.png`
added	`public_html/img/raid/20200819/tr_battle_state/vs.png`
added	`public_html/img/raid/20200819/tr_bonus/bonuschance_btn.png`
added	`public_html/img/raid/20200819/tr_bonus/bonuschance_text.png`
added	`public_html/img/raid/20200819/tr_bonus/bonuschance_title.png`
added	`public_html/img/raid/20200819/tri.png`
modified	`public_html/index.php`
modified	`public_html/js/JOLLYROGER.js`
modified	`public_html/template/Build-ClockItemList.tpl`
modified	`public_html/template/Build.tpl`
modified	`public_html/template/BuildingStorage-DeleteProgress.tpl`
modified	`public_html/template/BuildingStorage-ReserveRestoreResult.tpl`
modified	`public_html/template/BuildingStorage-RestoreProgress.tpl`
modified	`public_html/template/Main.tpl`
modified	`public_html/template/Raid-Default.tpl`
modified	`public_html/template/Raid-DefaultMedal.tpl`
modified	`public_html/template/Raid-Vs.tpl`
added	`public_html/template/RaidBlueBallSummon-Check.tpl`
added	`public_html/template/RaidBlueBallSummon-Result.tpl`
added	`public_html/template/parts_raid_default.tpl`

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