From 1d6a0e034285b1e4eb62d957f38d80f0830bac43 Mon Sep 17 00:00:00 2001 From: Ben Oukhanov Date: Fri, 20 Dec 2024 20:15:56 +0200 Subject: [PATCH] fix(maple-fighters): save player character data --- .../Sample/Characters/Archer 0.prefab | 250 ------------------ .../Sample/Characters/Archer 0.prefab.meta | 9 - .../Sample/Characters/Archer 2.prefab | 250 ------------------ .../Sample/Characters/Archer 2.prefab.meta | 9 - .../{Archer 1.prefab => Archer.prefab} | 164 +++++++++++- ...rcher 1.prefab.meta => Archer.prefab.meta} | 0 .../Sample/Characters/Knight 0.prefab | 250 ------------------ .../Sample/Characters/Knight 0.prefab.meta | 9 - .../Sample/Characters/Knight 2.prefab | 250 ------------------ .../Sample/Characters/Knight 2.prefab.meta | 9 - .../{Knight 1.prefab => Knight.prefab} | 166 +++++++++++- ...night 1.prefab.meta => Knight.prefab.meta} | 0 .../Sample/Characters/Sample 0.prefab | 154 ----------- .../Sample/Characters/Sample 0.prefab.meta | 9 - .../Sample/Characters/Sample 2.prefab | 154 ----------- .../Sample/Characters/Sample 2.prefab.meta | 9 - .../{Sample 1.prefab => Sample.prefab} | 4 +- ...ample 1.prefab.meta => Sample.prefab.meta} | 0 .../Sample/Characters/Wizard 0.prefab | 250 ------------------ .../Sample/Characters/Wizard 0.prefab.meta | 9 - .../Sample/Characters/Wizard 2.prefab | 250 ------------------ .../Sample/Characters/Wizard 2.prefab.meta | 9 - .../{Wizard 1.prefab => Wizard.prefab} | 164 +++++++++++- ...izard 1.prefab.meta => Wizard.prefab.meta} | 0 .../Data/CharacterData.cs | 4 + .../DummyCharacterProviderApi.cs | 24 ++ .../HttpCharacterProviderApi.cs | 5 + .../ICharacterProviderApi.cs | 2 + .../Scripts/Services/UserMetadata.cs | 11 +- .../Controller/CharacterViewController.cs | 9 +- .../Controller/CharacterViewInteractor.cs | 25 +- .../UI/CharacterSelection/Controller/Utils.cs | 3 +- .../Model/UICharacterDetails.cs | 16 ++ .../Window/ClickableCharacterImage.cs | 46 +++- .../Window/IClickableCharacterView.cs | 4 + 35 files changed, 629 insertions(+), 1898 deletions(-) delete mode 100644 src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/Archer 0.prefab delete mode 100644 src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/Archer 0.prefab.meta delete mode 100644 src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/Archer 2.prefab delete mode 100644 src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/Archer 2.prefab.meta rename src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/{Archer 1.prefab => Archer.prefab} (61%) rename src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/{Archer 1.prefab.meta => Archer.prefab.meta} (100%) delete mode 100644 src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/Knight 0.prefab delete mode 100644 src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/Knight 0.prefab.meta delete mode 100644 src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/Knight 2.prefab delete mode 100644 src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/Knight 2.prefab.meta rename src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/{Knight 1.prefab => Knight.prefab} (60%) rename src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/{Knight 1.prefab.meta => Knight.prefab.meta} (100%) delete mode 100644 src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/Sample 0.prefab delete mode 100644 src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/Sample 0.prefab.meta delete mode 100644 src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/Sample 2.prefab delete mode 100644 src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/Sample 2.prefab.meta rename src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/{Sample 1.prefab => Sample.prefab} (98%) rename src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/{Sample 1.prefab.meta => Sample.prefab.meta} (100%) delete mode 100644 src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/Wizard 0.prefab delete mode 100644 src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/Wizard 0.prefab.meta delete mode 100644 src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/Wizard 2.prefab delete mode 100644 src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/Wizard 2.prefab.meta rename src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/{Wizard 1.prefab => Wizard.prefab} (61%) rename src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/{Wizard 1.prefab.meta => Wizard.prefab.meta} (100%) diff --git a/src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/Archer 0.prefab b/src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/Archer 0.prefab deleted file mode 100644 index 3bb095633..000000000 --- a/src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/Archer 0.prefab +++ /dev/null @@ -1,250 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &1014507296264946 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 224948462560385002} - - component: {fileID: 222458845406108004} - - component: {fileID: 114060125637535146} - - component: {fileID: 114583655525919648} - - component: {fileID: 114399532191546718} - - component: {fileID: 95183814847357350} - - component: {fileID: 114078760840527200} - - component: {fileID: 225782389749551890} - - component: {fileID: 3838074697026537822} - m_Layer: 5 - m_Name: Archer 0 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &224948462560385002 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1014507296264946} - 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_Children: - - {fileID: 4493072029564002369} - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: -150, y: 107} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &222458845406108004 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1014507296264946} - m_CullTransparentMesh: 0 ---- !u!114 &114060125637535146 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1014507296264946} - 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: 21300000, guid: ff7f482061b725842998f3d0d5df3771, type: 3} - m_Type: 0 - 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!114 &114583655525919648 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1014507296264946} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3} - m_Name: - m_EditorClassIdentifier: - m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} - m_EffectDistance: {x: 1, y: -1} - m_UseGraphicAlpha: 1 ---- !u!114 &114399532191546718 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1014507296264946} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: cfabb0440166ab443bba8876756fdfa9, type: 3} - m_Name: - m_EditorClassIdentifier: - m_EffectColor: {r: 0, g: 0, b: 0, a: 0.39215687} - m_EffectDistance: {x: 10, y: 0} - m_UseGraphicAlpha: 1 ---- !u!95 &95183814847357350 -Animator: - serializedVersion: 3 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1014507296264946} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: 3a114e7a229d5de45b67b6881c567a93, type: 2} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 ---- !u!114 &114078760840527200 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1014507296264946} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fc290b47e1d4682408d10399fa46c3a0, type: 3} - m_Name: - m_EditorClassIdentifier: - characterNameText: {fileID: 8487850535484945415} ---- !u!225 &225782389749551890 -CanvasGroup: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1014507296264946} - m_Enabled: 1 - m_Alpha: 0 - m_Interactable: 0 - m_BlocksRaycasts: 0 - m_IgnoreParentGroups: 0 ---- !u!114 &3838074697026537822 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1014507296264946} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a3094f8d4df92413e899c1328e289fce, type: 3} - m_Name: - m_EditorClassIdentifier: - speed: 5 ---- !u!1 &7634047246003360838 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4493072029564002369} - - component: {fileID: 5034765401699077868} - - component: {fileID: 8487850535484945415} - m_Layer: 5 - m_Name: Name - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4493072029564002369 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7634047246003360838} - 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_Children: [] - m_Father: {fileID: 224948462560385002} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: -10, y: -25} - m_SizeDelta: {x: 200, y: 50} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5034765401699077868 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7634047246003360838} - m_CullTransparentMesh: 1 ---- !u!114 &8487850535484945415 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7634047246003360838} - 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: 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_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 16 - m_FontStyle: 1 - m_BestFit: 0 - m_MinSize: 1 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: diff --git a/src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/Archer 0.prefab.meta b/src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/Archer 0.prefab.meta deleted file mode 100644 index 0b4bbb8ea..000000000 --- a/src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/Archer 0.prefab.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 6f7befce1e5a66a49a8d60f69175538f -timeCreated: 1507572259 -licenseType: Free -NativeFormatImporter: - mainObjectFileID: 100100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/Archer 2.prefab b/src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/Archer 2.prefab deleted file mode 100644 index c4a12bfd3..000000000 --- a/src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/Archer 2.prefab +++ /dev/null @@ -1,250 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &1295207963551168 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 224723529994352544} - - component: {fileID: 222252187926298780} - - component: {fileID: 114943579543535130} - - component: {fileID: 114947553292799674} - - component: {fileID: 114688496052917484} - - component: {fileID: 95614304517029192} - - component: {fileID: 114004158859006664} - - component: {fileID: 225670116764125102} - - component: {fileID: 6690978418327625192} - m_Layer: 5 - m_Name: Archer 2 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &224723529994352544 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1295207963551168} - 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_Children: - - {fileID: 5566253869653430108} - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 150, y: 107} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &222252187926298780 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1295207963551168} - m_CullTransparentMesh: 0 ---- !u!114 &114943579543535130 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1295207963551168} - 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: 21300000, guid: ff7f482061b725842998f3d0d5df3771, type: 3} - m_Type: 0 - 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!114 &114947553292799674 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1295207963551168} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3} - m_Name: - m_EditorClassIdentifier: - m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} - m_EffectDistance: {x: 1, y: -1} - m_UseGraphicAlpha: 1 ---- !u!114 &114688496052917484 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1295207963551168} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: cfabb0440166ab443bba8876756fdfa9, type: 3} - m_Name: - m_EditorClassIdentifier: - m_EffectColor: {r: 0, g: 0, b: 0, a: 0.39215687} - m_EffectDistance: {x: 10, y: 0} - m_UseGraphicAlpha: 1 ---- !u!95 &95614304517029192 -Animator: - serializedVersion: 3 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1295207963551168} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: 3a114e7a229d5de45b67b6881c567a93, type: 2} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 ---- !u!114 &114004158859006664 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1295207963551168} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fc290b47e1d4682408d10399fa46c3a0, type: 3} - m_Name: - m_EditorClassIdentifier: - characterNameText: {fileID: 4800238904239658041} ---- !u!225 &225670116764125102 -CanvasGroup: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1295207963551168} - m_Enabled: 1 - m_Alpha: 0 - m_Interactable: 0 - m_BlocksRaycasts: 0 - m_IgnoreParentGroups: 0 ---- !u!114 &6690978418327625192 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1295207963551168} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a3094f8d4df92413e899c1328e289fce, type: 3} - m_Name: - m_EditorClassIdentifier: - speed: 5 ---- !u!1 &7058248636069021523 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5566253869653430108} - - component: {fileID: 5198983750429899620} - - component: {fileID: 4800238904239658041} - m_Layer: 5 - m_Name: Name - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &5566253869653430108 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7058248636069021523} - 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_Children: [] - m_Father: {fileID: 224723529994352544} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: -10, y: -25} - m_SizeDelta: {x: 200, y: 50} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5198983750429899620 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7058248636069021523} - m_CullTransparentMesh: 1 ---- !u!114 &4800238904239658041 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7058248636069021523} - 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: 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_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 16 - m_FontStyle: 1 - m_BestFit: 0 - m_MinSize: 1 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: diff --git a/src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/Archer 2.prefab.meta b/src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/Archer 2.prefab.meta deleted file mode 100644 index 1a4f1f293..000000000 --- a/src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/Archer 2.prefab.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 2533e525228b6fe4ebe468ec0b7253cf -timeCreated: 1507572265 -licenseType: Free -NativeFormatImporter: - mainObjectFileID: 100100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/Archer 1.prefab b/src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/Archer.prefab similarity index 61% rename from src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/Archer 1.prefab rename to src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/Archer.prefab index 0bdb4df4e..bc5088b6f 100644 --- a/src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/Archer 1.prefab +++ b/src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/Archer.prefab @@ -18,7 +18,7 @@ GameObject: - component: {fileID: 225896370293227458} - component: {fileID: 1958035016165651811} m_Layer: 5 - m_Name: Archer 1 + m_Name: Archer m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -36,6 +36,8 @@ RectTransform: m_LocalScale: {x: -1, y: 1, z: 1} m_Children: - {fileID: 3008874729781281122} + - {fileID: 1767836560029822382} + - {fileID: 514715372245906729} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -144,6 +146,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: characterNameText: {fileID: 6083088443904850699} + characterLevelText: {fileID: 4462033812957132242} + characterExperienceText: {fileID: 2211938839719953253} --- !u!225 &225896370293227458 CanvasGroup: m_ObjectHideFlags: 0 @@ -248,3 +252,161 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: +--- !u!1 &1533941145058913845 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1767836560029822382} + - component: {fileID: 9020073579757650615} + - component: {fileID: 4462033812957132242} + m_Layer: 5 + m_Name: Level + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1767836560029822382 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1533941145058913845} + 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_Children: [] + m_Father: {fileID: 224577366975049464} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 25, y: 25} + m_SizeDelta: {x: 50, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &9020073579757650615 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1533941145058913845} + m_CullTransparentMesh: 1 +--- !u!114 &4462033812957132242 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1533941145058913845} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, 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_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 16 + m_FontStyle: 1 + m_BestFit: 1 + m_MinSize: 1 + m_MaxSize: 16 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: +--- !u!1 &5235929116642994818 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 514715372245906729} + - component: {fileID: 7856333934532222030} + - component: {fileID: 2211938839719953253} + m_Layer: 5 + m_Name: Experience + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &514715372245906729 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5235929116642994818} + 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_Children: [] + m_Father: {fileID: 224577366975049464} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: -25, y: 25} + m_SizeDelta: {x: 50, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7856333934532222030 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5235929116642994818} + m_CullTransparentMesh: 1 +--- !u!114 &2211938839719953253 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5235929116642994818} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, 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_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 16 + m_FontStyle: 1 + m_BestFit: 1 + m_MinSize: 1 + m_MaxSize: 16 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: diff --git a/src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/Archer 1.prefab.meta b/src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/Archer.prefab.meta similarity index 100% rename from src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/Archer 1.prefab.meta rename to src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/Archer.prefab.meta diff --git a/src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/Knight 0.prefab b/src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/Knight 0.prefab deleted file mode 100644 index b0995c034..000000000 --- a/src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/Knight 0.prefab +++ /dev/null @@ -1,250 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &1683352798662084 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 224222764673526686} - - component: {fileID: 222050672365718320} - - component: {fileID: 114897711029495458} - - component: {fileID: 114866263273159578} - - component: {fileID: 114946679722740890} - - component: {fileID: 95965510625532454} - - component: {fileID: 114202471708446980} - - component: {fileID: 225870590003064536} - - component: {fileID: 1378333694333340988} - m_Layer: 5 - m_Name: Knight 0 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &224222764673526686 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1683352798662084} - 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_Children: - - {fileID: 8199871953563035788} - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: -150, y: 102.5} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &222050672365718320 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1683352798662084} - m_CullTransparentMesh: 0 ---- !u!114 &114897711029495458 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1683352798662084} - 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: 21300000, guid: cec66af462424d045b3a6df81e95d6e5, type: 3} - m_Type: 0 - 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!114 &114866263273159578 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1683352798662084} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3} - m_Name: - m_EditorClassIdentifier: - m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} - m_EffectDistance: {x: 1, y: -1} - m_UseGraphicAlpha: 1 ---- !u!114 &114946679722740890 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1683352798662084} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: cfabb0440166ab443bba8876756fdfa9, type: 3} - m_Name: - m_EditorClassIdentifier: - m_EffectColor: {r: 0, g: 0, b: 0, a: 0.39215687} - m_EffectDistance: {x: 5, y: 1} - m_UseGraphicAlpha: 1 ---- !u!95 &95965510625532454 -Animator: - serializedVersion: 3 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1683352798662084} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: 193d3f78aa34b26489e7abef019f9f4c, type: 2} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 ---- !u!114 &114202471708446980 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1683352798662084} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fc290b47e1d4682408d10399fa46c3a0, type: 3} - m_Name: - m_EditorClassIdentifier: - characterNameText: {fileID: 8837542083664511523} ---- !u!225 &225870590003064536 -CanvasGroup: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1683352798662084} - m_Enabled: 1 - m_Alpha: 0 - m_Interactable: 0 - m_BlocksRaycasts: 0 - m_IgnoreParentGroups: 0 ---- !u!114 &1378333694333340988 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1683352798662084} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a3094f8d4df92413e899c1328e289fce, type: 3} - m_Name: - m_EditorClassIdentifier: - speed: 5 ---- !u!1 &4291096183754232042 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8199871953563035788} - - component: {fileID: 20001427910945811} - - component: {fileID: 8837542083664511523} - m_Layer: 5 - m_Name: Name - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &8199871953563035788 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4291096183754232042} - 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_Children: [] - m_Father: {fileID: 224222764673526686} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 10, y: -20} - m_SizeDelta: {x: 200, y: 50} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &20001427910945811 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4291096183754232042} - m_CullTransparentMesh: 1 ---- !u!114 &8837542083664511523 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4291096183754232042} - 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: 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_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 16 - m_FontStyle: 1 - m_BestFit: 0 - m_MinSize: 1 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: diff --git a/src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/Knight 0.prefab.meta b/src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/Knight 0.prefab.meta deleted file mode 100644 index 07528e80a..000000000 --- a/src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/Knight 0.prefab.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 15dcce4610123984c940673fdda330e7 -timeCreated: 1507572397 -licenseType: Free -NativeFormatImporter: - mainObjectFileID: 100100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/Knight 2.prefab b/src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/Knight 2.prefab deleted file mode 100644 index 9bb5b4944..000000000 --- a/src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/Knight 2.prefab +++ /dev/null @@ -1,250 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &1974807408954002 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 224665975536855438} - - component: {fileID: 222799470453044472} - - component: {fileID: 114252320291314934} - - component: {fileID: 114089505174587286} - - component: {fileID: 114348042679657770} - - component: {fileID: 95576553005871758} - - component: {fileID: 114149055171644472} - - component: {fileID: 225682078424160002} - - component: {fileID: 8068866382921903788} - m_Layer: 5 - m_Name: Knight 2 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &224665975536855438 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1974807408954002} - 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_Children: - - {fileID: 5156815432576409386} - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 150, y: 102.5} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &222799470453044472 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1974807408954002} - m_CullTransparentMesh: 0 ---- !u!114 &114252320291314934 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1974807408954002} - 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: 21300000, guid: cec66af462424d045b3a6df81e95d6e5, type: 3} - m_Type: 0 - 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!114 &114089505174587286 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1974807408954002} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3} - m_Name: - m_EditorClassIdentifier: - m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} - m_EffectDistance: {x: 1, y: -1} - m_UseGraphicAlpha: 1 ---- !u!114 &114348042679657770 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1974807408954002} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: cfabb0440166ab443bba8876756fdfa9, type: 3} - m_Name: - m_EditorClassIdentifier: - m_EffectColor: {r: 0, g: 0, b: 0, a: 0.39215687} - m_EffectDistance: {x: 5, y: 1} - m_UseGraphicAlpha: 1 ---- !u!95 &95576553005871758 -Animator: - serializedVersion: 3 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1974807408954002} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: 193d3f78aa34b26489e7abef019f9f4c, type: 2} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 ---- !u!114 &114149055171644472 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1974807408954002} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fc290b47e1d4682408d10399fa46c3a0, type: 3} - m_Name: - m_EditorClassIdentifier: - characterNameText: {fileID: 113284442319829454} ---- !u!225 &225682078424160002 -CanvasGroup: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1974807408954002} - m_Enabled: 1 - m_Alpha: 0 - m_Interactable: 0 - m_BlocksRaycasts: 0 - m_IgnoreParentGroups: 0 ---- !u!114 &8068866382921903788 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1974807408954002} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a3094f8d4df92413e899c1328e289fce, type: 3} - m_Name: - m_EditorClassIdentifier: - speed: 5 ---- !u!1 &2862576253927948607 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5156815432576409386} - - component: {fileID: 3919947567647055233} - - component: {fileID: 113284442319829454} - m_Layer: 5 - m_Name: Name - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &5156815432576409386 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2862576253927948607} - 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_Children: [] - m_Father: {fileID: 224665975536855438} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 10, y: -20} - m_SizeDelta: {x: 200, y: 50} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3919947567647055233 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2862576253927948607} - m_CullTransparentMesh: 1 ---- !u!114 &113284442319829454 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2862576253927948607} - 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: 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_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 16 - m_FontStyle: 1 - m_BestFit: 0 - m_MinSize: 1 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: diff --git a/src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/Knight 2.prefab.meta b/src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/Knight 2.prefab.meta deleted file mode 100644 index d9d3c1bad..000000000 --- a/src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/Knight 2.prefab.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 5db65920ec33c774f9c86c5963a51968 -timeCreated: 1507572403 -licenseType: Free -NativeFormatImporter: - mainObjectFileID: 100100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/Knight 1.prefab b/src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/Knight.prefab similarity index 60% rename from src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/Knight 1.prefab rename to src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/Knight.prefab index 2f61e5324..645aca4cc 100644 --- a/src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/Knight 1.prefab +++ b/src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/Knight.prefab @@ -18,7 +18,7 @@ GameObject: - component: {fileID: 225723374521663474} - component: {fileID: 6005808725319845263} m_Layer: 5 - m_Name: Knight 1 + m_Name: Knight m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -36,12 +36,14 @@ RectTransform: m_LocalScale: {x: -1, y: 1, z: 1} m_Children: - {fileID: 8531752109901636155} + - {fileID: 7414070736944255735} + - {fileID: 5700411309795688469} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 102.5} + m_AnchoredPosition: {x: 10, y: 102.5} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222970139045507776 @@ -144,6 +146,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: characterNameText: {fileID: 5554499303199299980} + characterLevelText: {fileID: 239288069379742796} + characterExperienceText: {fileID: 2179108452821313837} --- !u!225 &225723374521663474 CanvasGroup: m_ObjectHideFlags: 0 @@ -169,6 +173,164 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: speed: 5 +--- !u!1 &1153710908886790712 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7414070736944255735} + - component: {fileID: 4703238515282938336} + - component: {fileID: 239288069379742796} + m_Layer: 5 + m_Name: Level + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7414070736944255735 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1153710908886790712} + 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_Children: [] + m_Father: {fileID: 224974295143463026} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 25, y: 25} + m_SizeDelta: {x: 50, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4703238515282938336 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1153710908886790712} + m_CullTransparentMesh: 1 +--- !u!114 &239288069379742796 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1153710908886790712} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, 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_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 16 + m_FontStyle: 1 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: +--- !u!1 &4993732277498539194 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5700411309795688469} + - component: {fileID: 8536506070956848963} + - component: {fileID: 2179108452821313837} + m_Layer: 5 + m_Name: Experience + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5700411309795688469 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4993732277498539194} + 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_Children: [] + m_Father: {fileID: 224974295143463026} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: -25.5, y: 25} + m_SizeDelta: {x: 50, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8536506070956848963 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4993732277498539194} + m_CullTransparentMesh: 1 +--- !u!114 &2179108452821313837 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4993732277498539194} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, 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_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 16 + m_FontStyle: 1 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: --- !u!1 &8757242759860158505 GameObject: m_ObjectHideFlags: 0 diff --git a/src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/Knight 1.prefab.meta b/src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/Knight.prefab.meta similarity index 100% rename from src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/Knight 1.prefab.meta rename to src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/Knight.prefab.meta diff --git a/src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/Sample 0.prefab b/src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/Sample 0.prefab deleted file mode 100644 index 681edfd6e..000000000 --- a/src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/Sample 0.prefab +++ /dev/null @@ -1,154 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &1314365897868124 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 224942048711309472} - - component: {fileID: 222911732127288468} - - component: {fileID: 114158090055871474} - - component: {fileID: 114998733186420518} - - component: {fileID: 95915865120525604} - - component: {fileID: 114677917484173600} - - component: {fileID: 225250885069382540} - - component: {fileID: 6389412331709749115} - m_Layer: 5 - m_Name: Sample 0 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &224942048711309472 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1314365897868124} - 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_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: -149.99997, y: 100} - m_SizeDelta: {x: 75, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &222911732127288468 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1314365897868124} - m_CullTransparentMesh: 0 ---- !u!114 &114158090055871474 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1314365897868124} - 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: 0.19607843} - 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: d909bdea74d750c4480ba430a35c0344, type: 3} - m_Type: 0 - 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!114 &114998733186420518 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1314365897868124} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3} - m_Name: - m_EditorClassIdentifier: - m_EffectColor: {r: 0, g: 0, b: 0, a: 1} - m_EffectDistance: {x: 1, y: -1} - m_UseGraphicAlpha: 1 ---- !u!95 &95915865120525604 -Animator: - serializedVersion: 3 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1314365897868124} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: a2e3c870010598d41b9f411db2b7cf43, type: 2} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 ---- !u!114 &114677917484173600 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1314365897868124} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fc290b47e1d4682408d10399fa46c3a0, type: 3} - m_Name: - m_EditorClassIdentifier: - characterNameText: {fileID: 0} ---- !u!225 &225250885069382540 -CanvasGroup: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1314365897868124} - m_Enabled: 1 - m_Alpha: 0 - m_Interactable: 0 - m_BlocksRaycasts: 0 - m_IgnoreParentGroups: 0 ---- !u!114 &6389412331709749115 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1314365897868124} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a3094f8d4df92413e899c1328e289fce, type: 3} - m_Name: - m_EditorClassIdentifier: - speed: 5 diff --git a/src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/Sample 0.prefab.meta b/src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/Sample 0.prefab.meta deleted file mode 100644 index 4e4ecb2d8..000000000 --- a/src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/Sample 0.prefab.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 865d70715b3a2e94cb8b3e2267432dba -timeCreated: 1507134834 -licenseType: Free -NativeFormatImporter: - mainObjectFileID: 100100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/Sample 2.prefab b/src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/Sample 2.prefab deleted file mode 100644 index 8e82eb1b3..000000000 --- a/src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/Sample 2.prefab +++ /dev/null @@ -1,154 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &1975075671148090 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 224162137945518364} - - component: {fileID: 222211383073210366} - - component: {fileID: 114408900917793598} - - component: {fileID: 114778116619178172} - - component: {fileID: 95793896731532916} - - component: {fileID: 114447154115473422} - - component: {fileID: 225840707118197784} - - component: {fileID: 3566115400086661067} - m_Layer: 5 - m_Name: Sample 2 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &224162137945518364 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1975075671148090} - 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_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 150, y: 100} - m_SizeDelta: {x: 75, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &222211383073210366 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1975075671148090} - m_CullTransparentMesh: 0 ---- !u!114 &114408900917793598 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1975075671148090} - 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: 0.19607843} - 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: d909bdea74d750c4480ba430a35c0344, type: 3} - m_Type: 0 - 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!114 &114778116619178172 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1975075671148090} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3} - m_Name: - m_EditorClassIdentifier: - m_EffectColor: {r: 0, g: 0, b: 0, a: 1} - m_EffectDistance: {x: 1, y: -1} - m_UseGraphicAlpha: 1 ---- !u!95 &95793896731532916 -Animator: - serializedVersion: 3 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1975075671148090} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: a2e3c870010598d41b9f411db2b7cf43, type: 2} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 ---- !u!114 &114447154115473422 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1975075671148090} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fc290b47e1d4682408d10399fa46c3a0, type: 3} - m_Name: - m_EditorClassIdentifier: - characterNameText: {fileID: 0} ---- !u!225 &225840707118197784 -CanvasGroup: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1975075671148090} - m_Enabled: 1 - m_Alpha: 0 - m_Interactable: 0 - m_BlocksRaycasts: 0 - m_IgnoreParentGroups: 0 ---- !u!114 &3566115400086661067 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1975075671148090} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a3094f8d4df92413e899c1328e289fce, type: 3} - m_Name: - m_EditorClassIdentifier: - speed: 5 diff --git a/src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/Sample 2.prefab.meta b/src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/Sample 2.prefab.meta deleted file mode 100644 index 55af1c129..000000000 --- a/src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/Sample 2.prefab.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 50afb4995626d1245ab25cbc3c1dd357 -timeCreated: 1507134840 -licenseType: Free -NativeFormatImporter: - mainObjectFileID: 100100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/Sample 1.prefab b/src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/Sample.prefab similarity index 98% rename from src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/Sample 1.prefab rename to src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/Sample.prefab index 27c7fb2ec..d946d415b 100644 --- a/src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/Sample 1.prefab +++ b/src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/Sample.prefab @@ -17,7 +17,7 @@ GameObject: - component: {fileID: 225240873354403080} - component: {fileID: 8559039274618302552} m_Layer: 5 - m_Name: Sample 1 + m_Name: Sample m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -127,6 +127,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: characterNameText: {fileID: 0} + characterLevelText: {fileID: 0} + characterExperienceText: {fileID: 0} --- !u!225 &225240873354403080 CanvasGroup: m_ObjectHideFlags: 0 diff --git a/src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/Sample 1.prefab.meta b/src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/Sample.prefab.meta similarity index 100% rename from src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/Sample 1.prefab.meta rename to src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/Sample.prefab.meta diff --git a/src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/Wizard 0.prefab b/src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/Wizard 0.prefab deleted file mode 100644 index cbee677de..000000000 --- a/src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/Wizard 0.prefab +++ /dev/null @@ -1,250 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &1693650994926910 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 224125437935118014} - - component: {fileID: 222363201032997908} - - component: {fileID: 114201583190098254} - - component: {fileID: 114124754091337392} - - component: {fileID: 114202231914835064} - - component: {fileID: 95060716735797616} - - component: {fileID: 114033041642338622} - - component: {fileID: 225205991737147780} - - component: {fileID: 2893914954156349957} - m_Layer: 5 - m_Name: Wizard 0 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &224125437935118014 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1693650994926910} - 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_Children: - - {fileID: 4339345031806800525} - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: -150, y: 112.5} - m_SizeDelta: {x: 130, y: 145} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &222363201032997908 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1693650994926910} - m_CullTransparentMesh: 0 ---- !u!114 &114201583190098254 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1693650994926910} - 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: 21300000, guid: c323b4b94758aed43a479d677d44b59b, type: 3} - m_Type: 0 - 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!114 &114124754091337392 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1693650994926910} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3} - m_Name: - m_EditorClassIdentifier: - m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} - m_EffectDistance: {x: 1, y: -1} - m_UseGraphicAlpha: 1 ---- !u!114 &114202231914835064 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1693650994926910} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: cfabb0440166ab443bba8876756fdfa9, type: 3} - m_Name: - m_EditorClassIdentifier: - m_EffectColor: {r: 0, g: 0, b: 0, a: 0.39215687} - m_EffectDistance: {x: 10, y: 1} - m_UseGraphicAlpha: 1 ---- !u!95 &95060716735797616 -Animator: - serializedVersion: 3 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1693650994926910} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: c74594c2bbf567c4da2fd54638ae8903, type: 2} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 ---- !u!114 &114033041642338622 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1693650994926910} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fc290b47e1d4682408d10399fa46c3a0, type: 3} - m_Name: - m_EditorClassIdentifier: - characterNameText: {fileID: 5938189539018254358} ---- !u!225 &225205991737147780 -CanvasGroup: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1693650994926910} - m_Enabled: 1 - m_Alpha: 0 - m_Interactable: 0 - m_BlocksRaycasts: 0 - m_IgnoreParentGroups: 0 ---- !u!114 &2893914954156349957 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1693650994926910} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a3094f8d4df92413e899c1328e289fce, type: 3} - m_Name: - m_EditorClassIdentifier: - speed: 5 ---- !u!1 &6509440784815202348 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4339345031806800525} - - component: {fileID: 2405317102542388201} - - component: {fileID: 5938189539018254358} - m_Layer: 5 - m_Name: Name - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4339345031806800525 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6509440784815202348} - 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_Children: [] - m_Father: {fileID: 224125437935118014} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: -10, y: -8} - m_SizeDelta: {x: 200, y: 50} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &2405317102542388201 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6509440784815202348} - m_CullTransparentMesh: 1 ---- !u!114 &5938189539018254358 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6509440784815202348} - 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: 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_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 16 - m_FontStyle: 1 - m_BestFit: 0 - m_MinSize: 1 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: diff --git a/src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/Wizard 0.prefab.meta b/src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/Wizard 0.prefab.meta deleted file mode 100644 index 6d4e9ba05..000000000 --- a/src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/Wizard 0.prefab.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 90c107775eef02a4394329de46d20111 -timeCreated: 1507572746 -licenseType: Free -NativeFormatImporter: - mainObjectFileID: 100100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/Wizard 2.prefab b/src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/Wizard 2.prefab deleted file mode 100644 index e3ba26e66..000000000 --- a/src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/Wizard 2.prefab +++ /dev/null @@ -1,250 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &1548961426480822 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 224788606773557148} - - component: {fileID: 222329774676513778} - - component: {fileID: 114661776864345084} - - component: {fileID: 114154830950501734} - - component: {fileID: 114623710108144926} - - component: {fileID: 95067983765548206} - - component: {fileID: 114374544059665382} - - component: {fileID: 225361657963418198} - - component: {fileID: 2536791957787100910} - m_Layer: 5 - m_Name: Wizard 2 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &224788606773557148 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1548961426480822} - 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_Children: - - {fileID: 7063816389260095374} - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 150, y: 112.5} - m_SizeDelta: {x: 130, y: 145} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &222329774676513778 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1548961426480822} - m_CullTransparentMesh: 0 ---- !u!114 &114661776864345084 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1548961426480822} - 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: 21300000, guid: c323b4b94758aed43a479d677d44b59b, type: 3} - m_Type: 0 - 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!114 &114154830950501734 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1548961426480822} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3} - m_Name: - m_EditorClassIdentifier: - m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} - m_EffectDistance: {x: 1, y: -1} - m_UseGraphicAlpha: 1 ---- !u!114 &114623710108144926 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1548961426480822} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: cfabb0440166ab443bba8876756fdfa9, type: 3} - m_Name: - m_EditorClassIdentifier: - m_EffectColor: {r: 0, g: 0, b: 0, a: 0.39215687} - m_EffectDistance: {x: 10, y: 1} - m_UseGraphicAlpha: 1 ---- !u!95 &95067983765548206 -Animator: - serializedVersion: 3 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1548961426480822} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: c74594c2bbf567c4da2fd54638ae8903, type: 2} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 ---- !u!114 &114374544059665382 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1548961426480822} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fc290b47e1d4682408d10399fa46c3a0, type: 3} - m_Name: - m_EditorClassIdentifier: - characterNameText: {fileID: 3386541609965068712} ---- !u!225 &225361657963418198 -CanvasGroup: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1548961426480822} - m_Enabled: 1 - m_Alpha: 0 - m_Interactable: 0 - m_BlocksRaycasts: 0 - m_IgnoreParentGroups: 0 ---- !u!114 &2536791957787100910 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1548961426480822} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a3094f8d4df92413e899c1328e289fce, type: 3} - m_Name: - m_EditorClassIdentifier: - speed: 5 ---- !u!1 &874822135676378266 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7063816389260095374} - - component: {fileID: 265378837047266054} - - component: {fileID: 3386541609965068712} - m_Layer: 5 - m_Name: Name - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7063816389260095374 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 874822135676378266} - 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_Children: [] - m_Father: {fileID: 224788606773557148} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: -10, y: -8} - m_SizeDelta: {x: 200, y: 50} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &265378837047266054 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 874822135676378266} - m_CullTransparentMesh: 1 ---- !u!114 &3386541609965068712 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 874822135676378266} - 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: 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_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 16 - m_FontStyle: 1 - m_BestFit: 0 - m_MinSize: 1 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: diff --git a/src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/Wizard 2.prefab.meta b/src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/Wizard 2.prefab.meta deleted file mode 100644 index 9e55157ce..000000000 --- a/src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/Wizard 2.prefab.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 5b1b7d95b9bf2f94c85150e47aab923e -timeCreated: 1507572751 -licenseType: Free -NativeFormatImporter: - mainObjectFileID: 100100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/Wizard 1.prefab b/src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/Wizard.prefab similarity index 61% rename from src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/Wizard 1.prefab rename to src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/Wizard.prefab index feed67969..ec096027c 100644 --- a/src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/Wizard 1.prefab +++ b/src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/Wizard.prefab @@ -18,7 +18,7 @@ GameObject: - component: {fileID: 225860807519844094} - component: {fileID: 8362638440079807456} m_Layer: 5 - m_Name: Wizard 1 + m_Name: Wizard m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -36,6 +36,8 @@ RectTransform: m_LocalScale: {x: -1, y: 1, z: 1} m_Children: - {fileID: 331138721883234398} + - {fileID: 9118454107240614429} + - {fileID: 2501360657391729066} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -144,6 +146,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: characterNameText: {fileID: 9145346226840022179} + characterLevelText: {fileID: 8689496538810966461} + characterExperienceText: {fileID: 6676333911142423942} --- !u!225 &225860807519844094 CanvasGroup: m_ObjectHideFlags: 0 @@ -248,3 +252,161 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: +--- !u!1 &774414281287316156 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2501360657391729066} + - component: {fileID: 3321982964332872138} + - component: {fileID: 6676333911142423942} + m_Layer: 5 + m_Name: Experience + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2501360657391729066 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 774414281287316156} + 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_Children: [] + m_Father: {fileID: 224411895423003542} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: -35, y: 25} + m_SizeDelta: {x: 60, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3321982964332872138 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 774414281287316156} + m_CullTransparentMesh: 1 +--- !u!114 &6676333911142423942 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 774414281287316156} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, 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_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 16 + m_FontStyle: 1 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: +--- !u!1 &7791562103139798438 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9118454107240614429} + - component: {fileID: 1080966845310506981} + - component: {fileID: 8689496538810966461} + m_Layer: 5 + m_Name: Level + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9118454107240614429 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7791562103139798438} + 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_Children: [] + m_Father: {fileID: 224411895423003542} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 30, y: 25} + m_SizeDelta: {x: 70, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1080966845310506981 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7791562103139798438} + m_CullTransparentMesh: 1 +--- !u!114 &8689496538810966461 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7791562103139798438} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, 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_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 16 + m_FontStyle: 1 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: diff --git a/src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/Wizard 1.prefab.meta b/src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/Wizard.prefab.meta similarity index 100% rename from src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/Wizard 1.prefab.meta rename to src/maple-fighters/Assets/Maple Fighters/Resources/Sample/Characters/Wizard.prefab.meta diff --git a/src/maple-fighters/Assets/Maple Fighters/Scripts/Services/CharacterProviderApi/Data/CharacterData.cs b/src/maple-fighters/Assets/Maple Fighters/Scripts/Services/CharacterProviderApi/Data/CharacterData.cs index 171664d4b..f8871b880 100644 --- a/src/maple-fighters/Assets/Maple Fighters/Scripts/Services/CharacterProviderApi/Data/CharacterData.cs +++ b/src/maple-fighters/Assets/Maple Fighters/Scripts/Services/CharacterProviderApi/Data/CharacterData.cs @@ -11,6 +11,10 @@ public struct CharacterData public string charactername; + public int characterlevel; + + public float characterexperience; + public int index; public int classindex; diff --git a/src/maple-fighters/Assets/Maple Fighters/Scripts/Services/CharacterProviderApi/DummyCharacterProviderApi.cs b/src/maple-fighters/Assets/Maple Fighters/Scripts/Services/CharacterProviderApi/DummyCharacterProviderApi.cs index 14d9126b0..818b4586e 100644 --- a/src/maple-fighters/Assets/Maple Fighters/Scripts/Services/CharacterProviderApi/DummyCharacterProviderApi.cs +++ b/src/maple-fighters/Assets/Maple Fighters/Scripts/Services/CharacterProviderApi/DummyCharacterProviderApi.cs @@ -72,6 +72,8 @@ public void CreateCharacter( { id = id, userid = userid, + characterlevel = 1, + characterexperience = 0f, charactername = charactername, index = index, classindex = classindex @@ -82,6 +84,26 @@ public void CreateCharacter( CreateCharacterCallback?.Invoke(statusCode, json); } + public void UpdateCharacter(int characterid, int characterlevel, float characterexperience) + { + if (characters.Count == 0) + { + var userMetadata = FindObjectOfType(); + var userId = userMetadata?.UserData.id ?? string.Empty; + + GetCharacters(userId); + } + + if (characters.TryGetValue(characterid, out CharacterData characterData)) + { + characterData.characterlevel = characterlevel; + characterData.characterexperience = characterexperience; + characters[characterid] = characterData; + } + + SaveCharacterCollection(); + } + public void DeleteCharacter(int characterid) { var statusCode = (long)StatusCodes.Ok; @@ -124,6 +146,8 @@ public void GetCharacters(string userid) id = character.id, userid = character.userid, charactername = character.charactername, + characterlevel = character.characterlevel, + characterexperience = character.characterexperience, index = character.index, classindex = character.classindex }); diff --git a/src/maple-fighters/Assets/Maple Fighters/Scripts/Services/CharacterProviderApi/HttpCharacterProviderApi.cs b/src/maple-fighters/Assets/Maple Fighters/Scripts/Services/CharacterProviderApi/HttpCharacterProviderApi.cs index 6830f1f15..d39f7de6c 100644 --- a/src/maple-fighters/Assets/Maple Fighters/Scripts/Services/CharacterProviderApi/HttpCharacterProviderApi.cs +++ b/src/maple-fighters/Assets/Maple Fighters/Scripts/Services/CharacterProviderApi/HttpCharacterProviderApi.cs @@ -75,6 +75,11 @@ private void OnCreateCharacterCallback(RequestException request, ResponseHelper CreateCharacterCallback?.Invoke(statusCode, json); } + public void UpdateCharacter(int characterid, int characterlevel, float characterexperience) + { + // Left blank intentionally + } + public void DeleteCharacter(int characterid) { RestClient.Delete($"{url}/characters/{characterid}", OnDeleteCharacterCallback); diff --git a/src/maple-fighters/Assets/Maple Fighters/Scripts/Services/CharacterProviderApi/ICharacterProviderApi.cs b/src/maple-fighters/Assets/Maple Fighters/Scripts/Services/CharacterProviderApi/ICharacterProviderApi.cs index ae278d740..567d22a8b 100644 --- a/src/maple-fighters/Assets/Maple Fighters/Scripts/Services/CharacterProviderApi/ICharacterProviderApi.cs +++ b/src/maple-fighters/Assets/Maple Fighters/Scripts/Services/CharacterProviderApi/ICharacterProviderApi.cs @@ -12,6 +12,8 @@ public interface ICharacterProviderApi void CreateCharacter(string userid, string charactername, int index, int classindex); + void UpdateCharacter(int characterid, int characterlevel, float characterexperience); + void DeleteCharacter(int characterid); void GetCharacters(string userid); diff --git a/src/maple-fighters/Assets/Maple Fighters/Scripts/Services/UserMetadata.cs b/src/maple-fighters/Assets/Maple Fighters/Scripts/Services/UserMetadata.cs index 30e2d7f06..ee0ade62a 100644 --- a/src/maple-fighters/Assets/Maple Fighters/Scripts/Services/UserMetadata.cs +++ b/src/maple-fighters/Assets/Maple Fighters/Scripts/Services/UserMetadata.cs @@ -13,6 +13,8 @@ public class UserMetadata : MonoBehaviour public UserData UserData { get; set; } + public int CharacterId { get; set; } + public int CharacterType { get; set; } public int CharacterHealth { get; set; } @@ -38,8 +40,6 @@ private void Start() }; CharacterHealth = GetMaxCharacterHealth(); - CharacterLevel = 1; - CharacterExperiencePoints = 0; } public void AddExperiencePoints(float value) @@ -47,6 +47,7 @@ public void AddExperiencePoints(float value) CharacterExperiencePoints += value; VerifyCharacterLevel(value); + SaveCharacterData(); } public int GetMaxCharacterHealth() @@ -79,6 +80,12 @@ private void VerifyCharacterLevel(float value) } } + private void SaveCharacterData() + { + var characterProviderApi = ApiProvider.ProvideCharacterProviderApi(); + characterProviderApi.UpdateCharacter(CharacterId, CharacterLevel, CharacterExperiencePoints); + } + private string GetUserId() { string userid; diff --git a/src/maple-fighters/Assets/Maple Fighters/Scripts/UI/CharacterSelection/Controller/CharacterViewController.cs b/src/maple-fighters/Assets/Maple Fighters/Scripts/UI/CharacterSelection/Controller/CharacterViewController.cs index 7a2f678a3..3933894de 100644 --- a/src/maple-fighters/Assets/Maple Fighters/Scripts/UI/CharacterSelection/Controller/CharacterViewController.cs +++ b/src/maple-fighters/Assets/Maple Fighters/Scripts/UI/CharacterSelection/Controller/CharacterViewController.cs @@ -231,6 +231,8 @@ public void OnCharacterReceived(UICharacterDetails characterDetails) { characterView.Id = characterDetails.GetCharacterId(); characterView.CharacterName = characterDetails.GetCharacterName(); + characterView.CharacterLevel = characterDetails.GetCharacterLevel(); + characterView.CharacterExperience = characterDetails.GetCharacterExperience(); characterView.CharacterIndex = characterDetails.GetCharacterIndex(); characterView.CharacterClass = characterDetails.GetCharacterClass(); @@ -406,10 +408,13 @@ private void OnChooseCharacterButtonClicked() var character = characterViewCollection?.Get(characterIndex); if (character != null) { + var characterId = character.Id; var characterClass = (byte)character.CharacterClass; var characterName = character.CharacterName; + var characterLevel = character.CharacterLevel; + var characterExperience = character.CharacterExperience; - characterViewInteractor.UpdateCharacterData(characterClass, characterName); + characterViewInteractor.UpdateCharacterData(characterId, characterClass, characterName, characterLevel, characterExperience); HideCharacterSelectionOptionsWindow(); @@ -434,7 +439,7 @@ private void LoadLobby() if (screenFadeController != null) { screenFadeController.Show(); - screenFadeController.FadeInCompleted += OnFadeInCompleted; + screenFadeController.FadeInCompleted += OnFadeInCompleted; } } diff --git a/src/maple-fighters/Assets/Maple Fighters/Scripts/UI/CharacterSelection/Controller/CharacterViewInteractor.cs b/src/maple-fighters/Assets/Maple Fighters/Scripts/UI/CharacterSelection/Controller/CharacterViewInteractor.cs index 45d8b3bb9..641cc7b8d 100644 --- a/src/maple-fighters/Assets/Maple Fighters/Scripts/UI/CharacterSelection/Controller/CharacterViewInteractor.cs +++ b/src/maple-fighters/Assets/Maple Fighters/Scripts/UI/CharacterSelection/Controller/CharacterViewInteractor.cs @@ -134,9 +134,11 @@ private void OnGetCharactersCallback(long statusCode, string json) { var id = character.id; var name = character.charactername; + var level = character.characterlevel; + var experience = character.characterexperience; var index = (UICharacterIndex)character.index; var classindex = (UICharacterClass)character.classindex; - var uiCharacterDetails = new UICharacterDetails(id, name, index, classindex); + var uiCharacterDetails = new UICharacterDetails(id, name, level, experience, index, classindex); onCharacterReceivedListener.OnCharacterReceived(uiCharacterDetails); } @@ -160,6 +162,8 @@ private void SetCharacters(ref CharacterData[] characters, string json) characters[index].id = character.id; characters[index].charactername = character.charactername; + characters[index].characterlevel = character.characterlevel; + characters[index].characterexperience = character.characterexperience; characters[index].classindex = character.classindex; } } @@ -167,21 +171,30 @@ private void SetCharacters(ref CharacterData[] characters, string json) private CharacterData[] GetSampleCharacterData() { // NOTE: Make sure the "index" parameter is like this array - return new CharacterData[3] + return new CharacterData[1] { - new CharacterData { userid = string.Empty, charactername = "Sample", index = 0, classindex = 0 }, - new CharacterData { userid = string.Empty, charactername = "Sample", index = 1, classindex = 0 }, - new CharacterData { userid = string.Empty, charactername = "Sample", index = 2, classindex = 0 } + new CharacterData + { + userid = string.Empty, + charactername = "Sample", + characterlevel = 1, + characterexperience = 0, + index = 0, + classindex = 0 + } }; } - public void UpdateCharacterData(byte characterType, string characterName) + public void UpdateCharacterData(int characterId, byte characterType, string characterName, int characterLevel, float characterExperience) { var userMetadata = FindObjectOfType(); if (userMetadata != null) { + userMetadata.CharacterId = characterId; userMetadata.CharacterType = characterType; userMetadata.CharacterName = characterName; + userMetadata.CharacterLevel = characterLevel; + userMetadata.CharacterExperiencePoints = characterExperience; } } } diff --git a/src/maple-fighters/Assets/Maple Fighters/Scripts/UI/CharacterSelection/Controller/Utils.cs b/src/maple-fighters/Assets/Maple Fighters/Scripts/UI/CharacterSelection/Controller/Utils.cs index 782bbe478..b7b070e0a 100644 --- a/src/maple-fighters/Assets/Maple Fighters/Scripts/UI/CharacterSelection/Controller/Utils.cs +++ b/src/maple-fighters/Assets/Maple Fighters/Scripts/UI/CharacterSelection/Controller/Utils.cs @@ -7,8 +7,7 @@ public static class Utils public static string GetCharacterPath(UICharacterDetails characterDetails) { var characterClass = characterDetails.GetCharacterClass(); - var characterIndex = characterDetails.GetCharacterIndex(); - var name = $"{characterClass} {(int)characterIndex}"; + var name = $"{characterClass}"; return string.Format(Paths.Resources.Sample.Characters, name); } diff --git a/src/maple-fighters/Assets/Maple Fighters/Scripts/UI/CharacterSelection/Model/UICharacterDetails.cs b/src/maple-fighters/Assets/Maple Fighters/Scripts/UI/CharacterSelection/Model/UICharacterDetails.cs index 719bcfa34..61fe60610 100644 --- a/src/maple-fighters/Assets/Maple Fighters/Scripts/UI/CharacterSelection/Model/UICharacterDetails.cs +++ b/src/maple-fighters/Assets/Maple Fighters/Scripts/UI/CharacterSelection/Model/UICharacterDetails.cs @@ -4,17 +4,23 @@ public struct UICharacterDetails { private int characterId; private string characterName; + private int characterLevel; + private float characterExperience; private UICharacterIndex uiCharacterIndex; private UICharacterClass uiCharacterClass; public UICharacterDetails( int characterId, string characterName, + int characterLevel, + float characterExperience, UICharacterIndex uiCharacterIndex, UICharacterClass uiCharacterClass) { this.characterId = characterId; this.characterName = characterName; + this.characterLevel = characterLevel; + this.characterExperience = characterExperience; this.uiCharacterIndex = uiCharacterIndex; this.uiCharacterClass = uiCharacterClass; } @@ -44,6 +50,16 @@ public string GetCharacterName() return characterName; } + public int GetCharacterLevel() + { + return characterLevel; + } + + public float GetCharacterExperience() + { + return characterExperience; + } + public UICharacterIndex GetCharacterIndex() { return uiCharacterIndex; diff --git a/src/maple-fighters/Assets/Maple Fighters/Scripts/UI/CharacterSelection/Window/ClickableCharacterImage.cs b/src/maple-fighters/Assets/Maple Fighters/Scripts/UI/CharacterSelection/Window/ClickableCharacterImage.cs index 1d60eda89..e41adec2a 100644 --- a/src/maple-fighters/Assets/Maple Fighters/Scripts/UI/CharacterSelection/Window/ClickableCharacterImage.cs +++ b/src/maple-fighters/Assets/Maple Fighters/Scripts/UI/CharacterSelection/Window/ClickableCharacterImage.cs @@ -38,6 +38,42 @@ public string CharacterName } } + public int CharacterLevel + { + get + { + return characterLevel; + } + + set + { + characterLevel = value; + + if (characterLevelText != null) + { + characterLevelText.text = $"Lvl. {characterLevel}"; + } + } + } + + public float CharacterExperience + { + get + { + return characterExperience; + } + + set + { + characterExperience = value; + + if (characterExperienceText != null) + { + characterExperienceText.text = $"({characterExperience}%)"; + } + } + } + public UICharacterIndex CharacterIndex { get; set; } public UICharacterClass CharacterClass { get; set; } @@ -47,9 +83,17 @@ public string CharacterName [Header("Text"), SerializeField] private Text characterNameText; - private bool hasCharacter; + [Header("Text"), SerializeField] + private Text characterLevelText; + + [Header("Text"), SerializeField] + private Text characterExperienceText; + private Animator animator; + private int characterLevel; + private float characterExperience; + private void Awake() { animator = GetComponent(); diff --git a/src/maple-fighters/Assets/Maple Fighters/Scripts/UI/CharacterSelection/Window/IClickableCharacterView.cs b/src/maple-fighters/Assets/Maple Fighters/Scripts/UI/CharacterSelection/Window/IClickableCharacterView.cs index ed3095bca..3ba5134bb 100644 --- a/src/maple-fighters/Assets/Maple Fighters/Scripts/UI/CharacterSelection/Window/IClickableCharacterView.cs +++ b/src/maple-fighters/Assets/Maple Fighters/Scripts/UI/CharacterSelection/Window/IClickableCharacterView.cs @@ -12,6 +12,10 @@ public interface IClickableCharacterView : IView string CharacterName { get; set; } + int CharacterLevel { get; set; } + + float CharacterExperience { get; set; } + UICharacterIndex CharacterIndex { get; set; } UICharacterClass CharacterClass { get; set; }