Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
300 changes: 298 additions & 2 deletions Assets/App/Scenes/SampleScene.unity
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,127 @@ Transform:
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &344372761
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 344372762}
- component: {fileID: 344372765}
- component: {fileID: 344372764}
- component: {fileID: 344372763}
m_Layer: 5
m_Name: GeneratePlayerButton
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &344372762
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 344372761}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1267245699}
m_Father: {fileID: 568042970}
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: -40}
m_SizeDelta: {x: 160, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &344372763
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 344372761}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_WrapAround: 0
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 1
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_SelectedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_SelectedTrigger: Selected
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 344372764}
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!114 &344372764
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 344372761}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
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: 10905, guid: 0000000000000000f000000000000000, type: 0}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!222 &344372765
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 344372761}
m_CullTransparentMesh: 1
--- !u!1 &404842156
GameObject:
m_ObjectHideFlags: 0
Expand All @@ -180,7 +301,7 @@ GameObject:
- component: {fileID: 404842159}
- component: {fileID: 404842158}
m_Layer: 5
m_Name: GenerateButton
m_Name: GenerateEnemyButton
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
Expand All @@ -197,7 +318,8 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Children:
- {fileID: 1083513898}
m_Father: {fileID: 568042970}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
Expand Down Expand Up @@ -708,6 +830,7 @@ RectTransform:
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 404842157}
- {fileID: 344372762}
- {fileID: 842995929}
- {fileID: 416316748}
- {fileID: 1110636000}
Expand Down Expand Up @@ -1008,6 +1131,7 @@ MonoBehaviour:
autoRun: 1
autoInjectGameObjects: []
_BattleDebugEnemyPresenter: {fileID: 2048206442}
_BattleDebugPlayerPresenter: {fileID: 2048206444}
_BattleDebugStatePresenter: {fileID: 2048206443}
--- !u!1 &842995928
GameObject:
Expand Down Expand Up @@ -1130,6 +1254,85 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 842995928}
m_CullTransparentMesh: 1
--- !u!1 &1083513897
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1083513898}
- component: {fileID: 1083513900}
- component: {fileID: 1083513899}
m_Layer: 5
m_Name: Text
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1083513898
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1083513897}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.9999506, y: 0.9999506, z: 0.9999506}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 404842157}
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: 150, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1083513899
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1083513897}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0, g: 0, b: 0, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_FontSize: 14
m_FontStyle: 1
m_BestFit: 0
m_MinSize: 10
m_MaxSize: 40
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: GenerateEnemy
--- !u!222 &1083513900
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1083513897}
m_CullTransparentMesh: 1
--- !u!1 &1110635999
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -1330,6 +1533,85 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1222253567}
m_CullTransparentMesh: 1
--- !u!1 &1267245698
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1267245699}
- component: {fileID: 1267245701}
- component: {fileID: 1267245700}
m_Layer: 5
m_Name: Text
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1267245699
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1267245698}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.9999506, y: 0.9999506, z: 0.9999506}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 344372762}
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: 150, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1267245700
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1267245698}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0, g: 0, b: 0, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_FontSize: 14
m_FontStyle: 1
m_BestFit: 0
m_MinSize: 10
m_MaxSize: 40
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: GeneratePlayer
--- !u!222 &1267245701
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1267245698}
m_CullTransparentMesh: 1
--- !u!1 &1387411687
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -1588,6 +1870,7 @@ GameObject:
m_Component:
- component: {fileID: 2048206441}
- component: {fileID: 2048206442}
- component: {fileID: 2048206444}
- component: {fileID: 2048206443}
m_Layer: 0
m_Name: BattleDebugPresenter
Expand Down Expand Up @@ -1640,6 +1923,19 @@ MonoBehaviour:
_cancelStateButton: {fileID: 416316749}
_increaseStateIndexButton: {fileID: 1110636001}
_decreaseStateIndexButton: {fileID: 1387411689}
--- !u!114 &2048206444
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2048206440}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1b940b6e2eb4947408843bf72f095cd3, type: 3}
m_Name:
m_EditorClassIdentifier:
_generatePlayerButton: {fileID: 344372763}
--- !u!1660057539 &9223372036854775807
SceneRoots:
m_ObjectHideFlags: 0
Expand Down
2 changes: 2 additions & 0 deletions Assets/App/Scripts/Battle/BattleLifetimeScope.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ protected override void Configure(IContainerBuilder builder)
{
builder.Register<BattleEnemyDatastore>(Lifetime.Singleton).AsImplementedInterfaces();
builder.Register<BattleEnemyUseCase>(Lifetime.Singleton).AsImplementedInterfaces();
builder.Register<BattlePlayerDatastore>(Lifetime.Singleton).AsImplementedInterfaces();
builder.Register<BattlePlayerUseCase>(Lifetime.Singleton).AsImplementedInterfaces();
builder.Register<BattleStateMachineUseCase>(Lifetime.Singleton).AsImplementedInterfaces();
builder.Register<BattleStateMachinePresenter>(Lifetime.Singleton).AsImplementedInterfaces();
}
Expand Down
18 changes: 18 additions & 0 deletions Assets/App/Scripts/Battle/Data/Player.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
using App.Common.Data;

namespace App.Battle.Data
{
public class Player
{
public string Id { get; }
Comment thread
ujisuke marked this conversation as resolved.
public CharacterParameter characterParameter { get; }
public ExperiencePoint experiencePoint { get; }

public Player(string id, CharacterParameter characterParameter, ExperiencePoint experiencePoint)
{
Id = id;
this.characterParameter = characterParameter;
this.experiencePoint = experiencePoint;
}
}
}
Loading