Items #3

Merged
dddushesss merged 61 commits from Alexei into main 2022-01-05 12:48:28 +00:00
34 changed files with 2020 additions and 202 deletions
Showing only changes of commit 4f188bc304 - Show all commits

30
Assets/BarCanvas.cs Normal file
View File

@ -0,0 +1,30 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
public class BarCanvas : MonoBehaviour
{
[SerializeField] private Image healthBar;
[SerializeField] private Image manaBar;
[SerializeField] private ShotUIView shotPrefab;
[SerializeField] private GameObject grid;
public Image HealthBar => healthBar;
public Image ManaBar => manaBar;
public ShotUIView ShotUIView => shotPrefab;
public Stack<ShotUIView> SpawnShotUI(int count)
{
Stack<ShotUIView> stack = new Stack<ShotUIView>();
List<GameObject> shots = new List<GameObject>();
for (int i = 0; i < count; i++)
{
shots.Add(Instantiate(shotPrefab.gameObject, grid.transform));
}
shots.Reverse();
shots.ForEach(shot => stack.Push(shot.GetComponent<ShotUIView>()));
return stack;
}
}

View File

@ -1,13 +0,0 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
public class CharBar : MonoBehaviour
{
[SerializeField] private Image _healthBar;
[SerializeField] private Image _manaBar;
public Image HealthBar => _healthBar;
public Image ManaBar => _manaBar;
}

View File

@ -0,0 +1,196 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &2273039178377770117
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 859777855380249073}
- component: {fileID: 4155610655756139463}
- component: {fileID: 3748583951425988394}
- component: {fileID: 6763014501615571600}
- component: {fileID: 5390111712102929048}
m_Layer: 5
m_Name: AimCanvas
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &859777855380249073
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2273039178377770117}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
m_Children:
- {fileID: 1682201888086621645}
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 &4155610655756139463
Canvas:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2273039178377770117}
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 &3748583951425988394
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2273039178377770117}
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 &6763014501615571600
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2273039178377770117}
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 &5390111712102929048
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2273039178377770117}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 6650f022a8987a34e8da86d910b6e277, type: 3}
m_Name:
m_EditorClassIdentifier:
healthBar: {fileID: 0}
manaBar: {fileID: 0}
shotPrefab: {fileID: 9204531176590517796, guid: 74ba0f2e00eb74a4882dcf82bb66bb3f,
type: 3}
grid: {fileID: 0}
--- !u!1 &4408587040574959135
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1682201888086621645}
- component: {fileID: 4166681067140898453}
- component: {fileID: 4289004574052349883}
m_Layer: 5
m_Name: Aim
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1682201888086621645
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4408587040574959135}
m_LocalRotation: {x: -0.5, y: -0.5, z: -0.5, w: 0.5}
m_LocalPosition: {x: 0, y: 0, z: 2.28}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 859777855380249073}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: -90, y: -90, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0.04, y: 0.3}
m_SizeDelta: {x: 5, y: 1}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4166681067140898453
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4408587040574959135}
m_CullTransparentMesh: 1
--- !u!114 &4289004574052349883
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4408587040574959135}
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: 4007780875627063171, guid: e816ecf82b202d0449267fe992da842e,
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

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 09a0317cbdff9fa479a18c9e20743a8e
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -10,9 +10,9 @@ GameObject:
m_Component: m_Component:
- component: {fileID: 5894909873554395549} - component: {fileID: 5894909873554395549}
- component: {fileID: 8174616228555596217} - component: {fileID: 8174616228555596217}
- component: {fileID: 7337933991429132297} - component: {fileID: 6466448468551854656}
m_Layer: 5 m_Layer: 5
m_Name: Mana m_Name: Shots
m_TagString: Untagged m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
@ -26,7 +26,7 @@ RectTransform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3185331048183402439} m_GameObject: {fileID: 3185331048183402439}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 2.8} m_LocalPosition: {x: 0, y: 0, z: 5}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 5156761560679623958} m_Father: {fileID: 5156761560679623958}
@ -34,8 +34,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 3.39} m_AnchoredPosition: {x: 0, y: 3.75}
m_SizeDelta: {x: 3, y: 1} m_SizeDelta: {x: 3, y: 0.2}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8174616228555596217 --- !u!222 &8174616228555596217
CanvasRenderer: CanvasRenderer:
@ -45,7 +45,7 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3185331048183402439} m_GameObject: {fileID: 3185331048183402439}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 1
--- !u!114 &7337933991429132297 --- !u!114 &6466448468551854656
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
@ -54,25 +54,96 @@ MonoBehaviour:
m_GameObject: {fileID: 3185331048183402439} m_GameObject: {fileID: 3185331048183402439}
m_Enabled: 1 m_Enabled: 1
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Padding:
m_Left: 0
m_Right: 0
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 2
m_StartCorner: 0
m_StartAxis: 0
m_CellSize: {x: 0.5, y: 0.2}
m_Spacing: {x: 0, y: 0}
m_Constraint: 0
m_ConstraintCount: 1
--- !u!1 &4564225513960759228
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 82951532315249996}
- component: {fileID: 3314045166140750521}
- component: {fileID: 1578129097074153488}
m_Layer: 5
m_Name: ManaBack
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &82951532315249996
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4564225513960759228}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 5}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 6551948662265214362}
m_Father: {fileID: 5156761560679623958}
m_RootOrder: 2
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: 2.08, y: 4}
m_SizeDelta: {x: 1, y: 1}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3314045166140750521
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4564225513960759228}
m_CullTransparentMesh: 1
--- !u!114 &1578129097074153488
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4564225513960759228}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Material: {fileID: 0} m_Material: {fileID: 0}
m_Color: {r: 0.044025064, g: 0.105446905, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0 m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1 m_Maskable: 1
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_Sprite: {fileID: 21300000, guid: c8585b68a92b5d440992ddd7d1b1a3d6, type: 3} m_Sprite: {fileID: -5455261514569519910, guid: bcfec907e0672ed45b69575096b4a1c2,
m_Type: 3 type: 3}
m_Type: 0
m_PreserveAspect: 0 m_PreserveAspect: 0
m_FillCenter: 1 m_FillCenter: 1
m_FillMethod: 0 m_FillMethod: 4
m_FillAmount: 1 m_FillAmount: 1
m_FillClockwise: 1 m_FillClockwise: 1
m_FillOrigin: 1 m_FillOrigin: 0
m_UseSpriteMesh: 0 m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1 m_PixelsPerUnitMultiplier: 1
--- !u!1 &6049883652435591266 --- !u!1 &6049883652435591266
@ -102,12 +173,13 @@ RectTransform:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6049883652435591266} m_GameObject: {fileID: 6049883652435591266}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} 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: 0}
m_LocalScale: {x: 0.8, y: 0.8, z: 0.8} m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
m_Children: m_Children:
- {fileID: 5894909873554395549} - {fileID: 5894909873554395549}
- {fileID: 7064199837503171822} - {fileID: 7064199837503171822}
- {fileID: 82951532315249996}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -159,7 +231,7 @@ MonoBehaviour:
m_FallbackScreenDPI: 96 m_FallbackScreenDPI: 96
m_DefaultSpriteDPI: 96 m_DefaultSpriteDPI: 96
m_DynamicPixelsPerUnit: 1 m_DynamicPixelsPerUnit: 1
m_PresetInfoIsWorld: 1 m_PresetInfoIsWorld: 0
--- !u!114 &1271697267505620599 --- !u!114 &1271697267505620599
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -189,8 +261,11 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 6650f022a8987a34e8da86d910b6e277, type: 3} m_Script: {fileID: 11500000, guid: 6650f022a8987a34e8da86d910b6e277, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
_healthBar: {fileID: 2447735196939325693} healthBar: {fileID: 7888535169076749686}
_manaBar: {fileID: 7337933991429132297} manaBar: {fileID: 9185818537322146330}
shotPrefab: {fileID: 9204531176590517796, guid: 74ba0f2e00eb74a4882dcf82bb66bb3f,
type: 3}
grid: {fileID: 3185331048183402439}
--- !u!1 &6201783996967795459 --- !u!1 &6201783996967795459
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -203,7 +278,7 @@ GameObject:
- component: {fileID: 1357902011422320789} - component: {fileID: 1357902011422320789}
- component: {fileID: 2447735196939325693} - component: {fileID: 2447735196939325693}
m_Layer: 5 m_Layer: 5
m_Name: Health m_Name: HealthBack
m_TagString: Untagged m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
@ -217,16 +292,17 @@ RectTransform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6201783996967795459} m_GameObject: {fileID: 6201783996967795459}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 2.8} m_LocalPosition: {x: 0, y: 0, z: 5}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children:
- {fileID: 9025064510373730425}
m_Father: {fileID: 5156761560679623958} m_Father: {fileID: 5156761560679623958}
m_RootOrder: 1 m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 4.0299997} m_AnchoredPosition: {x: 0, y: 4.25}
m_SizeDelta: {x: 3, y: 1} m_SizeDelta: {x: 3, y: 0.5}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1357902011422320789 --- !u!222 &1357902011422320789
CanvasRenderer: CanvasRenderer:
@ -249,14 +325,167 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Material: {fileID: 0} m_Material: {fileID: 0}
m_Color: {r: 1, g: 0, b: 0, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0 m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1 m_Maskable: 1
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_Sprite: {fileID: 21300000, guid: c8585b68a92b5d440992ddd7d1b1a3d6, type: 3} m_Sprite: {fileID: -8254845973784877126, guid: bcfec907e0672ed45b69575096b4a1c2,
type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 0
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 1
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &7234977947494318781
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6551948662265214362}
- component: {fileID: 7108030091433613238}
- component: {fileID: 9185818537322146330}
m_Layer: 5
m_Name: Mana
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &6551948662265214362
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7234977947494318781}
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: 82951532315249996}
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: 0}
m_SizeDelta: {x: 1, y: 1}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7108030091433613238
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7234977947494318781}
m_CullTransparentMesh: 1
--- !u!114 &9185818537322146330
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7234977947494318781}
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: -7745828531039951331, guid: bcfec907e0672ed45b69575096b4a1c2,
type: 3}
m_Type: 3
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 2
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &8978451512121849335
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 9025064510373730425}
- component: {fileID: 5013792723321420898}
- component: {fileID: 7888535169076749686}
m_Layer: 5
m_Name: Health
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &9025064510373730425
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8978451512121849335}
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: 7064199837503171822}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5013792723321420898
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8978451512121849335}
m_CullTransparentMesh: 1
--- !u!114 &7888535169076749686
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8978451512121849335}
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: -4039628871920856409, guid: bcfec907e0672ed45b69575096b4a1c2,
type: 3}
m_Type: 3 m_Type: 3
m_PreserveAspect: 0 m_PreserveAspect: 0
m_FillCenter: 1 m_FillCenter: 1

