yangwu
/
popcorn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'feature/addMiniGame' of bitbucket.org:usaya/popcorn into feature/addMiniGame

This commit is contained in:
koya_15 2022-06-30 16:55:32 +09:00
parent 894afbfddb 976f44d586
commit 4845ab7e0d
2 changed files with 79 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/GameManager.cs
View File

@ -180,7 +180,7 @@ namespace MyGame.Scenes.MiniGame.Scripts
SoundManager.Instance.PlaySE("se_minigame_Start"); SoundManager.Instance.PlaySE("se_minigame_Start");
var sharedTimer = Observable.Timer(TimeSpan.Zero, TimeSpan.FromSeconds(1f)) var sharedTimer = Observable.Timer(TimeSpan.Zero, TimeSpan.FromSeconds(1f))
.Select(time => (int)(timeLimit - time)) .Select(time => (int)(timeLimit - time))
.TakeWhile(time => time > 0) .TakeWhile(time => time >= 0)
.Share(); .Share();
sharedTimer.Subscribe(time => sharedTimer.Subscribe(time =>
{ {

79
popcorn/Assets/Resources/I2Languages.asset
View File

@ -13423,6 +13423,83 @@ MonoBehaviour:
- Material_en/UI/ui_tutorial_FryingPanExplanation_en_Dither[ui_tutorial_FryingPanExplanation_en_Dither] - Material_en/UI/ui_tutorial_FryingPanExplanation_en_Dither[ui_tutorial_FryingPanExplanation_en_Dither]
Flags: 0000000000 Flags: 0000000000
Languages_Touch: [] Languages_Touch: []
- Term: Item/MaterialName0022
TermType: 0
Description:
Languages:
- "\u9EBB\u8FA3\u30D1\u30A6\u30C0\u30FC"
-
-
-
-
Flags: 0000000000
Languages_Touch: []
- Term: Item/MaterialName0023
TermType: 0
Description:
Languages:
- "\u9EBB\u8FA3\u30DD\u30C3\u30D7\u30B3\u30FC\u30F3"
-
-
-
-
Flags: 0000000000
Languages_Touch: []
- Term: Item/MaterialText0022
TermType: 0
Description:
Languages:
-
-
-
-
-
Flags: 0000000000
Languages_Touch: []
- Term: Item/MaterialText0023
TermType: 0
Description:
Languages:
-
-
-
-
-
Flags: 0000000000
Languages_Touch: []
- Term: Item/ProductName0025
TermType: 0
Description:
Languages:
- "\u9EBB\u8FA3\u30DD\u30C3\u30D7\u30B3\u30FC\u30F3"
-
-
-
-
Flags: 0000000000
Languages_Touch: []
- Term: Item/ProductText0025
TermType: 0
Description:
Languages:
- "\u82B1\u6912\u3068\u5510\u8F9B\u5B50\u306E\u30CF\u30FC\u30E2\u30CB\u30FC\u304C\u751F\u307F\u51FA\u3059\n\u7D76\u5999\u306A\u8F9B\u3055\u304C\u3084\u307F\u3064\u304D\u306B\u306A\u308B\u30DD\u30C3\u30D7\u30B3\u30FC\u30F3\n"
-
-
-
-
Flags: 0000000000
Languages_Touch: []
- Term: Item/ScrollGamePlaceName0001
TermType: 0
Description:
Languages:
- "\u3068\u3046\u304C\u3089\u3057\u7551"
-
-
-
-
Flags: 0000000000
Languages_Touch: []
CaseInsensitiveTerms: 0 CaseInsensitiveTerms: 0
OnMissingTranslation: 3 OnMissingTranslation: 3
mTerm_AppName: mTerm_AppName:
@ -13447,7 +13524,7 @@ MonoBehaviour:
Google_WebServiceURL: https://script.google.com/a/macros/usaya.jp/s/AKfycbzSBhEFwZVCfg1dkGwVNsYBgv460KeK1X-gKOxsu89c8EkzjZmPR3kOWC_EVVyii6Xt4w/exec Google_WebServiceURL: https://script.google.com/a/macros/usaya.jp/s/AKfycbzSBhEFwZVCfg1dkGwVNsYBgv460KeK1X-gKOxsu89c8EkzjZmPR3kOWC_EVVyii6Xt4w/exec
Google_SpreadsheetKey: 1jfQDKhWF5LDrIA_xkhvBOVczqi-7YMQFd-wlN2BIqI8 Google_SpreadsheetKey: 1jfQDKhWF5LDrIA_xkhvBOVczqi-7YMQFd-wlN2BIqI8
Google_SpreadsheetName: I2Loc popcorn Localization Google_SpreadsheetName: I2Loc popcorn Localization
Google_LastUpdatedVersion: 1656496771065 Google_LastUpdatedVersion: 1656573045103
Google_Password: change_this Google_Password: change_this
GoogleUpdateFrequency: 1 GoogleUpdateFrequency: 1
GoogleInEditorCheckFrequency: 1 GoogleInEditorCheckFrequency: 1