ヤマダ版ではリリースしないが、コレクションボーナス実装時に必要な処理を含むためマージ
リリースは遠い未来に設定して非公開で本番反映
秘宝効果マスタ jolly/jrye-db#960
秘宝の使用、入手時の表示
相場変動制ページへの導線非公開確認
魂、秘宝でカード強化時の合計EXP
@kouho
レビューお願いします。
| base | 0da5c176ab3e4642c46ac968b7765156e45ac14f |
|---|---|
| head | d15d8a1ba014cf38a154fbbbdde68be0674394b0 |
| base branch | jolly/jr-web:master |
| head branch | jolly/jr-web:area_item_update |
| status | file |
|---|---|
| modified | cpanel_html/template/m_limited_quest_add.tpl |
| modified | cpanel_html/template/m_limited_quest_edit.tpl |
| modified | lib/SubFunc.inc |
| modified | lib/SubFunc_mission.inc |
| modified | lib/ajax/areaItem_cardDetail.inc |
| modified | lib/ajax/areaItem_cardList.inc |
| modified | lib/ajax/areaItem_detail.inc |
| modified | lib/ajax/areaItem_result.inc |
| modified | lib/ajax/mission_default.inc |
| modified | lib/ajax/ship_makeComposite.inc |
| added | lib/conf/class/AreaItemEffectConfig.class.php |
| modified | lib/cpanel/m_limited_quest_add_check.inc |
| modified | lib/cpanel/m_limited_quest_edit_check.inc |
| modified | lib/cpanel/m_questRegistCheck.inc |
| modified | lib/cpanel/m_quest_edit_check.inc |
| added | lib/exec/area_item_effect_update.sh |
| added | lib/exec/tool_area_item_effect_update.inc |
| modified | lib/models/Yamada_game_marathon.php |
| added | lib/public/AreaItem-Effect.inc |
| modified | lib/public/Bar-ItemGachaResult.inc |
| modified | lib/public/Card-ExpItem.inc |
| modified | lib/public/Ship-CustomExec.inc |
| added | public_html/img/area_item/effect/back_01.png |
| added | public_html/img/area_item/effect/back_02.png |
| added | public_html/img/area_item/effect/back_03.png |
| added | public_html/img/area_item/effect/back_04.png |
| added | public_html/img/area_item/effect/back_05.png |
| added | public_html/img/area_item/effect/icon_clock.png |
| added | public_html/img/area_item/effect/icon_flag.png |
| added | public_html/img/area_item/effect/tab_00.png |
| added | public_html/img/area_item/effect/tab_00_off.png |
| added | public_html/img/area_item/effect/tab_01.png |
| added | public_html/img/area_item/effect/tab_01_off.png |
| added | public_html/img/area_item/effect/tab_02.png |
| added | public_html/img/area_item/effect/tab_02_off.png |
| added | public_html/img/area_item/effect/tab_03.png |
| added | public_html/img/area_item/effect/tab_03_off.png |
| added | public_html/img/area_item/effect/tab_04.png |
| added | public_html/img/area_item/effect/tab_04_off.png |
| added | public_html/img/area_item/effect/tab_05.png |
| added | public_html/img/area_item/effect/tab_05_off.png |
| modified | public_html/index.php |
| modified | public_html/js/JOLLYROGER.js |
| modified | public_html/js/JOLLYROGER_mission.js |
| added | public_html/template/AreaItem-Effect.tpl |
| modified | public_html/template/AreaItem.tpl |
| modified | public_html/template/Card-ExpItem.tpl |
| modified | public_html/template/Friend-Trade.tpl |
| modified | public_html/template/Main-Location.tpl |
| modified | tool/analytics/一時バッチ処理/tool_daily_ship_analytics.php |