169
Assets/Prefab/ShotUI.prefab Normal file
View File

@ -0,0 +1,169 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &4480070793116953995
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1711727953511302732}
- component: {fileID: 4906111601013646711}
- component: {fileID: 5706126650174485490}
m_Layer: 5
m_Name: Shot
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1711727953511302732
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4480070793116953995}
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: 5300324731342171972}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4906111601013646711
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4480070793116953995}
m_CullTransparentMesh: 1
--- !u!114 &5706126650174485490
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4480070793116953995}
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: -5932287172053968506, guid: bcfec907e0672ed45b69575096b4a1c2,
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!1 &5004675740029417095
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5300324731342171972}
- component: {fileID: 1529365557084670523}
- component: {fileID: 18408299690945801}
- component: {fileID: 9204531176590517796}
m_Layer: 5
m_Name: ShotUI
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &5300324731342171972
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5004675740029417095}
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: 1711727953511302732}
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: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1529365557084670523
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5004675740029417095}
m_CullTransparentMesh: 1
--- !u!114 &18408299690945801
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5004675740029417095}
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: -8254845973784877126, guid: bcfec907e0672ed45b69575096b4a1c2,
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 &9204531176590517796
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5004675740029417095}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 89a8d361af438bd45a054f00251816f3, type: 3}
m_Name:
m_EditorClassIdentifier:
shotOn: {fileID: 4480070793116953995}

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 74ba0f2e00eb74a4882dcf82bb66bb3f
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -29,7 +29,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 4572196853266583038} m_Father: {fileID: 4572196853266583038}
m_RootOrder: 12 m_RootOrder: 13
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!137 &4912662343870396594 --- !u!137 &4912662343870396594
SkinnedMeshRenderer: SkinnedMeshRenderer:
@ -116,7 +116,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 4572196853266583038} m_Father: {fileID: 4572196853266583038}
m_RootOrder: 3 m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!137 &5765518534334543026 --- !u!137 &5765518534334543026
SkinnedMeshRenderer: SkinnedMeshRenderer:
@ -199,7 +199,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 4572196853266583038} m_Father: {fileID: 4572196853266583038}
m_RootOrder: 15 m_RootOrder: 16
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &332471246648109621 --- !u!1 &332471246648109621
GameObject: GameObject:
@ -323,7 +323,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 4572196853266583038} m_Father: {fileID: 4572196853266583038}
m_RootOrder: 8 m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!137 &1077460698320737771 --- !u!137 &1077460698320737771
SkinnedMeshRenderer: SkinnedMeshRenderer:
@ -964,7 +964,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 4572196853266583038} m_Father: {fileID: 4572196853266583038}
m_RootOrder: 7 m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!137 &5758144497826521225 --- !u!137 &5758144497826521225
SkinnedMeshRenderer: SkinnedMeshRenderer:
@ -1089,7 +1089,7 @@ Transform:
m_LocalScale: {x: 1.0000001, y: 1.0000001, z: 1.0000001} m_LocalScale: {x: 1.0000001, y: 1.0000001, z: 1.0000001}
m_Children: [] m_Children: []
m_Father: {fileID: 4572196853266583038} m_Father: {fileID: 4572196853266583038}
m_RootOrder: 18 m_RootOrder: 19
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &2758233992143147040 --- !u!1 &2758233992143147040
GameObject: GameObject:
@ -1359,7 +1359,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 4572196853266583038} m_Father: {fileID: 4572196853266583038}
m_RootOrder: 4 m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!137 &529592062793113924 --- !u!137 &529592062793113924
SkinnedMeshRenderer: SkinnedMeshRenderer:
@ -1477,7 +1477,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 4572196853266583038} m_Father: {fileID: 4572196853266583038}
m_RootOrder: 6 m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!137 &2884541352540552726 --- !u!137 &2884541352540552726
SkinnedMeshRenderer: SkinnedMeshRenderer:
@ -1636,6 +1636,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: m_Children:
- {fileID: 1719605314077195295} - {fileID: 1719605314077195295}
- {fileID: 1904133429405396096}
- {fileID: 762334722203785836} - {fileID: 762334722203785836}
- {fileID: 4049110387097277270} - {fileID: 4049110387097277270}
- {fileID: 4694339321759696670} - {fileID: 4694339321759696670}
@ -1688,7 +1689,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 04619977b07331e43a21b8d1bc33b6e9, type: 3} m_Script: {fileID: 11500000, guid: 04619977b07331e43a21b8d1bc33b6e9, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
charBarCanvas: {fileID: 268172662505640299} barCanvas: {fileID: 268172662505640299}
aimCanvas: {fileID: 1011384888140022260}
--- !u!136 &1900872271281143359 --- !u!136 &1900872271281143359
CapsuleCollider: CapsuleCollider:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -1778,7 +1780,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 4572196853266583038} m_Father: {fileID: 4572196853266583038}
m_RootOrder: 2 m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!137 &1983015544488362856 --- !u!137 &1983015544488362856
SkinnedMeshRenderer: SkinnedMeshRenderer:
@ -1931,7 +1933,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 4572196853266583038} m_Father: {fileID: 4572196853266583038}
m_RootOrder: 11 m_RootOrder: 12
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!137 &6498218744713055762 --- !u!137 &6498218744713055762
SkinnedMeshRenderer: SkinnedMeshRenderer:
@ -2080,7 +2082,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 4572196853266583038} m_Father: {fileID: 4572196853266583038}
m_RootOrder: 13 m_RootOrder: 14
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!137 &6765341491546692835 --- !u!137 &6765341491546692835
SkinnedMeshRenderer: SkinnedMeshRenderer:
@ -2513,7 +2515,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 4572196853266583038} m_Father: {fileID: 4572196853266583038}
m_RootOrder: 5 m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!137 &5261007101627874884 --- !u!137 &5261007101627874884
SkinnedMeshRenderer: SkinnedMeshRenderer:
@ -2663,7 +2665,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 4572196853266583038} m_Father: {fileID: 4572196853266583038}
m_RootOrder: 10 m_RootOrder: 11
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!137 &3485271364007879237 --- !u!137 &3485271364007879237
SkinnedMeshRenderer: SkinnedMeshRenderer:
@ -2904,7 +2906,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 4572196853266583038} m_Father: {fileID: 4572196853266583038}
m_RootOrder: 9 m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!137 &5945613682891009746 --- !u!137 &5945613682891009746
SkinnedMeshRenderer: SkinnedMeshRenderer:
@ -3082,7 +3084,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 4572196853266583038} m_Father: {fileID: 4572196853266583038}
m_RootOrder: 1 m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!137 &8983723231154842395 --- !u!137 &8983723231154842395
SkinnedMeshRenderer: SkinnedMeshRenderer:
@ -3205,7 +3207,7 @@ Transform:
- {fileID: 7708733371814815158} - {fileID: 7708733371814815158}
- {fileID: 6129107727045909686} - {fileID: 6129107727045909686}
m_Father: {fileID: 4572196853266583038} m_Father: {fileID: 4572196853266583038}
m_RootOrder: 17 m_RootOrder: 18
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &8063799099225487758 --- !u!1 &8063799099225487758
GameObject: GameObject:
@ -3438,7 +3440,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 4572196853266583038} m_Father: {fileID: 4572196853266583038}
m_RootOrder: 14 m_RootOrder: 15
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!137 &6541130630822603112 --- !u!137 &6541130630822603112
SkinnedMeshRenderer: SkinnedMeshRenderer:
@ -3635,7 +3637,7 @@ Transform:
m_LocalScale: {x: 1.0000001, y: 1.0000001, z: 1.0000001} m_LocalScale: {x: 1.0000001, y: 1.0000001, z: 1.0000001}
m_Children: [] m_Children: []
m_Father: {fileID: 4572196853266583038} m_Father: {fileID: 4572196853266583038}
m_RootOrder: 16 m_RootOrder: 17
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &8965199495429162257 --- !u!1 &8965199495429162257
GameObject: GameObject:
@ -3730,6 +3732,142 @@ Transform:
m_Father: {fileID: 4672659128853226903} m_Father: {fileID: 4672659128853226903}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1261672157705434481
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 4572196853266583038}
m_Modifications:
- target: {fileID: 859777855380249073, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_Pivot.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 859777855380249073, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 859777855380249073, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_RootOrder
value: 1
objectReference: {fileID: 0}
- target: {fileID: 859777855380249073, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 859777855380249073, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 859777855380249073, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_AnchorMin.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 859777855380249073, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 859777855380249073, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_SizeDelta.x
value: 1080
objectReference: {fileID: 0}
- target: {fileID: 859777855380249073, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_SizeDelta.y
value: 1920
objectReference: {fileID: 0}
- target: {fileID: 859777855380249073, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 859777855380249073, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 859777855380249073, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 859777855380249073, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 859777855380249073, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 859777855380249073, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 859777855380249073, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 859777855380249073, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 859777855380249073, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 859777855380249073, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 859777855380249073, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 859777855380249073, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2273039178377770117, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_Name
value: AimCanvas
objectReference: {fileID: 0}
- target: {fileID: 2273039178377770117, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 09a0317cbdff9fa479a18c9e20743a8e, type: 3}
--- !u!224 &1904133429405396096 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 859777855380249073, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
m_PrefabInstance: {fileID: 1261672157705434481}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1011384888140022260 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 2273039178377770117, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
m_PrefabInstance: {fileID: 1261672157705434481}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &5786347879975309577 --- !u!1001 &5786347879975309577
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -3845,7 +3983,12 @@ PrefabInstance:
- target: {fileID: 6049883652435591266, guid: dec5dd0d644d5c548a53563e65837162, - target: {fileID: 6049883652435591266, guid: dec5dd0d644d5c548a53563e65837162,
type: 3} type: 3}
propertyPath: m_Name propertyPath: m_Name
value: CharBar value: BarCanvas
objectReference: {fileID: 0}
- target: {fileID: 8681621801813709773, guid: dec5dd0d644d5c548a53563e65837162,
type: 3}
propertyPath: m_PresetInfoIsWorld
value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: dec5dd0d644d5c548a53563e65837162, type: 3} m_SourcePrefab: {fileID: 100100000, guid: dec5dd0d644d5c548a53563e65837162, type: 3}

View File

@ -2975,6 +2975,7 @@ Transform:
- {fileID: 6640574666343173209} - {fileID: 6640574666343173209}
- {fileID: 6357826002191603761} - {fileID: 6357826002191603761}
- {fileID: 6484114110451091213} - {fileID: 6484114110451091213}
- {fileID: 3747978489896321932}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -3009,7 +3010,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 04619977b07331e43a21b8d1bc33b6e9, type: 3} m_Script: {fileID: 11500000, guid: 04619977b07331e43a21b8d1bc33b6e9, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
charBarCanvas: {fileID: 5591725933991455353} barCanvas: {fileID: 5591725933991455353}
aimCanvas: {fileID: 2334695180834975480}
--- !u!136 &8911891366586862002 --- !u!136 &8911891366586862002
CapsuleCollider: CapsuleCollider:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -3921,7 +3923,12 @@ PrefabInstance:
- target: {fileID: 6049883652435591266, guid: dec5dd0d644d5c548a53563e65837162, - target: {fileID: 6049883652435591266, guid: dec5dd0d644d5c548a53563e65837162,
type: 3} type: 3}
propertyPath: m_Name propertyPath: m_Name
value: CharBar value: BarCanvas
objectReference: {fileID: 0}
- target: {fileID: 8681621801813709773, guid: dec5dd0d644d5c548a53563e65837162,
type: 3}
propertyPath: m_PresetInfoIsWorld
value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: dec5dd0d644d5c548a53563e65837162, type: 3} m_SourcePrefab: {fileID: 100100000, guid: dec5dd0d644d5c548a53563e65837162, type: 3}
@ -3937,3 +3944,144 @@ RectTransform:
type: 3} type: 3}
m_PrefabInstance: {fileID: 2192210941540280859} m_PrefabInstance: {fileID: 2192210941540280859}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
--- !u!1001 &4606608419032177277
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 7150739129758644021}
m_Modifications:
- target: {fileID: 859777855380249073, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_Pivot.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 859777855380249073, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 859777855380249073, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_RootOrder
value: 20
objectReference: {fileID: 0}
- target: {fileID: 859777855380249073, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 859777855380249073, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 859777855380249073, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_AnchorMin.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 859777855380249073, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 859777855380249073, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_SizeDelta.x
value: 1080
objectReference: {fileID: 0}
- target: {fileID: 859777855380249073, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_SizeDelta.y
value: 1920
objectReference: {fileID: 0}
- target: {fileID: 859777855380249073, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 859777855380249073, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 859777855380249073, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 859777855380249073, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 859777855380249073, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 859777855380249073, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 859777855380249073, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 859777855380249073, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 859777855380249073, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 859777855380249073, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 859777855380249073, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 859777855380249073, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2273039178377770117, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_Name
value: AimCanvas
objectReference: {fileID: 0}
- target: {fileID: 2273039178377770117, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5390111712102929048, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: grid
value:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 09a0317cbdff9fa479a18c9e20743a8e, type: 3}
--- !u!1 &2334695180834975480 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 2273039178377770117, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
m_PrefabInstance: {fileID: 4606608419032177277}
m_PrefabAsset: {fileID: 0}
--- !u!224 &3747978489896321932 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 859777855380249073, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
m_PrefabInstance: {fileID: 4606608419032177277}
m_PrefabAsset: {fileID: 0}

View File

@ -157,7 +157,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 73672630868547665} m_Father: {fileID: 73672630868547665}
m_RootOrder: 11 m_RootOrder: 12
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!137 &7230607862960200637 --- !u!137 &7230607862960200637
SkinnedMeshRenderer: SkinnedMeshRenderer:
@ -244,7 +244,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 73672630868547665} m_Father: {fileID: 73672630868547665}
m_RootOrder: 2 m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!137 &2734562589375010503 --- !u!137 &2734562589375010503
SkinnedMeshRenderer: SkinnedMeshRenderer:
@ -334,6 +334,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: m_Children:
- {fileID: 7764648799730394358} - {fileID: 7764648799730394358}
- {fileID: 6971375767392389975}
- {fileID: 3810699951024672707} - {fileID: 3810699951024672707}
- {fileID: 452431992228447993} - {fileID: 452431992228447993}
- {fileID: 9174866752866685617} - {fileID: 9174866752866685617}
@ -387,7 +388,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 04619977b07331e43a21b8d1bc33b6e9, type: 3} m_Script: {fileID: 11500000, guid: 04619977b07331e43a21b8d1bc33b6e9, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
charBarCanvas: {fileID: 9197595637317142914} barCanvas: {fileID: 9197595637317142914}
aimCanvas: {fileID: 8420239414472468003}
--- !u!136 &1571523103774403885 --- !u!136 &1571523103774403885
CapsuleCollider: CapsuleCollider:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -508,7 +510,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 73672630868547665} m_Father: {fileID: 73672630868547665}
m_RootOrder: 6 m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!137 &1617349845600775097 --- !u!137 &1617349845600775097
SkinnedMeshRenderer: SkinnedMeshRenderer:
@ -694,7 +696,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 73672630868547665} m_Father: {fileID: 73672630868547665}
m_RootOrder: 4 m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!137 &4120640975241344235 --- !u!137 &4120640975241344235
SkinnedMeshRenderer: SkinnedMeshRenderer:
@ -1020,7 +1022,7 @@ Transform:
m_LocalScale: {x: 1.0000001, y: 1.0000001, z: 1.0000001} m_LocalScale: {x: 1.0000001, y: 1.0000001, z: 1.0000001}
m_Children: [] m_Children: []
m_Father: {fileID: 73672630868547665} m_Father: {fileID: 73672630868547665}
m_RootOrder: 18 m_RootOrder: 19
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &2493757812983432245 --- !u!1 &2493757812983432245
GameObject: GameObject:
@ -1112,7 +1114,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 73672630868547665} m_Father: {fileID: 73672630868547665}
m_RootOrder: 7 m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!137 &8187264743474099494 --- !u!137 &8187264743474099494
SkinnedMeshRenderer: SkinnedMeshRenderer:
@ -1619,7 +1621,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 73672630868547665} m_Father: {fileID: 73672630868547665}
m_RootOrder: 8 m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!137 &3496447825461477444 --- !u!137 &3496447825461477444
SkinnedMeshRenderer: SkinnedMeshRenderer:
@ -1786,7 +1788,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 73672630868547665} m_Father: {fileID: 73672630868547665}
m_RootOrder: 15 m_RootOrder: 16
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &4233258354060922112 --- !u!1 &4233258354060922112
GameObject: GameObject:
@ -1910,7 +1912,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 73672630868547665} m_Father: {fileID: 73672630868547665}
m_RootOrder: 12 m_RootOrder: 13
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!137 &8816711415388613917 --- !u!137 &8816711415388613917
SkinnedMeshRenderer: SkinnedMeshRenderer:
@ -1997,7 +1999,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 73672630868547665} m_Father: {fileID: 73672630868547665}
m_RootOrder: 3 m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!137 &7959325645278503197 --- !u!137 &7959325645278503197
SkinnedMeshRenderer: SkinnedMeshRenderer:
@ -2173,7 +2175,7 @@ Transform:
m_LocalScale: {x: 1.0000001, y: 1.0000001, z: 1.0000001} m_LocalScale: {x: 1.0000001, y: 1.0000001, z: 1.0000001}
m_Children: [] m_Children: []
m_Father: {fileID: 73672630868547665} m_Father: {fileID: 73672630868547665}
m_RootOrder: 16 m_RootOrder: 17
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &4989313113406661300 --- !u!1 &4989313113406661300
GameObject: GameObject:
@ -2235,7 +2237,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 73672630868547665} m_Father: {fileID: 73672630868547665}
m_RootOrder: 14 m_RootOrder: 15
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!137 &7255522925012335815 --- !u!137 &7255522925012335815
SkinnedMeshRenderer: SkinnedMeshRenderer:
@ -2609,7 +2611,7 @@ Transform:
- {fileID: 6092495251639054361} - {fileID: 6092495251639054361}
- {fileID: 7744220000464390425} - {fileID: 7744220000464390425}
m_Father: {fileID: 73672630868547665} m_Father: {fileID: 73672630868547665}
m_RootOrder: 17 m_RootOrder: 18
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &6016574637594614918 --- !u!1 &6016574637594614918
GameObject: GameObject:
@ -2671,7 +2673,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 73672630868547665} m_Father: {fileID: 73672630868547665}
m_RootOrder: 1 m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!137 &4817321768360558260 --- !u!137 &4817321768360558260
SkinnedMeshRenderer: SkinnedMeshRenderer:
@ -2819,7 +2821,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 73672630868547665} m_Father: {fileID: 73672630868547665}
m_RootOrder: 9 m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!137 &7851208097931475837 --- !u!137 &7851208097931475837
SkinnedMeshRenderer: SkinnedMeshRenderer:
@ -3090,7 +3092,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 73672630868547665} m_Father: {fileID: 73672630868547665}
m_RootOrder: 10 m_RootOrder: 11
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!137 &1020104729156155370 --- !u!137 &1020104729156155370
SkinnedMeshRenderer: SkinnedMeshRenderer:
@ -3301,7 +3303,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 73672630868547665} m_Father: {fileID: 73672630868547665}
m_RootOrder: 5 m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!137 &8607735805242092523 --- !u!137 &8607735805242092523
SkinnedMeshRenderer: SkinnedMeshRenderer:
@ -3664,7 +3666,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 73672630868547665} m_Father: {fileID: 73672630868547665}
m_RootOrder: 13 m_RootOrder: 14
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!137 &7175740744853981516 --- !u!137 &7175740744853981516
SkinnedMeshRenderer: SkinnedMeshRenderer:
@ -3846,22 +3848,27 @@ PrefabInstance:
- target: {fileID: 6049883652435591266, guid: dec5dd0d644d5c548a53563e65837162, - target: {fileID: 6049883652435591266, guid: dec5dd0d644d5c548a53563e65837162,
type: 3} type: 3}
propertyPath: m_Name propertyPath: m_Name
value: CharBar value: BarCanvas
objectReference: {fileID: 0}
- target: {fileID: 8681621801813709773, guid: dec5dd0d644d5c548a53563e65837162,
type: 3}
propertyPath: m_PresetInfoIsWorld
value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: dec5dd0d644d5c548a53563e65837162, type: 3} m_SourcePrefab: {fileID: 100100000, guid: dec5dd0d644d5c548a53563e65837162, type: 3}
--- !u!1 &9197595637317142914 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 6049883652435591266, guid: dec5dd0d644d5c548a53563e65837162,
type: 3}
m_PrefabInstance: {fileID: 3193594884886186464}
m_PrefabAsset: {fileID: 0}
--- !u!224 &7764648799730394358 stripped --- !u!224 &7764648799730394358 stripped
RectTransform: RectTransform:
m_CorrespondingSourceObject: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162, m_CorrespondingSourceObject: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162,
type: 3} type: 3}
m_PrefabInstance: {fileID: 3193594884886186464} m_PrefabInstance: {fileID: 3193594884886186464}
m_PrefabAsset: {fileID: 0} 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 --- !u!1001 &7193426573827869494
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -3872,7 +3879,7 @@ PrefabInstance:
- target: {fileID: 5327400453591529684, guid: 04efd775509c00144993f7b46ecc2812, - target: {fileID: 5327400453591529684, guid: 04efd775509c00144993f7b46ecc2812,
type: 3} type: 3}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 19 value: 20
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 5327400453591529684, guid: 04efd775509c00144993f7b46ecc2812, - target: {fileID: 5327400453591529684, guid: 04efd775509c00144993f7b46ecc2812,
type: 3} type: 3}
@ -3937,3 +3944,139 @@ Transform:
type: 3} type: 3}
m_PrefabInstance: {fileID: 7193426573827869494} m_PrefabInstance: {fileID: 7193426573827869494}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
--- !u!1001 &7733179963500614310
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 73672630868547665}
m_Modifications:
- target: {fileID: 859777855380249073, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_Pivot.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 859777855380249073, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 859777855380249073, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_RootOrder
value: 1
objectReference: {fileID: 0}
- target: {fileID: 859777855380249073, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 859777855380249073, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 859777855380249073, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_AnchorMin.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 859777855380249073, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 859777855380249073, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_SizeDelta.x
value: 1080
objectReference: {fileID: 0}
- target: {fileID: 859777855380249073, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_SizeDelta.y
value: 1920
objectReference: {fileID: 0}
- target: {fileID: 859777855380249073, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 859777855380249073, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 859777855380249073, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 859777855380249073, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 859777855380249073, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 859777855380249073, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 859777855380249073, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 859777855380249073, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 859777855380249073, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 859777855380249073, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 859777855380249073, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 859777855380249073, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2273039178377770117, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_Name
value: AimCanvas
objectReference: {fileID: 0}
- target: {fileID: 2273039178377770117, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 09a0317cbdff9fa479a18c9e20743a8e, type: 3}
--- !u!1 &8420239414472468003 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 2273039178377770117, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
m_PrefabInstance: {fileID: 7733179963500614310}
m_PrefabAsset: {fileID: 0}
--- !u!224 &6971375767392389975 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 859777855380249073, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
m_PrefabInstance: {fileID: 7733179963500614310}
m_PrefabAsset: {fileID: 0}

View File

@ -274,7 +274,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 8075972121593568698} m_Father: {fileID: 8075972121593568698}
m_RootOrder: 13 m_RootOrder: 14
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!137 &1334045384112983207 --- !u!137 &1334045384112983207
SkinnedMeshRenderer: SkinnedMeshRenderer:
@ -524,7 +524,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 8075972121593568698} m_Father: {fileID: 8075972121593568698}
m_RootOrder: 10 m_RootOrder: 11
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!137 &9168769041933808129 --- !u!137 &9168769041933808129
SkinnedMeshRenderer: SkinnedMeshRenderer:
@ -704,7 +704,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 8075972121593568698} m_Father: {fileID: 8075972121593568698}
m_RootOrder: 5 m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!137 &460197425555041792 --- !u!137 &460197425555041792
SkinnedMeshRenderer: SkinnedMeshRenderer:
@ -888,7 +888,7 @@ Transform:
- {fileID: 2709694883264689650} - {fileID: 2709694883264689650}
- {fileID: 1904703828787956978} - {fileID: 1904703828787956978}
m_Father: {fileID: 8075972121593568698} m_Father: {fileID: 8075972121593568698}
m_RootOrder: 17 m_RootOrder: 18
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &2479526007719057773 --- !u!1 &2479526007719057773
GameObject: GameObject:
@ -950,7 +950,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 8075972121593568698} m_Father: {fileID: 8075972121593568698}
m_RootOrder: 1 m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!137 &3732553513964632927 --- !u!137 &3732553513964632927
SkinnedMeshRenderer: SkinnedMeshRenderer:
@ -1128,7 +1128,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 8075972121593568698} m_Father: {fileID: 8075972121593568698}
m_RootOrder: 9 m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!137 &2153627924161134230 --- !u!137 &2153627924161134230
SkinnedMeshRenderer: SkinnedMeshRenderer:
@ -1338,7 +1338,7 @@ Transform:
m_LocalScale: {x: 1.0000001, y: 1.0000001, z: 1.0000001} m_LocalScale: {x: 1.0000001, y: 1.0000001, z: 1.0000001}
m_Children: [] m_Children: []
m_Father: {fileID: 8075972121593568698} m_Father: {fileID: 8075972121593568698}
m_RootOrder: 16 m_RootOrder: 17
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &3923867629690678382 --- !u!1 &3923867629690678382
GameObject: GameObject:
@ -1369,7 +1369,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 8075972121593568698} m_Father: {fileID: 8075972121593568698}
m_RootOrder: 14 m_RootOrder: 15
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!137 &1560192352063879468 --- !u!137 &1560192352063879468
SkinnedMeshRenderer: SkinnedMeshRenderer:
@ -1996,7 +1996,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 8075972121593568698} m_Father: {fileID: 8075972121593568698}
m_RootOrder: 8 m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!137 &4725333466958120367 --- !u!137 &4725333466958120367
SkinnedMeshRenderer: SkinnedMeshRenderer:
@ -2112,7 +2112,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 8075972121593568698} m_Father: {fileID: 8075972121593568698}
m_RootOrder: 15 m_RootOrder: 16
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &5452081300575733995 --- !u!1 &5452081300575733995
GameObject: GameObject:
@ -2206,7 +2206,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 8075972121593568698} m_Father: {fileID: 8075972121593568698}
m_RootOrder: 3 m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!137 &2261675095244612854 --- !u!137 &2261675095244612854
SkinnedMeshRenderer: SkinnedMeshRenderer:
@ -2290,7 +2290,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 8075972121593568698} m_Father: {fileID: 8075972121593568698}
m_RootOrder: 12 m_RootOrder: 13
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!137 &814414124825110774 --- !u!137 &814414124825110774
SkinnedMeshRenderer: SkinnedMeshRenderer:
@ -2377,7 +2377,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 8075972121593568698} m_Father: {fileID: 8075972121593568698}
m_RootOrder: 7 m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!137 &38598230598365389 --- !u!137 &38598230598365389
SkinnedMeshRenderer: SkinnedMeshRenderer:
@ -2799,7 +2799,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 8075972121593568698} m_Father: {fileID: 8075972121593568698}
m_RootOrder: 4 m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!137 &5204283373755937024 --- !u!137 &5204283373755937024
SkinnedMeshRenderer: SkinnedMeshRenderer:
@ -3125,7 +3125,7 @@ Transform:
m_LocalScale: {x: 1.0000001, y: 1.0000001, z: 1.0000001} m_LocalScale: {x: 1.0000001, y: 1.0000001, z: 1.0000001}
m_Children: [] m_Children: []
m_Father: {fileID: 8075972121593568698} m_Father: {fileID: 8075972121593568698}
m_RootOrder: 18 m_RootOrder: 19
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &8214953217507735526 --- !u!1 &8214953217507735526
GameObject: GameObject:
@ -3253,7 +3253,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 8075972121593568698} m_Father: {fileID: 8075972121593568698}
m_RootOrder: 11 m_RootOrder: 12
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!137 &1535277290013843030 --- !u!137 &1535277290013843030
SkinnedMeshRenderer: SkinnedMeshRenderer:
@ -3371,7 +3371,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 8075972121593568698} m_Father: {fileID: 8075972121593568698}
m_RootOrder: 2 m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!137 &6117365122380419884 --- !u!137 &6117365122380419884
SkinnedMeshRenderer: SkinnedMeshRenderer:
@ -3461,6 +3461,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: m_Children:
- {fileID: 7200088151662806852} - {fileID: 7200088151662806852}
- {fileID: 6977806888759989363}
- {fileID: 5040779706105907752} - {fileID: 5040779706105907752}
- {fileID: 8597791130170475282} - {fileID: 8597791130170475282}
- {fileID: 1028383905452218202} - {fileID: 1028383905452218202}
@ -3514,7 +3515,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 04619977b07331e43a21b8d1bc33b6e9, type: 3} m_Script: {fileID: 11500000, guid: 04619977b07331e43a21b8d1bc33b6e9, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
charBarCanvas: {fileID: 8614863231585036848} barCanvas: {fileID: 8614863231585036848}
aimCanvas: {fileID: 8409302512724572423}
--- !u!136 &2198464067484123790 --- !u!136 &2198464067484123790
CapsuleCollider: CapsuleCollider:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -3665,7 +3667,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 8075972121593568698} m_Father: {fileID: 8075972121593568698}
m_RootOrder: 6 m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!137 &7451163908134235730 --- !u!137 &7451163908134235730
SkinnedMeshRenderer: SkinnedMeshRenderer:
@ -3741,7 +3743,7 @@ PrefabInstance:
- target: {fileID: 5327400453591529684, guid: 04efd775509c00144993f7b46ecc2812, - target: {fileID: 5327400453591529684, guid: 04efd775509c00144993f7b46ecc2812,
type: 3} type: 3}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 19 value: 20
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 5327400453591529684, guid: 04efd775509c00144993f7b46ecc2812, - target: {fileID: 5327400453591529684, guid: 04efd775509c00144993f7b46ecc2812,
type: 3} type: 3}
@ -3921,7 +3923,12 @@ PrefabInstance:
- target: {fileID: 6049883652435591266, guid: dec5dd0d644d5c548a53563e65837162, - target: {fileID: 6049883652435591266, guid: dec5dd0d644d5c548a53563e65837162,
type: 3} type: 3}
propertyPath: m_Name propertyPath: m_Name
value: CharBar value: BarCanvas
objectReference: {fileID: 0}
- target: {fileID: 8681621801813709773, guid: dec5dd0d644d5c548a53563e65837162,
type: 3}
propertyPath: m_PresetInfoIsWorld
value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: dec5dd0d644d5c548a53563e65837162, type: 3} m_SourcePrefab: {fileID: 100100000, guid: dec5dd0d644d5c548a53563e65837162, type: 3}
@ -3937,3 +3944,139 @@ GameObject:
type: 3} type: 3}
m_PrefabInstance: {fileID: 2628876604355308114} m_PrefabInstance: {fileID: 2628876604355308114}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
--- !u!1001 &7726115386004852098
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 8075972121593568698}
m_Modifications:
- target: {fileID: 859777855380249073, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_Pivot.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 859777855380249073, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 859777855380249073, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_RootOrder
value: 1
objectReference: {fileID: 0}
- target: {fileID: 859777855380249073, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 859777855380249073, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 859777855380249073, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_AnchorMin.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 859777855380249073, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 859777855380249073, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_SizeDelta.x
value: 1080
objectReference: {fileID: 0}
- target: {fileID: 859777855380249073, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_SizeDelta.y
value: 1920
objectReference: {fileID: 0}
- target: {fileID: 859777855380249073, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 859777855380249073, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 859777855380249073, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 859777855380249073, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 859777855380249073, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 859777855380249073, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 859777855380249073, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 859777855380249073, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 859777855380249073, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 859777855380249073, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 859777855380249073, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 859777855380249073, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2273039178377770117, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_Name
value: AimCanvas
objectReference: {fileID: 0}
- target: {fileID: 2273039178377770117, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 09a0317cbdff9fa479a18c9e20743a8e, type: 3}
--- !u!224 &6977806888759989363 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 859777855380249073, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
m_PrefabInstance: {fileID: 7726115386004852098}
m_PrefabAsset: {fileID: 0}
--- !u!1 &8409302512724572423 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 2273039178377770117, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
m_PrefabInstance: {fileID: 7726115386004852098}
m_PrefabAsset: {fileID: 0}

View File

@ -29,7 +29,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 609351601165668828} m_Father: {fileID: 609351601165668828}
m_RootOrder: 2 m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!137 &3207258909871447882 --- !u!137 &3207258909871447882
SkinnedMeshRenderer: SkinnedMeshRenderer:
@ -119,6 +119,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: m_Children:
- {fileID: 9055592242171101397} - {fileID: 9055592242171101397}
- {fileID: 2548601768047453584}
- {fileID: 4436949130001090126} - {fileID: 4436949130001090126}
- {fileID: 1096128071457673076} - {fileID: 1096128071457673076}
- {fileID: 8512588759625374524} - {fileID: 8512588759625374524}
@ -172,7 +173,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 04619977b07331e43a21b8d1bc33b6e9, type: 3} m_Script: {fileID: 11500000, guid: 04619977b07331e43a21b8d1bc33b6e9, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
charBarCanvas: {fileID: 7624052504724712865} barCanvas: {fileID: 7624052504724712865}
aimCanvas: {fileID: 3979930549707458788}
--- !u!136 &6373024555497604353 --- !u!136 &6373024555497604353
CapsuleCollider: CapsuleCollider:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -323,7 +325,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 609351601165668828} m_Father: {fileID: 609351601165668828}
m_RootOrder: 6 m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!137 &2233958923311522356 --- !u!137 &2233958923311522356
SkinnedMeshRenderer: SkinnedMeshRenderer:
@ -515,7 +517,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 609351601165668828} m_Father: {fileID: 609351601165668828}
m_RootOrder: 11 m_RootOrder: 12
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!137 &7865854891116106288 --- !u!137 &7865854891116106288
SkinnedMeshRenderer: SkinnedMeshRenderer:
@ -728,7 +730,7 @@ Transform:
m_LocalScale: {x: 1.0000001, y: 1.0000001, z: 1.0000001} m_LocalScale: {x: 1.0000001, y: 1.0000001, z: 1.0000001}
m_Children: [] m_Children: []
m_Father: {fileID: 609351601165668828} m_Father: {fileID: 609351601165668828}
m_RootOrder: 18 m_RootOrder: 19
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1790588752376035915 --- !u!1 &1790588752376035915
GameObject: GameObject:
@ -820,7 +822,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 609351601165668828} m_Father: {fileID: 609351601165668828}
m_RootOrder: 4 m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!137 &3485245087883001190 --- !u!137 &3485245087883001190
SkinnedMeshRenderer: SkinnedMeshRenderer:
@ -1163,7 +1165,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 609351601165668828} m_Father: {fileID: 609351601165668828}
m_RootOrder: 7 m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!137 &8714015803898821803 --- !u!137 &8714015803898821803
SkinnedMeshRenderer: SkinnedMeshRenderer:
@ -1493,7 +1495,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 609351601165668828} m_Father: {fileID: 609351601165668828}
m_RootOrder: 8 m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!137 &4176110184165050825 --- !u!137 &4176110184165050825
SkinnedMeshRenderer: SkinnedMeshRenderer:
@ -1609,7 +1611,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 609351601165668828} m_Father: {fileID: 609351601165668828}
m_RootOrder: 15 m_RootOrder: 16
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &3718357059954767383 --- !u!1 &3718357059954767383
GameObject: GameObject:
@ -1703,7 +1705,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 609351601165668828} m_Father: {fileID: 609351601165668828}
m_RootOrder: 3 m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!137 &7423148600506869904 --- !u!137 &7423148600506869904
SkinnedMeshRenderer: SkinnedMeshRenderer:
@ -1787,7 +1789,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 609351601165668828} m_Father: {fileID: 609351601165668828}
m_RootOrder: 12 m_RootOrder: 13
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!137 &8298487604563911824 --- !u!137 &8298487604563911824
SkinnedMeshRenderer: SkinnedMeshRenderer:
@ -2376,7 +2378,7 @@ Transform:
m_LocalScale: {x: 1.0000001, y: 1.0000001, z: 1.0000001} m_LocalScale: {x: 1.0000001, y: 1.0000001, z: 1.0000001}
m_Children: [] m_Children: []
m_Father: {fileID: 609351601165668828} m_Father: {fileID: 609351601165668828}
m_RootOrder: 16 m_RootOrder: 17
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &5625883272213733384 --- !u!1 &5625883272213733384
GameObject: GameObject:
@ -2407,7 +2409,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 609351601165668828} m_Father: {fileID: 609351601165668828}
m_RootOrder: 14 m_RootOrder: 15
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!137 &7908793165493908810 --- !u!137 &7908793165493908810
SkinnedMeshRenderer: SkinnedMeshRenderer:
@ -2665,7 +2667,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 609351601165668828} m_Father: {fileID: 609351601165668828}
m_RootOrder: 9 m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!137 &7315111304627041008 --- !u!137 &7315111304627041008
SkinnedMeshRenderer: SkinnedMeshRenderer:
@ -2818,7 +2820,7 @@ Transform:
- {fileID: 6772713405425793428} - {fileID: 6772713405425793428}
- {fileID: 7064346664378220692} - {fileID: 7064346664378220692}
m_Father: {fileID: 609351601165668828} m_Father: {fileID: 609351601165668828}
m_RootOrder: 17 m_RootOrder: 18
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &6902029820718956939 --- !u!1 &6902029820718956939
GameObject: GameObject:
@ -2849,7 +2851,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 609351601165668828} m_Father: {fileID: 609351601165668828}
m_RootOrder: 1 m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!137 &5452722750088951609 --- !u!137 &5452722750088951609
SkinnedMeshRenderer: SkinnedMeshRenderer:
@ -3029,7 +3031,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 609351601165668828} m_Father: {fileID: 609351601165668828}
m_RootOrder: 5 m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!137 &9080862996854514278 --- !u!137 &9080862996854514278
SkinnedMeshRenderer: SkinnedMeshRenderer:
@ -3332,7 +3334,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 609351601165668828} m_Father: {fileID: 609351601165668828}
m_RootOrder: 10 m_RootOrder: 11
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!137 &529530345768451687 --- !u!137 &529530345768451687
SkinnedMeshRenderer: SkinnedMeshRenderer:
@ -3511,7 +3513,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 609351601165668828} m_Father: {fileID: 609351601165668828}
m_RootOrder: 13 m_RootOrder: 14
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!137 &7702348211638010049 --- !u!137 &7702348211638010049
SkinnedMeshRenderer: SkinnedMeshRenderer:
@ -3741,7 +3743,7 @@ PrefabInstance:
- target: {fileID: 5327400453591529684, guid: 04efd775509c00144993f7b46ecc2812, - target: {fileID: 5327400453591529684, guid: 04efd775509c00144993f7b46ecc2812,
type: 3} type: 3}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 19 value: 20
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 5327400453591529684, guid: 04efd775509c00144993f7b46ecc2812, - target: {fileID: 5327400453591529684, guid: 04efd775509c00144993f7b46ecc2812,
type: 3} type: 3}
@ -3806,6 +3808,142 @@ Transform:
type: 3} type: 3}
m_PrefabInstance: {fileID: 2559583355116911974} m_PrefabInstance: {fileID: 2559583355116911974}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
--- !u!1001 &2932116763859057761
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 609351601165668828}
m_Modifications:
- target: {fileID: 859777855380249073, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_Pivot.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 859777855380249073, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 859777855380249073, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_RootOrder
value: 1
objectReference: {fileID: 0}
- target: {fileID: 859777855380249073, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 859777855380249073, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 859777855380249073, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_AnchorMin.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 859777855380249073, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 859777855380249073, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_SizeDelta.x
value: 1080
objectReference: {fileID: 0}
- target: {fileID: 859777855380249073, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_SizeDelta.y
value: 1920
objectReference: {fileID: 0}
- target: {fileID: 859777855380249073, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 859777855380249073, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 859777855380249073, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 859777855380249073, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 859777855380249073, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 859777855380249073, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 859777855380249073, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 859777855380249073, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 859777855380249073, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 859777855380249073, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 859777855380249073, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 859777855380249073, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2273039178377770117, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_Name
value: AimCanvas
objectReference: {fileID: 0}
- target: {fileID: 2273039178377770117, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 09a0317cbdff9fa479a18c9e20743a8e, type: 3}
--- !u!224 &2548601768047453584 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 859777855380249073, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
m_PrefabInstance: {fileID: 2932116763859057761}
m_PrefabAsset: {fileID: 0}
--- !u!1 &3979930549707458788 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 2273039178377770117, guid: 09a0317cbdff9fa479a18c9e20743a8e,
type: 3}
m_PrefabInstance: {fileID: 2932116763859057761}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &4196108535858654659 --- !u!1001 &4196108535858654659
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -3921,19 +4059,24 @@ PrefabInstance:
- target: {fileID: 6049883652435591266, guid: dec5dd0d644d5c548a53563e65837162, - target: {fileID: 6049883652435591266, guid: dec5dd0d644d5c548a53563e65837162,
type: 3} type: 3}
propertyPath: m_Name propertyPath: m_Name
value: CharBar value: BarCanvas
objectReference: {fileID: 0}
- target: {fileID: 8681621801813709773, guid: dec5dd0d644d5c548a53563e65837162,
type: 3}
propertyPath: m_PresetInfoIsWorld
value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: dec5dd0d644d5c548a53563e65837162, type: 3} 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 --- !u!1 &7624052504724712865 stripped
GameObject: GameObject:
m_CorrespondingSourceObject: {fileID: 6049883652435591266, guid: dec5dd0d644d5c548a53563e65837162, m_CorrespondingSourceObject: {fileID: 6049883652435591266, guid: dec5dd0d644d5c548a53563e65837162,
type: 3} type: 3}
m_PrefabInstance: {fileID: 4196108535858654659} m_PrefabInstance: {fileID: 4196108535858654659}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
--- !u!224 &9055592242171101397 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 5156761560679623958, guid: dec5dd0d644d5c548a53563e65837162,
type: 3}
m_PrefabInstance: {fileID: 4196108535858654659}
m_PrefabAsset: {fileID: 0}

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d566c0d102577d49b4c7408f7669b9bc6d14fa35fb9ade60d86c410ecdc2f74e
size 8499

View File

@ -0,0 +1,288 @@
fileFormatVersion: 2
guid: bcfec907e0672ed45b69575096b4a1c2
TextureImporter:
internalIDToNameTable:
- first:
213: -5455261514569519910
second: HP_Bar_0
- first:
213: -8254845973784877126
second: HP_Bar_1
- first:
213: -4039628871920856409
second: HP_Bar_2
- first:
213: -7745828531039951331
second: HP_Bar_3
- first:
213: -2685135706508046216
second: HP_Bar_4
- first:
213: -7678979329471444576
second: HP_Bar_5
- first:
213: -5932287172053968506
second: HP_Bar_6
externalObjects: {}
serializedVersion: 11
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 2
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites:
- serializedVersion: 2
name: HP_Bar_0
rect:
serializedVersion: 2
x: 35
y: 64
width: 51
height: 57
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: adc69334e840b44b0800000000000000
internalID: -5455261514569519910
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: HP_Bar_1
rect:
serializedVersion: 2
x: 93
y: 99
width: 127
height: 23
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: ab72df8a255e07d80800000000000000
internalID: -8254845973784877126
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: HP_Bar_2
rect:
serializedVersion: 2
x: 95
y: 77
width: 122
height: 17
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 7a2deb0a1fa50f7c0800000000000000
internalID: -4039628871920856409
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: HP_Bar_3
rect:
serializedVersion: 2
x: 37
y: 6
width: 47
height: 53
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: d16274c7df9418490800000000000000
internalID: -7745828531039951331
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: HP_Bar_4
rect:
serializedVersion: 2
x: 95
y: 51
width: 122
height: 17
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 870ded72d4b7cbad0800000000000000
internalID: -2685135706508046216
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: HP_Bar_5
rect:
serializedVersion: 2
x: 95
y: 22
width: 44
height: 20
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 0a9894d1cf8ce6590800000000000000
internalID: -7678979329471444576
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: HP_Bar_6
rect:
serializedVersion: 2
x: 145
y: 25
width: 37
height: 14
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 689dd146f384cada0800000000000000
internalID: -5932287172053968506
vertices: []
indices:
edges: []
weights: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -19,9 +19,15 @@ MonoBehaviour:
playerPrefab: {fileID: 742650227762578155, guid: 97b4a76c55741764e880b63d6e1514a9, playerPrefab: {fileID: 742650227762578155, guid: 97b4a76c55741764e880b63d6e1514a9,
type: 3} type: 3}
color: 0 color: 0
maxHP: 100
maxMana: 100
manaRegen: 10
- spawnPos: - spawnPos:
x: 9 x: 9
z: 2 z: 2
playerPrefab: {fileID: 8887939040951305984, guid: 1a81dbbd6ef62324491d9f58654ebe4b, playerPrefab: {fileID: 8887939040951305984, guid: 1a81dbbd6ef62324491d9f58654ebe4b,
type: 3} type: 3}
color: 1 color: 1
maxHP: 100
maxMana: 100
manaRegen: 10

View File

@ -16,13 +16,14 @@ MonoBehaviour:
height: 50 height: 50
defaultColor: {r: 1, g: 1, b: 1, a: 1} defaultColor: {r: 1, g: 1, b: 1, a: 1}
touchedColor: {r: 1, g: 0, b: 1, a: 1} touchedColor: {r: 1, g: 0, b: 1, a: 1}
hexCaptureManaCost: 10
cellPrefab: {fileID: 1661242500252451528, guid: bcea5b4a96735bd4b936f8f3fefcc688, cellPrefab: {fileID: 1661242500252451528, guid: bcea5b4a96735bd4b936f8f3fefcc688,
type: 3} type: 3}
cellLabelPrefab: {fileID: 3836123284387241147, guid: efd47cbd22ddfee4aa2b1391914116fc, cellLabelPrefab: {fileID: 3836123284387241147, guid: efd47cbd22ddfee4aa2b1391914116fc,
type: 3} type: 3}
CoordinatesCanvas: {fileID: 4726489279989878083, guid: f31e0880dd078104bb31dc0fd7ef9f19, CoordinatesCanvas: {fileID: 4726489279989878083, guid: f31e0880dd078104bb31dc0fd7ef9f19,
type: 3} type: 3}
DefaultTexture: {fileID: 0} DefaultTexture: {fileID: 2800000, guid: 983242f4b4db7a841af48234cf0021b8, type: 3}
colors: colors:
- _unitColor: 2 - _unitColor: 2
_texture: {fileID: 2800000, guid: 983242f4b4db7a841af48234cf0021b8, type: 3} _texture: {fileID: 2800000, guid: 983242f4b4db7a841af48234cf0021b8, type: 3}

View File

@ -20,3 +20,6 @@ MonoBehaviour:
joystickView: {fileID: 4385872142190176059, guid: 4df6913b39f4979429158c344680d83f, joystickView: {fileID: 4385872142190176059, guid: 4df6913b39f4979429158c344680d83f,
type: 3} type: 3}
color: 3 color: 3
manaRegen: 10
maxMana: 100
maxHP: 100

View File

@ -15,9 +15,11 @@ MonoBehaviour:
_weapons: _weapons:
- objectToThrow: {fileID: 4746165193704193263, guid: 4e7523811a052fd46acf941fc69c8c98, - objectToThrow: {fileID: 4746165193704193263, guid: 4e7523811a052fd46acf941fc69c8c98,
type: 3} type: 3}
VFXGameObject: {fileID: 2957420090356197408, guid: 5d1244f7b80cadd428a70173a01ce889,
type: 3}
manaCost: 10 manaCost: 10
damage: 10 damage: 10
speed: 10 speed: 1
disnatce: 5 disnatce: 5
reloadTime: 1 reloadTime: 3
shots: 3 shots: 3

View File

@ -7,9 +7,8 @@ namespace Chars
{ {
public class Enemy : IUnit public class Enemy : IUnit
{ {
private GameObject _enemyPrefab;
private HexCoordinates _spawnPos; private EnemyInfo _data;
private UnitColor _color;
private HexCell _cell; private HexCell _cell;
private HexGrid _grid; private HexGrid _grid;
private GameObject _instance; private GameObject _instance;
@ -18,7 +17,7 @@ namespace Chars
private bool _isBusy; private bool _isBusy;
private Animator _animator; private Animator _animator;
private AnimLength _animLength; private AnimLength _animLength;
private CharBar _charBar; private BarCanvas _barCanvas;
private float _mana; private float _mana;
private float _hp; private float _hp;
@ -27,9 +26,7 @@ namespace Chars
public Enemy(EnemyInfo enemyInfo, HexGrid grid) public Enemy(EnemyInfo enemyInfo, HexGrid grid)
{ {
_enemyPrefab = enemyInfo.playerPrefab; _data = enemyInfo;
_spawnPos = enemyInfo.spawnPos;
_color = enemyInfo.color;
_grid = grid; _grid = grid;
_isAlive = false; _isAlive = false;
} }
@ -67,28 +64,40 @@ namespace Chars
private void UpdateCanvas() private void UpdateCanvas()
{ {
_charBar.ManaBar.fillAmount = _mana / 100; if (_hp > _data.maxHP)
_charBar.HealthBar.fillAmount = _hp / 100; _hp = _data.maxHP;
if (_mana > _data.maxMana)
_mana = _data.maxMana;
float hp = _hp;
float mana = _mana;
float maxHp = _data.maxHP;
float maxMana = _data.maxMana;
_barCanvas.ManaBar.DOFillAmount(mana / maxMana, 0.5f).SetEase(Ease.InQuad);
_barCanvas.HealthBar.DOFillAmount(hp / maxHp, 0.5f).SetEase(Ease.InQuad);
} }
public void Spawn() public void Spawn()
{ {
if(!_isAlive) if(!_isAlive)
{ {
_cell = _grid.GetCellFromCoord(_spawnPos); _cell = _grid.GetCellFromCoord(_data.spawnPos);
_instance = Object.Instantiate(_enemyPrefab, _cell.transform.parent); _instance = Object.Instantiate(_data.playerPrefab, _cell.transform.parent);
_instance.transform.localPosition = _cell.transform.localPosition; _instance.transform.localPosition = _cell.transform.localPosition;
_cell.PaintHex(_color); _cell.PaintHex(_data.color);
for (int i = 0; i < 6; i++) for (int i = 0; i < 6; i++)
{ {
_cell.GetNeighbor((HexDirection)i).PaintHex(_color); _cell.GetNeighbor((HexDirection)i).PaintHex(_data.color);
} }
_isAlive = true; _isAlive = true;
_unitView = _instance.GetComponent<UnitView>(); _unitView = _instance.GetComponent<UnitView>();
_animator = _instance.GetComponent<Animator>(); _animator = _instance.GetComponent<Animator>();
_charBar = _instance.GetComponent<CharBar>(); _barCanvas = _unitView.BarCanvas.GetComponent<BarCanvas>();
_hp = _data.maxHP;
_mana = _data.maxMana;
SetAnimLength(); SetAnimLength();
SetUpActions();
} }
} }
@ -101,13 +110,13 @@ namespace Chars
throw new System.NotImplementedException(); throw new System.NotImplementedException();
} }
public void Attack(Vector2 direction) public void StartAttack(Vector2 direction)
{ {
throw new System.NotImplementedException(); throw new System.NotImplementedException();
} }
public void Damage(float dmg) public void Damage(int dmg)
{ {
_hp -= dmg; _hp -= dmg;
UpdateCanvas(); UpdateCanvas();

View File

@ -26,8 +26,8 @@ namespace Chars
{ {
if (_enemy.EnemyView != null) if (_enemy.EnemyView != null)
{ {
_enemy.EnemyView.charBarCanvas.transform.LookAt( _enemy.EnemyView.BarCanvas.transform.LookAt(
_enemy.EnemyView.charBarCanvas.transform.position + _camera.transform.rotation * Vector3.back, _enemy.EnemyView.BarCanvas.transform.position + _camera.transform.rotation * Vector3.back,
_camera.transform.rotation * Vector3.up); _camera.transform.rotation * Vector3.up);
} }
} }

View File

@ -9,7 +9,7 @@ namespace Chars
public void Move(HexDirection direction); public void Move(HexDirection direction);
public void Spawn(); public void Spawn();
public void Death(); public void Death();
public void Attack(Vector2 direction); public void StartAttack(Vector2 direction);
public void Damage(float dmg); public void Damage(int dmg);
} }
} }

View File

@ -1,4 +1,5 @@
using System; using System;
using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using Data; using Data;
using DefaultNamespace.Weapons; using DefaultNamespace.Weapons;
@ -12,10 +13,9 @@ namespace Chars
{ {
public class Player : IUnit public class Player : IUnit
{ {
private HexCoordinates _spawnPos;
private bool _isAlive; private bool _isAlive;
private GameObject _instance; private GameObject _instance;
private GameObject _prefab;
private AnimLength _animLength; private AnimLength _animLength;
private HexCell _cell; private HexCell _cell;
private HexGrid _hexGrid; private HexGrid _hexGrid;
@ -23,12 +23,13 @@ namespace Chars
private Animator _animator; private Animator _animator;
private UnitView _unitView; private UnitView _unitView;
private bool _isBusy; private bool _isBusy;
private UnitColor _color; private PlayerData _data;
private float _hp; private int _hp;
private float _mana; private int _mana;
private Weapon _weapon; private Weapon _weapon;
private Vector2 _direction; private Vector2 _direction;
private CharBar _charBar; private BarCanvas _barCanvas;
public bool IsBusy => _isBusy; public bool IsBusy => _isBusy;
public GameObject PlayerInstance => _instance; public GameObject PlayerInstance => _instance;
@ -37,25 +38,36 @@ namespace Chars
public Player(PlayerData playerData, Weapon weapon, HexGrid hexGrid) public Player(PlayerData playerData, Weapon weapon, HexGrid hexGrid)
{ {
_weapon = weapon; _weapon = weapon;
_spawnPos = playerData.spawnPos; _data = playerData;
_prefab = playerData.playerPrefab;
_isAlive = false; _isAlive = false;
_hexGrid = hexGrid; _hexGrid = hexGrid;
_isBusy = false; _isBusy = false;
_color = playerData.color;
} }
public void Move(HexDirection direction) public void Move(HexDirection direction)
{ {
if (_cell.GetNeighbor(direction)) if (!_cell.GetNeighbor(direction) || _isBusy) return;
if (_cell.GetNeighbor(direction).Color == _data.color)
{ {
_isBusy = true; DoTransit(direction);
_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);
} }
else if (_mana - _hexGrid.HexCaptureCost >= 0)
{
_mana -= _hexGrid.HexCaptureCost;
_unitView.RegenMana(_mana);
UpdateBarCanvas();
DoTransit(direction);
}
}
private void DoTransit(HexDirection 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() private void SetAnimLength()
@ -81,48 +93,56 @@ namespace Chars
{ {
if (!_isAlive) if (!_isAlive)
{ {
_cell = _hexGrid.GetCellFromCoord(_spawnPos); _cell = _hexGrid.GetCellFromCoord(_data.spawnPos);
_cell.PaintHex(_color); _cell.PaintHex(_data.color);
for (int i = 0; i < 6; i++) for (int i = 0; i < 6; i++)
{ {
_cell.GetNeighbor((HexDirection)i).PaintHex(_color); _cell.GetNeighbor((HexDirection)i).PaintHex(_data.color);
} }
_instance = Object.Instantiate(_prefab, _cell.transform.parent); _instance = Object.Instantiate(_data.playerPrefab, _cell.transform.parent);
_instance.transform.localPosition = _cell.transform.localPosition; _instance.transform.localPosition = _cell.transform.localPosition;
onPlayerSpawned?.Invoke(_instance); onPlayerSpawned?.Invoke(_instance);
_isAlive = true; _isAlive = true;
_animator = _instance.GetComponent<Animator>(); _animator = _instance.GetComponent<Animator>();
_unitView = _instance.GetComponent<UnitView>(); _unitView = _instance.GetComponent<UnitView>();
_charBar = _unitView.charBarCanvas.GetComponent<CharBar>(); _barCanvas = _unitView.BarCanvas.GetComponent<BarCanvas>();
_unitView.SetUp(_barCanvas.SpawnShotUI(_weapon.shots), _weapon, RegenMana, _data.manaRegen);
SetAnimLength(); SetAnimLength();
_mana = 100f; _mana = _data.maxMana;
_hp = 100f; _hp = _data.maxHP;
SetUpActions(); SetUpActions();
} }
} }
private void Step() private void RegenMana()
{
_mana += _data.manaRegen;
UpdateBarCanvas();
}
private void MoveEnd()
{ {
_isBusy = false; _isBusy = false;
_cell.PaintHex(_color); _cell.PaintHex(_data.color);
_animator.SetBool("isMoving", _isBusy); _animator.SetBool("isMoving", _isBusy);
} }
private void AttackEnd() private void AttackEnd()
{ {
_isBusy = false; _isBusy = false;
_mana -= _weapon.manaCost; UpdateBarCanvas();
UpdateCanvas();
} }
private void Attacking() private void Attacking()
{ {
var ball = Object.Instantiate(_weapon.objectToThrow, var ball = Object.Instantiate(_weapon.objectToThrow,
_instance.transform.position + new Vector3(0, 2), Quaternion.identity); _instance.transform.forward + _instance.transform.position + new Vector3(0, 2), _instance.transform.rotation);
ball.GetComponent<WeaponView>().SetWeapon(_weapon);
ball.transform.DOMove( ball.transform.DOMove(
new Vector3(_direction.normalized.x, new Vector3(_direction.normalized.x,
0, _direction.normalized.y) * _weapon.disnatce * _hexGrid.HexDistance + _instance.transform.position + new Vector3(0,2,0), 0, _direction.normalized.y) * _weapon.disnatce * _hexGrid.HexDistance +
_instance.transform.position + new Vector3(0, 2, 0),
_weapon.speed) _weapon.speed)
.SetEase(Ease.Linear) .SetEase(Ease.Linear)
.OnComplete(() => Object.Destroy(ball)); .OnComplete(() => Object.Destroy(ball));
@ -130,15 +150,25 @@ namespace Chars
private void SetUpActions() private void SetUpActions()
{ {
_unitView.OnStep += Step; _unitView.OnStep += MoveEnd;
_unitView.OnAttackEnd += AttackEnd; _unitView.OnAttackEnd += AttackEnd;
_unitView.OnAttack += Attacking; _unitView.OnAttack += Attacking;
_unitView.OnHit += Damage;
} }
private void UpdateCanvas() private void UpdateBarCanvas()
{ {
_charBar.ManaBar.fillAmount = _mana / 100; if (_hp > _data.maxHP)
_charBar.HealthBar.fillAmount = _hp / 100; _hp = _data.maxHP;
if (_mana > _data.maxMana)
_mana = _data.maxMana;
float hp = _hp;
float mana = _mana;
float maxHp = _data.maxHP;
float maxMana = _data.maxMana;
_barCanvas.ManaBar.DOFillAmount(mana / maxMana, 0.5f).SetEase(Ease.InQuad);
_barCanvas.HealthBar.DOFillAmount(hp / maxHp, 0.5f).SetEase(Ease.InQuad);
} }
public void Death() public void Death()
@ -147,10 +177,13 @@ namespace Chars
} }
public void Attack(Vector2 direction) public void StartAttack(Vector2 direction)
{ {
_isBusy = true; if (!_isBusy && _unitView.Shoot())
_animator.SetTrigger("Attack"); {
_isBusy = true;
_animator.SetTrigger("Attack");
}
} }
public void Aim(Vector2 direction) public void Aim(Vector2 direction)
@ -159,7 +192,7 @@ namespace Chars
_direction = direction; _direction = direction;
} }
public void Damage(float dmg) public void Damage(int dmg)
{ {
if (_hp - dmg <= 0f) if (_hp - dmg <= 0f)
{ {

View File

@ -25,11 +25,18 @@ namespace Chars
_attackJoystick = joyView.AttackJoystick; _attackJoystick = joyView.AttackJoystick;
_camera = Camera.main; _camera = Camera.main;
_attackJoystick.OnTouchUp += DoAttack; _attackJoystick.OnTouchUp += DoAttack;
_attackJoystick.OnTouchDown += AimCanvas;
} }
private void DoAttack() private void DoAttack()
{ {
_player.Attack(_attackDircetion); _player.UnitView.AimCanvas.SetActive(false);
_player.StartAttack(_attackDircetion);
}
private void AimCanvas()
{
_player.UnitView.AimCanvas.SetActive(true);
} }
public void FixedExecute() public void FixedExecute()
@ -87,8 +94,8 @@ namespace Chars
{ {
if (_player.UnitView != null) if (_player.UnitView != null)
{ {
_player.UnitView.charBarCanvas.transform.LookAt( _player.UnitView.BarCanvas.transform.LookAt(
_player.UnitView.charBarCanvas.transform.position + _camera.transform.rotation * Vector3.back, _player.UnitView.BarCanvas.transform.position + _camera.transform.rotation * Vector3.back,
_camera.transform.rotation * Vector3.up); _camera.transform.rotation * Vector3.up);
} }
} }

View File

@ -18,5 +18,8 @@ namespace Data
public HexCoordinates spawnPos; public HexCoordinates spawnPos;
public GameObject playerPrefab; public GameObject playerPrefab;
public UnitColor color; public UnitColor color;
public int maxHP;
public int maxMana;
public int manaRegen;
} }
} }

View File

@ -13,6 +13,7 @@ namespace Runtime.Data
public int height = 6; public int height = 6;
public Color defaultColor = Color.white; public Color defaultColor = Color.white;
public Color touchedColor = Color.magenta; public Color touchedColor = Color.magenta;
public int hexCaptureManaCost;
public GameObject cellPrefab; public GameObject cellPrefab;
public TMP_Text cellLabelPrefab; public TMP_Text cellLabelPrefab;

View File

@ -11,5 +11,8 @@ namespace Data
public GameObject playerPrefab; public GameObject playerPrefab;
public PlayerControlView joystickView; public PlayerControlView joystickView;
public UnitColor color; public UnitColor color;
public int manaRegen;
public int maxMana;
public int maxHP;
} }
} }

View File

@ -18,6 +18,7 @@ namespace DefaultNamespace.Weapons
public struct Weapon public struct Weapon
{ {
public GameObject objectToThrow; public GameObject objectToThrow;
public GameObject VFXGameObject;
public int manaCost; public int manaCost;
public int damage; public int damage;
public float speed; public float speed;

View File

@ -14,6 +14,8 @@ namespace HexFiled
private MeshRenderer _renderer; private MeshRenderer _renderer;
private Dictionary<UnitColor, CellColor> _cellColor; private Dictionary<UnitColor, CellColor> _cellColor;
public UnitColor Color => _color;
private void Awake() private void Awake()
{ {
_renderer = GetComponent<MeshRenderer>(); _renderer = GetComponent<MeshRenderer>();

View File

@ -19,13 +19,16 @@ namespace HexFiled
private GameObject _baseGameObject; private GameObject _baseGameObject;
private Dictionary<UnitColor, CellColor> _colors; private Dictionary<UnitColor, CellColor> _colors;
private float _hexDistance; private float _hexDistance;
private int _hexCaptureCost;
public float HexDistance => _hexDistance; public float HexDistance => _hexDistance;
public Action<HexCell> OnHexPainted; public Action<HexCell> OnHexPainted;
public Action OnGridLoaded; public Action OnGridLoaded;
public int HexCaptureCost => _hexCaptureCost;
public HexGrid(FieldData fieldData) public HexGrid(FieldData fieldData)
{ {
_hexCaptureCost = fieldData.hexCaptureManaCost;
_width = fieldData.width; _width = fieldData.width;
_height = fieldData.height; _height = fieldData.height;
_cellPrefab = fieldData.cellPrefab; _cellPrefab = fieldData.cellPrefab;

13
Assets/ShotUIView.cs Normal file
View File

@ -0,0 +1,13 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class ShotUIView : MonoBehaviour
{
[SerializeField] private GameObject shotOn;
public void Switch()
{
shotOn.SetActive(!shotOn.activeSelf);
}
}

11
Assets/ShotUIView.cs.meta Normal file
View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 89a8d361af438bd45a054f00251816f3
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,5 +1,9 @@
using System; using System;
using System.Collections;
using System.Collections.Generic;
using DefaultNamespace.Weapons; using DefaultNamespace.Weapons;
using DG.Tweening;
using TMPro;
using UnityEngine; using UnityEngine;
public class UnitView : MonoBehaviour public class UnitView : MonoBehaviour
@ -7,8 +11,55 @@ public class UnitView : MonoBehaviour
public Action OnStep; public Action OnStep;
public Action OnAttackEnd; public Action OnAttackEnd;
public Action OnAttack; public Action OnAttack;
public Action<float> OnHit; public Action<int> OnHit;
public GameObject charBarCanvas; [SerializeField] private GameObject barCanvas;
[SerializeField] private GameObject aimCanvas;
private Stack<ShotUIView> _shotUIStack;
private Stack<ShotUIView> _toReloadStack;
private Weapon _weapon;
private int _manaRegen;
private Action _startRegen;
private Coroutine _previosRegen;
private Coroutine _previosReload;
private int _mana;
public GameObject BarCanvas => barCanvas;
public GameObject AimCanvas => aimCanvas;
public void SetUp(Stack<ShotUIView> shots, Weapon weapon, Action RegenMana, int manaRegen)
{
_shotUIStack = shots;
_weapon = weapon;
_toReloadStack = new Stack<ShotUIView>();
_startRegen = RegenMana;
_manaRegen = manaRegen;
}
public bool Shoot()
{
if (_shotUIStack.Count == 0) return false;
var shot = _shotUIStack.Pop();
shot.Switch();
_toReloadStack.Push(shot);
if (_previosReload != null)
{
StopCoroutine(_previosReload);
}
_previosReload = StartCoroutine(Reload());
return true;
}
public void RegenMana(int mana)
{
if (_previosRegen != null)
{
StopCoroutine(_previosRegen);
}
_mana = mana;
_previosRegen = StartCoroutine(Regen());
}
private void Step() private void Step()
{ {
@ -31,9 +82,37 @@ public class UnitView : MonoBehaviour
if (weaponView != null) if (weaponView != null)
{ {
OnHit?.Invoke(weaponView.Weapon.damage); OnHit?.Invoke(weaponView.Weapon.damage);
Destroy(other); other.transform.DOComplete();
other.transform.position = transform.position;
Destroy(other.gameObject);
} }
} }
private IEnumerator Reload()
{
if (_toReloadStack.Count == 0)
{
yield break;
}
yield return new WaitForSeconds(_weapon.reloadTime);
var shot = _toReloadStack.Pop();
shot.Switch();
_shotUIStack.Push(shot);
StartCoroutine(Reload());
}
private IEnumerator Regen()
{
if (_mana >= 100)
{
yield break;
}
yield return new WaitForSeconds(1f);
_mana += _manaRegen;
_startRegen.Invoke();
StartCoroutine(Regen());
}
} }

View File

@ -1,3 +1,4 @@
using System;
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using DefaultNamespace.Weapons; using DefaultNamespace.Weapons;
@ -14,4 +15,8 @@ public class WeaponView : MonoBehaviour
_weapon = weapon; _weapon = weapon;
} }
private void OnDestroy()
{
Instantiate(_weapon.VFXGameObject, transform.position, transform.rotation);
}
} }