PR

【9/29 14:00】ゲソてん関連更新 #4288

wada opened this at 2025-09-29T10:59:46; closed

Description

opened by wada at 2025-09-29T10:59:46; updated 2025-09-29T14:02:46

概要

該当のPRに関して、どちらもjs更新を含むためまとめて対応

PR内容以外の対応

  • js圧縮、version更新
  • ハロウィンガチャコイン購入リンク修正

マージPR

【9/29】ゲソてんAPI #4278
【9/29】ゲソてんPC対応 #4231

CREATE TABLE `log_gesoten_payment` (
  `payment_id` char(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT '' COMMENT '決済ID',
  `user_no` int(11) NOT NULL COMMENT 'ユーザ管理番号',
  `type` int(11) NOT NULL COMMENT '1:酒場雇用、3:アイテム、4:ガチャ1枚、5:ガチャ10枚',
  `item_id` int(11) NOT NULL COMMENT 'アイテム管理番号',
  `item_json` char(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT '' COMMENT 'json構造',
  `amount` int(11) NOT NULL COMMENT '個数',
  `unit_price` int(11) NOT NULL COMMENT '値段',
  `result_flg` tinyint(4) NOT NULL DEFAULT '0' COMMENT '決済完了ステータス',
  `reg_date` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '登録日時',
  PRIMARY KEY (`payment_id`),
  KEY `user_no` (`user_no`),
  KEY `reg_date` (`reg_date`),
  KEY `result_flg` (`result_flg`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
ALTER TABLE user_platform ADD `platform_id` int(10) unsigned NOT NULL DEFAULT '0';
ALTER TABLE user_platform ADD `media_id` int(10) unsigned NOT NULL DEFAULT '0';

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

TODO

  • [x] テーブル作成
  • [x] js圧縮
  • [ ] デプロイ
  • [ ] 本番確認
wada delete_label at 2025-09-29T11:01:09: レビュー待ち
wada merge at 2025-09-29T14:02:42: 【9/29 14:00】ゲソてん関連更新
wada close at 2025-09-29T14:02:42: Close
wada delete_branch at 2025-09-29T14:02:46: release_092914

Commit range

base5917f1c941c051200c772b019c74a3194aa0eb5a
head4decb92ac17ce33897c1287d4182377f700fcda3
base branchjolly/jr-web:master
head branchjolly/jr-web:release_092914

View commits

Commit details are loaded from Git when a dynamic archive server is running, or can be embedded with --include-commits.
Files changed156 filesView patch
statusfile
modifiedlib/SubFunc.inc
addedlib/SubFunc/SubFunc_gesoten.inc
modifiedlib/SubFunc/SubFunc_platform.inc
modifiedlib/SubFunc/SubFunc_yamada.inc
modifiedlib/ajax/friend_detail.inc
modifiedlib/ajax/shop_payment.inc
modifiedlib/ajax/shop_select.inc
addedlib/class/platform/gesoten/GesotenAPI.class.php
addedlib/class/platform/gesoten/GesotenPlatformService.class.php
addedlib/class/platform/gesoten/GesotenWithoutAPI.class.php
modifiedlib/class/platform/yamada/YamadaWithoutAPI.class.php
modifiedlib/class/pop_up/PopUpAbstract.class.php
modifiedlib/conf/define.inc
addedlib/conf/define_gesoten.inc
modifiedlib/dGameOAuth.php
modifiedlib/models/Gacha_payment.php
addedlib/models/Gacha_payment_gesoten.php
addedlib/models/Shop_payment_gesoten.php
addedlib/models/dao/log_gesoten_payment.php
modifiedlib/models/shop/Base_item.php
addedlib/public/APIDebug-Gesoten.inc
modifiedlib/public/Bar-GachaCheck.inc
modifiedlib/public/Bar-GachaExec.inc
modifiedlib/public/Bar-ItemGachaCheck.inc
modifiedlib/public/Bar-ItemGachaExec.inc
modifiedlib/public/Bar-MonsterGachaCheck.inc
modifiedlib/public/Bar-MonsterGachaExec.inc
modifiedlib/public/Bar-PickupGachaCheck.inc
modifiedlib/public/Bar-PickupGachaExec.inc
modifiedlib/public/Bar-PointGachaCheck.inc
modifiedlib/public/Bar-PointGachaExec.inc
modifiedlib/public/Bar-SPGachaCheck.inc
modifiedlib/public/Bar-SPGachaExec.inc
modifiedlib/public/Bar-SelectCheck.inc
modifiedlib/public/Bar-SelectCoinResult.inc
modifiedlib/public/Bar-SetupGachaCheck.inc
modifiedlib/public/Bar-SetupGachaExec.inc
modifiedlib/public/Debug.inc
addedlib/public/GesotenLp.inc
modifiedpublic_html/css/design.css
addedpublic_html/img/fullscreen_background.jpg
modifiedpublic_html/index.php
addedpublic_html/item_buy_response_gesoten.php
addedpublic_html/item_check_response_gesoten.php
modifiedpublic_html/js/JOLLYROGER.js
modifiedpublic_html/js/JOLLYROGER_battle.js
modifiedpublic_html/js/JOLLYROGER_collect_ef.js
modifiedpublic_html/js/JOLLYROGER_func.js
modifiedpublic_html/js/JOLLYROGER_mission.js
modifiedpublic_html/js/JOLLYROGER_opening.js
modifiedpublic_html/js/JOLLYROGER_valhalla.js
modifiedpublic_html/js/autoload_platform_js.php
modifiedpublic_html/js/dgame_footer.js
modifiedpublic_html/js/jquery_ex.js
modifiedpublic_html/js/jr_battle.min.js
modifiedpublic_html/js/jr_collect_ef.min.js
modifiedpublic_html/js/jr_func.min.js
modifiedpublic_html/js/jr_main.min.js
modifiedpublic_html/js/jr_mission.min.js
modifiedpublic_html/js/jr_opening.min.js
modifiedpublic_html/js/jr_valhalla.min.js
addedpublic_html/js/platform_gesoten.js
addedpublic_html/sandbox_gesoten_gadget.xml
addedpublic_html/template/APIDebug-Gesoten.tpl
modifiedpublic_html/template/Anniversary-Animation.tpl
modifiedpublic_html/template/Bar-DrinkItemGacha.tpl
modifiedpublic_html/template/Bar-Gacha.tpl
modifiedpublic_html/template/Bar-GachaCheck.tpl
modifiedpublic_html/template/Bar-GachaCheckReprint2.tpl
modifiedpublic_html/template/Bar-GachaCheckReprint3.tpl
modifiedpublic_html/template/Bar-GachaReprint2.tpl
modifiedpublic_html/template/Bar-GachaReprint3.tpl
modifiedpublic_html/template/Bar-GachaRevival.tpl
modifiedpublic_html/template/Bar-Gacha_old.tpl
modifiedpublic_html/template/Bar-ItemGachaCheck.tpl
modifiedpublic_html/template/Bar-ItemGachaResult.tpl
modifiedpublic_html/template/Bar-MonsterGachaAnimation2.tpl
modifiedpublic_html/template/Bar-MonsterGachaCheck.tpl
modifiedpublic_html/template/Bar-MonsterGacha_Default.tpl
modifiedpublic_html/template/Bar-PickupGacha.tpl
modifiedpublic_html/template/Bar-PickupGachaAnimation.tpl
modifiedpublic_html/template/Bar-PickupGachaCheck.tpl
modifiedpublic_html/template/Bar-PickupGachaResult.tpl
modifiedpublic_html/template/Bar-PickupGachaSP.tpl
modifiedpublic_html/template/Bar-PointGacha.tpl
modifiedpublic_html/template/Bar-PointGachaAnimation.tpl
modifiedpublic_html/template/Bar-PointGachaCheck.tpl
modifiedpublic_html/template/Bar-PointGachaResult.tpl
modifiedpublic_html/template/Bar-SPGacha.tpl
modifiedpublic_html/template/Bar-SPGachaAnimation.tpl
modifiedpublic_html/template/Bar-SPGachaCheck.tpl
modifiedpublic_html/template/Bar-SPGachaReprint.tpl
modifiedpublic_html/template/Bar-SPGachaYamada.tpl
modifiedpublic_html/template/Bar-SPGacha_515.tpl
modifiedpublic_html/template/Bar-SPGacha_517.tpl
modifiedpublic_html/template/Bar-SelectCheck.tpl
modifiedpublic_html/template/Bar-SetupGacha.tpl
modifiedpublic_html/template/Bar-SetupGachaAnimation.tpl
modifiedpublic_html/template/Bar-SetupGachaCheck.tpl
modifiedpublic_html/template/Bar-SetupGachaResult.tpl
modifiedpublic_html/template/Bar-SpecialGachaAnimation.tpl
modifiedpublic_html/template/Bar-SpecialGacha_Default.tpl
modifiedpublic_html/template/Bar-SpecialGacha_Reprint.tpl
modifiedpublic_html/template/Battle-FinishAnimation.tpl
modifiedpublic_html/template/Commerce-Home.tpl
modifiedpublic_html/template/Deck-CardDetail.tpl
modifiedpublic_html/template/Deck-Home.tpl
modifiedpublic_html/template/Deck-SelectChangeCard.tpl
modifiedpublic_html/template/Deck-ShipDetail.tpl
modifiedpublic_html/template/DgameCampaign-LoginLotteryExec.tpl
modifiedpublic_html/template/Friend.tpl
addedpublic_html/template/GesotenLp.tpl
addedpublic_html/template/Gesoten__Error.tpl
modifiedpublic_html/template/Main-IslandUnlockAnimation.tpl
modifiedpublic_html/template/Main.tpl
modifiedpublic_html/template/OceanArea-DeckCardDetail.tpl
modifiedpublic_html/template/OceanArea-DeckHome.tpl
modifiedpublic_html/template/OceanArea-DeckSelectChangeCard.tpl
modifiedpublic_html/template/OceanArea-Default.tpl
modifiedpublic_html/template/OceanArea-ShipDetail.tpl
modifiedpublic_html/template/OceanArea-TeamMonsterCallAnimation.tpl
modifiedpublic_html/template/RaidBlueBallSummon-Check.tpl
modifiedpublic_html/template/RaidBlueBallSummon-Result.tpl
modifiedpublic_html/template/RaidBreakItem-Check.tpl
modifiedpublic_html/template/RaidBreakItem-Result.tpl
modifiedpublic_html/template/Resurrection-Animation.tpl
modifiedpublic_html/template/Ruins-DeckCardDetail.tpl
addedpublic_html/template/Ruins-DeckHome.tpl
modifiedpublic_html/template/Ruins-DeckSelectChangeCard.tpl
modifiedpublic_html/template/SeasonPass-TreasureLoki.tpl
modifiedpublic_html/template/SeasonPass-TreasureLokiAnimation.tpl
modifiedpublic_html/template/SeasonPass-TreasureLokiResult.tpl
modifiedpublic_html/template/Ship-CustomAnimation.tpl
modifiedpublic_html/template/Ship-CustomLvMaxAnimation.tpl
modifiedpublic_html/template/Ship-Default.tpl
modifiedpublic_html/template/Ship-MakeCompositeAnimation.tpl
modifiedpublic_html/template/Ship-MakeCompositeEndAnimation.tpl
modifiedpublic_html/template/Shop-Assortment.tpl
modifiedpublic_html/template/Shop-BoxSet.tpl
modifiedpublic_html/template/Shop-BoxSetAnimation.tpl
modifiedpublic_html/template/Shop-BoxSetCheck.tpl
modifiedpublic_html/template/Shop-CardHolderPack.tpl
modifiedpublic_html/template/Shop-GainSet.tpl
modifiedpublic_html/template/Shop-GoldSet.tpl
modifiedpublic_html/template/Shop-PurchaseLoginBonus.tpl
modifiedpublic_html/template/Shop-StarterPack.tpl
modifiedpublic_html/template/Shop-TrainingPack.tpl
modifiedpublic_html/template/Shop.tpl
modifiedpublic_html/template/Team.tpl
modifiedpublic_html/template/footer.tpl
modifiedpublic_html/template/header_sp.tpl
addedpublic_html/template/parts_card_info_modal.tpl
modifiedpublic_html/template/parts_cardpiece_info_modal.tpl
modifiedpublic_html/template/parts_limited_trade_shop_info_modal.tpl
modifiedpublic_html/template/parts_pirate_store_item_info_modal.tpl
modifiedpublic_html/template/parts_quest_tabs.tpl
Patch body is stored as a separate file to keep this page lightweight.