Shape added
This commit is contained in:
@@ -13,5 +13,6 @@ public interface IColoringController
|
|||||||
|
|
||||||
void PaintRegion(string regionId, Color color);
|
void PaintRegion(string regionId, Color color);
|
||||||
IReadOnlyDictionary<string, Color> GetCurrentColors();
|
IReadOnlyDictionary<string, Color> GetCurrentColors();
|
||||||
|
UniTask PlayCompletionAnimationAsync(CancellationToken ct);
|
||||||
void Clear();
|
void Clear();
|
||||||
}
|
}
|
||||||
@@ -84,6 +84,19 @@ public class ColoringController : IColoringController, IDisposable
|
|||||||
return snapshot;
|
return snapshot;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public async UniTask PlayCompletionAnimationAsync(CancellationToken ct)
|
||||||
|
{
|
||||||
|
if (_colorInstance == null) return;
|
||||||
|
var animator = _colorInstance.GetComponentInChildren<Animator>(includeInactive: true);
|
||||||
|
if (animator == null || animator.runtimeAnimatorController == null) return;
|
||||||
|
|
||||||
|
animator.Play(0, 0, 0f);
|
||||||
|
animator.Update(0f);
|
||||||
|
var length = animator.GetCurrentAnimatorStateInfo(0).length;
|
||||||
|
if (length <= 0f) return;
|
||||||
|
await UniTask.Delay(TimeSpan.FromSeconds(length), cancellationToken: ct);
|
||||||
|
}
|
||||||
|
|
||||||
public void Clear()
|
public void Clear()
|
||||||
{
|
{
|
||||||
_history.Drop();
|
_history.Drop();
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
using Darkmatter.Core.Contracts.Features.GameplayFlow;
|
using Darkmatter.Core.Contracts.Features.GameplayFlow;
|
||||||
using Darkmatter.Features.GameplayFlow.SceneRefs;
|
using Darkmatter.Features.GameplayFlow.SceneRefs;
|
||||||
using Darkmatter.Features.GameplayFlow.Systems;
|
using Darkmatter.Features.GameplayFlow.Systems;
|
||||||
|
using Darkmatter.Features.GameplayFlow.UI;
|
||||||
using Darkmatter.Libs.Installers;
|
using Darkmatter.Libs.Installers;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
using VContainer;
|
using VContainer;
|
||||||
@@ -11,6 +12,8 @@ namespace Darkmatter.Features.GameplayFlow
|
|||||||
public class GameplayFlowFeatureModule : MonoBehaviour, IModule
|
public class GameplayFlowFeatureModule : MonoBehaviour, IModule
|
||||||
{
|
{
|
||||||
[SerializeField] private GameplaySceneRefs sceneRefs;
|
[SerializeField] private GameplaySceneRefs sceneRefs;
|
||||||
|
[SerializeField] private NextButtonView nextButtonView;
|
||||||
|
[SerializeField] private BackButtonView backButtonView;
|
||||||
|
|
||||||
public void Register(IContainerBuilder builder)
|
public void Register(IContainerBuilder builder)
|
||||||
{
|
{
|
||||||
@@ -20,6 +23,12 @@ namespace Darkmatter.Features.GameplayFlow
|
|||||||
builder.Register<GameplayFlowController>(Lifetime.Singleton)
|
builder.Register<GameplayFlowController>(Lifetime.Singleton)
|
||||||
.As<IGameplayFlowController>()
|
.As<IGameplayFlowController>()
|
||||||
.As<IAsyncStartable>();
|
.As<IAsyncStartable>();
|
||||||
|
|
||||||
|
if (nextButtonView != null)
|
||||||
|
builder.RegisterEntryPoint<NextButtonPresenter>().WithParameter(nextButtonView);
|
||||||
|
|
||||||
|
if (backButtonView != null)
|
||||||
|
builder.RegisterEntryPoint<BackButtonPresenter>().WithParameter(backButtonView);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -106,9 +106,11 @@ namespace Darkmatter.Features.GameplayFlow.Systems
|
|||||||
public async UniTask BackAsync(CancellationToken ct)
|
public async UniTask BackAsync(CancellationToken ct)
|
||||||
{
|
{
|
||||||
await SaveCurrentAsync(CancellationToken.None);
|
await SaveCurrentAsync(CancellationToken.None);
|
||||||
|
_loadingScreen.Show();
|
||||||
_shapeBuilder.Clear();
|
_shapeBuilder.Clear();
|
||||||
_coloring.Clear();
|
_coloring.Clear();
|
||||||
await _scenes.LoadSceneAsync(GameScene.Colorbook, progress: null, cancellationToken: ct);
|
await _scenes.LoadSceneAsync(GameScene.Colorbook, progress: null, cancellationToken: ct);
|
||||||
|
await _scenes.UnloadSceneAsync(GameScene.Gameplay, progress: null, cancellationToken: ct);
|
||||||
}
|
}
|
||||||
|
|
||||||
public async UniTask SaveAsync(CancellationToken ct)
|
public async UniTask SaveAsync(CancellationToken ct)
|
||||||
@@ -120,12 +122,17 @@ namespace Darkmatter.Features.GameplayFlow.Systems
|
|||||||
public async UniTask NextAsync(CancellationToken ct)
|
public async UniTask NextAsync(CancellationToken ct)
|
||||||
{
|
{
|
||||||
await SaveCurrentAsync(ct);
|
await SaveCurrentAsync(ct);
|
||||||
|
await _coloring.PlayCompletionAnimationAsync(ct);
|
||||||
_progression.MarkCompleted(_templateId);
|
_progression.MarkCompleted(_templateId);
|
||||||
|
|
||||||
var nextId = _catalog.GetNextTemplate(_templateId);
|
var nextId = _catalog.GetNextTemplate(_templateId);
|
||||||
if (string.IsNullOrEmpty(nextId))
|
if (string.IsNullOrEmpty(nextId))
|
||||||
{
|
{
|
||||||
|
_loadingScreen.Show();
|
||||||
|
_shapeBuilder.Clear();
|
||||||
|
_coloring.Clear();
|
||||||
await _scenes.LoadSceneAsync(GameScene.Colorbook, progress: null, cancellationToken: default);
|
await _scenes.LoadSceneAsync(GameScene.Colorbook, progress: null, cancellationToken: default);
|
||||||
|
await _scenes.UnloadSceneAsync(GameScene.Gameplay, progress: null, cancellationToken: default);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
8
Assets/Darkmatter/Code/Features/GameplayFlow/UI.meta
Normal file
8
Assets/Darkmatter/Code/Features/GameplayFlow/UI.meta
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 0d25e0f770e2843b1bfcfc70127113a5
|
||||||
|
folderAsset: yes
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@@ -0,0 +1,44 @@
|
|||||||
|
using System;
|
||||||
|
using Cysharp.Threading.Tasks;
|
||||||
|
using Darkmatter.Core.Contracts.Features.GameplayFlow;
|
||||||
|
using VContainer.Unity;
|
||||||
|
|
||||||
|
namespace Darkmatter.Features.GameplayFlow.UI
|
||||||
|
{
|
||||||
|
public class BackButtonPresenter : IStartable, IDisposable
|
||||||
|
{
|
||||||
|
private readonly BackButtonView _view;
|
||||||
|
private readonly IGameplayFlowController _flow;
|
||||||
|
|
||||||
|
public BackButtonPresenter(BackButtonView view, IGameplayFlowController flow)
|
||||||
|
{
|
||||||
|
_view = view;
|
||||||
|
_flow = flow;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Start()
|
||||||
|
{
|
||||||
|
_view.OnBackClicked += HandleBackClicked;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void HandleBackClicked() => BackAsync().Forget();
|
||||||
|
|
||||||
|
private async UniTaskVoid BackAsync()
|
||||||
|
{
|
||||||
|
_view.SetInteractable(false);
|
||||||
|
try
|
||||||
|
{
|
||||||
|
await _flow.BackAsync(default);
|
||||||
|
}
|
||||||
|
finally
|
||||||
|
{
|
||||||
|
_view.SetInteractable(true);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Dispose()
|
||||||
|
{
|
||||||
|
_view.OnBackClicked -= HandleBackClicked;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,2 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: c389d35e3758a429abbf74013ad72c68
|
||||||
@@ -0,0 +1,29 @@
|
|||||||
|
using System;
|
||||||
|
using UnityEngine;
|
||||||
|
using UnityEngine.UI;
|
||||||
|
|
||||||
|
namespace Darkmatter.Features.GameplayFlow.UI
|
||||||
|
{
|
||||||
|
public class BackButtonView : MonoBehaviour
|
||||||
|
{
|
||||||
|
[SerializeField] private Button backButton;
|
||||||
|
|
||||||
|
public event Action OnBackClicked;
|
||||||
|
|
||||||
|
private void Awake()
|
||||||
|
{
|
||||||
|
if (backButton != null)
|
||||||
|
backButton.onClick.AddListener(() => OnBackClicked?.Invoke());
|
||||||
|
}
|
||||||
|
|
||||||
|
public void SetInteractable(bool value)
|
||||||
|
{
|
||||||
|
if (backButton != null) backButton.interactable = value;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void OnDestroy()
|
||||||
|
{
|
||||||
|
if (backButton != null) backButton.onClick.RemoveAllListeners();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,2 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: b7254cdaad34b4d6fa607b0520ea5b4c
|
||||||
@@ -0,0 +1,52 @@
|
|||||||
|
using System;
|
||||||
|
using Cysharp.Threading.Tasks;
|
||||||
|
using Darkmatter.Core.Contracts.Features.GameplayFlow;
|
||||||
|
using Darkmatter.Core.Data.Signals.Features.Coloring;
|
||||||
|
using Darkmatter.Libs.Observer;
|
||||||
|
using VContainer.Unity;
|
||||||
|
|
||||||
|
namespace Darkmatter.Features.GameplayFlow.UI
|
||||||
|
{
|
||||||
|
public class NextButtonPresenter : IStartable, IDisposable
|
||||||
|
{
|
||||||
|
private readonly NextButtonView _view;
|
||||||
|
private readonly IGameplayFlowController _flow;
|
||||||
|
private readonly IEventBus _bus;
|
||||||
|
private IDisposable _colorSub;
|
||||||
|
|
||||||
|
public NextButtonPresenter(NextButtonView view, IGameplayFlowController flow, IEventBus bus)
|
||||||
|
{
|
||||||
|
_view = view;
|
||||||
|
_flow = flow;
|
||||||
|
_bus = bus;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Start()
|
||||||
|
{
|
||||||
|
_view.Hide();
|
||||||
|
_view.OnNextClicked += HandleNextClicked;
|
||||||
|
_colorSub = _bus.Subscribe<ColorAppliedSignal>(_ => _view.Show());
|
||||||
|
}
|
||||||
|
|
||||||
|
private void HandleNextClicked() => NextAsync().Forget();
|
||||||
|
|
||||||
|
private async UniTaskVoid NextAsync()
|
||||||
|
{
|
||||||
|
_view.SetInteractable(false);
|
||||||
|
try
|
||||||
|
{
|
||||||
|
await _flow.NextAsync(default);
|
||||||
|
}
|
||||||
|
finally
|
||||||
|
{
|
||||||
|
_view.SetInteractable(true);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Dispose()
|
||||||
|
{
|
||||||
|
_view.OnNextClicked -= HandleNextClicked;
|
||||||
|
_colorSub?.Dispose();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,2 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 06e4d4a98bf0e45de98a7960005542a0
|
||||||
@@ -0,0 +1,32 @@
|
|||||||
|
using System;
|
||||||
|
using UnityEngine;
|
||||||
|
using UnityEngine.UI;
|
||||||
|
|
||||||
|
namespace Darkmatter.Features.GameplayFlow.UI
|
||||||
|
{
|
||||||
|
public class NextButtonView : MonoBehaviour
|
||||||
|
{
|
||||||
|
[SerializeField] private Button nextButton;
|
||||||
|
|
||||||
|
public event Action OnNextClicked;
|
||||||
|
|
||||||
|
private void Awake()
|
||||||
|
{
|
||||||
|
if (nextButton != null)
|
||||||
|
nextButton.onClick.AddListener(() => OnNextClicked?.Invoke());
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Show() => gameObject.SetActive(true);
|
||||||
|
public void Hide() => gameObject.SetActive(false);
|
||||||
|
|
||||||
|
public void SetInteractable(bool value)
|
||||||
|
{
|
||||||
|
if (nextButton != null) nextButton.interactable = value;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void OnDestroy()
|
||||||
|
{
|
||||||
|
if (nextButton != null) nextButton.onClick.RemoveAllListeners();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,2 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: e41584b03d9144e55b851c6db449aadb
|
||||||
@@ -35,7 +35,7 @@ RectTransform:
|
|||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0.5, y: 1}
|
m_AnchorMin: {x: 0.5, y: 1}
|
||||||
m_AnchorMax: {x: 0.5, y: 1}
|
m_AnchorMax: {x: 0.5, y: 1}
|
||||||
m_AnchoredPosition: {x: 54, y: -326}
|
m_AnchoredPosition: {x: 56.7, y: -326.5}
|
||||||
m_SizeDelta: {x: 31, y: 69}
|
m_SizeDelta: {x: 31, y: 69}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &1883818561078558899
|
--- !u!222 &1883818561078558899
|
||||||
|
|||||||
@@ -0,0 +1,92 @@
|
|||||||
|
%YAML 1.1
|
||||||
|
%TAG !u! tag:unity3d.com,2011:
|
||||||
|
--- !u!1 &4018315547665848156
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 7744307764399824425}
|
||||||
|
- component: {fileID: 6365559784855574788}
|
||||||
|
- component: {fileID: 5619168769716611897}
|
||||||
|
- component: {fileID: 1426813748225321167}
|
||||||
|
m_Layer: 5
|
||||||
|
m_Name: Semi Circle
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!224 &7744307764399824425
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 4018315547665848156}
|
||||||
|
m_LocalRotation: {x: -0, y: -0, z: 0.9459242, w: 0.3243876}
|
||||||
|
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||||
|
m_LocalScale: {x: 0.62555456, y: 0.62555456, z: 0.62555456}
|
||||||
|
m_ConstrainProportionsScale: 1
|
||||||
|
m_Children: []
|
||||||
|
m_Father: {fileID: 0}
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 142.143}
|
||||||
|
m_AnchorMin: {x: 0, y: 0}
|
||||||
|
m_AnchorMax: {x: 0, y: 0}
|
||||||
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
|
m_SizeDelta: {x: 0, y: 0}
|
||||||
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
--- !u!222 &6365559784855574788
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 4018315547665848156}
|
||||||
|
m_CullTransparentMesh: 1
|
||||||
|
--- !u!114 &5619168769716611897
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 4018315547665848156}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image
|
||||||
|
m_Material: {fileID: 0}
|
||||||
|
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
m_RaycastTarget: 1
|
||||||
|
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
m_Maskable: 1
|
||||||
|
m_OnCullStateChanged:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_Sprite: {fileID: 21300000, guid: ec25d9f38cb5b9e4e8137867ab2fdba5, type: 3}
|
||||||
|
m_Type: 0
|
||||||
|
m_PreserveAspect: 1
|
||||||
|
m_FillCenter: 1
|
||||||
|
m_FillMethod: 4
|
||||||
|
m_FillAmount: 1
|
||||||
|
m_FillClockwise: 1
|
||||||
|
m_FillOrigin: 0
|
||||||
|
m_UseSpriteMesh: 0
|
||||||
|
m_PixelsPerUnitMultiplier: 1
|
||||||
|
--- !u!114 &1426813748225321167
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 4018315547665848156}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 5d79b18d536324085b58d842648372a8, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier: Features.ShapeBuilder::Darkmatter.Features.ShapeBuilder.UI.SlotMarker
|
||||||
|
shape: {fileID: 11400000, guid: f5c929a6f977347d0ad820f3c75fad22, type: 2}
|
||||||
|
outline: {fileID: 0}
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 672d03f1267bd475e8e13138745d7a26
|
||||||
|
PrefabImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@@ -0,0 +1,92 @@
|
|||||||
|
%YAML 1.1
|
||||||
|
%TAG !u! tag:unity3d.com,2011:
|
||||||
|
--- !u!1 &3131919094368649507
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 6065956399601147459}
|
||||||
|
- component: {fileID: 8696052209776578822}
|
||||||
|
- component: {fileID: 2246199958633846422}
|
||||||
|
- component: {fileID: 2943043780804435268}
|
||||||
|
m_Layer: 5
|
||||||
|
m_Name: Semi Oval
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!224 &6065956399601147459
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 3131919094368649507}
|
||||||
|
m_LocalRotation: {x: -0, y: -0, z: 0.9459242, w: 0.3243876}
|
||||||
|
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||||
|
m_LocalScale: {x: 0.62555456, y: 0.62555456, z: 0.62555456}
|
||||||
|
m_ConstrainProportionsScale: 1
|
||||||
|
m_Children: []
|
||||||
|
m_Father: {fileID: 0}
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 142.143}
|
||||||
|
m_AnchorMin: {x: 0, y: 0}
|
||||||
|
m_AnchorMax: {x: 0, y: 0}
|
||||||
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
|
m_SizeDelta: {x: 0, y: 0}
|
||||||
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
--- !u!222 &8696052209776578822
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 3131919094368649507}
|
||||||
|
m_CullTransparentMesh: 1
|
||||||
|
--- !u!114 &2246199958633846422
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 3131919094368649507}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image
|
||||||
|
m_Material: {fileID: 0}
|
||||||
|
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
m_RaycastTarget: 1
|
||||||
|
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
m_Maskable: 1
|
||||||
|
m_OnCullStateChanged:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_Sprite: {fileID: 21300000, guid: 1beff6daa2ae430489c42e4a555da441, type: 3}
|
||||||
|
m_Type: 0
|
||||||
|
m_PreserveAspect: 1
|
||||||
|
m_FillCenter: 1
|
||||||
|
m_FillMethod: 4
|
||||||
|
m_FillAmount: 1
|
||||||
|
m_FillClockwise: 1
|
||||||
|
m_FillOrigin: 0
|
||||||
|
m_UseSpriteMesh: 0
|
||||||
|
m_PixelsPerUnitMultiplier: 1
|
||||||
|
--- !u!114 &2943043780804435268
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 3131919094368649507}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 5d79b18d536324085b58d842648372a8, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier: Features.ShapeBuilder::Darkmatter.Features.ShapeBuilder.UI.SlotMarker
|
||||||
|
shape: {fileID: 11400000, guid: 5cf3e58088f124445b00423cf68c01aa, type: 2}
|
||||||
|
outline: {fileID: 0}
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 1f67e787040f74945b4094368d0ba215
|
||||||
|
PrefabImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
File diff suppressed because one or more lines are too long
@@ -887,7 +887,7 @@ AnimationClip:
|
|||||||
m_PostInfinity: 2
|
m_PostInfinity: 2
|
||||||
m_RotationOrder: 4
|
m_RotationOrder: 4
|
||||||
attribute: m_LocalEulerAngles.z
|
attribute: m_LocalEulerAngles.z
|
||||||
path: ' Apple Steam (1)'
|
path: ' Apple Leaf (1)'
|
||||||
classID: 224
|
classID: 224
|
||||||
script: {fileID: 0}
|
script: {fileID: 0}
|
||||||
flags: 0
|
flags: 0
|
||||||
@@ -899,19 +899,7 @@ AnimationClip:
|
|||||||
m_PostInfinity: 2
|
m_PostInfinity: 2
|
||||||
m_RotationOrder: 4
|
m_RotationOrder: 4
|
||||||
attribute: m_LocalEulerAngles.y
|
attribute: m_LocalEulerAngles.y
|
||||||
path: ' Apple Steam (1)'
|
path: ' Apple Leaf (1)'
|
||||||
classID: 224
|
|
||||||
script: {fileID: 0}
|
|
||||||
flags: 0
|
|
||||||
- serializedVersion: 2
|
|
||||||
curve:
|
|
||||||
serializedVersion: 2
|
|
||||||
m_Curve: []
|
|
||||||
m_PreInfinity: 2
|
|
||||||
m_PostInfinity: 2
|
|
||||||
m_RotationOrder: 4
|
|
||||||
attribute: m_LocalEulerAngles.x
|
|
||||||
path: ' Apple Steam (1)'
|
|
||||||
classID: 224
|
classID: 224
|
||||||
script: {fileID: 0}
|
script: {fileID: 0}
|
||||||
flags: 0
|
flags: 0
|
||||||
@@ -927,6 +915,18 @@ AnimationClip:
|
|||||||
classID: 224
|
classID: 224
|
||||||
script: {fileID: 0}
|
script: {fileID: 0}
|
||||||
flags: 0
|
flags: 0
|
||||||
|
- serializedVersion: 2
|
||||||
|
curve:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Curve: []
|
||||||
|
m_PreInfinity: 2
|
||||||
|
m_PostInfinity: 2
|
||||||
|
m_RotationOrder: 4
|
||||||
|
attribute: m_LocalEulerAngles.x
|
||||||
|
path: ' Apple Steam (1)'
|
||||||
|
classID: 224
|
||||||
|
script: {fileID: 0}
|
||||||
|
flags: 0
|
||||||
- serializedVersion: 2
|
- serializedVersion: 2
|
||||||
curve:
|
curve:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
@@ -935,7 +935,7 @@ AnimationClip:
|
|||||||
m_PostInfinity: 2
|
m_PostInfinity: 2
|
||||||
m_RotationOrder: 4
|
m_RotationOrder: 4
|
||||||
attribute: m_LocalEulerAngles.y
|
attribute: m_LocalEulerAngles.y
|
||||||
path: ' Apple Leaf (1)'
|
path: ' Apple Steam (1)'
|
||||||
classID: 224
|
classID: 224
|
||||||
script: {fileID: 0}
|
script: {fileID: 0}
|
||||||
flags: 0
|
flags: 0
|
||||||
@@ -947,7 +947,7 @@ AnimationClip:
|
|||||||
m_PostInfinity: 2
|
m_PostInfinity: 2
|
||||||
m_RotationOrder: 4
|
m_RotationOrder: 4
|
||||||
attribute: m_LocalEulerAngles.z
|
attribute: m_LocalEulerAngles.z
|
||||||
path: ' Apple Leaf (1)'
|
path: ' Apple Steam (1)'
|
||||||
classID: 224
|
classID: 224
|
||||||
script: {fileID: 0}
|
script: {fileID: 0}
|
||||||
flags: 0
|
flags: 0
|
||||||
|
|||||||
17
Assets/Darkmatter/Data/Drawings/Shapes/Semi Circle.asset
Normal file
17
Assets/Darkmatter/Data/Drawings/Shapes/Semi Circle.asset
Normal file
@@ -0,0 +1,17 @@
|
|||||||
|
%YAML 1.1
|
||||||
|
%TAG !u! tag:unity3d.com,2011:
|
||||||
|
--- !u!114 &11400000
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 0}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: fd4d7742f1ae94c31b7592503ec2bc2f, type: 3}
|
||||||
|
m_Name: Semi Circle
|
||||||
|
m_EditorClassIdentifier: Core::Darkmatter.Core.Data.Static.Features.ShapeBuilder.ShapeSO
|
||||||
|
<Id>k__BackingField: Semi Circle
|
||||||
|
<Sprite>k__BackingField: {fileID: 21300000, guid: ec25d9f38cb5b9e4e8137867ab2fdba5, type: 3}
|
||||||
|
<DefaultSizeDelta>k__BackingField: {x: 256, y: 256}
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: f5c929a6f977347d0ad820f3c75fad22
|
||||||
|
NativeFormatImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
mainObjectFileID: 11400000
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
17
Assets/Darkmatter/Data/Drawings/Shapes/Semi Oval.asset
Normal file
17
Assets/Darkmatter/Data/Drawings/Shapes/Semi Oval.asset
Normal file
@@ -0,0 +1,17 @@
|
|||||||
|
%YAML 1.1
|
||||||
|
%TAG !u! tag:unity3d.com,2011:
|
||||||
|
--- !u!114 &11400000
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 0}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: fd4d7742f1ae94c31b7592503ec2bc2f, type: 3}
|
||||||
|
m_Name: Semi Oval
|
||||||
|
m_EditorClassIdentifier: Core::Darkmatter.Core.Data.Static.Features.ShapeBuilder.ShapeSO
|
||||||
|
<Id>k__BackingField: Semi Oval
|
||||||
|
<Sprite>k__BackingField: {fileID: 21300000, guid: 1beff6daa2ae430489c42e4a555da441, type: 3}
|
||||||
|
<DefaultSizeDelta>k__BackingField: {x: 256, y: 256}
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 5cf3e58088f124445b00423cf68c01aa
|
||||||
|
NativeFormatImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
mainObjectFileID: 11400000
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@@ -163,7 +163,7 @@ MonoBehaviour:
|
|||||||
m_Script: {fileID: 11500000, guid: 9b7df1c2a732341d3b123b5e7ae5d7b7, type: 3}
|
m_Script: {fileID: 11500000, guid: 9b7df1c2a732341d3b123b5e7ae5d7b7, type: 3}
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier: Features.Capture::Darkmatter.Features.Capture.CaptureFeatureModule
|
m_EditorClassIdentifier: Features.Capture::Darkmatter.Features.Capture.CaptureFeatureModule
|
||||||
captureSize: 1
|
captureScale: 1
|
||||||
captureButtonView: {fileID: 376589371}
|
captureButtonView: {fileID: 376589371}
|
||||||
--- !u!1 &64614225
|
--- !u!1 &64614225
|
||||||
GameObject:
|
GameObject:
|
||||||
@@ -354,6 +354,7 @@ RectTransform:
|
|||||||
- {fileID: 1518670451}
|
- {fileID: 1518670451}
|
||||||
- {fileID: 1989194441}
|
- {fileID: 1989194441}
|
||||||
- {fileID: 153461769}
|
- {fileID: 153461769}
|
||||||
|
- {fileID: 1340226039}
|
||||||
m_Father: {fileID: 2069155641}
|
m_Father: {fileID: 2069155641}
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 0}
|
m_AnchorMin: {x: 0, y: 0}
|
||||||
@@ -533,6 +534,7 @@ GameObject:
|
|||||||
- component: {fileID: 259035381}
|
- component: {fileID: 259035381}
|
||||||
- component: {fileID: 259035380}
|
- component: {fileID: 259035380}
|
||||||
- component: {fileID: 259035379}
|
- component: {fileID: 259035379}
|
||||||
|
- component: {fileID: 259035382}
|
||||||
m_Layer: 5
|
m_Layer: 5
|
||||||
m_Name: NextButton
|
m_Name: NextButton
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
@@ -642,6 +644,19 @@ CanvasRenderer:
|
|||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 259035377}
|
m_GameObject: {fileID: 259035377}
|
||||||
m_CullTransparentMesh: 1
|
m_CullTransparentMesh: 1
|
||||||
|
--- !u!114 &259035382
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 259035377}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: e41584b03d9144e55b851c6db449aadb, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier: Features.GameplayFlow::Darkmatter.Features.GameplayFlow.UI.NextButtonView
|
||||||
|
nextButton: {fileID: 259035379}
|
||||||
--- !u!1 &357588033
|
--- !u!1 &357588033
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@@ -1380,6 +1395,8 @@ MonoBehaviour:
|
|||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier: Features.GameplayFlow::Darkmatter.Features.GameplayFlow.GameplayFlowFeatureModule
|
m_EditorClassIdentifier: Features.GameplayFlow::Darkmatter.Features.GameplayFlow.GameplayFlowFeatureModule
|
||||||
sceneRefs: {fileID: 396806867}
|
sceneRefs: {fileID: 396806867}
|
||||||
|
nextButtonView: {fileID: 259035382}
|
||||||
|
backButtonView: {fileID: 1130088203}
|
||||||
--- !u!1 &1129540368
|
--- !u!1 &1129540368
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@@ -1499,6 +1516,7 @@ GameObject:
|
|||||||
- component: {fileID: 1130088202}
|
- component: {fileID: 1130088202}
|
||||||
- component: {fileID: 1130088201}
|
- component: {fileID: 1130088201}
|
||||||
- component: {fileID: 1130088200}
|
- component: {fileID: 1130088200}
|
||||||
|
- component: {fileID: 1130088203}
|
||||||
m_Layer: 5
|
m_Layer: 5
|
||||||
m_Name: Back
|
m_Name: Back
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
@@ -1608,6 +1626,19 @@ CanvasRenderer:
|
|||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 1130088198}
|
m_GameObject: {fileID: 1130088198}
|
||||||
m_CullTransparentMesh: 1
|
m_CullTransparentMesh: 1
|
||||||
|
--- !u!114 &1130088203
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1130088198}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: b7254cdaad34b4d6fa607b0520ea5b4c, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier: Features.GameplayFlow::Darkmatter.Features.GameplayFlow.UI.BackButtonView
|
||||||
|
backButton: {fileID: 1130088200}
|
||||||
--- !u!1 &1143672389
|
--- !u!1 &1143672389
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@@ -2081,6 +2112,93 @@ MonoBehaviour:
|
|||||||
undoButton: {fileID: 2058063739}
|
undoButton: {fileID: 2058063739}
|
||||||
redoButton: {fileID: 0}
|
redoButton: {fileID: 0}
|
||||||
clearButton: {fileID: 1982732273}
|
clearButton: {fileID: 1982732273}
|
||||||
|
--- !u!1 &1340226038
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 1340226039}
|
||||||
|
- component: {fileID: 1340226041}
|
||||||
|
- component: {fileID: 1340226040}
|
||||||
|
m_Layer: 5
|
||||||
|
m_Name: Confetti
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!224 &1340226039
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1340226038}
|
||||||
|
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||||
|
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||||
|
m_LocalScale: {x: 0, y: 0, z: 0}
|
||||||
|
m_ConstrainProportionsScale: 0
|
||||||
|
m_Children: []
|
||||||
|
m_Father: {fileID: 201822947}
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||||
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||||
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
|
m_SizeDelta: {x: 0, y: 0}
|
||||||
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
--- !u!114 &1340226040
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1340226038}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 16f0b0b6d0b7542bfbd20a3e05b04ff1, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier: Coffee.UIParticle::Coffee.UIExtensions.UIParticle
|
||||||
|
m_Material: {fileID: 0}
|
||||||
|
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
m_RaycastTarget: 1
|
||||||
|
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
m_Maskable: 1
|
||||||
|
m_OnCullStateChanged:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_IsTrail: 0
|
||||||
|
m_IgnoreCanvasScaler: 0
|
||||||
|
m_AbsoluteMode: 0
|
||||||
|
m_Scale3D: {x: 10, y: 10, z: 10}
|
||||||
|
m_AnimatableProperties: []
|
||||||
|
m_Particles:
|
||||||
|
- {fileID: 0}
|
||||||
|
- {fileID: 0}
|
||||||
|
- {fileID: 0}
|
||||||
|
- {fileID: 0}
|
||||||
|
- {fileID: 0}
|
||||||
|
- {fileID: 0}
|
||||||
|
- {fileID: 0}
|
||||||
|
m_MeshSharing: 0
|
||||||
|
m_GroupId: 0
|
||||||
|
m_GroupMaxId: 0
|
||||||
|
m_PositionMode: 0
|
||||||
|
m_AutoScaling: 0
|
||||||
|
m_AutoScalingMode: 2
|
||||||
|
m_UseCustomView: 0
|
||||||
|
m_CustomViewSize: 10
|
||||||
|
m_TimeScaleMultiplier: 1
|
||||||
|
--- !u!222 &1340226041
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1340226038}
|
||||||
|
m_CullTransparentMesh: 1
|
||||||
--- !u!1 &1351490753
|
--- !u!1 &1351490753
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|||||||
Reference in New Issue
Block a user