Skip to content

Commit

Permalink
Merge branch 'release/Ver.1.0.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
YSRKEN committed Jun 30, 2018
2 parents 7abff10 + 1d8cc6b commit 94d01ce
Show file tree
Hide file tree
Showing 12 changed files with 50 additions and 3 deletions.
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<p>
app-shell works!
使用方法は「ヘルプ」欄に記載してあります。
</p>
46 changes: 44 additions & 2 deletions CalcGachaProbTool/src/app/main/main.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,30 @@
<div class="col-xs-12 col-sm-8 col-md-6 mx-auto my-3">
<h1 class="text-center d-none d-sm-block">ガチャ確率計算機</h1>
<h2 class="text-center d-xs-block d-sm-none">ガチャ確率計算機</h2>
<h3 class="text-center d-none d-sm-block"><u><a href="https://github.com/YSRKEN/CalcGachaProbTool">Ver.1.0.0</a></u> 作者:<u><a href="https://twitter.com/YSRKEN">YSR</a></u></h3>
<h4 class="text-center d-xs-block d-sm-none"><u><a href="https://github.com/YSRKEN/CalcGachaProbTool">Ver.1.0.0</a></u> 作者:<u><a href="https://twitter.com/YSRKEN">YSR</a></u></h4>
<h3 class="text-center d-none d-sm-block">
<u>
<a href="https://github.com/YSRKEN/CalcGachaProbTool">Ver.1.0.1</a>
</u> 作者:
<u>
<a href="https://twitter.com/YSRKEN">YSR</a>
</u>
</h3>
<h4 class="text-center d-xs-block d-sm-none">
<u>
<a href="https://github.com/YSRKEN/CalcGachaProbTool">Ver.1.0.1</a>
</u> 作者:
<u>
<a href="https://twitter.com/YSRKEN">YSR</a>
</u>
</h4>
<!-- タブ部分 -->
<nav class="mt-3">
<div class="nav nav-tabs" id="nav-tab" role="tablist">
<a class="nav-item nav-link active" id="nav-calcprob-tab" data-toggle="tab" href="#nav-calcprob" role="tab" aria-controls="nav-calcprob"
aria-selected="true">確率計算</a>
<a class="nav-item nav-link" id="nav-testprob-tab" data-toggle="tab" href="#nav-testprob" role="tab" aria-controls="nav-testprob"
aria-selected="false">確率推定</a>
<a class="nav-item nav-link" id="nav-help-tab" data-toggle="tab" href="#nav-help" role="tab" aria-controls="nav-help" aria-selected="false">ヘルプ</a>
</div>
</nav>

Expand All @@ -27,6 +42,33 @@ <h4 class="text-center d-xs-block d-sm-none"><u><a href="https://github.com/YSRK
<div class="tab-pane border-right border-bottom border-left pt-3" id="nav-testprob" role="tabpanel" aria-labelledby="nav-testprob-tab">
<app-test-prob></app-test-prob>
</div>

<!-- ヘルプ -->
<div class="tab-pane border-right border-bottom border-left pt-3" id="nav-help" role="tabpanel" aria-labelledby="nav-help-tab">
<div class="scroll">
<p class="px-3">※スクロールして読んでください</p>
<h4> インストール方法</h4>
<p class="px-3"> スマホのChromeブラウザやSafariブラウザで開き、メニューから
<strong>「ホーム画面に追加」</strong>をタップしてください。</p>
<h4>「確率計算」について</h4>
<p class="px-3"> ガチャ1連で当たりを引く確率と引く回数から、成功確率などを計算してくれます。</p>
<h4>「確率推定」について</h4>
<p class="px-3"> ガチャを引いた回数とドロップ数と予想ドロップ率から、95%信頼区間やp値を計算してくれます。
<br>
<br>
<strong>95%信頼区間</strong>……「その設定のガチャを引いた人のうち、95%は当たりがこの範囲で出る」(雑な説明)
<br> . 使用した計算方法は
<strong>Clopper-Pearson method</strong>です(真面目な説明)
<br>
<br>
<strong>p値</strong>……「この値が0.05未満なら、予想ドロップ率と実際のドロップ率がかけ離れていると言える」(雑な説明)
<br> . 使用した計算方法は
<strong>Sterneの手法</strong>です(真面目な説明)
<br>
<br>
</p>
</div>
</div>
</div>
</div>
</div>
Expand Down
5 changes: 5 additions & 0 deletions CalcGachaProbTool/src/app/main/main.component.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
div.scroll {
width: 100%;
height: 70vh;
overflow: auto;
}
Binary file modified CalcGachaProbTool/src/assets/icons/icon-128x128.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified CalcGachaProbTool/src/assets/icons/icon-144x144.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified CalcGachaProbTool/src/assets/icons/icon-152x152.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified CalcGachaProbTool/src/assets/icons/icon-192x192.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified CalcGachaProbTool/src/assets/icons/icon-384x384.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified CalcGachaProbTool/src/assets/icons/icon-512x512.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified CalcGachaProbTool/src/assets/icons/icon-72x72.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified CalcGachaProbTool/src/assets/icons/icon-96x96.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified CalcGachaProbTool/src/favicon.ico
Binary file not shown.

0 comments on commit 94d01ce

Please sign in to comment.