GameManager修正, MiniGameシーン設定追加
This commit is contained in:
kimura
parent
3c03aa99e9
commit
40ca643170
|
|
@ -233,18 +233,6 @@ Transform:
|
|||
type: 3}
|
||||
m_PrefabInstance: {fileID: 184442866}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &184442868 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 3590064911546481895, guid: 10a5596421a45564397efb765bcabb55,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 184442866}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 55925464a5e04e219bc8367e5e6736a3, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1 &275350936
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -504,18 +492,6 @@ Transform:
|
|||
type: 3}
|
||||
m_PrefabInstance: {fileID: 480107651}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &480107653 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 3590064911546481895, guid: 10a5596421a45564397efb765bcabb55,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 480107651}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 55925464a5e04e219bc8367e5e6736a3, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1 &515787033
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -744,18 +720,6 @@ Transform:
|
|||
type: 3}
|
||||
m_PrefabInstance: {fileID: 628830307}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &628830309 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 3590064911546481895, guid: 10a5596421a45564397efb765bcabb55,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 628830307}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 55925464a5e04e219bc8367e5e6736a3, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!4 &644307298 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 153722296424896321, guid: acd6e6365b5fe4863aedc684a50b8028,
|
||||
|
|
@ -850,18 +814,6 @@ Transform:
|
|||
type: 3}
|
||||
m_PrefabInstance: {fileID: 894575453}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &894575455 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 3590064911546481895, guid: 10a5596421a45564397efb765bcabb55,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 894575453}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 55925464a5e04e219bc8367e5e6736a3, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!114 &896692871
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -955,18 +907,6 @@ Transform:
|
|||
type: 3}
|
||||
m_PrefabInstance: {fileID: 930800255}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &930800257 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 3590064911546481895, guid: 10a5596421a45564397efb765bcabb55,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 930800255}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 55925464a5e04e219bc8367e5e6736a3, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1001 &931896956
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -1047,18 +987,6 @@ Transform:
|
|||
type: 3}
|
||||
m_PrefabInstance: {fileID: 931896956}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &931896958 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 3590064911546481895, guid: 10a5596421a45564397efb765bcabb55,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 931896956}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 55925464a5e04e219bc8367e5e6736a3, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1001 &962275290
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -1139,18 +1067,6 @@ Transform:
|
|||
type: 3}
|
||||
m_PrefabInstance: {fileID: 962275290}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &962275292 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 3590064911546481895, guid: 10a5596421a45564397efb765bcabb55,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 962275290}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 55925464a5e04e219bc8367e5e6736a3, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!114 &963314161
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -1407,6 +1323,11 @@ PrefabInstance:
|
|||
propertyPath: hitTime
|
||||
value: 1.4
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2607884839347368726, guid: acd6e6365b5fe4863aedc684a50b8028,
|
||||
type: 3}
|
||||
propertyPath: fallLimit
|
||||
value: -7.59
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2607884839347368726, guid: acd6e6365b5fe4863aedc684a50b8028,
|
||||
type: 3}
|
||||
propertyPath: fallSpeed
|
||||
|
|
@ -1802,18 +1723,6 @@ Transform:
|
|||
type: 3}
|
||||
m_PrefabInstance: {fileID: 1328382762}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &1328382764 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 3590064911546481895, guid: 10a5596421a45564397efb765bcabb55,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 1328382762}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 55925464a5e04e219bc8367e5e6736a3, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!114 &1340402662
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -1907,18 +1816,6 @@ Transform:
|
|||
type: 3}
|
||||
m_PrefabInstance: {fileID: 1363981460}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &1363981462 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 3590064911546481895, guid: 10a5596421a45564397efb765bcabb55,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 1363981460}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 55925464a5e04e219bc8367e5e6736a3, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!114 &1426747593
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -1956,7 +1853,7 @@ Transform:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1450368325}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 9.285316, y: -2.5877247, z: -5.716469}
|
||||
m_LocalPosition: {x: 0, y: -2.5877247, z: -5.716469}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
|
|
@ -2383,18 +2280,6 @@ Transform:
|
|||
type: 3}
|
||||
m_PrefabInstance: {fileID: 1862591111}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &1862591113 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 3590064911546481895, guid: 10a5596421a45564397efb765bcabb55,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 1862591111}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 55925464a5e04e219bc8367e5e6736a3, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1 &1870432532
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -2426,7 +2311,6 @@ MonoBehaviour:
|
|||
m_Script: {fileID: 11500000, guid: 96c2b99ef2e6c42dd998b782def0bd0e, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
timeLimit: 30
|
||||
headerView: {fileID: 7328251774669809638}
|
||||
player: {fileID: 1261404582}
|
||||
stageSelectView: {fileID: 2071735749}
|
||||
|
|
@ -2482,19 +2366,14 @@ MonoBehaviour:
|
|||
m_Script: {fileID: 11500000, guid: 92d8af3e7a454c858429c462d377f112, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
backGrounds:
|
||||
- {fileID: 894575455}
|
||||
- {fileID: 2044773547}
|
||||
- {fileID: 184442868}
|
||||
- {fileID: 628830309}
|
||||
- {fileID: 962275292}
|
||||
- {fileID: 931896958}
|
||||
- {fileID: 480107653}
|
||||
- {fileID: 1328382764}
|
||||
- {fileID: 1862591113}
|
||||
- {fileID: 930800257}
|
||||
- {fileID: 1363981462}
|
||||
stageTarget: {fileID: 1450368326}
|
||||
normalTime: 2
|
||||
hardTime: 4
|
||||
extraTime: 6
|
||||
stageGenerateDistance: 10
|
||||
generateStageCount: 1
|
||||
beginStageOffset: 0.5
|
||||
partsToPartsOffset: 3
|
||||
--- !u!114 &1932485204
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -2583,18 +2462,6 @@ Transform:
|
|||
type: 3}
|
||||
m_PrefabInstance: {fileID: 2044773545}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &2044773547 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 3590064911546481895, guid: 10a5596421a45564397efb765bcabb55,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 2044773545}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 55925464a5e04e219bc8367e5e6736a3, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1 &2055584752
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -2860,7 +2727,7 @@ PrefabInstance:
|
|||
- target: {fileID: 2233378810729895866, guid: 4700f2d6cab15484295a1f9b42d78ec9,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
value: 2.3
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2233378810729895866, guid: 4700f2d6cab15484295a1f9b42d78ec9,
|
||||
type: 3}
|
||||
|
|
@ -2917,6 +2784,11 @@ PrefabInstance:
|
|||
propertyPath: m_IsActive
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9198101237787776717, guid: 4700f2d6cab15484295a1f9b42d78ec9,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 7.5
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 4700f2d6cab15484295a1f9b42d78ec9, type: 3}
|
||||
--- !u!4 &2104274173 stripped
|
||||
|
|
|
|||
|
|
@ -1,9 +1,7 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using MyGame.Scripts;
|
||||
using UniRx;
|
||||
using UniRx.Diagnostics;
|
||||
using UniRx.Triggers;
|
||||
using UnityEditor;
|
||||
using UnityEngine;
|
||||
|
|
@ -25,7 +23,6 @@ namespace MyGame.Scenes.MiniGame.Scripts
|
|||
Failure
|
||||
}
|
||||
|
||||
[SerializeField] private float timeLimit = 30f;
|
||||
[SerializeField] private HeaderView headerView;
|
||||
[SerializeField] private Player player;
|
||||
[SerializeField] private StageSelectView stageSelectView;
|
||||
|
|
@ -163,28 +160,12 @@ namespace MyGame.Scenes.MiniGame.Scripts
|
|||
break;
|
||||
case GameState.Play:
|
||||
SoundManager.Instance.PlaySE("se_minigame_Start");
|
||||
var sharedTimer = Observable.Timer(TimeSpan.Zero, TimeSpan.FromSeconds(1f))
|
||||
.Select(time => (int)(timeLimit - time))
|
||||
.TakeWhile(time => time >= 0)
|
||||
.Share();
|
||||
sharedTimer.Subscribe(time =>
|
||||
{
|
||||
headerView.ChangeTimeCount(time);
|
||||
}, () =>
|
||||
{
|
||||
headerView.ChangeTimeCount(0f);
|
||||
state.Value = GameState.Success;
|
||||
}).AddTo(gameCompositeDisposable);
|
||||
sharedTimer
|
||||
.Where(time => time <= 5)
|
||||
.Take(1)
|
||||
.Subscribe(time =>
|
||||
{
|
||||
SoundManager.Instance.PlaySE("se_minigame_RemainingTimeLeft");
|
||||
headerView.StartCountDown();
|
||||
}).AddTo(gameCompositeDisposable);
|
||||
stageManager.StartTimer();
|
||||
break;
|
||||
case GameState.Success:
|
||||
SoundManager.Instance.PlaySE("se_minigame_End");
|
||||
stageManager.StopTimer();
|
||||
player.Result();
|
||||
break;
|
||||
case GameState.Failure:
|
||||
break;
|
||||
|
|
@ -218,6 +199,7 @@ namespace MyGame.Scenes.MiniGame.Scripts
|
|||
// カメラ移動
|
||||
cameraTransform.position = playerPosX * Vector3.right + cameraOffset;
|
||||
bgManager.UpdatePos(playerPosX);
|
||||
stageManager.UpdatePos(playerPosX);
|
||||
}).AddTo(this);
|
||||
|
||||
stageManager.OnFence.Subscribe(x =>
|
||||
|
|
@ -225,6 +207,12 @@ namespace MyGame.Scenes.MiniGame.Scripts
|
|||
bgManager.SetFenceXPos(x);
|
||||
}).AddTo(this);
|
||||
|
||||
// コース難易度変更
|
||||
stageManager.Difficulty.SkipLatestValueOnSubscribe().Subscribe(x =>
|
||||
{
|
||||
bgManager.SetSky(x);
|
||||
}).AddTo(this);
|
||||
|
||||
player.OnHitItem.Where(_ => state.Value == GameState.Play).Subscribe(x =>
|
||||
{
|
||||
if (!x.TryGetComponent<StageItem>(out var item))
|
||||
|
|
@ -275,6 +263,11 @@ namespace MyGame.Scenes.MiniGame.Scripts
|
|||
}
|
||||
player.Hit(x.ClosestPoint(playerTransform.position));
|
||||
x.enabled = false;
|
||||
// ゲーム終了
|
||||
Observable.Timer(TimeSpan.FromSeconds(1f)).Subscribe(_ =>
|
||||
{
|
||||
state.Value = GameState.Success;
|
||||
}).AddTo(this);
|
||||
break;
|
||||
case StageItem.Type.Item1:
|
||||
break;
|
||||
|
|
@ -294,34 +287,20 @@ namespace MyGame.Scenes.MiniGame.Scripts
|
|||
{
|
||||
SoundManager.Instance.ChangeVolumeUniqueBGM(1f);
|
||||
// ステージ読み込み
|
||||
stageManager.SetSky(stageData.Difficulty);
|
||||
stageManager.SetBeginStages(stageData.GetBeginStagePrefabs());
|
||||
player.transform.position = characterBeginPos;
|
||||
player.ResetPlayer();
|
||||
scoreCount.Value = 0;
|
||||
headerView.ChangeTimeCount(timeLimit);
|
||||
resultManager.Reset();
|
||||
gameCompositeDisposable.Clear();
|
||||
state.SkipLatestValueOnSubscribe().Subscribe(x =>
|
||||
{
|
||||
switch (x)
|
||||
if (x == GameState.Success)
|
||||
{
|
||||
case GameState.Ready:
|
||||
break;
|
||||
case GameState.Play:
|
||||
break;
|
||||
case GameState.Success:
|
||||
SoundManager.Instance.PlaySE("se_minigame_End");
|
||||
player.Result();
|
||||
this.CallWaitForSeconds(1f, () =>
|
||||
{
|
||||
resultManager.ShowResult(scoreCount.Value, placeList, stageData);
|
||||
});
|
||||
break;
|
||||
case GameState.Failure:
|
||||
break;
|
||||
default:
|
||||
throw new ArgumentOutOfRangeException(nameof(x), x, null);
|
||||
this.CallWaitForSeconds(1f, () =>
|
||||
{
|
||||
resultManager.ShowResult(scoreCount.Value, placeList, stageData);
|
||||
});
|
||||
}
|
||||
}).AddTo(gameCompositeDisposable);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue