jolly/jr-web #357 【10/20】リリース&メンテナンス

Description

opened by iwamoto at 2020-10-19T20:29:51; updated 2023-08-22T19:00:00

コイン減算API成功後にアイテム付与 #333

下記イベントもこのときにmerge予定
【10/20】レイドイベント #334
【10/21】島テーマ #336

wada merge at 2020-10-20T10:04:29: Merged by user

wada close at 2020-10-20T10:04:30: Close

Metadata

type	Pull Request
state	closed
opened by	iwamoto
assigned	wada
registered	2020-10-19T20:29:51
updated	2023-08-22T19:00:00
milestone	release_20201020

Labels

レビュー待ちマスタへマージ

Pull Request

base	jolly/jr-web:master
head	jolly/jr-web:develop
from	cfc7abb2b652da1f1f6739f328461eb8dcbb3756
to	f00efcbe5e4c661b2ef47db75f8d000482eed062

Commit range

base	`cfc7abb2b652da1f1f6739f328461eb8dcbb3756`
head	`f00efcbe5e4c661b2ef47db75f8d000482eed062`
base branch	jolly/jr-web:master
head branch	jolly/jr-web:develop

View commits

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

Files changed210 filesView patch

status	file
added	`database/migrate/2020101201_master_object_data.sql`
added	`island_img/island_20001.jpg`
added	`island_img/object_20001.png`
added	`island_img/object_999997_20001.png`
added	`island_img/object_event_0_20001.png`
modified	`lib/SkillFunc.inc`
modified	`lib/SubFunc.inc`
modified	`lib/ajax/shop_payment.inc`
modified	`lib/conf/class/BattleEventConfig.class.php`
modified	`lib/conf/class/BuildEventItemConfig.class.php`
modified	`lib/conf/class/JackpotWarConfig.class.php`
modified	`lib/conf/class/PresentItemConfig.class.php`
modified	`lib/conf/class/RaidMonsterConfig.class.php`
modified	`lib/conf/class/RaidMonsterTypeConfig.class.php`
modified	`lib/conf/define_y.inc`
modified	`lib/exec/tool_send_yamada_rewards.php`
added	`lib/models/Gacha_payment.php`
modified	`lib/models/Present_model.php`
added	`lib/models/Shop_payment.php`
added	`lib/models/shop/Base_item.php`
added	`lib/models/shop/Card_holder.php`
added	`lib/models/shop/Card_pot.php`
added	`lib/models/shop/Item_factory.php`
added	`lib/models/shop/Item_pack.php`
added	`lib/models/shop/Skill_ball_gacha.php`
modified	`lib/public/Bar-Gacha.inc`
modified	`lib/public/Bar-GachaCheck.inc`
modified	`lib/public/Bar-GachaExec.inc`
modified	`lib/public/Bar-SelectCoinResult.inc`
added	`public_html/img/banner/IslandThemeEvent/build_10032_1_1.jpg`
added	`public_html/img/banner/IslandThemeEvent/build_10032_1_2.jpg`
added	`public_html/img/banner/IslandThemeEvent/build_10032_2_1.jpg`
added	`public_html/img/banner/IslandThemeEvent/build_10032_2_2.jpg`
added	`public_html/img/banner/JackpotWar/banner1_1.jpg`
added	`public_html/img/banner/JackpotWar/banner1_2.jpg`
added	`public_html/img/banner/JackpotWar/banner2_1.jpg`
added	`public_html/img/banner/JackpotWar/banner2_2.jpg`
added	`public_html/img/banner/RaidEvent/raid_banner_7_1.jpg`
added	`public_html/img/banner/RaidEvent/raid_banner_7_2.jpg`
added	`public_html/img/banner/RaidEvent/raid_banner_8_1.jpg`
added	`public_html/img/banner/RaidEvent/raid_banner_8_2.jpg`
deleted	`public_html/img/info_event/info_event_100_1.jpg`
deleted	`public_html/img/info_event/info_event_100_2.jpg`
deleted	`public_html/img/info_event/info_event_101_1.jpg`
deleted	`public_html/img/info_event/info_event_101_2.jpg`
added	`public_html/img/info_event/info_event_57_1.jpg`
added	`public_html/img/info_event/info_event_57_2.jpg`
added	`public_html/img/info_event/info_event_58_1.jpg`
added	`public_html/img/info_event/info_event_58_2.jpg`
added	`public_html/img/info_event/info_event_59_1.jpg`
added	`public_html/img/info_event/info_event_59_2.jpg`
added	`public_html/img/info_event/info_event_60_1.jpg`
added	`public_html/img/info_event/info_event_60_2.jpg`
added	`public_html/img/info_event/info_event_61_1.jpg`
added	`public_html/img/info_event/info_event_61_2.jpg`
renamed	`public_html/img/info_event/info_event_68_1.jpg -> public_html/img/info_event/info_event_62_1.jpg`
added	`public_html/img/info_event/info_event_62_2.jpg`
added	`public_html/img/info_event/info_event_63_1.jpg`
added	`public_html/img/info_event/info_event_63_2.jpg`
deleted	`public_html/img/info_event/info_event_66_1.jpg`
deleted	`public_html/img/info_event/info_event_66_2.jpg`
deleted	`public_html/img/info_event/info_event_67_1.jpg`
deleted	`public_html/img/info_event/info_event_67_2.jpg`
deleted	`public_html/img/info_event/info_event_73_2.jpg`
deleted	`public_html/img/info_event/info_event_74_1.jpg`
deleted	`public_html/img/info_event/info_event_74_2.jpg`
deleted	`public_html/img/info_event/info_event_75_1.jpg`
deleted	`public_html/img/info_event/info_event_75_2.jpg`
deleted	`public_html/img/info_event/info_event_76_1.jpg`
deleted	`public_html/img/info_event/info_event_76_2.jpg`
deleted	`public_html/img/info_event/info_event_77_1.jpg`
deleted	`public_html/img/info_event/info_event_77_2.jpg`
deleted	`public_html/img/info_event/info_event_78_1.jpg`
deleted	`public_html/img/info_event/info_event_78_2.jpg`
deleted	`public_html/img/info_event/info_event_79_1.jpg`
deleted	`public_html/img/info_event/info_event_79_2.jpg`
deleted	`public_html/img/info_event/info_event_80_1.jpg`
deleted	`public_html/img/info_event/info_event_80_2.jpg`
deleted	`public_html/img/info_event/info_event_81_1.jpg`
deleted	`public_html/img/info_event/info_event_81_2.jpg`
deleted	`public_html/img/info_event/info_event_82_1.jpg`
deleted	`public_html/img/info_event/info_event_82_2.jpg`
deleted	`public_html/img/info_event/info_event_83_1.jpg`
deleted	`public_html/img/info_event/info_event_83_2.jpg`
deleted	`public_html/img/info_event/info_event_84_1.jpg`
deleted	`public_html/img/info_event/info_event_84_2.jpg`
deleted	`public_html/img/info_event/info_event_85_1.jpg`
deleted	`public_html/img/info_event/info_event_85_2.jpg`
deleted	`public_html/img/info_event/info_event_86_1.jpg`
deleted	`public_html/img/info_event/info_event_86_2.jpg`
deleted	`public_html/img/info_event/info_event_87_1.jpg`
deleted	`public_html/img/info_event/info_event_90_1.jpg`
deleted	`public_html/img/info_event/info_event_90_2.jpg`
deleted	`public_html/img/info_event/info_event_91_1.jpg`
deleted	`public_html/img/info_event/info_event_91_2.jpg`
deleted	`public_html/img/info_event/info_event_92_1.jpg`
deleted	`public_html/img/info_event/info_event_92_2.jpg`
deleted	`public_html/img/info_event/info_event_93_1.jpg`
deleted	`public_html/img/info_event/info_event_93_2.jpg`
deleted	`public_html/img/info_event/info_event_94_1.jpg`
deleted	`public_html/img/info_event/info_event_94_2.jpg`
deleted	`public_html/img/info_event/info_event_95_1.jpg`
deleted	`public_html/img/info_event/info_event_95_2.jpg`
deleted	`public_html/img/info_event/info_event_96_1.jpg`
deleted	`public_html/img/info_event/info_event_96_2.jpg`
deleted	`public_html/img/info_event/info_event_97_1.jpg`
deleted	`public_html/img/info_event/info_event_97_2.jpg`
deleted	`public_html/img/info_event/info_event_98_1.jpg`
deleted	`public_html/img/info_event/info_event_98_2.jpg`
deleted	`public_html/img/info_event/info_event_99_1.jpg`
deleted	`public_html/img/info_event/info_event_99_2.jpg`
added	`public_html/img/info_jrye/275/info1.jpg`
added	`public_html/img/info_jrye/275/info2.jpg`
added	`public_html/img/info_jrye/275/info2_0.jpg`
added	`public_html/img/info_jrye/275/info2_1.jpg`
added	`public_html/img/info_jrye/275/info2_2.jpg`
added	`public_html/img/info_jrye/275/info3.jpg`
added	`public_html/img/info_jrye/276/info1.jpg`
added	`public_html/img/info_jrye/276/info10.jpg`
added	`public_html/img/info_jrye/276/info1_1.jpg`
added	`public_html/img/info_jrye/276/info2.jpg`
added	`public_html/img/info_jrye/276/info2_0.jpg`
added	`public_html/img/info_jrye/276/info2_1.jpg`
added	`public_html/img/info_jrye/276/info2_2.jpg`
added	`public_html/img/info_jrye/276/info3.jpg`
added	`public_html/img/info_jrye/276/info4.jpg`
added	`public_html/img/info_jrye/276/info5.jpg`
added	`public_html/img/info_jrye/276/info6.jpg`
added	`public_html/img/info_jrye/276/info7.jpg`
added	`public_html/img/info_jrye/276/info8.jpg`
added	`public_html/img/info_jrye/276/info9.jpg`
added	`public_html/img/info_jrye/281/info1.jpg`
added	`public_html/img/info_jrye/281/info1_.jpg`
added	`public_html/img/info_jrye/281/item1.jpg`
added	`public_html/img/info_jrye/281/item2.jpg`
added	`public_html/img/info_jrye/281/item3.jpg`
added	`public_html/img/info_jrye/281/item4.jpg`
added	`public_html/img/info_jrye/281/item_1.jpg`
added	`public_html/img/info_jrye/281/item_2.jpg`
added	`public_html/img/info_jrye/281/item_3.jpg`
added	`public_html/img/info_jrye/281/item_4.jpg`
added	`public_html/img/info_jrye/288/info1.jpg`
added	`public_html/img/info_jrye/288/info2-2.jpg`
added	`public_html/img/info_jrye/288/info2-3.jpg`
added	`public_html/img/info_jrye/288/info3.jpg`
added	`public_html/img/info_jrye/288/info4.jpg`
added	`public_html/img/info_jrye/288/info6-2.jpg`
added	`public_html/img/info_jrye/288/info6-3.jpg`
added	`public_html/img/info_jrye/288/info6.jpg`
added	`public_html/img/info_jrye/289/event_logo.png`
added	`public_html/img/info_jrye/289/info1.jpg`
added	`public_html/img/info_jrye/289/info2.jpg`
added	`public_html/img/info_jrye/289/info6.jpg`
added	`public_html/img/info_jrye/289/info_gk.jpg`
added	`public_html/img/info_jrye/289/itemrank1.png`
added	`public_html/img/info_jrye/289/itemrank2.png`
added	`public_html/img/info_jrye/289/reward_info.jpg`
added	`public_html/img/info_jrye/289/vs-reward1.jpg`
added	`public_html/img/info_jrye/289/vs-reward2.jpg`
added	`public_html/img/info_jrye/289/vs-reward3.jpg`
added	`public_html/img/info_jrye/290/info1.jpg`
added	`public_html/img/info_jrye/290/info2-2.jpg`
added	`public_html/img/info_jrye/290/info4.jpg`
added	`public_html/img/info_jrye/290/vs-reward1.jpg`
added	`public_html/img/info_jrye/290/vs-reward2.jpg`
added	`public_html/img/info_jrye/290/vs-reward3.jpg`
added	`public_html/img/info_jrye/JackpotWarInfo/280/info1_1.jpg`
added	`public_html/img/info_jrye/JackpotWarInfo/280/info2.jpg`
added	`public_html/img/info_jrye/JackpotWarInfo/281/info1.jpg`
added	`public_html/img/info_jrye/JackpotWarInfo/281/info1_.jpg`
added	`public_html/img/info_jrye/JackpotWarInfo/281/item1.jpg`
added	`public_html/img/info_jrye/JackpotWarInfo/281/item2.jpg`
added	`public_html/img/info_jrye/JackpotWarInfo/281/item3.jpg`
added	`public_html/img/info_jrye/JackpotWarInfo/281/item4.jpg`
added	`public_html/img/info_jrye/JackpotWarInfo/282/info1.jpg`
added	`public_html/img/info_jrye/JackpotWarInfo/282/info10.jpg`
added	`public_html/img/info_jrye/JackpotWarInfo/282/info11.jpg`
added	`public_html/img/info_jrye/JackpotWarInfo/282/info11_1.jpg`
added	`public_html/img/info_jrye/JackpotWarInfo/282/info11_2.jpg`
added	`public_html/img/info_jrye/JackpotWarInfo/282/info12.jpg`
added	`public_html/img/info_jrye/JackpotWarInfo/282/info13.jpg`
added	`public_html/img/info_jrye/JackpotWarInfo/282/info14.jpg`
added	`public_html/img/info_jrye/JackpotWarInfo/282/info1_4.jpg`
added	`public_html/img/info_jrye/JackpotWarInfo/282/info2.jpg`
added	`public_html/img/info_jrye/JackpotWarInfo/282/info3.jpg`
added	`public_html/img/info_jrye/JackpotWarInfo/282/info4.jpg`
added	`public_html/img/info_jrye/JackpotWarInfo/282/info5.jpg`
added	`public_html/img/info_jrye/JackpotWarInfo/282/info6.jpg`
added	`public_html/img/info_jrye/JackpotWarInfo/282/info7.jpg`
added	`public_html/img/info_jrye/JackpotWarInfo/282/info8.jpg`
added	`public_html/img/info_jrye/JackpotWarInfo/282/info9.jpg`
added	`public_html/img/info_jrye/JackpotWarInfo/283/info1.jpg`
added	`public_html/img/info_jrye/JackpotWarInfo/283/info2.jpg`
added	`public_html/img/info_jrye/JackpotWarInfo/283/info3.jpg`
added	`public_html/img/info_jrye/JackpotWarInfo/283/info4.jpg`
modified	`public_html/img/info_jrye/RaidEventImg/info_combo_2.jpg`
added	`public_html/img/island/background/20001.jpg`
added	`public_html/img/island/object/object_20001.png`
modified	`public_html/img/main/event_icon/raid/725.png`
modified	`public_html/img/main/event_icon/raid/725_rare.png`
modified	`public_html/img/main/event_icon/raid/725_team.png`
added	`public_html/img/raid/point_item/106_1.png`
added	`public_html/img/raid/point_item/106_2.png`
modified	`public_html/template/Deck-Default.tpl`
modified	`public_html/template/Main.tpl`
modified	`public_html/template/Mission.tpl`
modified	`public_html/template/Raid-DefaultMedal.tpl`
modified	`public_html/template/Raid-Vs.tpl`
modified	`public_html/template/TeamWar-Result.tpl`
modified	`public_html/template/parts_raid_default.tpl`

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