From 43365264175ddea88c54b7f154ec5be42e7de045 Mon Sep 17 00:00:00 2001 From: dddushesss <37773701+dddushesss@users.noreply.github.com> Date: Wed, 22 Dec 2021 21:53:12 +0300 Subject: [PATCH] added enemy spawn --- Assets/Prefab/CharBar.prefab | 284 +++++++++--------- Assets/Prefab/CharBar.prefab.meta | 2 +- .../1/Character/Prefab/Ariost.prefab | 184 ++++++++++-- .../1/Character/Prefab/Asvald.prefab | 76 ++--- .../Resources/1/Character/Prefab/Emir.prefab | 188 ++++++++++-- .../Resources/1/Character/Prefab/Mats.prefab | 188 ++++++++++-- .../1/Character/Prefab/Ragnar.prefab | 186 ++++++++++-- Assets/Resources/Data/Data.asset | 1 + Assets/Resources/Data/WeaponsData.asset | 3 + Assets/Scripts/Chars/AnimLength.cs | 8 + Assets/Scripts/Chars/AnimLength.cs.meta | 3 + Assets/Scripts/Chars/Enemy.cs | 73 ++++- Assets/Scripts/Chars/EnemyController.cs | 35 +++ Assets/Scripts/Chars/EnemyController.cs.meta | 3 + Assets/Scripts/Chars/Player.cs | 23 +- Assets/Scripts/Chars/Player.cs.meta | 3 - Assets/Scripts/Chars/PlayerControl.cs | 9 +- Assets/Scripts/Controller/GameInit.cs | 9 +- Assets/Scripts/Data/Data.cs | 16 + Assets/Scripts/Data/EnemyData.cs | 22 ++ Assets/Scripts/Data/EnemyData.cs.meta | 3 + .../Scripts/{Weapons => Data}/WeaponsData.cs | 4 + .../{Weapons => Data}/WeaponsData.cs.meta | 0 Assets/Scripts/HexFiled/HexGrid.cs | 3 +- Assets/Scripts/VFXController.cs | 14 - Assets/Scripts/VFXController.cs.meta | 3 - Assets/{PlayerView.cs => UnitView.cs} | 2 +- .../{PlayerView.cs.meta => UnitView.cs.meta} | 0 28 files changed, 1028 insertions(+), 317 deletions(-) create mode 100644 Assets/Scripts/Chars/AnimLength.cs create mode 100644 Assets/Scripts/Chars/AnimLength.cs.meta create mode 100644 Assets/Scripts/Chars/EnemyController.cs create mode 100644 Assets/Scripts/Chars/EnemyController.cs.meta delete mode 100644 Assets/Scripts/Chars/Player.cs.meta create mode 100644 Assets/Scripts/Data/EnemyData.cs create mode 100644 Assets/Scripts/Data/EnemyData.cs.meta rename Assets/Scripts/{Weapons => Data}/WeaponsData.cs (83%) rename Assets/Scripts/{Weapons => Data}/WeaponsData.cs.meta (100%) delete mode 100644 Assets/Scripts/VFXController.cs delete mode 100644 Assets/Scripts/VFXController.cs.meta rename Assets/{PlayerView.cs => UnitView.cs} (90%) rename Assets/{PlayerView.cs.meta => UnitView.cs.meta} (100%) diff --git a/Assets/Prefab/CharBar.prefab b/Assets/Prefab/CharBar.prefab index afd50fa0..bbe1e1d0 100644 --- a/Assets/Prefab/CharBar.prefab +++ b/Assets/Prefab/CharBar.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &847038657889069213 +--- !u!1 &3185331048183402439 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,9 +8,9 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 8519462296099616455} - - component: {fileID: 6235175116952422115} - - component: {fileID: 4764892567925634899} + - component: {fileID: 5894909873554395549} + - component: {fileID: 8174616228555596217} + - component: {fileID: 7337933991429132297} m_Layer: 5 m_Name: Mana m_TagString: Untagged @@ -18,40 +18,40 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &8519462296099616455 +--- !u!224 &5894909873554395549 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 847038657889069213} + m_GameObject: {fileID: 3185331048183402439} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 2.8} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 6946142497316555340} + m_Father: {fileID: 5156761560679623958} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 4.78} + m_AnchoredPosition: {x: 0, y: 3.39} m_SizeDelta: {x: 3, y: 1} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6235175116952422115 +--- !u!222 &8174616228555596217 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 847038657889069213} + m_GameObject: {fileID: 3185331048183402439} m_CullTransparentMesh: 1 ---- !u!114 &4764892567925634899 +--- !u!114 &7337933991429132297 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 847038657889069213} + m_GameObject: {fileID: 3185331048183402439} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} @@ -75,7 +75,7 @@ MonoBehaviour: m_FillOrigin: 1 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &8206949618169764953 +--- !u!1 &6049883652435591266 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -83,9 +83,125 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 5043130871251553204} - - component: {fileID: 3831969763758919631} - - component: {fileID: 436218786097723303} + - component: {fileID: 5156761560679623958} + - component: {fileID: 8490769543284739872} + - component: {fileID: 8681621801813709773} + - component: {fileID: 1271697267505620599} + - component: {fileID: 482855193181693567} + m_Layer: 5 + m_Name: CharBar + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5156761560679623958 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6049883652435591266} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.8, y: 0.8, z: 0.8} + m_Children: + - {fileID: 5894909873554395549} + - {fileID: 7064199837503171822} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 1080, y: 1920} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!223 &8490769543284739872 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6049883652435591266} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 2 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!114 &8681621801813709773 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6049883652435591266} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 1 +--- !u!114 &1271697267505620599 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6049883652435591266} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &482855193181693567 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6049883652435591266} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6650f022a8987a34e8da86d910b6e277, type: 3} + m_Name: + m_EditorClassIdentifier: + _healthBar: {fileID: 2447735196939325693} + _manaBar: {fileID: 7337933991429132297} +--- !u!1 &6201783996967795459 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7064199837503171822} + - component: {fileID: 1357902011422320789} + - component: {fileID: 2447735196939325693} m_Layer: 5 m_Name: Health m_TagString: Untagged @@ -93,40 +209,40 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &5043130871251553204 +--- !u!224 &7064199837503171822 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8206949618169764953} + m_GameObject: {fileID: 6201783996967795459} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 2.8} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 6946142497316555340} + m_Father: {fileID: 5156761560679623958} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 5.42} + m_AnchoredPosition: {x: 0, y: 4.0299997} m_SizeDelta: {x: 3, y: 1} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3831969763758919631 +--- !u!222 &1357902011422320789 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8206949618169764953} + m_GameObject: {fileID: 6201783996967795459} m_CullTransparentMesh: 1 ---- !u!114 &436218786097723303 +--- !u!114 &2447735196939325693 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8206949618169764953} + m_GameObject: {fileID: 6201783996967795459} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} @@ -150,119 +266,3 @@ MonoBehaviour: m_FillOrigin: 1 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &8358779576878573368 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6946142497316555340} - - component: {fileID: 5917903032868120698} - - component: {fileID: 6885592156746708119} - - component: {fileID: 3913664843453759789} - - component: {fileID: 2397791458811887909} - m_Layer: 5 - m_Name: CharBar - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6946142497316555340 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8358779576878573368} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.8, y: 0.8, z: 0.8} - m_Children: - - {fileID: 8519462296099616455} - - {fileID: 5043130871251553204} - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 432, y: 768} - m_SizeDelta: {x: 1080, y: 1920} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!223 &5917903032868120698 -Canvas: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8358779576878573368} - m_Enabled: 1 - serializedVersion: 3 - m_RenderMode: 2 - m_Camera: {fileID: 0} - m_PlaneDistance: 100 - m_PixelPerfect: 0 - m_ReceivesEvents: 1 - m_OverrideSorting: 0 - m_OverridePixelPerfect: 0 - m_SortingBucketNormalizedSize: 0 - m_AdditionalShaderChannelsFlag: 0 - m_SortingLayerID: 0 - m_SortingOrder: 0 - m_TargetDisplay: 0 ---- !u!114 &6885592156746708119 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8358779576878573368} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} - m_Name: - m_EditorClassIdentifier: - m_UiScaleMode: 0 - m_ReferencePixelsPerUnit: 100 - m_ScaleFactor: 1 - m_ReferenceResolution: {x: 800, y: 600} - m_ScreenMatchMode: 0 - m_MatchWidthOrHeight: 0 - m_PhysicalUnit: 3 - m_FallbackScreenDPI: 96 - m_DefaultSpriteDPI: 96 - m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 0 ---- !u!114 &3913664843453759789 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8358779576878573368} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreReversedGraphics: 1 - m_BlockingObjects: 0 - m_BlockingMask: - serializedVersion: 2 - m_Bits: 4294967295 ---- !u!114 &2397791458811887909 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8358779576878573368} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 6650f022a8987a34e8da86d910b6e277, type: 3} - m_Name: - m_EditorClassIdentifier: - _healthBar: {fileID: 436218786097723303} - _manaBar: {fileID: 4764892567925634899} diff --git a/Assets/Prefab/CharBar.prefab.meta b/Assets/Prefab/CharBar.prefab.meta index b2cc9440..1e8a7e23 100644 --- a/Assets/Prefab/CharBar.prefab.meta +++ b/Assets/Prefab/CharBar.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: bcf32629375eb5e49be4b148f76e95c5 +guid: dec5dd0d644d5c548a53563e65837162 PrefabImporter: externalObjects: {} userData: diff --git a/Assets/Resources/1/Character/Prefab/Ariost.prefab b/Assets/Resources/1/Character/Prefab/Ariost.prefab index 1842416f..60967788 100644 --- a/Assets/Resources/1/Character/Prefab/Ariost.prefab +++ b/Assets/Resources/1/Character/Prefab/Ariost.prefab @@ -29,7 +29,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4572196853266583038} - m_RootOrder: 11 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!137 &4912662343870396594 SkinnedMeshRenderer: @@ -116,7 +116,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4572196853266583038} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!137 &5765518534334543026 SkinnedMeshRenderer: @@ -199,7 +199,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4572196853266583038} - m_RootOrder: 14 + m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &332471246648109621 GameObject: @@ -323,7 +323,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4572196853266583038} - m_RootOrder: 7 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!137 &1077460698320737771 SkinnedMeshRenderer: @@ -964,7 +964,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4572196853266583038} - m_RootOrder: 6 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!137 &5758144497826521225 SkinnedMeshRenderer: @@ -1089,7 +1089,7 @@ Transform: m_LocalScale: {x: 1.0000001, y: 1.0000001, z: 1.0000001} m_Children: [] m_Father: {fileID: 4572196853266583038} - m_RootOrder: 17 + m_RootOrder: 18 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2758233992143147040 GameObject: @@ -1359,7 +1359,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4572196853266583038} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!137 &529592062793113924 SkinnedMeshRenderer: @@ -1477,7 +1477,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4572196853266583038} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!137 &2884541352540552726 SkinnedMeshRenderer: @@ -1614,6 +1614,7 @@ GameObject: m_Component: - component: {fileID: 4572196853266583038} - component: {fileID: 4105327572543419563} + - component: {fileID: 5011141071925245406} m_Layer: 0 m_Name: Ariost m_TagString: Untagged @@ -1630,8 +1631,9 @@ Transform: m_GameObject: {fileID: 3762867976042010436} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.25, y: 1.25, z: 1.25} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 1719605314077195295} - {fileID: 762334722203785836} - {fileID: 4049110387097277270} - {fileID: 4694339321759696670} @@ -1672,6 +1674,19 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!114 &5011141071925245406 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3762867976042010436} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 04619977b07331e43a21b8d1bc33b6e9, type: 3} + m_Name: + m_EditorClassIdentifier: + charBarCanvas: {fileID: 268172662505640299} --- !u!1 &3785454847173043879 GameObject: m_ObjectHideFlags: 0 @@ -1731,7 +1746,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4572196853266583038} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!137 &1983015544488362856 SkinnedMeshRenderer: @@ -1884,7 +1899,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4572196853266583038} - m_RootOrder: 10 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!137 &6498218744713055762 SkinnedMeshRenderer: @@ -2033,7 +2048,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4572196853266583038} - m_RootOrder: 12 + m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!137 &6765341491546692835 SkinnedMeshRenderer: @@ -2466,7 +2481,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4572196853266583038} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!137 &5261007101627874884 SkinnedMeshRenderer: @@ -2616,7 +2631,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4572196853266583038} - m_RootOrder: 9 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!137 &3485271364007879237 SkinnedMeshRenderer: @@ -2857,7 +2872,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4572196853266583038} - m_RootOrder: 8 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!137 &5945613682891009746 SkinnedMeshRenderer: @@ -3035,7 +3050,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4572196853266583038} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!137 &8983723231154842395 SkinnedMeshRenderer: @@ -3158,7 +3173,7 @@ Transform: - {fileID: 7708733371814815158} - {fileID: 6129107727045909686} m_Father: {fileID: 4572196853266583038} - m_RootOrder: 16 + m_RootOrder: 17 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &8063799099225487758 GameObject: @@ -3391,7 +3406,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4572196853266583038} - m_RootOrder: 13 + m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!137 &6541130630822603112 SkinnedMeshRenderer: @@ -3588,7 +3603,7 @@ Transform: m_LocalScale: {x: 1.0000001, y: 1.0000001, z: 1.0000001} m_Children: [] m_Father: {fileID: 4572196853266583038} - m_RootOrder: 15 + m_RootOrder: 16 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &8965199495429162257 GameObject: @@ -3683,3 +3698,134 @@ Transform: m_Father: {fileID: 4672659128853226903} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &5786347879975309577 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 4572196853266583038} + m_Modifications: + - target: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, + type: 3} + propertyPath: m_SizeDelta.x + value: 1080 + objectReference: {fileID: 0} + - target: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, + type: 3} + propertyPath: m_SizeDelta.y + value: 1920 + objectReference: {fileID: 0} + - target: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6049883652435591266, guid: dec5dd0d644d5c548a53563e65837162, + type: 3} + propertyPath: m_Name + value: CharBar + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: dec5dd0d644d5c548a53563e65837162, type: 3} +--- !u!1 &268172662505640299 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6049883652435591266, guid: dec5dd0d644d5c548a53563e65837162, + type: 3} + m_PrefabInstance: {fileID: 5786347879975309577} + m_PrefabAsset: {fileID: 0} +--- !u!224 &1719605314077195295 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, + type: 3} + m_PrefabInstance: {fileID: 5786347879975309577} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Resources/1/Character/Prefab/Asvald.prefab b/Assets/Resources/1/Character/Prefab/Asvald.prefab index 96f75e89..b1e40197 100644 --- a/Assets/Resources/1/Character/Prefab/Asvald.prefab +++ b/Assets/Resources/1/Character/Prefab/Asvald.prefab @@ -3774,154 +3774,134 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1284989811002482917} m_PrefabAsset: {fileID: 0} ---- !u!1001 &4150511952206318913 +--- !u!1001 &2192210941540280859 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 7150739129758644021} m_Modifications: - - target: {fileID: 5043130871251553204, guid: bcf32629375eb5e49be4b148f76e95c5, - type: 3} - propertyPath: m_LocalPosition.z - value: 2.8 - objectReference: {fileID: 0} - - target: {fileID: 5043130871251553204, guid: bcf32629375eb5e49be4b148f76e95c5, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 4.0299997 - objectReference: {fileID: 0} - - target: {fileID: 6946142497316555340, guid: bcf32629375eb5e49be4b148f76e95c5, + - target: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, type: 3} propertyPath: m_Pivot.x value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 6946142497316555340, guid: bcf32629375eb5e49be4b148f76e95c5, + - target: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, type: 3} propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 6946142497316555340, guid: bcf32629375eb5e49be4b148f76e95c5, + - target: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, type: 3} propertyPath: m_RootOrder value: 19 objectReference: {fileID: 0} - - target: {fileID: 6946142497316555340, guid: bcf32629375eb5e49be4b148f76e95c5, + - target: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, type: 3} propertyPath: m_AnchorMax.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 6946142497316555340, guid: bcf32629375eb5e49be4b148f76e95c5, + - target: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, type: 3} propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 6946142497316555340, guid: bcf32629375eb5e49be4b148f76e95c5, + - target: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, type: 3} propertyPath: m_AnchorMin.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 6946142497316555340, guid: bcf32629375eb5e49be4b148f76e95c5, + - target: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, type: 3} propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 6946142497316555340, guid: bcf32629375eb5e49be4b148f76e95c5, + - target: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, type: 3} propertyPath: m_SizeDelta.x value: 1080 objectReference: {fileID: 0} - - target: {fileID: 6946142497316555340, guid: bcf32629375eb5e49be4b148f76e95c5, + - target: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, type: 3} propertyPath: m_SizeDelta.y value: 1920 objectReference: {fileID: 0} - - target: {fileID: 6946142497316555340, guid: bcf32629375eb5e49be4b148f76e95c5, + - target: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 6946142497316555340, guid: bcf32629375eb5e49be4b148f76e95c5, + - target: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 6946142497316555340, guid: bcf32629375eb5e49be4b148f76e95c5, + - target: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 6946142497316555340, guid: bcf32629375eb5e49be4b148f76e95c5, + - target: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 6946142497316555340, guid: bcf32629375eb5e49be4b148f76e95c5, + - target: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, type: 3} propertyPath: m_LocalRotation.x value: -0 objectReference: {fileID: 0} - - target: {fileID: 6946142497316555340, guid: bcf32629375eb5e49be4b148f76e95c5, + - target: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, type: 3} propertyPath: m_LocalRotation.y value: -0 objectReference: {fileID: 0} - - target: {fileID: 6946142497316555340, guid: bcf32629375eb5e49be4b148f76e95c5, + - target: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, type: 3} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: 6946142497316555340, guid: bcf32629375eb5e49be4b148f76e95c5, + - target: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, type: 3} propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 6946142497316555340, guid: bcf32629375eb5e49be4b148f76e95c5, + - target: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, type: 3} propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 6946142497316555340, guid: bcf32629375eb5e49be4b148f76e95c5, + - target: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 6946142497316555340, guid: bcf32629375eb5e49be4b148f76e95c5, + - target: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 6946142497316555340, guid: bcf32629375eb5e49be4b148f76e95c5, + - target: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 8358779576878573368, guid: bcf32629375eb5e49be4b148f76e95c5, + - target: {fileID: 6049883652435591266, guid: dec5dd0d644d5c548a53563e65837162, type: 3} propertyPath: m_Name value: CharBar objectReference: {fileID: 0} - - target: {fileID: 8519462296099616455, guid: bcf32629375eb5e49be4b148f76e95c5, - type: 3} - propertyPath: m_LocalPosition.z - value: 2.8 - objectReference: {fileID: 0} - - target: {fileID: 8519462296099616455, guid: bcf32629375eb5e49be4b148f76e95c5, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.39 - objectReference: {fileID: 0} m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: bcf32629375eb5e49be4b148f76e95c5, type: 3} + m_SourcePrefab: {fileID: 100100000, guid: dec5dd0d644d5c548a53563e65837162, type: 3} --- !u!1 &5591725933991455353 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 8358779576878573368, guid: bcf32629375eb5e49be4b148f76e95c5, + m_CorrespondingSourceObject: {fileID: 6049883652435591266, guid: dec5dd0d644d5c548a53563e65837162, type: 3} - m_PrefabInstance: {fileID: 4150511952206318913} + m_PrefabInstance: {fileID: 2192210941540280859} m_PrefabAsset: {fileID: 0} --- !u!224 &6484114110451091213 stripped RectTransform: - m_CorrespondingSourceObject: {fileID: 6946142497316555340, guid: bcf32629375eb5e49be4b148f76e95c5, + m_CorrespondingSourceObject: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, type: 3} - m_PrefabInstance: {fileID: 4150511952206318913} + m_PrefabInstance: {fileID: 2192210941540280859} m_PrefabAsset: {fileID: 0} diff --git a/Assets/Resources/1/Character/Prefab/Emir.prefab b/Assets/Resources/1/Character/Prefab/Emir.prefab index 849e1634..f800ef03 100644 --- a/Assets/Resources/1/Character/Prefab/Emir.prefab +++ b/Assets/Resources/1/Character/Prefab/Emir.prefab @@ -157,7 +157,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 73672630868547665} - m_RootOrder: 10 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!137 &7230607862960200637 SkinnedMeshRenderer: @@ -244,7 +244,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 73672630868547665} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!137 &2734562589375010503 SkinnedMeshRenderer: @@ -312,6 +312,7 @@ GameObject: m_Component: - component: {fileID: 73672630868547665} - component: {fileID: -4047225411828250527} + - component: {fileID: 8353965929846142445} m_Layer: 0 m_Name: Emir m_TagString: Untagged @@ -328,8 +329,9 @@ Transform: m_GameObject: {fileID: 742650227762578155} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.25, y: 1.25, z: 1.25} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 7764648799730394358} - {fileID: 3810699951024672707} - {fileID: 452431992228447993} - {fileID: 9174866752866685617} @@ -362,7 +364,7 @@ Animator: m_GameObject: {fileID: 742650227762578155} m_Enabled: 1 m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: 6c6726efa8f26a44c89dbcc255bf46f9, type: 2} + m_Controller: {fileID: 9100000, guid: 9e1a6090cd4d65d4599676c24fcb5cff, type: 2} m_CullingMode: 0 m_UpdateMode: 0 m_ApplyRootMotion: 0 @@ -371,6 +373,19 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!114 &8353965929846142445 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 742650227762578155} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 04619977b07331e43a21b8d1bc33b6e9, type: 3} + m_Name: + m_EditorClassIdentifier: + charBarCanvas: {fileID: 9197595637317142914} --- !u!1 &792258801834930952 GameObject: m_ObjectHideFlags: 0 @@ -461,7 +476,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 73672630868547665} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!137 &1617349845600775097 SkinnedMeshRenderer: @@ -647,7 +662,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 73672630868547665} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!137 &4120640975241344235 SkinnedMeshRenderer: @@ -973,7 +988,7 @@ Transform: m_LocalScale: {x: 1.0000001, y: 1.0000001, z: 1.0000001} m_Children: [] m_Father: {fileID: 73672630868547665} - m_RootOrder: 17 + m_RootOrder: 18 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2493757812983432245 GameObject: @@ -1065,7 +1080,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 73672630868547665} - m_RootOrder: 6 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!137 &8187264743474099494 SkinnedMeshRenderer: @@ -1572,7 +1587,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 73672630868547665} - m_RootOrder: 7 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!137 &3496447825461477444 SkinnedMeshRenderer: @@ -1739,7 +1754,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 73672630868547665} - m_RootOrder: 14 + m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &4233258354060922112 GameObject: @@ -1863,7 +1878,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 73672630868547665} - m_RootOrder: 11 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!137 &8816711415388613917 SkinnedMeshRenderer: @@ -1950,7 +1965,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 73672630868547665} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!137 &7959325645278503197 SkinnedMeshRenderer: @@ -2126,7 +2141,7 @@ Transform: m_LocalScale: {x: 1.0000001, y: 1.0000001, z: 1.0000001} m_Children: [] m_Father: {fileID: 73672630868547665} - m_RootOrder: 15 + m_RootOrder: 16 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &4989313113406661300 GameObject: @@ -2188,7 +2203,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 73672630868547665} - m_RootOrder: 13 + m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!137 &7255522925012335815 SkinnedMeshRenderer: @@ -2562,7 +2577,7 @@ Transform: - {fileID: 6092495251639054361} - {fileID: 7744220000464390425} m_Father: {fileID: 73672630868547665} - m_RootOrder: 16 + m_RootOrder: 17 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &6016574637594614918 GameObject: @@ -2624,7 +2639,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 73672630868547665} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!137 &4817321768360558260 SkinnedMeshRenderer: @@ -2772,7 +2787,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 73672630868547665} - m_RootOrder: 8 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!137 &7851208097931475837 SkinnedMeshRenderer: @@ -3043,7 +3058,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 73672630868547665} - m_RootOrder: 9 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!137 &1020104729156155370 SkinnedMeshRenderer: @@ -3254,7 +3269,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 73672630868547665} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!137 &8607735805242092523 SkinnedMeshRenderer: @@ -3617,7 +3632,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 73672630868547665} - m_RootOrder: 12 + m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!137 &7175740744853981516 SkinnedMeshRenderer: @@ -3684,6 +3699,137 @@ SkinnedMeshRenderer: m_Center: {x: 0.25809923, y: 0.054787725, z: 0.000030040741} m_Extent: {x: 0.47428843, y: 0.26083967, z: 0.27584353} m_DirtyAABB: 0 +--- !u!1001 &3193594884886186464 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 73672630868547665} + m_Modifications: + - target: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, + type: 3} + propertyPath: m_SizeDelta.x + value: 1080 + objectReference: {fileID: 0} + - target: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, + type: 3} + propertyPath: m_SizeDelta.y + value: 1920 + objectReference: {fileID: 0} + - target: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6049883652435591266, guid: dec5dd0d644d5c548a53563e65837162, + type: 3} + propertyPath: m_Name + value: CharBar + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: dec5dd0d644d5c548a53563e65837162, type: 3} +--- !u!224 &7764648799730394358 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, + type: 3} + m_PrefabInstance: {fileID: 3193594884886186464} + m_PrefabAsset: {fileID: 0} +--- !u!1 &9197595637317142914 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6049883652435591266, guid: dec5dd0d644d5c548a53563e65837162, + type: 3} + m_PrefabInstance: {fileID: 3193594884886186464} + m_PrefabAsset: {fileID: 0} --- !u!1001 &7193426573827869494 PrefabInstance: m_ObjectHideFlags: 0 @@ -3694,7 +3840,7 @@ PrefabInstance: - target: {fileID: 5327400453591529684, guid: 04efd775509c00144993f7b46ecc2812, type: 3} propertyPath: m_RootOrder - value: 18 + value: 19 objectReference: {fileID: 0} - target: {fileID: 5327400453591529684, guid: 04efd775509c00144993f7b46ecc2812, type: 3} diff --git a/Assets/Resources/1/Character/Prefab/Mats.prefab b/Assets/Resources/1/Character/Prefab/Mats.prefab index 308112b1..41e3e005 100644 --- a/Assets/Resources/1/Character/Prefab/Mats.prefab +++ b/Assets/Resources/1/Character/Prefab/Mats.prefab @@ -274,7 +274,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8075972121593568698} - m_RootOrder: 12 + m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!137 &1334045384112983207 SkinnedMeshRenderer: @@ -524,7 +524,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8075972121593568698} - m_RootOrder: 9 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!137 &9168769041933808129 SkinnedMeshRenderer: @@ -704,7 +704,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8075972121593568698} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!137 &460197425555041792 SkinnedMeshRenderer: @@ -888,7 +888,7 @@ Transform: - {fileID: 2709694883264689650} - {fileID: 1904703828787956978} m_Father: {fileID: 8075972121593568698} - m_RootOrder: 16 + m_RootOrder: 17 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2479526007719057773 GameObject: @@ -950,7 +950,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8075972121593568698} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!137 &3732553513964632927 SkinnedMeshRenderer: @@ -1128,7 +1128,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8075972121593568698} - m_RootOrder: 8 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!137 &2153627924161134230 SkinnedMeshRenderer: @@ -1338,7 +1338,7 @@ Transform: m_LocalScale: {x: 1.0000001, y: 1.0000001, z: 1.0000001} m_Children: [] m_Father: {fileID: 8075972121593568698} - m_RootOrder: 15 + m_RootOrder: 16 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &3923867629690678382 GameObject: @@ -1369,7 +1369,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8075972121593568698} - m_RootOrder: 13 + m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!137 &1560192352063879468 SkinnedMeshRenderer: @@ -1996,7 +1996,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8075972121593568698} - m_RootOrder: 7 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!137 &4725333466958120367 SkinnedMeshRenderer: @@ -2112,7 +2112,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8075972121593568698} - m_RootOrder: 14 + m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &5452081300575733995 GameObject: @@ -2206,7 +2206,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8075972121593568698} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!137 &2261675095244612854 SkinnedMeshRenderer: @@ -2290,7 +2290,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8075972121593568698} - m_RootOrder: 11 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!137 &814414124825110774 SkinnedMeshRenderer: @@ -2377,7 +2377,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8075972121593568698} - m_RootOrder: 6 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!137 &38598230598365389 SkinnedMeshRenderer: @@ -2799,7 +2799,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8075972121593568698} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!137 &5204283373755937024 SkinnedMeshRenderer: @@ -3125,7 +3125,7 @@ Transform: m_LocalScale: {x: 1.0000001, y: 1.0000001, z: 1.0000001} m_Children: [] m_Father: {fileID: 8075972121593568698} - m_RootOrder: 17 + m_RootOrder: 18 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &8214953217507735526 GameObject: @@ -3253,7 +3253,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8075972121593568698} - m_RootOrder: 10 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!137 &1535277290013843030 SkinnedMeshRenderer: @@ -3371,7 +3371,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8075972121593568698} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!137 &6117365122380419884 SkinnedMeshRenderer: @@ -3439,6 +3439,7 @@ GameObject: m_Component: - component: {fileID: 8075972121593568698} - component: {fileID: -1510388322638865353} + - component: {fileID: 7120083236827966330} m_Layer: 0 m_Name: Mats m_TagString: Untagged @@ -3455,8 +3456,9 @@ Transform: m_GameObject: {fileID: 8887939040951305984} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.25, y: 1.25, z: 1.25} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 7200088151662806852} - {fileID: 5040779706105907752} - {fileID: 8597791130170475282} - {fileID: 1028383905452218202} @@ -3489,7 +3491,7 @@ Animator: m_GameObject: {fileID: 8887939040951305984} m_Enabled: 1 m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: 6c6726efa8f26a44c89dbcc255bf46f9, type: 2} + m_Controller: {fileID: 9100000, guid: 9e1a6090cd4d65d4599676c24fcb5cff, type: 2} m_CullingMode: 0 m_UpdateMode: 0 m_ApplyRootMotion: 0 @@ -3498,6 +3500,19 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!114 &7120083236827966330 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8887939040951305984} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 04619977b07331e43a21b8d1bc33b6e9, type: 3} + m_Name: + m_EditorClassIdentifier: + charBarCanvas: {fileID: 8614863231585036848} --- !u!1 &8928538182418462435 GameObject: m_ObjectHideFlags: 0 @@ -3618,7 +3633,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8075972121593568698} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!137 &7451163908134235730 SkinnedMeshRenderer: @@ -3694,7 +3709,7 @@ PrefabInstance: - target: {fileID: 5327400453591529684, guid: 04efd775509c00144993f7b46ecc2812, type: 3} propertyPath: m_RootOrder - value: 18 + value: 19 objectReference: {fileID: 0} - target: {fileID: 5327400453591529684, guid: 04efd775509c00144993f7b46ecc2812, type: 3} @@ -3759,3 +3774,134 @@ Transform: type: 3} m_PrefabInstance: {fileID: 145121345677679786} m_PrefabAsset: {fileID: 0} +--- !u!1001 &2628876604355308114 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 8075972121593568698} + m_Modifications: + - target: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, + type: 3} + propertyPath: m_SizeDelta.x + value: 1080 + objectReference: {fileID: 0} + - target: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, + type: 3} + propertyPath: m_SizeDelta.y + value: 1920 + objectReference: {fileID: 0} + - target: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6049883652435591266, guid: dec5dd0d644d5c548a53563e65837162, + type: 3} + propertyPath: m_Name + value: CharBar + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: dec5dd0d644d5c548a53563e65837162, type: 3} +--- !u!1 &8614863231585036848 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6049883652435591266, guid: dec5dd0d644d5c548a53563e65837162, + type: 3} + m_PrefabInstance: {fileID: 2628876604355308114} + m_PrefabAsset: {fileID: 0} +--- !u!224 &7200088151662806852 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, + type: 3} + m_PrefabInstance: {fileID: 2628876604355308114} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Resources/1/Character/Prefab/Ragnar.prefab b/Assets/Resources/1/Character/Prefab/Ragnar.prefab index 367b4b0b..1f348710 100644 --- a/Assets/Resources/1/Character/Prefab/Ragnar.prefab +++ b/Assets/Resources/1/Character/Prefab/Ragnar.prefab @@ -29,7 +29,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 609351601165668828} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!137 &3207258909871447882 SkinnedMeshRenderer: @@ -97,6 +97,7 @@ GameObject: m_Component: - component: {fileID: 609351601165668828} - component: {fileID: -1148229131982139879} + - component: {fileID: 7312803781132825500} m_Layer: 0 m_Name: Ragnar m_TagString: Untagged @@ -113,8 +114,9 @@ Transform: m_GameObject: {fileID: 233917392663333734} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.25, y: 1.25, z: 1.25} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 9055592242171101397} - {fileID: 4436949130001090126} - {fileID: 1096128071457673076} - {fileID: 8512588759625374524} @@ -156,6 +158,19 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!114 &7312803781132825500 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 233917392663333734} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 04619977b07331e43a21b8d1bc33b6e9, type: 3} + m_Name: + m_EditorClassIdentifier: + charBarCanvas: {fileID: 7624052504724712865} --- !u!1 &256650191767157381 GameObject: m_ObjectHideFlags: 0 @@ -276,7 +291,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 609351601165668828} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!137 &2233958923311522356 SkinnedMeshRenderer: @@ -468,7 +483,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 609351601165668828} - m_RootOrder: 10 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!137 &7865854891116106288 SkinnedMeshRenderer: @@ -681,7 +696,7 @@ Transform: m_LocalScale: {x: 1.0000001, y: 1.0000001, z: 1.0000001} m_Children: [] m_Father: {fileID: 609351601165668828} - m_RootOrder: 17 + m_RootOrder: 18 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1790588752376035915 GameObject: @@ -773,7 +788,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 609351601165668828} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!137 &3485245087883001190 SkinnedMeshRenderer: @@ -1116,7 +1131,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 609351601165668828} - m_RootOrder: 6 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!137 &8714015803898821803 SkinnedMeshRenderer: @@ -1446,7 +1461,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 609351601165668828} - m_RootOrder: 7 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!137 &4176110184165050825 SkinnedMeshRenderer: @@ -1562,7 +1577,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 609351601165668828} - m_RootOrder: 14 + m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &3718357059954767383 GameObject: @@ -1656,7 +1671,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 609351601165668828} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!137 &7423148600506869904 SkinnedMeshRenderer: @@ -1740,7 +1755,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 609351601165668828} - m_RootOrder: 11 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!137 &8298487604563911824 SkinnedMeshRenderer: @@ -2329,7 +2344,7 @@ Transform: m_LocalScale: {x: 1.0000001, y: 1.0000001, z: 1.0000001} m_Children: [] m_Father: {fileID: 609351601165668828} - m_RootOrder: 15 + m_RootOrder: 16 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &5625883272213733384 GameObject: @@ -2360,7 +2375,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 609351601165668828} - m_RootOrder: 13 + m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!137 &7908793165493908810 SkinnedMeshRenderer: @@ -2618,7 +2633,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 609351601165668828} - m_RootOrder: 8 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!137 &7315111304627041008 SkinnedMeshRenderer: @@ -2771,7 +2786,7 @@ Transform: - {fileID: 6772713405425793428} - {fileID: 7064346664378220692} m_Father: {fileID: 609351601165668828} - m_RootOrder: 16 + m_RootOrder: 17 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &6902029820718956939 GameObject: @@ -2802,7 +2817,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 609351601165668828} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!137 &5452722750088951609 SkinnedMeshRenderer: @@ -2982,7 +2997,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 609351601165668828} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!137 &9080862996854514278 SkinnedMeshRenderer: @@ -3285,7 +3300,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 609351601165668828} - m_RootOrder: 9 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!137 &529530345768451687 SkinnedMeshRenderer: @@ -3464,7 +3479,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 609351601165668828} - m_RootOrder: 12 + m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!137 &7702348211638010049 SkinnedMeshRenderer: @@ -3694,7 +3709,7 @@ PrefabInstance: - target: {fileID: 5327400453591529684, guid: 04efd775509c00144993f7b46ecc2812, type: 3} propertyPath: m_RootOrder - value: 18 + value: 19 objectReference: {fileID: 0} - target: {fileID: 5327400453591529684, guid: 04efd775509c00144993f7b46ecc2812, type: 3} @@ -3759,3 +3774,134 @@ Transform: type: 3} m_PrefabInstance: {fileID: 2559583355116911974} m_PrefabAsset: {fileID: 0} +--- !u!1001 &4196108535858654659 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 609351601165668828} + m_Modifications: + - target: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, + type: 3} + propertyPath: m_SizeDelta.x + value: 1080 + objectReference: {fileID: 0} + - target: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, + type: 3} + propertyPath: m_SizeDelta.y + value: 1920 + objectReference: {fileID: 0} + - target: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6049883652435591266, guid: dec5dd0d644d5c548a53563e65837162, + type: 3} + propertyPath: m_Name + value: CharBar + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: dec5dd0d644d5c548a53563e65837162, type: 3} +--- !u!224 &9055592242171101397 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, + type: 3} + m_PrefabInstance: {fileID: 4196108535858654659} + m_PrefabAsset: {fileID: 0} +--- !u!1 &7624052504724712865 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6049883652435591266, guid: dec5dd0d644d5c548a53563e65837162, + type: 3} + m_PrefabInstance: {fileID: 4196108535858654659} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Resources/Data/Data.asset b/Assets/Resources/Data/Data.asset index 103ab30d..1d8d15a4 100644 --- a/Assets/Resources/Data/Data.asset +++ b/Assets/Resources/Data/Data.asset @@ -16,3 +16,4 @@ MonoBehaviour: cameraDataPath: CameraData playerDataPath: PlayerData weaponDataPath: WeaponsData + enemyDataPath: EnemyData diff --git a/Assets/Resources/Data/WeaponsData.asset b/Assets/Resources/Data/WeaponsData.asset index 58e18016..ac238e69 100644 --- a/Assets/Resources/Data/WeaponsData.asset +++ b/Assets/Resources/Data/WeaponsData.asset @@ -18,3 +18,6 @@ MonoBehaviour: manaCost: 10 damage: 10 speed: 10 + disnatce: 5 + reloadTime: 1 + shots: 3 diff --git a/Assets/Scripts/Chars/AnimLength.cs b/Assets/Scripts/Chars/AnimLength.cs new file mode 100644 index 00000000..06fe3970 --- /dev/null +++ b/Assets/Scripts/Chars/AnimLength.cs @@ -0,0 +1,8 @@ +namespace Chars +{ + public struct AnimLength + { + public float Move; + public float Attack; + } +} \ No newline at end of file diff --git a/Assets/Scripts/Chars/AnimLength.cs.meta b/Assets/Scripts/Chars/AnimLength.cs.meta new file mode 100644 index 00000000..7093a0d4 --- /dev/null +++ b/Assets/Scripts/Chars/AnimLength.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: b3d706b1596441daae167fe91665bf50 +timeCreated: 1640197963 \ No newline at end of file diff --git a/Assets/Scripts/Chars/Enemy.cs b/Assets/Scripts/Chars/Enemy.cs index c377b4c7..101abb43 100644 --- a/Assets/Scripts/Chars/Enemy.cs +++ b/Assets/Scripts/Chars/Enemy.cs @@ -1,18 +1,85 @@ -using HexFiled; +using Data; +using DG.Tweening; +using HexFiled; using UnityEngine; namespace Chars { public class Enemy : IUnit { + private GameObject _playerPrefab; + private HexCoordinates _spawnPos; + private UnitColor _color; + private HexCell _cell; + private HexGrid _grid; + private GameObject _instance; + private bool _isAlive; + private UnitView _unitView; + private bool _isBusy; + private Animator _animator; + private AnimLength _animLength; + + public UnitView EnemyView => _unitView; + public bool IsBusy => _isBusy; + + public Enemy(EnemyInfo enemyInfo, HexGrid grid) + { + _playerPrefab = enemyInfo.playerPrefab; + _spawnPos = enemyInfo.spawnPos; + _color = enemyInfo.color; + _grid = grid; + _isAlive = false; + } public void Move(HexDirection direction) { - throw new System.NotImplementedException(); + if (_cell.GetNeighbor(direction)) + { + _isBusy = true; + _cell = _cell.GetNeighbor(direction); + _instance.transform.DOLookAt(_cell.transform.position, 0.1f); + _animator.SetTrigger("Move"); + _animator.SetBool("isMoving", _isBusy); + _instance.transform.DOMove(_cell.transform.position, _animLength.Move); + } + } + + private void SetAnimLength() + { + AnimationClip[] clips = _animator.runtimeAnimatorController.animationClips; + foreach (var clip in clips) + { + switch (clip.name) + { + case "MoveJump": + _animLength.Move = clip.length; + break; + case "Attack": + _animLength.Attack = clip.length; + break; + default: + break; + } + } } public void Spawn() { - throw new System.NotImplementedException(); + if(!_isAlive) + { + _cell = _grid.GetCellFromCoord(_spawnPos); + _instance = Object.Instantiate(_playerPrefab, _cell.transform.parent); + _instance.transform.localPosition = _cell.transform.localPosition; + _cell.PaintHex(_color); + for (int i = 0; i < 6; i++) + { + _cell.GetNeighbor((HexDirection)i).PaintHex(_color); + } + + _isAlive = true; + _unitView = _instance.GetComponent(); + _animator = _instance.GetComponent(); + SetAnimLength(); + } } public void Death() diff --git a/Assets/Scripts/Chars/EnemyController.cs b/Assets/Scripts/Chars/EnemyController.cs new file mode 100644 index 00000000..ae062755 --- /dev/null +++ b/Assets/Scripts/Chars/EnemyController.cs @@ -0,0 +1,35 @@ +using Controller; +using Data; +using Runtime.Controller; +using UnityEngine; + +namespace Chars +{ + public class EnemyController : IFixedExecute, IExecute + { + private Enemy _enemy; + private Camera _camera; + + public EnemyController(EnemyInfo enemyInfo, Enemy enemy) + { + _enemy = enemy; + _camera = Camera.main; + + } + + public void FixedExecute() + { + //throw new System.NotImplementedException(); + } + + public void Execute() + { + if (_enemy.EnemyView != null) + { + _enemy.EnemyView.charBarCanvas.transform.LookAt( + _enemy.EnemyView.charBarCanvas.transform.position + _camera.transform.rotation * Vector3.back, + _camera.transform.rotation * Vector3.up); + } + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Chars/EnemyController.cs.meta b/Assets/Scripts/Chars/EnemyController.cs.meta new file mode 100644 index 00000000..007a74b1 --- /dev/null +++ b/Assets/Scripts/Chars/EnemyController.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 3a02fa710e3d4b5c898b6303e56581e2 +timeCreated: 1640196926 \ No newline at end of file diff --git a/Assets/Scripts/Chars/Player.cs b/Assets/Scripts/Chars/Player.cs index d60bff69..f8320394 100644 --- a/Assets/Scripts/Chars/Player.cs +++ b/Assets/Scripts/Chars/Player.cs @@ -10,13 +10,6 @@ using Object = UnityEngine.Object; namespace Chars { - struct AnimLength - { - public float Move; - public float Attack; - } - - public class Player : IUnit { private HexCoordinates _spawnPos; @@ -28,7 +21,7 @@ namespace Chars private HexGrid _hexGrid; public Action onPlayerSpawned; private Animator _animator; - private PlayerView _playerView; + private UnitView _unitView; private bool _isBusy; private UnitColor _color; private float _hp; @@ -39,7 +32,7 @@ namespace Chars public bool IsBusy => _isBusy; public GameObject PlayerInstance => _instance; - public PlayerView PlayerView => _playerView; + public UnitView UnitView => _unitView; public Player(PlayerData playerData, Weapon weapon, HexGrid hexGrid) { @@ -100,8 +93,8 @@ namespace Chars onPlayerSpawned?.Invoke(_instance); _isAlive = true; _animator = _instance.GetComponent(); - _playerView = _instance.GetComponent(); - _charBar = _playerView.charBarCanvas.GetComponent(); + _unitView = _instance.GetComponent(); + _charBar = _unitView.charBarCanvas.GetComponent(); SetAnimLength(); _mana = 100f; _hp = 100f; @@ -134,9 +127,9 @@ namespace Chars private void SetUpActions() { - _playerView.OnStep += Step; - _playerView.OnAttackEnd += AttackEnd; - _playerView.OnAttack += Attacking; + _unitView.OnStep += Step; + _unitView.OnAttackEnd += AttackEnd; + _unitView.OnAttack += Attacking; } private void UpdateCanvas() @@ -159,7 +152,7 @@ namespace Chars public void Aim(Vector2 direction) { - _playerView.transform.LookAt(new Vector3(direction.x,0, direction.y) + _playerView.transform.position); + _unitView.transform.LookAt(new Vector3(direction.x,0, direction.y) + _unitView.transform.position); _direction = direction; } diff --git a/Assets/Scripts/Chars/Player.cs.meta b/Assets/Scripts/Chars/Player.cs.meta deleted file mode 100644 index 617d79b3..00000000 --- a/Assets/Scripts/Chars/Player.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 0757c78a3a7349caa9e9ba28aa2d7f57 -timeCreated: 1639488785 \ No newline at end of file diff --git a/Assets/Scripts/Chars/PlayerControl.cs b/Assets/Scripts/Chars/PlayerControl.cs index 1ccd59fa..782c4416 100644 --- a/Assets/Scripts/Chars/PlayerControl.cs +++ b/Assets/Scripts/Chars/PlayerControl.cs @@ -85,9 +85,12 @@ namespace Chars public void Execute() { - _player.PlayerView.charBarCanvas.transform.LookAt( - _player.PlayerView.charBarCanvas.transform.position + _camera.transform.rotation * Vector3.back, - _camera.transform.rotation * Vector3.up); + if (_player.UnitView != null) + { + _player.UnitView.charBarCanvas.transform.LookAt( + _player.UnitView.charBarCanvas.transform.position + _camera.transform.rotation * Vector3.back, + _camera.transform.rotation * Vector3.up); + } } } } \ No newline at end of file diff --git a/Assets/Scripts/Controller/GameInit.cs b/Assets/Scripts/Controller/GameInit.cs index 83cc90b8..9a7a9a46 100644 --- a/Assets/Scripts/Controller/GameInit.cs +++ b/Assets/Scripts/Controller/GameInit.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; using CamControl; using Chars; +using Data; using HexFiled; using UnityEngine; @@ -15,8 +16,14 @@ namespace Controller hexGrid.OnHexPainted += DoSomething; Player player = new Player(data.PlayerData, data.WeaponsData.WeaponsList[0], hexGrid); - List units = new List { player }; + data.EnemyData.Enemies.ForEach(enemyInfo => + { + var enemy = new Enemy(enemyInfo, hexGrid); + var enemyController = new EnemyController(enemyInfo, enemy); + controllers.Add(enemyController); + units.Add(enemy); + }); var unitFactory = new UnitFactory(units); hexGrid.OnGridLoaded += unitFactory.Spawn; diff --git a/Assets/Scripts/Data/Data.cs b/Assets/Scripts/Data/Data.cs index 867f2213..f442655b 100644 --- a/Assets/Scripts/Data/Data.cs +++ b/Assets/Scripts/Data/Data.cs @@ -17,7 +17,22 @@ namespace Data private PlayerData _playerData; [SerializeField] private string weaponDataPath; private WeaponsData _weaponData; + [SerializeField] private string enemyDataPath; + private EnemyData _enemyData; + public EnemyData EnemyData + { + get + { + if (_enemyData == null) + { + _enemyData = Load("Data/" + enemyDataPath); + } + + return _enemyData; + } + } + public WeaponsData WeaponsData { get @@ -73,4 +88,5 @@ namespace Data private static T Load(string resourcesPath) where T : Object => Resources.Load(Path.ChangeExtension(resourcesPath, null)); } + } \ No newline at end of file diff --git a/Assets/Scripts/Data/EnemyData.cs b/Assets/Scripts/Data/EnemyData.cs new file mode 100644 index 00000000..80496171 --- /dev/null +++ b/Assets/Scripts/Data/EnemyData.cs @@ -0,0 +1,22 @@ +using System; +using System.Collections.Generic; +using HexFiled; +using UnityEngine; + +namespace Data +{ + [CreateAssetMenu(fileName = "EnemyData", menuName = "Data/EnemyData", order = 0)] + public class EnemyData : ScriptableObject + { + [SerializeField] private List _enemies; + public List Enemies => _enemies; + } + + [Serializable] + public struct EnemyInfo + { + public HexCoordinates spawnPos; + public GameObject playerPrefab; + public UnitColor color; + } +} \ No newline at end of file diff --git a/Assets/Scripts/Data/EnemyData.cs.meta b/Assets/Scripts/Data/EnemyData.cs.meta new file mode 100644 index 00000000..01afe0f4 --- /dev/null +++ b/Assets/Scripts/Data/EnemyData.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: a68fdab0e3dd421d93555195f3a2bd5b +timeCreated: 1640183173 \ No newline at end of file diff --git a/Assets/Scripts/Weapons/WeaponsData.cs b/Assets/Scripts/Data/WeaponsData.cs similarity index 83% rename from Assets/Scripts/Weapons/WeaponsData.cs rename to Assets/Scripts/Data/WeaponsData.cs index 4aae3f52..c7cedb10 100644 --- a/Assets/Scripts/Weapons/WeaponsData.cs +++ b/Assets/Scripts/Data/WeaponsData.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using UnityEditor; using UnityEngine; namespace DefaultNamespace.Weapons @@ -20,5 +21,8 @@ namespace DefaultNamespace.Weapons public int manaCost; public int damage; public float speed; + public int disnatce; + public float reloadTime; + public int shots; } } \ No newline at end of file diff --git a/Assets/Scripts/Weapons/WeaponsData.cs.meta b/Assets/Scripts/Data/WeaponsData.cs.meta similarity index 100% rename from Assets/Scripts/Weapons/WeaponsData.cs.meta rename to Assets/Scripts/Data/WeaponsData.cs.meta diff --git a/Assets/Scripts/HexFiled/HexGrid.cs b/Assets/Scripts/HexFiled/HexGrid.cs index 0d78c9e6..efd771c3 100644 --- a/Assets/Scripts/HexFiled/HexGrid.cs +++ b/Assets/Scripts/HexFiled/HexGrid.cs @@ -107,8 +107,7 @@ namespace HexFiled CreateCell(x, z, i++); } } - - // _hexMesh.Triangulate(_cells); + OnGridLoaded.Invoke(); } } diff --git a/Assets/Scripts/VFXController.cs b/Assets/Scripts/VFXController.cs deleted file mode 100644 index 29200172..00000000 --- a/Assets/Scripts/VFXController.cs +++ /dev/null @@ -1,14 +0,0 @@ -using HexFiled; -using UnityEngine; - -namespace DefaultNamespace -{ - public class VFXController - { - void HexCaptured(HexCell cell) - { - ParticleSystem system; - - } - } -} \ No newline at end of file diff --git a/Assets/Scripts/VFXController.cs.meta b/Assets/Scripts/VFXController.cs.meta deleted file mode 100644 index 6cf34c5e..00000000 --- a/Assets/Scripts/VFXController.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: e5124914ee2c478bb47f35353a0669fb -timeCreated: 1640027806 \ No newline at end of file diff --git a/Assets/PlayerView.cs b/Assets/UnitView.cs similarity index 90% rename from Assets/PlayerView.cs rename to Assets/UnitView.cs index a8eafcb4..d63edbac 100644 --- a/Assets/PlayerView.cs +++ b/Assets/UnitView.cs @@ -1,7 +1,7 @@ using System; using UnityEngine; -public class PlayerView : MonoBehaviour +public class UnitView : MonoBehaviour { public Action OnStep; public Action OnAttackEnd; diff --git a/Assets/PlayerView.cs.meta b/Assets/UnitView.cs.meta similarity index 100% rename from Assets/PlayerView.cs.meta rename to Assets/UnitView.cs.meta