Merge branch 'Alexei' into Zakhar
# Conflicts: # Assets/Scripts/Controller/GameInit.cs
This commit is contained in:
DyatelO
commit
88a0e09a9c
@ -1,6 +1,6 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1 &855721721
|
||||
--- !u!1 &1971885220552812170
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
@ -8,155 +8,53 @@ GameObject:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 855721725}
|
||||
- component: {fileID: 855721724}
|
||||
- component: {fileID: 855721723}
|
||||
- component: {fileID: 855721722}
|
||||
- component: {fileID: 3975719838618124896}
|
||||
- component: {fileID: 8375927724544650520}
|
||||
- component: {fileID: 2191591739830093116}
|
||||
- component: {fileID: 8632423750406408422}
|
||||
m_Layer: 5
|
||||
m_Name: ExtralifeCanvas
|
||||
m_Name: Button
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &855721725
|
||||
--- !u!224 &3975719838618124896
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 855721721}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 0, y: 0, z: 0}
|
||||
m_Children:
|
||||
- {fileID: 9010224305754668558}
|
||||
- {fileID: 1368758085}
|
||||
m_Father: {fileID: 7017227080055577098}
|
||||
m_RootOrder: 2
|
||||
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, y: 0}
|
||||
--- !u!223 &855721724
|
||||
Canvas:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 855721721}
|
||||
m_Enabled: 1
|
||||
serializedVersion: 3
|
||||
m_RenderMode: 0
|
||||
m_Camera: {fileID: 0}
|
||||
m_PlaneDistance: 100
|
||||
m_PixelPerfect: 0
|
||||
m_ReceivesEvents: 1
|
||||
m_OverrideSorting: 0
|
||||
m_OverridePixelPerfect: 0
|
||||
m_SortingBucketNormalizedSize: 0
|
||||
m_AdditionalShaderChannelsFlag: 25
|
||||
m_SortingLayerID: 0
|
||||
m_SortingOrder: 0
|
||||
m_TargetDisplay: 0
|
||||
--- !u!114 &855721723
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 855721721}
|
||||
m_Enabled: 0
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_UiScaleMode: 0
|
||||
m_ReferencePixelsPerUnit: 100
|
||||
m_ScaleFactor: 1
|
||||
m_ReferenceResolution: {x: 800, y: 600}
|
||||
m_ScreenMatchMode: 0
|
||||
m_MatchWidthOrHeight: 0
|
||||
m_PhysicalUnit: 3
|
||||
m_FallbackScreenDPI: 96
|
||||
m_DefaultSpriteDPI: 96
|
||||
m_DynamicPixelsPerUnit: 1
|
||||
m_PresetInfoIsWorld: 0
|
||||
--- !u!114 &855721722
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 855721721}
|
||||
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!1 &1368758084
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1368758085}
|
||||
- component: {fileID: 1368758088}
|
||||
- component: {fileID: 1368758087}
|
||||
- component: {fileID: 1368758086}
|
||||
m_Layer: 5
|
||||
m_Name: ExtralifeButton
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &1368758085
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1368758084}
|
||||
m_GameObject: {fileID: 1971885220552812170}
|
||||
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: 1900174883}
|
||||
- {fileID: 6546462637559422819}
|
||||
m_Father: {fileID: 855721725}
|
||||
m_RootOrder: 1
|
||||
- {fileID: 3104897430720789503}
|
||||
m_Father: {fileID: 5695591491590183961}
|
||||
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: -516.68}
|
||||
m_SizeDelta: {x: 364.9279, y: 96.9068}
|
||||
m_AnchorMin: {x: 0.5, y: 0}
|
||||
m_AnchorMax: {x: 0.5, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 541.731}
|
||||
m_SizeDelta: {x: 400, y: 150}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1368758088
|
||||
--- !u!222 &8375927724544650520
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1368758084}
|
||||
m_GameObject: {fileID: 1971885220552812170}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &1368758087
|
||||
--- !u!114 &2191591739830093116
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1368758084}
|
||||
m_Enabled: 0
|
||||
m_GameObject: {fileID: 1971885220552812170}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||
m_Name:
|
||||
@ -169,8 +67,8 @@ MonoBehaviour:
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
|
||||
m_Type: 1
|
||||
m_Sprite: {fileID: 21300000, guid: d60ccf0feab112a4baa66853572c90ad, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
@ -179,13 +77,13 @@ MonoBehaviour:
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!114 &1368758086
|
||||
--- !u!114 &8632423750406408422
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1368758084}
|
||||
m_GameObject: {fileID: 1971885220552812170}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
|
||||
@ -219,11 +117,11 @@ MonoBehaviour:
|
||||
m_SelectedTrigger: Selected
|
||||
m_DisabledTrigger: Disabled
|
||||
m_Interactable: 1
|
||||
m_TargetGraphic: {fileID: 1368758087}
|
||||
m_TargetGraphic: {fileID: 2191591739830093116}
|
||||
m_OnClick:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
--- !u!1 &1900174882
|
||||
--- !u!1 &4314761925928617334
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
@ -231,241 +129,31 @@ GameObject:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1900174883}
|
||||
- component: {fileID: 1900174885}
|
||||
- component: {fileID: 1900174884}
|
||||
- component: {fileID: 5695591491590183961}
|
||||
- component: {fileID: 3287032526730687245}
|
||||
- component: {fileID: 1608152011222876715}
|
||||
- component: {fileID: 8705588810450687165}
|
||||
- component: {fileID: 3306115827101638291}
|
||||
m_Layer: 5
|
||||
m_Name: Text
|
||||
m_Name: Ads
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
--- !u!224 &1900174883
|
||||
m_IsActive: 1
|
||||
--- !u!224 &5695591491590183961
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1900174882}
|
||||
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: 1368758085}
|
||||
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 &1900174885
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1900174882}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &1900174884
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1900174882}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_FontData:
|
||||
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
|
||||
m_FontSize: 62
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 10
|
||||
m_MaxSize: 84
|
||||
m_Alignment: 4
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 0
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: EXTRALIFE
|
||||
--- !u!1 &840994902530579766
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 6374203161451546813}
|
||||
- component: {fileID: 648636861675192753}
|
||||
- component: {fileID: 8439688539017693756}
|
||||
- component: {fileID: 5602960826927261039}
|
||||
m_Layer: 5
|
||||
m_Name: Button
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
--- !u!224 &6374203161451546813
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 840994902530579766}
|
||||
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: 1228572368403975580}
|
||||
m_Father: {fileID: 7017227080055577098}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 540, y: 960}
|
||||
m_SizeDelta: {x: 160, y: 30}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &648636861675192753
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 840994902530579766}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &8439688539017693756
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 840994902530579766}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
|
||||
m_Type: 1
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!114 &5602960826927261039
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 840994902530579766}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Navigation:
|
||||
m_Mode: 0
|
||||
m_WrapAround: 0
|
||||
m_SelectOnUp: {fileID: 0}
|
||||
m_SelectOnDown: {fileID: 0}
|
||||
m_SelectOnLeft: {fileID: 0}
|
||||
m_SelectOnRight: {fileID: 0}
|
||||
m_Transition: 1
|
||||
m_Colors:
|
||||
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
|
||||
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
|
||||
m_ColorMultiplier: 1
|
||||
m_FadeDuration: 0.1
|
||||
m_SpriteState:
|
||||
m_HighlightedSprite: {fileID: 0}
|
||||
m_PressedSprite: {fileID: 0}
|
||||
m_SelectedSprite: {fileID: 0}
|
||||
m_DisabledSprite: {fileID: 0}
|
||||
m_AnimationTriggers:
|
||||
m_NormalTrigger: Normal
|
||||
m_HighlightedTrigger: Highlighted
|
||||
m_PressedTrigger: Pressed
|
||||
m_SelectedTrigger: Selected
|
||||
m_DisabledTrigger: Disabled
|
||||
m_Interactable: 1
|
||||
m_TargetGraphic: {fileID: 8439688539017693756}
|
||||
m_OnClick:
|
||||
m_PersistentCalls:
|
||||
m_Calls:
|
||||
- m_Target: {fileID: 7017227080055577099}
|
||||
m_TargetAssemblyTypeName: AdsMob, Assembly-CSharp
|
||||
m_MethodName: ShowAd
|
||||
m_Mode: 1
|
||||
m_Arguments:
|
||||
m_ObjectArgument: {fileID: 0}
|
||||
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
|
||||
m_IntArgument: 0
|
||||
m_FloatArgument: 0
|
||||
m_StringArgument:
|
||||
m_BoolArgument: 0
|
||||
m_CallState: 2
|
||||
--- !u!1 &959541702021905399
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 462934624606052230}
|
||||
- component: {fileID: 1717549448275548369}
|
||||
- component: {fileID: 8019465967749733583}
|
||||
- component: {fileID: 3518427172387084100}
|
||||
m_Layer: 5
|
||||
m_Name: Canvas
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
--- !u!224 &462934624606052230
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 959541702021905399}
|
||||
m_GameObject: {fileID: 4314761925928617334}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 0, y: 0, z: 0}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 7017227080055577098}
|
||||
m_Children:
|
||||
- {fileID: 3975719838618124896}
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
@ -473,13 +161,13 @@ RectTransform:
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0, y: 0}
|
||||
--- !u!223 &1717549448275548369
|
||||
--- !u!223 &3287032526730687245
|
||||
Canvas:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 959541702021905399}
|
||||
m_GameObject: {fileID: 4314761925928617334}
|
||||
m_Enabled: 1
|
||||
serializedVersion: 3
|
||||
m_RenderMode: 0
|
||||
@ -490,40 +178,40 @@ Canvas:
|
||||
m_OverrideSorting: 0
|
||||
m_OverridePixelPerfect: 0
|
||||
m_SortingBucketNormalizedSize: 0
|
||||
m_AdditionalShaderChannelsFlag: 0
|
||||
m_AdditionalShaderChannelsFlag: 25
|
||||
m_SortingLayerID: 0
|
||||
m_SortingOrder: 0
|
||||
m_TargetDisplay: 0
|
||||
--- !u!114 &8019465967749733583
|
||||
--- !u!114 &1608152011222876715
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 959541702021905399}
|
||||
m_GameObject: {fileID: 4314761925928617334}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_UiScaleMode: 0
|
||||
m_UiScaleMode: 1
|
||||
m_ReferencePixelsPerUnit: 100
|
||||
m_ScaleFactor: 1
|
||||
m_ReferenceResolution: {x: 800, y: 600}
|
||||
m_ReferenceResolution: {x: 1080, y: 1920}
|
||||
m_ScreenMatchMode: 0
|
||||
m_MatchWidthOrHeight: 0
|
||||
m_MatchWidthOrHeight: 1
|
||||
m_PhysicalUnit: 3
|
||||
m_FallbackScreenDPI: 96
|
||||
m_DefaultSpriteDPI: 96
|
||||
m_DynamicPixelsPerUnit: 1
|
||||
m_PresetInfoIsWorld: 0
|
||||
--- !u!114 &3518427172387084100
|
||||
--- !u!114 &8705588810450687165
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 959541702021905399}
|
||||
m_GameObject: {fileID: 4314761925928617334}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
|
||||
@ -534,82 +222,21 @@ MonoBehaviour:
|
||||
m_BlockingMask:
|
||||
serializedVersion: 2
|
||||
m_Bits: 4294967295
|
||||
--- !u!1 &1999367400106432257
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 9010224305754668558}
|
||||
- component: {fileID: 8157564002663662341}
|
||||
- component: {fileID: 5408929494246104917}
|
||||
m_Layer: 5
|
||||
m_Name: Back
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &9010224305754668558
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1999367400106432257}
|
||||
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: 855721725}
|
||||
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: -518}
|
||||
m_SizeDelta: {x: -680, y: -1809.5325}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &8157564002663662341
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1999367400106432257}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &5408929494246104917
|
||||
--- !u!114 &3306115827101638291
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1999367400106432257}
|
||||
m_GameObject: {fileID: 4314761925928617334}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||
m_Script: {fileID: 11500000, guid: a7c276b4af35fbc4a80539b97e444f32, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: 21300000, guid: d60ccf0feab112a4baa66853572c90ad, 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 &4042280681130453449
|
||||
button: {fileID: 8632423750406408422}
|
||||
canvas: {fileID: 1971885220552812170}
|
||||
--- !u!1 &6301283852488076976
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
@ -617,28 +244,28 @@ GameObject:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1228572368403975580}
|
||||
- component: {fileID: 4574297410292119365}
|
||||
- component: {fileID: 4226890313483791420}
|
||||
- component: {fileID: 3104897430720789503}
|
||||
- component: {fileID: 346799076098862248}
|
||||
- component: {fileID: 449182202535964334}
|
||||
m_Layer: 5
|
||||
m_Name: Text
|
||||
m_Name: Text (TMP)
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &1228572368403975580
|
||||
--- !u!224 &3104897430720789503
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4042280681130453449}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_GameObject: {fileID: 6301283852488076976}
|
||||
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: 6374203161451546813}
|
||||
m_Father: {fileID: 3975719838618124896}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
@ -646,100 +273,21 @@ RectTransform:
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4574297410292119365
|
||||
--- !u!222 &346799076098862248
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4042280681130453449}
|
||||
m_GameObject: {fileID: 6301283852488076976}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &4226890313483791420
|
||||
--- !u!114 &449182202535964334
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4042280681130453449}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
|
||||
m_RaycastTarget: 0
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_FontData:
|
||||
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
|
||||
m_FontSize: 14
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 10
|
||||
m_MaxSize: 40
|
||||
m_Alignment: 4
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 0
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: Button
|
||||
--- !u!1 &4988408123839147871
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 6546462637559422819}
|
||||
- component: {fileID: 1811238904848561244}
|
||||
- component: {fileID: 1241824234629738060}
|
||||
m_Layer: 5
|
||||
m_Name: ExtraLifeText
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &6546462637559422819
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4988408123839147871}
|
||||
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: 1368758085}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0, y: 3.02}
|
||||
m_SizeDelta: {x: 356.4681, y: 136.8}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1811238904848561244
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4988408123839147871}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &1241824234629738060
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4988408123839147871}
|
||||
m_GameObject: {fileID: 6301283852488076976}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
|
||||
@ -756,8 +304,7 @@ MonoBehaviour:
|
||||
m_text: EXTRALIFE
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: 9a2157e1f9c4c4d38841fbb92558f587, type: 2}
|
||||
m_sharedMaterial: {fileID: -6360588970910393389, guid: 9a2157e1f9c4c4d38841fbb92558f587,
|
||||
type: 2}
|
||||
m_sharedMaterial: {fileID: -6360588970910393389, guid: 9a2157e1f9c4c4d38841fbb92558f587, type: 2}
|
||||
m_fontSharedMaterials: []
|
||||
m_fontMaterial: {fileID: 0}
|
||||
m_fontMaterials: []
|
||||
@ -782,7 +329,7 @@ MonoBehaviour:
|
||||
serializedVersion: 2
|
||||
rgba: 4294967295
|
||||
m_fontSize: 72
|
||||
m_fontSizeBase: 62.45
|
||||
m_fontSizeBase: 24
|
||||
m_fontWeight: 400
|
||||
m_enableAutoSizing: 1
|
||||
m_fontSizeMin: 18
|
||||
@ -823,56 +370,3 @@ MonoBehaviour:
|
||||
m_hasFontAssetChanged: 0
|
||||
m_baseMaterial: {fileID: 0}
|
||||
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
|
||||
--- !u!1 &7017227080055577093
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 7017227080055577098}
|
||||
- component: {fileID: 7017227080055577099}
|
||||
m_Layer: 5
|
||||
m_Name: ADs
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &7017227080055577098
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7017227080055577093}
|
||||
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: 462934624606052230}
|
||||
- {fileID: 6374203161451546813}
|
||||
- {fileID: 855721725}
|
||||
m_Father: {fileID: 0}
|
||||
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: 100, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &7017227080055577099
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7017227080055577093}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: a7c276b4af35fbc4a80539b97e444f32, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
button: {fileID: 1368758086}
|
||||
canvas: {fileID: 855721721}
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 1328a0e1e252d60408278772275bf560
|
||||
guid: 829cf0211d46b58489f4cb061c784378
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
||||
@ -65,8 +65,7 @@ MonoBehaviour:
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: -4039628871920856409, guid: bcfec907e0672ed45b69575096b4a1c2,
|
||||
type: 3}
|
||||
m_Sprite: {fileID: -4039628871920856409, guid: bcfec907e0672ed45b69575096b4a1c2, type: 3}
|
||||
m_Type: 3
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
@ -138,7 +137,7 @@ MonoBehaviour:
|
||||
m_Right: 0
|
||||
m_Top: 0
|
||||
m_Bottom: 0
|
||||
m_ChildAlignment: 5
|
||||
m_ChildAlignment: 4
|
||||
m_StartCorner: 0
|
||||
m_StartAxis: 0
|
||||
m_CellSize: {x: 0.5, y: 0.2}
|
||||
@ -211,8 +210,7 @@ MonoBehaviour:
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: -8254845973784877126, guid: bcfec907e0672ed45b69575096b4a1c2,
|
||||
type: 3}
|
||||
m_Sprite: {fileID: -8254845973784877126, guid: bcfec907e0672ed45b69575096b4a1c2, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
@ -288,8 +286,7 @@ MonoBehaviour:
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: -5455261514569519910, guid: bcfec907e0672ed45b69575096b4a1c2,
|
||||
type: 3}
|
||||
m_Sprite: {fileID: -5455261514569519910, guid: bcfec907e0672ed45b69575096b4a1c2, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
@ -313,7 +310,7 @@ GameObject:
|
||||
- component: {fileID: 1271697267505620599}
|
||||
- component: {fileID: 482855193181693567}
|
||||
m_Layer: 5
|
||||
m_Name: BarCAnvas
|
||||
m_Name: BarCanvas
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
@ -385,7 +382,7 @@ MonoBehaviour:
|
||||
m_FallbackScreenDPI: 96
|
||||
m_DefaultSpriteDPI: 96
|
||||
m_DynamicPixelsPerUnit: 1
|
||||
m_PresetInfoIsWorld: 0
|
||||
m_PresetInfoIsWorld: 1
|
||||
--- !u!114 &1271697267505620599
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -417,8 +414,7 @@ MonoBehaviour:
|
||||
m_EditorClassIdentifier:
|
||||
healthBar: {fileID: 7888535169076749686}
|
||||
manaBar: {fileID: 9185818537322146330}
|
||||
shotPrefab: {fileID: 9204531176590517796, guid: 74ba0f2e00eb74a4882dcf82bb66bb3f,
|
||||
type: 3}
|
||||
shotPrefab: {fileID: 9204531176590517796, guid: 74ba0f2e00eb74a4882dcf82bb66bb3f, type: 3}
|
||||
grid: {fileID: 3185331048183402439}
|
||||
captureBar: {fileID: 3113562572513926796}
|
||||
captureBack: {fileID: 3936950508401920806}
|
||||
@ -488,8 +484,7 @@ MonoBehaviour:
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: -8254845973784877126, guid: bcfec907e0672ed45b69575096b4a1c2,
|
||||
type: 3}
|
||||
m_Sprite: {fileID: -8254845973784877126, guid: bcfec907e0672ed45b69575096b4a1c2, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
@ -564,8 +559,7 @@ MonoBehaviour:
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: -7745828531039951331, guid: bcfec907e0672ed45b69575096b4a1c2,
|
||||
type: 3}
|
||||
m_Sprite: {fileID: -7745828531039951331, guid: bcfec907e0672ed45b69575096b4a1c2, type: 3}
|
||||
m_Type: 3
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
@ -640,8 +634,7 @@ MonoBehaviour:
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: -4039628871920856409, guid: bcfec907e0672ed45b69575096b4a1c2,
|
||||
type: 3}
|
||||
m_Sprite: {fileID: -4039628871920856409, guid: bcfec907e0672ed45b69575096b4a1c2, type: 3}
|
||||
m_Type: 3
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
|
||||
@ -80,4 +80,4 @@ MonoBehaviour:
|
||||
m_FallbackScreenDPI: 96
|
||||
m_DefaultSpriteDPI: 96
|
||||
m_DynamicPixelsPerUnit: 10
|
||||
m_PresetInfoIsWorld: 0
|
||||
m_PresetInfoIsWorld: 1
|
||||
|
||||
@ -266,8 +266,7 @@ MonoBehaviour:
|
||||
'
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: 9a2157e1f9c4c4d38841fbb92558f587, type: 2}
|
||||
m_sharedMaterial: {fileID: -6360588970910393389, guid: 9a2157e1f9c4c4d38841fbb92558f587,
|
||||
type: 2}
|
||||
m_sharedMaterial: {fileID: -6360588970910393389, guid: 9a2157e1f9c4c4d38841fbb92558f587, type: 2}
|
||||
m_fontSharedMaterials: []
|
||||
m_fontMaterial: {fileID: 0}
|
||||
m_fontMaterials: []
|
||||
@ -412,7 +411,7 @@ MonoBehaviour:
|
||||
m_ScaleFactor: 1
|
||||
m_ReferenceResolution: {x: 1080, y: 1920}
|
||||
m_ScreenMatchMode: 0
|
||||
m_MatchWidthOrHeight: 0
|
||||
m_MatchWidthOrHeight: 1
|
||||
m_PhysicalUnit: 3
|
||||
m_FallbackScreenDPI: 96
|
||||
m_DefaultSpriteDPI: 96
|
||||
@ -882,8 +881,7 @@ MonoBehaviour:
|
||||
m_text: Settings
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: 9a2157e1f9c4c4d38841fbb92558f587, type: 2}
|
||||
m_sharedMaterial: {fileID: -6360588970910393389, guid: 9a2157e1f9c4c4d38841fbb92558f587,
|
||||
type: 2}
|
||||
m_sharedMaterial: {fileID: -6360588970910393389, guid: 9a2157e1f9c4c4d38841fbb92558f587, type: 2}
|
||||
m_fontSharedMaterials: []
|
||||
m_fontMaterial: {fileID: 0}
|
||||
m_fontMaterials: []
|
||||
@ -1019,8 +1017,7 @@ MonoBehaviour:
|
||||
'
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: 9a2157e1f9c4c4d38841fbb92558f587, type: 2}
|
||||
m_sharedMaterial: {fileID: -6360588970910393389, guid: 9a2157e1f9c4c4d38841fbb92558f587,
|
||||
type: 2}
|
||||
m_sharedMaterial: {fileID: -6360588970910393389, guid: 9a2157e1f9c4c4d38841fbb92558f587, type: 2}
|
||||
m_fontSharedMaterials: []
|
||||
m_fontMaterial: {fileID: 0}
|
||||
m_fontMaterials: []
|
||||
@ -1234,8 +1231,7 @@ MonoBehaviour:
|
||||
m_text: Continue
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: 9a2157e1f9c4c4d38841fbb92558f587, type: 2}
|
||||
m_sharedMaterial: {fileID: -6360588970910393389, guid: 9a2157e1f9c4c4d38841fbb92558f587,
|
||||
type: 2}
|
||||
m_sharedMaterial: {fileID: -6360588970910393389, guid: 9a2157e1f9c4c4d38841fbb92558f587, type: 2}
|
||||
m_fontSharedMaterials: []
|
||||
m_fontMaterial: {fileID: 0}
|
||||
m_fontMaterials: []
|
||||
|
||||
@ -17,12 +17,9 @@ MonoBehaviour:
|
||||
hexCaptureManaCost: 10
|
||||
hexHardCaptureManaCost: 20
|
||||
hexHardCaptureTime: 1
|
||||
cellPrefab: {fileID: 1661242500252451528, guid: bcea5b4a96735bd4b936f8f3fefcc688,
|
||||
type: 3}
|
||||
cellLabelPrefab: {fileID: 3836123284387241147, guid: efd47cbd22ddfee4aa2b1391914116fc,
|
||||
type: 3}
|
||||
CoordinatesCanvas: {fileID: 4726489279989878083, guid: f31e0880dd078104bb31dc0fd7ef9f19,
|
||||
type: 3}
|
||||
cellPrefab: {fileID: 1661242500252451528, guid: bcea5b4a96735bd4b936f8f3fefcc688, type: 3}
|
||||
cellLabelPrefab: {fileID: 3836123284387241147, guid: efd47cbd22ddfee4aa2b1391914116fc, type: 3}
|
||||
CoordinatesCanvas: {fileID: 4726489279989878083, guid: f31e0880dd078104bb31dc0fd7ef9f19, type: 3}
|
||||
colors:
|
||||
- _unitColor: 2
|
||||
_texture: {fileID: 2800000, guid: 983242f4b4db7a841af48234cf0021b8, type: 3}
|
||||
@ -30,25 +27,17 @@ MonoBehaviour:
|
||||
_vfxDeathPrefab: {fileID: 0}
|
||||
- _unitColor: 0
|
||||
_texture: {fileID: 2800000, guid: 0298dfcb0756f534a9a125d510461c7a, type: 3}
|
||||
_vfxCellCapturePrefab: {fileID: 8021195855904498788, guid: 2f6d0540c8fd7bb46b356ff86962379c,
|
||||
type: 3}
|
||||
_vfxDeathPrefab: {fileID: 8483527721606052447, guid: fd7fc481b936cf84a90d2d01d83e9b06,
|
||||
type: 3}
|
||||
_vfxCellCapturePrefab: {fileID: 8021195855904498788, guid: 2f6d0540c8fd7bb46b356ff86962379c, type: 3}
|
||||
_vfxDeathPrefab: {fileID: 8483527721606052447, guid: fd7fc481b936cf84a90d2d01d83e9b06, type: 3}
|
||||
- _unitColor: 1
|
||||
_texture: {fileID: 2800000, guid: 3b75368df991b164583e8cede390e24e, type: 3}
|
||||
_vfxCellCapturePrefab: {fileID: 442387583353148024, guid: 53959bc898e9a644daad0282881d596a,
|
||||
type: 3}
|
||||
_vfxDeathPrefab: {fileID: 730781534364879866, guid: 15620662117187f419d41032a4267445,
|
||||
type: 3}
|
||||
_vfxCellCapturePrefab: {fileID: 442387583353148024, guid: 53959bc898e9a644daad0282881d596a, type: 3}
|
||||
_vfxDeathPrefab: {fileID: 730781534364879866, guid: 15620662117187f419d41032a4267445, type: 3}
|
||||
- _unitColor: 3
|
||||
_texture: {fileID: 2800000, guid: 1a76a79d5a83143479c76f4f37c4b896, type: 3}
|
||||
_vfxCellCapturePrefab: {fileID: 5732852186060375560, guid: 54d847a18c62f57479c53469d4398ceb,
|
||||
type: 3}
|
||||
_vfxDeathPrefab: {fileID: 7140011676602114744, guid: 6d9f179a27798c248b3c35df9139eb85,
|
||||
type: 3}
|
||||
_vfxCellCapturePrefab: {fileID: 5732852186060375560, guid: 54d847a18c62f57479c53469d4398ceb, type: 3}
|
||||
_vfxDeathPrefab: {fileID: 7140011676602114744, guid: 6d9f179a27798c248b3c35df9139eb85, type: 3}
|
||||
- _unitColor: 4
|
||||
_texture: {fileID: 2800000, guid: 779719648deedb4478ddebb3b81751ef, type: 3}
|
||||
_vfxCellCapturePrefab: {fileID: 1651852338557341938, guid: fa6c1fc3da7c8d24c85a88b00cf598d4,
|
||||
type: 3}
|
||||
_vfxDeathPrefab: {fileID: 4578021055421768374, guid: b2b879dd7ca552a408d4349691d2c8df,
|
||||
type: 3}
|
||||
_vfxCellCapturePrefab: {fileID: 1651852338557341938, guid: fa6c1fc3da7c8d24c85a88b00cf598d4, type: 3}
|
||||
_vfxDeathPrefab: {fileID: 4578021055421768374, guid: b2b879dd7ca552a408d4349691d2c8df, type: 3}
|
||||
|
||||
@ -14,12 +14,12 @@ MonoBehaviour:
|
||||
m_EditorClassIdentifier:
|
||||
items:
|
||||
- item: {fileID: 11400000, guid: e7adbedb55c5db341a823370b696f709, type: 2}
|
||||
_spawnChance: 0.681
|
||||
_spawnChance: 0.486
|
||||
- item: {fileID: 11400000, guid: 62849ddbcd32e834887aac5eb3d98db0, type: 2}
|
||||
_spawnChance: 0.873
|
||||
_spawnChance: 0.766
|
||||
- item: {fileID: 11400000, guid: ef628c3158b0ea34bb919ca105507009, type: 2}
|
||||
_spawnChance: 0.767
|
||||
- item: {fileID: 0}
|
||||
_spawnChance: 0
|
||||
_spawnChance: 0.918
|
||||
- item: {fileID: 11400000, guid: ef628c3158b0ea34bb919ca105507009, type: 2}
|
||||
_spawnChance: 0.918
|
||||
fromTimeSpawn: 2.93
|
||||
toTimeSpawn: 10
|
||||
|
||||
17
Assets/Resources/Data/Items/CaptureTAbility.asset
Normal file
17
Assets/Resources/Data/Items/CaptureTAbility.asset
Normal file
@ -0,0 +1,17 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!114 &11400000
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 461496314fe84e509ae72dd06538b62c, type: 3}
|
||||
m_Name: CaptureTAbility
|
||||
m_EditorClassIdentifier:
|
||||
iconPrefab: {fileID: 0}
|
||||
icon: {fileID: 0}
|
||||
AimCanvas: {fileID: 0}
|
||||
@ -1,8 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 82adcc5c04b15af44afe569caa21fa7e
|
||||
guid: 133e523fdd159754e8bf8927faec5b0f
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 4890085278179872738
|
||||
mainObjectFileID: 11400000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -15,8 +15,6 @@ MonoBehaviour:
|
||||
_objectsToSpawn:
|
||||
- {fileID: 5336165614562949988, guid: b65a64902764f84428e8a07b071bad15, type: 3}
|
||||
- {fileID: 5296751824488078361, guid: 7305318dc10267546b643a42c7c21af3, type: 3}
|
||||
joystickView: {fileID: 4385872142190176059, guid: 4df6913b39f4979429158c344680d83f,
|
||||
type: 3}
|
||||
inventoryView: {fileID: 1527356263590969195, guid: ff3bc3b17ddefd14eb798b22cf0a854f,
|
||||
type: 3}
|
||||
adsMob: {fileID: 7017227080055577099, guid: 1328a0e1e252d60408278772275bf560, type: 3}
|
||||
joystickView: {fileID: 4385872142190176059, guid: 4df6913b39f4979429158c344680d83f, type: 3}
|
||||
inventoryView: {fileID: 1527356263590969195, guid: ff3bc3b17ddefd14eb798b22cf0a854f, type: 3}
|
||||
adsMob: {fileID: 3306115827101638291, guid: 829cf0211d46b58489f4cb061c784378, type: 3}
|
||||
|
||||
@ -13,25 +13,23 @@ MonoBehaviour:
|
||||
m_Name: UnitsData
|
||||
m_EditorClassIdentifier:
|
||||
_units:
|
||||
- isPlayer: 1
|
||||
- isPlayer: 0
|
||||
spawnPos:
|
||||
x: 19
|
||||
z: 4
|
||||
unitPrefa: {fileID: 7527582019267571087, guid: f102085e8bc4cad4992d43b84dee1055,
|
||||
type: 3}
|
||||
unitPrefa: {fileID: 7527582019267571087, guid: f102085e8bc4cad4992d43b84dee1055, type: 3}
|
||||
color: 3
|
||||
manaRegen: 10
|
||||
manaRegen: 1000
|
||||
maxMana: 1000
|
||||
maxHP: 100
|
||||
inventoryCapacity: 4
|
||||
- isPlayer: 0
|
||||
- isPlayer: 1
|
||||
spawnPos:
|
||||
x: 3
|
||||
z: 4
|
||||
unitPrefa: {fileID: 3762867976042010436, guid: d00f156879942114488e4db0689a3fb7,
|
||||
type: 3}
|
||||
unitPrefa: {fileID: 3762867976042010436, guid: d00f156879942114488e4db0689a3fb7, type: 3}
|
||||
color: 4
|
||||
manaRegen: 10
|
||||
manaRegen: 100
|
||||
maxMana: 1000
|
||||
maxHP: 100
|
||||
inventoryCapacity: 4
|
||||
@ -39,10 +37,9 @@ MonoBehaviour:
|
||||
spawnPos:
|
||||
x: -1
|
||||
z: 42
|
||||
unitPrefa: {fileID: 742650227762578155, guid: 97b4a76c55741764e880b63d6e1514a9,
|
||||
type: 3}
|
||||
unitPrefa: {fileID: 742650227762578155, guid: 97b4a76c55741764e880b63d6e1514a9, type: 3}
|
||||
color: 0
|
||||
manaRegen: 10
|
||||
manaRegen: 100
|
||||
maxMana: 1000
|
||||
maxHP: 100
|
||||
inventoryCapacity: 4
|
||||
@ -50,10 +47,9 @@ MonoBehaviour:
|
||||
spawnPos:
|
||||
x: -17
|
||||
z: 40
|
||||
unitPrefa: {fileID: 8887939040951305984, guid: 1a81dbbd6ef62324491d9f58654ebe4b,
|
||||
type: 3}
|
||||
unitPrefa: {fileID: 8887939040951305984, guid: 1a81dbbd6ef62324491d9f58654ebe4b, type: 3}
|
||||
color: 1
|
||||
manaRegen: 10
|
||||
manaRegen: 100
|
||||
maxMana: 1000
|
||||
maxHP: 100
|
||||
inventoryCapacity: 4
|
||||
|
||||
@ -15,28 +15,36 @@ MonoBehaviour:
|
||||
_weapons:
|
||||
- name: StandartAttac
|
||||
icon: {fileID: 3777131139682951229, guid: e85f2abe991b09140ac9b67cf8cb24a1, type: 3}
|
||||
objectToThrow: {fileID: 4746165193704193263, guid: 4e7523811a052fd46acf941fc69c8c98,
|
||||
type: 3}
|
||||
VFXGameObject: {fileID: 2957420090356197408, guid: 5d1244f7b80cadd428a70173a01ce889,
|
||||
type: 3}
|
||||
objectToThrow: {fileID: 4746165193704193263, guid: 4e7523811a052fd46acf941fc69c8c98, type: 3}
|
||||
VFXGameObject: {fileID: 2957420090356197408, guid: 5d1244f7b80cadd428a70173a01ce889, type: 3}
|
||||
modifiedDamage: 0
|
||||
damage: 10
|
||||
damage: 30
|
||||
speed: 1
|
||||
disnatce: 5
|
||||
disnatce: 7
|
||||
reloadTime: 3
|
||||
shots: 3
|
||||
shotSound: {fileID: 8300000, guid: 9ea918c6c23577f4e885a8490d2f2046, type: 3}
|
||||
hitSound: {fileID: 8300000, guid: 6c42231c18643dc4d9d8f8d15bc4735b, type: 3}
|
||||
- name: Laser
|
||||
icon: {fileID: 3777131139682951229, guid: dcb79c5472cbd5f4eb050a4acc4b197e, type: 3}
|
||||
objectToThrow: {fileID: 7219588875883387333, guid: ab214974cd498df42867306700ba5fd2,
|
||||
type: 3}
|
||||
VFXGameObject: {fileID: 8715260329460421181, guid: e0388f43a34de79458c79763de903ffb,
|
||||
type: 3}
|
||||
objectToThrow: {fileID: 7219588875883387333, guid: ab214974cd498df42867306700ba5fd2, type: 3}
|
||||
VFXGameObject: {fileID: 8715260329460421181, guid: e0388f43a34de79458c79763de903ffb, type: 3}
|
||||
modifiedDamage: 0
|
||||
damage: 30
|
||||
speed: 0.5
|
||||
disnatce: 3
|
||||
disnatce: 5
|
||||
reloadTime: 3
|
||||
shots: 5
|
||||
shotSound: {fileID: 8300000, guid: 9ea918c6c23577f4e885a8490d2f2046, type: 3}
|
||||
hitSound: {fileID: 8300000, guid: 6c42231c18643dc4d9d8f8d15bc4735b, type: 3}
|
||||
- name: Laser
|
||||
icon: {fileID: 3777131139682951229, guid: dcb79c5472cbd5f4eb050a4acc4b197e, type: 3}
|
||||
objectToThrow: {fileID: 7219588875883387333, guid: ab214974cd498df42867306700ba5fd2, type: 3}
|
||||
VFXGameObject: {fileID: 8715260329460421181, guid: e0388f43a34de79458c79763de903ffb, type: 3}
|
||||
modifiedDamage: 0
|
||||
damage: 30
|
||||
speed: 0.5
|
||||
disnatce: 5
|
||||
reloadTime: 3
|
||||
shots: 5
|
||||
shotSound: {fileID: 8300000, guid: 9ea918c6c23577f4e885a8490d2f2046, type: 3}
|
||||
|
||||
@ -235,6 +235,7 @@ GameObject:
|
||||
- component: {fileID: 963194228}
|
||||
- component: {fileID: 963194227}
|
||||
- component: {fileID: 963194226}
|
||||
- component: {fileID: 963194229}
|
||||
m_Layer: 0
|
||||
m_Name: Main Camera
|
||||
m_TagString: MainCamera
|
||||
@ -316,81 +317,14 @@ Transform:
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 60, y: 0, z: 0}
|
||||
--- !u!1 &1426991531
|
||||
GameObject:
|
||||
--- !u!81 &963194229
|
||||
AudioListener:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1426991534}
|
||||
- component: {fileID: 1426991533}
|
||||
- component: {fileID: 1426991532}
|
||||
m_Layer: 5
|
||||
m_Name: Back
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!114 &1426991532
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1426991531}
|
||||
m_GameObject: {fileID: 963194225}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: 21300000, guid: d60ccf0feab112a4baa66853572c90ad, 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!222 &1426991533
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1426991531}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!224 &1426991534
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1426991531}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 4
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 540, y: 970}
|
||||
m_SizeDelta: {x: 780, y: 240}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &1455205762
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
using System.Collections.Generic;
|
||||
using System.Timers;
|
||||
using UnityEngine;
|
||||
// using GoogleMobileAds.Api;
|
||||
using HexFiled;
|
||||
@ -41,6 +42,7 @@ public class AdsMob : MonoBehaviour
|
||||
{
|
||||
_player.Spawn(HexManager.CellByColor[UnitColor.GREY][Random.Range(0, HexManager.CellByColor[UnitColor.GREY].Count - 1)].coordinates);
|
||||
canvas.SetActive(false);
|
||||
Time.timeScale = 1f;
|
||||
}
|
||||
|
||||
// public void ShowAd()
|
||||
@ -55,6 +57,7 @@ public class AdsMob : MonoBehaviour
|
||||
public void ShowCanvas(Unit player)
|
||||
{
|
||||
_player = player;
|
||||
Time.timeScale = 0f;
|
||||
canvas.SetActive(true);
|
||||
}
|
||||
|
||||
|
||||
@ -1,63 +0,0 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!850595691 &4890085278179872738
|
||||
LightingSettings:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: New Lighting Settings
|
||||
serializedVersion: 3
|
||||
m_GIWorkflowMode: 1
|
||||
m_EnableBakedLightmaps: 1
|
||||
m_EnableRealtimeLightmaps: 0
|
||||
m_RealtimeEnvironmentLighting: 1
|
||||
m_BounceScale: 1
|
||||
m_AlbedoBoost: 1
|
||||
m_IndirectOutputScale: 1
|
||||
m_UsingShadowmask: 1
|
||||
m_BakeBackend: 1
|
||||
m_LightmapMaxSize: 1024
|
||||
m_BakeResolution: 40
|
||||
m_Padding: 2
|
||||
m_TextureCompression: 1
|
||||
m_AO: 0
|
||||
m_AOMaxDistance: 1
|
||||
m_CompAOExponent: 1
|
||||
m_CompAOExponentDirect: 0
|
||||
m_ExtractAO: 0
|
||||
m_MixedBakeMode: 2
|
||||
m_LightmapsBakeMode: 1
|
||||
m_FilterMode: 1
|
||||
m_LightmapParameters: {fileID: 15204, guid: 0000000000000000f000000000000000, type: 0}
|
||||
m_ExportTrainingData: 0
|
||||
m_TrainingDataDestination: TrainingData
|
||||
m_RealtimeResolution: 2
|
||||
m_ForceWhiteAlbedo: 0
|
||||
m_ForceUpdates: 0
|
||||
m_FinalGather: 0
|
||||
m_FinalGatherRayCount: 256
|
||||
m_FinalGatherFiltering: 1
|
||||
m_PVRCulling: 1
|
||||
m_PVRSampling: 1
|
||||
m_PVRDirectSampleCount: 32
|
||||
m_PVRSampleCount: 512
|
||||
m_PVREnvironmentSampleCount: 256
|
||||
m_PVREnvironmentReferencePointCount: 2048
|
||||
m_LightProbeSampleCountMultiplier: 4
|
||||
m_PVRBounces: 2
|
||||
m_PVRMinBounces: 1
|
||||
m_PVREnvironmentMIS: 1
|
||||
m_PVRFilteringMode: 1
|
||||
m_PVRDenoiserTypeDirect: 1
|
||||
m_PVRDenoiserTypeIndirect: 1
|
||||
m_PVRDenoiserTypeAO: 1
|
||||
m_PVRFilterTypeDirect: 0
|
||||
m_PVRFilterTypeIndirect: 0
|
||||
m_PVRFilterTypeAO: 0
|
||||
m_PVRFilteringGaussRadiusDirect: 1
|
||||
m_PVRFilteringGaussRadiusIndirect: 5
|
||||
m_PVRFilteringGaussRadiusAO: 2
|
||||
m_PVRFilteringAtrousPositionSigmaDirect: 0.5
|
||||
m_PVRFilteringAtrousPositionSigmaIndirect: 2
|
||||
m_PVRFilteringAtrousPositionSigmaAO: 1
|
||||
@ -11,7 +11,7 @@ using UnityEngine;
|
||||
|
||||
namespace DefaultNamespace.AI
|
||||
{
|
||||
public class AIAgent : IFixedExecute, IExecute
|
||||
public class AIAgent : IFixedExecute
|
||||
{
|
||||
private Unit _unit;
|
||||
private Camera _camera;
|
||||
@ -77,14 +77,6 @@ namespace DefaultNamespace.AI
|
||||
}
|
||||
}
|
||||
|
||||
public void Execute()
|
||||
{
|
||||
if (_unit.UnitView != null)
|
||||
{
|
||||
_unit.UnitView.BarCanvas.transform.DOLookAt(
|
||||
_unit.UnitView.BarCanvas.transform.position + _camera.transform.rotation * Vector3.back, 0f,
|
||||
up: _camera.transform.rotation * Vector3.up);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
@ -1,24 +1,19 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Runtime.CompilerServices;
|
||||
using Controller;
|
||||
using Data;
|
||||
using DefaultNamespace;
|
||||
using DefaultNamespace.AI;
|
||||
using HexFiled;
|
||||
using Items;
|
||||
using Runtime.Controller;
|
||||
using Units;
|
||||
using UnityEngine;
|
||||
using Object = UnityEngine.Object;
|
||||
using Random = UnityEngine.Random;
|
||||
|
||||
namespace AI
|
||||
{
|
||||
public class AIManager
|
||||
{
|
||||
private List<AIAgent> _agents;
|
||||
private int _triesToCalculatePath = 0;
|
||||
private int _maxTriesToCalculatePath = 5;
|
||||
private AIData _data;
|
||||
@ -35,7 +30,6 @@ namespace AI
|
||||
|
||||
public AIManager(AIData data)
|
||||
{
|
||||
_agents = new List<AIAgent>();
|
||||
_data = data;
|
||||
Instance = this;
|
||||
HexManager.agents = new Dictionary<GameObject, AIAgent>();
|
||||
@ -43,14 +37,11 @@ namespace AI
|
||||
|
||||
public void AddAgent(AIAgent agent)
|
||||
{
|
||||
_agents.Add(agent);
|
||||
|
||||
agent.OnAgentInited += InitAI;
|
||||
}
|
||||
|
||||
public void RemoveAgent(AIAgent agent)
|
||||
{
|
||||
_agents.Remove(agent);
|
||||
agent.OnAgentInited -= InitAI;
|
||||
}
|
||||
|
||||
@ -73,13 +64,31 @@ namespace AI
|
||||
|
||||
public static Unit GetNearestUnit(int cellDist, Unit agent)
|
||||
{
|
||||
return (from unit in HexManager.UnitCurrentCell
|
||||
where unit.Key != agent.Color &&
|
||||
Vector3.Distance(unit.Value.unit.Instance.transform.position,
|
||||
agent.Instance.transform.position) <= cellDist * HexGrid.HexDistance
|
||||
select unit.Value.unit).FirstOrDefault();
|
||||
List<(float dist, Unit unit)> res = new List<(float, Unit)>();
|
||||
try
|
||||
{
|
||||
foreach (var color in (UnitColor[])Enum.GetValues(typeof(UnitColor)))
|
||||
{
|
||||
if (HexManager.UnitCurrentCell.ContainsKey(color) &&
|
||||
HexManager.UnitCurrentCell[color] != (null, null) &&
|
||||
Vector3.Distance(HexManager.UnitCurrentCell[color].unit.Instance.transform.position,
|
||||
agent.Instance.transform.position) <= cellDist * HexGrid.HexDistance
|
||||
&& HexManager.UnitCurrentCell[color].unit.Color != agent.Color)
|
||||
{
|
||||
res.Add((Vector3.Distance(HexManager.UnitCurrentCell[color].unit.Instance.transform.position,
|
||||
agent.Instance.transform.position), HexManager.UnitCurrentCell[color].unit));
|
||||
}
|
||||
}
|
||||
|
||||
return res.Count > 0 ? res.OrderBy(x => x.Item1).First().unit : null;
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
Debug.Log(e.Message + " " + agent.Color + " ");
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
public BotState GetNewBehaviour(AIAgent agent)
|
||||
{
|
||||
|
||||
@ -1,19 +1,15 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Timers;
|
||||
using System.Collections.Generic;
|
||||
using AI;
|
||||
using CamControl;
|
||||
using Chars;
|
||||
using DefaultNamespace;
|
||||
using DefaultNamespace.AI;
|
||||
using DG.Tweening;
|
||||
using GameUI;
|
||||
using HexFiled;
|
||||
using Items;
|
||||
using Units;
|
||||
using UnityEngine;
|
||||
using Weapons;
|
||||
using Object = UnityEngine.Object;
|
||||
using Random = UnityEngine.Random;
|
||||
|
||||
namespace Controller
|
||||
@ -22,18 +18,18 @@ namespace Controller
|
||||
{
|
||||
public GameInit(Controllers controllers, Data.Data data)
|
||||
{
|
||||
|
||||
new AIManager(data.AIData);
|
||||
var hexGrid = new HexGrid(data.FieldData);
|
||||
new MusicController();
|
||||
new VFXController();
|
||||
MusicController.Instance.SetMusicData(data.MusicData);
|
||||
controllers.Add(hexGrid);
|
||||
|
||||
var paintedController = new PaintedController();
|
||||
|
||||
data.WeaponsData.WeaponsList.ForEach(x => x.SetModifiedDamage(0));
|
||||
|
||||
|
||||
ItemFabric itemFabric = new ItemFabric(data.ItemsData);
|
||||
controllers.Add(itemFabric);
|
||||
hexGrid.OnGridLoaded += () => controllers.Add(itemFabric);
|
||||
|
||||
UIController uiController = new UIController(data.UIData);
|
||||
uiController.Spawn(); //TODO при паузе Dotween ругается
|
||||
@ -45,6 +41,7 @@ namespace Controller
|
||||
{
|
||||
var weapon = JsonUtility.FromJson<Weapon>(data.ChosenWeapon);
|
||||
weapon.SetModifiedDamage(0);
|
||||
|
||||
player = new Unit(unit, weapon, hexGrid);
|
||||
PlayerControl playerControl = new PlayerControl(player, uiController.PlayerControlView,
|
||||
uiController.PlayerInventoryView);
|
||||
@ -52,11 +49,16 @@ namespace Controller
|
||||
CameraControl cameraControl =
|
||||
new CameraControl(Camera.main, data.CameraData);
|
||||
controllers.Add(cameraControl);
|
||||
|
||||
player.onPlayerSpawned += p => controllers.Add(playerControl);
|
||||
|
||||
player.OnDeath += unit1 => controllers.Remove(playerControl);
|
||||
|
||||
player.onPlayerSpawned += cameraControl.InitCameraControl;
|
||||
player.onPlayerSpawned += MusicController.Instance.AddAudioListener;
|
||||
units.Add(player);
|
||||
|
||||
//player.OnDeath += uiController.AdsMob.ShowCanvas;
|
||||
player.OnDeath += uiController.AdsMob.ShowCanvas;
|
||||
player.OnDeath += paintedController.PaintOnDeath;
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -67,25 +69,20 @@ namespace Controller
|
||||
units.Add(enemy);
|
||||
AIAgent agent = new AIAgent(unit, enemy);
|
||||
controllers.Add(agent);
|
||||
enemy.OnDeath += x => {controllers.Remove(agent);};
|
||||
enemy.OnDeath += x => { controllers.Remove(agent); };
|
||||
enemy.OnDeath += paintedController.PaintOnDeath;
|
||||
}
|
||||
|
||||
});
|
||||
|
||||
var unitFactory = new UnitFactory(units, hexGrid);
|
||||
|
||||
hexGrid.OnGridLoaded += unitFactory.Spawn;
|
||||
|
||||
var paintedController = new PaintedController();
|
||||
|
||||
|
||||
hexGrid.OnHexPainted += paintedController.SetHexColors;
|
||||
|
||||
hexGrid.OnHexPainted += itemFabric.UpdateCellToOpenList;
|
||||
hexGrid.OnHexPainted += paintedController.CheckDeathOrDestroy;
|
||||
}
|
||||
|
||||
private List<Type> SetUpItems()
|
||||
{
|
||||
return new List<Type>() { typeof(Building), typeof(Bonus)};
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
@ -14,17 +14,13 @@ namespace HexFiled
|
||||
public HexCoordinates coordinates;
|
||||
public Action<HexCell> onHexPainted;
|
||||
|
||||
public float gCost;
|
||||
public float hCost;
|
||||
public float fCost;
|
||||
public HexCell parent;
|
||||
|
||||
|
||||
[SerializeField] private HexCell[] neighbors;
|
||||
private Item _item;
|
||||
private UnitColor _color;
|
||||
private MeshRenderer _renderer;
|
||||
|
||||
public HexCell[] Neighbors => neighbors;
|
||||
|
||||
public UnitColor Color => _color;
|
||||
|
||||
public Item Item => _item;
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using Data;
|
||||
using Runtime.Controller;
|
||||
using TMPro;
|
||||
@ -48,12 +49,9 @@ namespace HexFiled
|
||||
|
||||
public HexCell GetCellFromCoord(HexCoordinates coordinates)
|
||||
{
|
||||
var i = 0;
|
||||
while (!_cells[i++].coordinates.Equals(coordinates))
|
||||
{
|
||||
}
|
||||
|
||||
return _cells[i - 1];
|
||||
return _cells.First(cell => cell.coordinates.Equals(coordinates));
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -24,7 +24,7 @@ namespace HexFiled
|
||||
if (neighbours.Any())
|
||||
{
|
||||
var dir = DirectionHelper.DirectionTo(end.transform.position,
|
||||
neighbours[Random.Range(0, neighbours.Count)].transform.position);
|
||||
neighbours[Random.Range(0, neighbours.Count - 1)].transform.position);
|
||||
path.Enqueue(DirectionHelper.VectorToDirection(new Vector2(dir.x, dir.z)));
|
||||
return;
|
||||
}
|
||||
@ -40,7 +40,7 @@ namespace HexFiled
|
||||
itters++;
|
||||
} while (end == null && itters < 5);
|
||||
|
||||
if (itters >= 5)
|
||||
if (itters >= 3)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
@ -3,6 +3,7 @@ using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using Units;
|
||||
using UnityEngine;
|
||||
using Object = UnityEngine.Object;
|
||||
using Random = UnityEngine.Random;
|
||||
|
||||
namespace HexFiled
|
||||
@ -17,6 +18,15 @@ namespace HexFiled
|
||||
HexManager.UnitCurrentCell = new Dictionary<UnitColor, (HexCell cell, Unit unit)>();
|
||||
}
|
||||
|
||||
public void PaintOnDeath(Unit unit)
|
||||
{
|
||||
for (var i = 0; i < HexManager.CellByColor[unit.Color].Count; i++)
|
||||
{
|
||||
HexManager.CellByColor[unit.Color][i].PaintHex(UnitColor.GREY);
|
||||
}
|
||||
|
||||
HexManager.CellByColor.Remove(unit.Color);
|
||||
}
|
||||
public void CheckDeathOrDestroy(HexCell cell)
|
||||
{
|
||||
List<Unit> unitsToDeath = new List<Unit>();
|
||||
@ -28,8 +38,7 @@ namespace HexFiled
|
||||
unitsToDeath.ForEach(x => x.Death());
|
||||
if (cell.Building != null && cell.Building.Color != cell.Color)
|
||||
{
|
||||
|
||||
|
||||
Object.Destroy(cell.Building);
|
||||
}
|
||||
}
|
||||
public void SetHexColors(HexCell cell)
|
||||
|
||||
@ -13,7 +13,7 @@ namespace Items
|
||||
|
||||
public void Invoke(Action action)
|
||||
{
|
||||
Unit.UseItem(this);
|
||||
|
||||
OnItemUsed += action;
|
||||
}
|
||||
|
||||
|
||||
37
Assets/Scripts/Items/CaptureAbility.cs
Normal file
37
Assets/Scripts/Items/CaptureAbility.cs
Normal file
@ -0,0 +1,37 @@
|
||||
using System;
|
||||
using DefaultNamespace;
|
||||
using HexFiled;
|
||||
using UnityEditor;
|
||||
using UnityEngine;
|
||||
using UnityEngine.UI;
|
||||
|
||||
namespace Items
|
||||
{
|
||||
[CreateAssetMenu(fileName = "CaptureAbility", menuName = "Item/Ability")]
|
||||
public class CaptureAbility : Item
|
||||
{
|
||||
[SerializeField] private GameObject AimCanvas;
|
||||
private GameObject _aimInstance;
|
||||
|
||||
|
||||
|
||||
public void Invoke(Action action)
|
||||
{
|
||||
OnItemUsed += action;
|
||||
_aimInstance = SpawnHelper.Spawn(AimCanvas, Vector3.zero, Unit.Instance);
|
||||
}
|
||||
|
||||
public void Aim(Vector2 direction)
|
||||
{
|
||||
_aimInstance.transform.LookAt(HexManager.UnitCurrentCell[Unit.Color].cell
|
||||
.GetNeighbor(DirectionHelper.VectorToDirection(direction)).transform);
|
||||
}
|
||||
|
||||
public void UseAbility()
|
||||
{
|
||||
Unit.UseItem(this);
|
||||
|
||||
OnItemUsed?.Invoke();
|
||||
}
|
||||
}
|
||||
}
|
||||
3
Assets/Scripts/Items/CaptureAbility.cs.meta
Normal file
3
Assets/Scripts/Items/CaptureAbility.cs.meta
Normal file
@ -0,0 +1,3 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 461496314fe84e509ae72dd06538b62c
|
||||
timeCreated: 1642532470
|
||||
@ -1,6 +1,7 @@
|
||||
using System;
|
||||
using Data;
|
||||
using DefaultNamespace;
|
||||
using DG.Tweening;
|
||||
using HexFiled;
|
||||
using Units;
|
||||
using UnityEngine;
|
||||
@ -20,18 +21,20 @@ namespace Items
|
||||
protected Unit Unit;
|
||||
protected Action OnItemUsed;
|
||||
|
||||
|
||||
public UnitColor Color => Unit.Color;
|
||||
|
||||
public GameObject Spawn(HexCell cell)
|
||||
public GameObject Spawn(HexCell cell, GameObject parrant)
|
||||
{
|
||||
var obj = SpawnHelper.Spawn(iconPrefab, cell.transform.position + new Vector3(0, 1, 0));
|
||||
obj.AddComponent<ItemView>().SetUp(this);
|
||||
obj.AddComponent<CapsuleCollider>().isTrigger = true;
|
||||
return obj;
|
||||
_instance = SpawnHelper.Spawn(iconPrefab, cell.transform.position + new Vector3(0, 1, 0), parrant);
|
||||
_instance.AddComponent<ItemView>().SetUp(this);
|
||||
_instance.AddComponent<CapsuleCollider>().isTrigger = true;
|
||||
return _instance;
|
||||
}
|
||||
|
||||
public void PickUp(Unit unit)
|
||||
{
|
||||
|
||||
Unit = unit;
|
||||
|
||||
}
|
||||
|
||||
@ -16,12 +16,13 @@ namespace Items
|
||||
private ItemsData _data;
|
||||
private List<HexCell> _openList;
|
||||
private List<Type> _itemTypes;
|
||||
|
||||
private GameObject _itemParrant;
|
||||
private float _spawnTime;
|
||||
private float time;
|
||||
|
||||
public ItemFabric(ItemsData data)
|
||||
{
|
||||
_itemParrant = new GameObject("Items");
|
||||
Items = new Dictionary<GameObject, HexCell>();
|
||||
_data = data;
|
||||
_openList = new List<HexCell>();
|
||||
@ -47,6 +48,10 @@ namespace Items
|
||||
List<HexCell> closedList = HexManager.UnitCurrentCell.Select(unitCells => unitCells.Value.cell)
|
||||
.ToList();
|
||||
time = Time.time;
|
||||
if (_openList.Count == 0)
|
||||
{
|
||||
return;
|
||||
}
|
||||
var cell = _openList[Random.Range(0, _openList.Count - 1)];
|
||||
|
||||
if (closedList.Contains(cell) || cell.Item != null)
|
||||
@ -61,7 +66,7 @@ namespace Items
|
||||
}
|
||||
|
||||
|
||||
Items.Add(_data.ItemInfos[i].Item.Spawn(cell), cell);
|
||||
Items.Add(_data.ItemInfos[i].Item.Spawn(cell, _itemParrant), cell);
|
||||
cell.SetItem(_data.ItemInfos[i].Item);
|
||||
_spawnTime = Random.Range(_data.SpawnTime.from, _data.SpawnTime.to);
|
||||
}
|
||||
|
||||
@ -9,27 +9,31 @@ namespace Items
|
||||
{
|
||||
private Item _item;
|
||||
|
||||
public string itemName;
|
||||
public Item Item => _item;
|
||||
|
||||
private void Start()
|
||||
{
|
||||
itemName = _item.name;
|
||||
}
|
||||
|
||||
public void SetUp(Item item)
|
||||
{
|
||||
_item = item;
|
||||
Rotate();
|
||||
}
|
||||
|
||||
public ItemView PickUp(Unit unit)
|
||||
private void OnDestroy()
|
||||
{
|
||||
transform.DOKill();
|
||||
_item.PickUp(unit);
|
||||
return this;
|
||||
}
|
||||
|
||||
private void Rotate()
|
||||
{
|
||||
|
||||
transform.DORotate(transform.rotation.eulerAngles + new Vector3(0,10,0), 0.1f)
|
||||
.SetEase(Ease.Linear)
|
||||
.OnComplete(Rotate);
|
||||
|
||||
transform.DORotate(transform.rotation.eulerAngles + new Vector3(0, 10, 0), 0.1f)
|
||||
.SetEase(Ease.InQuad)
|
||||
.SetLoops(-1, LoopType.Incremental);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -37,10 +37,7 @@ public class WeaponSelection : MonoBehaviour
|
||||
go.ReloadText.text = x.reloadTime.ToString();
|
||||
go.ShotsCount.text = x.shots.ToString();
|
||||
go.WeaponTitle.text = x.name;
|
||||
go.Button.onClick.AddListener(() =>
|
||||
{
|
||||
ChoseWeapon(x);
|
||||
});
|
||||
go.Button.onClick.AddListener(() => ChoseWeapon(x));
|
||||
_buttons.Add(go.Button);
|
||||
});
|
||||
}
|
||||
|
||||
@ -8,5 +8,10 @@ namespace DefaultNamespace
|
||||
{
|
||||
return Object.Instantiate(gameObject, pos, Quaternion.identity);
|
||||
}
|
||||
|
||||
public static GameObject Spawn(GameObject gameObject, Vector3 pos, GameObject parrant)
|
||||
{
|
||||
return Object.Instantiate(gameObject, pos, Quaternion.identity, parrant.transform);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -13,7 +13,7 @@ using Object = UnityEngine.Object;
|
||||
|
||||
namespace Chars
|
||||
{
|
||||
public class PlayerControl : IFixedExecute, IExecute
|
||||
public class PlayerControl : IFixedExecute
|
||||
{
|
||||
private Unit _unit;
|
||||
private Joystick _moveJoystick;
|
||||
@ -62,10 +62,14 @@ namespace Chars
|
||||
private void PlaceItem()
|
||||
{
|
||||
_unit.UnitView.AimCanvas.SetActive(false);
|
||||
|
||||
_placeJoystick.gameObject.SetActive(false);
|
||||
if (_cellToPlace == null)
|
||||
{
|
||||
return;
|
||||
}
|
||||
_itemToPlace.PlaceItem(_cellToPlace);
|
||||
|
||||
_placeJoystick.gameObject.SetActive(false);
|
||||
|
||||
}
|
||||
private void PickUp(Item item)
|
||||
{
|
||||
@ -90,7 +94,8 @@ namespace Chars
|
||||
{
|
||||
if (!_unit.IsBusy)
|
||||
{
|
||||
_cellToPlace = _unit.PlaceItemAim(DirectionHelper.VectorToDirection(placeDir.normalized));
|
||||
_unit.UnitView.AimCanvas.SetActive(true);
|
||||
_cellToPlace = _unit.PlaceItemAim(DirectionHelper.VectorToDirection(placeDir));
|
||||
}
|
||||
}
|
||||
|
||||
@ -105,16 +110,6 @@ namespace Chars
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
public void Execute()
|
||||
{
|
||||
if (_unit.IsAlive)
|
||||
{
|
||||
_unit.UnitView.BarCanvas.transform.LookAt(
|
||||
_unit.UnitView.BarCanvas.transform.position + _camera.transform.rotation * Vector3.back,
|
||||
_camera.transform.rotation * Vector3.up);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
@ -1,5 +1,6 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using AI;
|
||||
using Chars;
|
||||
@ -35,10 +36,10 @@ namespace Units
|
||||
private BarCanvas _barCanvas;
|
||||
private bool _isHardToCapture;
|
||||
private bool _isCapturing;
|
||||
private int _attackBonus;
|
||||
private int _defenceBonus;
|
||||
private Camera _camera;
|
||||
|
||||
public int AttackBonus => _attackBonus;
|
||||
public int AttackBonus => _weapon.modifiedDamage - _weapon.damage;
|
||||
|
||||
public int DefenceBonus => _defenceBonus;
|
||||
|
||||
@ -64,6 +65,7 @@ namespace Units
|
||||
|
||||
public Unit(UnitInfo unitData, Weapon weapon, HexGrid hexGrid)
|
||||
{
|
||||
_camera = Camera.main;
|
||||
_weapon = weapon;
|
||||
_data = unitData;
|
||||
_isAlive = false;
|
||||
@ -93,9 +95,11 @@ namespace Units
|
||||
|
||||
public void Move(HexDirection direction)
|
||||
{
|
||||
if (!_cell.GetNeighbor(direction) || _isBusy || _cell.GetNeighbor(direction).Color != UnitColor.GREY &&
|
||||
(!HexManager.UnitCurrentCell.TryGetValue(_cell.GetNeighbor(direction).Color, out var value)
|
||||
|| value.cell == _cell.GetNeighbor(direction))) return;
|
||||
if (_cell.GetNeighbor(direction) == null || _isBusy ||
|
||||
(_cell.GetNeighbor(direction).Color != Color
|
||||
&& HexManager.UnitCurrentCell.TryGetValue(_cell.GetNeighbor(direction).Color, out var value)
|
||||
&& value.cell.coordinates.Equals(_cell.GetNeighbor(direction).coordinates))) return;
|
||||
|
||||
|
||||
_unitView.StopHardCapture();
|
||||
if (_cell.GetNeighbor(direction).Color == _data.color)
|
||||
@ -140,7 +144,8 @@ namespace Units
|
||||
_mana -= _hexGrid.HexCaptureCost;
|
||||
}
|
||||
|
||||
_unitView.RegenMana(_mana);
|
||||
UnitView.RegenMana();
|
||||
|
||||
UpdateBarCanvas();
|
||||
_isBusy = false;
|
||||
_isHardToCapture = false;
|
||||
@ -175,12 +180,9 @@ namespace Units
|
||||
{
|
||||
_cell = _hexGrid.GetCellFromCoord(hexCoordinates);
|
||||
_cell.PaintHex(_data.color);
|
||||
_cell.GetListNeighbours().ForEach(x => x?.PaintHex(Color));
|
||||
_inventory = new List<Item>();
|
||||
for (int i = 0; i < 6; i++)
|
||||
{
|
||||
var neigh = _cell.GetNeighbor((HexDirection)i);
|
||||
neigh?.PaintHex(_data.color);
|
||||
}
|
||||
|
||||
|
||||
HexManager.UnitCurrentCell.Add(_data.color, (_cell, this));
|
||||
|
||||
@ -199,6 +201,10 @@ namespace Units
|
||||
_hp = _data.maxHP;
|
||||
SetUpActions();
|
||||
_weapon.SetModifiedDamage(0);
|
||||
BarCanvas.transform.LookAt(
|
||||
BarCanvas.transform.position + _camera.transform.rotation * Vector3.back,
|
||||
_camera.transform.rotation * Vector3.up);
|
||||
_isBusy = false;
|
||||
onPlayerSpawned?.Invoke(_instance);
|
||||
}
|
||||
}
|
||||
@ -293,48 +299,52 @@ namespace Units
|
||||
_unitView.OnAttack -= Attacking;
|
||||
_unitView.OnHit -= Damage;
|
||||
_isAlive = false;
|
||||
_isBusy = true;
|
||||
HexManager.UnitCurrentCell.Remove(Color);
|
||||
_animator.SetTrigger("Death");
|
||||
var vfx = VFXController.Instance.PlayEffect(HexGrid.Colors[Color].VFXDeathPrefab,
|
||||
_instance.transform.position);
|
||||
TimerHelper.Instance.StartTimer(() => Object.Destroy(_instance), _animLength.Death);
|
||||
OnDeath?.Invoke(this);
|
||||
TimerHelper.Instance.StartTimer(() =>
|
||||
{
|
||||
Object.Destroy(_instance);
|
||||
OnDeath?.Invoke(this);
|
||||
}, _animLength.Death);
|
||||
|
||||
MusicController.Instance.AddAudioSource(vfx);
|
||||
MusicController.Instance.PlayAudioClip(MusicController.Instance.MusicData.SfxMusic.Death, vfx);
|
||||
MusicController.Instance.RemoveAudioSource(_instance);
|
||||
HexManager.PaintHexList(HexManager.CellByColor[Color].ToList(), UnitColor.GREY);
|
||||
}
|
||||
|
||||
|
||||
public void StartAttack()
|
||||
{
|
||||
if (!_isBusy && _unitView.Shoot())
|
||||
if (_isBusy || !_unitView.Shoot()) return;
|
||||
|
||||
_isBusy = true;
|
||||
if (_direction.Equals(Vector2.zero))
|
||||
{
|
||||
_isBusy = true;
|
||||
if (_direction.Equals(Vector2.zero))
|
||||
var enemy = AIManager.GetNearestUnit(_weapon.disnatce, this);
|
||||
if (enemy == null)
|
||||
_direction =
|
||||
new Vector2(_unitView.transform.forward.x, _unitView.transform.forward.z);
|
||||
else
|
||||
{
|
||||
var enemy = AIManager.GetNearestUnit(_weapon.disnatce, this);
|
||||
if (enemy == null)
|
||||
_direction =
|
||||
new Vector2(_unitView.transform.forward.x, _unitView.transform.forward.z);
|
||||
else
|
||||
{
|
||||
var dir = DirectionHelper.DirectionTo(_instance.transform.position,
|
||||
enemy.Instance.transform.position);
|
||||
_direction = new Vector2(dir.x, dir.z);
|
||||
RotateUnit(_direction);
|
||||
|
||||
}
|
||||
var dir = DirectionHelper.DirectionTo(_instance.transform.position,
|
||||
enemy.Instance.transform.position);
|
||||
_direction = new Vector2(dir.x, dir.z);
|
||||
}
|
||||
|
||||
_animator.SetTrigger("Attack");
|
||||
}
|
||||
|
||||
RotateUnit(_direction);
|
||||
_animator.SetTrigger("Attack");
|
||||
}
|
||||
|
||||
private void RotateUnit(Vector2 direction)
|
||||
{
|
||||
_unitView.transform.DOLookAt(new Vector3(direction.x, 0, direction.y) + _unitView.transform.position,
|
||||
0.1f);
|
||||
0.1f).onUpdate += () => BarCanvas.transform.LookAt(
|
||||
BarCanvas.transform.position + _camera.transform.rotation * Vector3.back,
|
||||
_camera.transform.rotation * Vector3.up);
|
||||
}
|
||||
|
||||
public void Aim(Vector2 direction)
|
||||
@ -346,6 +356,12 @@ namespace Units
|
||||
|
||||
public HexCell PlaceItemAim(HexDirection direction)
|
||||
{
|
||||
if (_cell.GetNeighbor(direction).Color != Color)
|
||||
{
|
||||
_unitView.AimCanvas.SetActive(false);
|
||||
return null;
|
||||
}
|
||||
|
||||
var cell = _cell.GetNeighbor(direction);
|
||||
_unitView.AimCanvas.transform.LookAt(cell.transform);
|
||||
return cell;
|
||||
@ -362,10 +378,10 @@ namespace Units
|
||||
{
|
||||
_defenceBonus -= dmg;
|
||||
}
|
||||
|
||||
|
||||
else
|
||||
{
|
||||
SetUpBonus(0,0, BonusType.Defence);
|
||||
SetUpBonus(0, 0, BonusType.Defence);
|
||||
_hp -= dmg;
|
||||
}
|
||||
|
||||
|
||||
@ -97,15 +97,11 @@ public class UnitView : MonoBehaviour
|
||||
return true;
|
||||
}
|
||||
|
||||
public void RegenMana(int mana)
|
||||
public void RegenMana()
|
||||
{
|
||||
if (_previosRegen != null)
|
||||
{
|
||||
StopCoroutine(_previosRegen);
|
||||
}
|
||||
|
||||
_mana = mana;
|
||||
_previosRegen = StartCoroutine(Regen());
|
||||
|
||||
_mana = _unit.Mana;
|
||||
StartCoroutine(Regen());
|
||||
}
|
||||
|
||||
private void Step()
|
||||
@ -143,6 +139,11 @@ public class UnitView : MonoBehaviour
|
||||
Destroy(other.gameObject);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
private void OnTriggerStay(Collider other)
|
||||
{
|
||||
ItemView itemView = other.GetComponent<ItemView>();
|
||||
|
||||
if (itemView != null && _unit.PickUpItem(itemView.Item))
|
||||
@ -176,12 +177,12 @@ public class UnitView : MonoBehaviour
|
||||
|
||||
private IEnumerator Regen()
|
||||
{
|
||||
if (_mana >= 100)
|
||||
if (_mana >= _unit.Data.maxMana)
|
||||
{
|
||||
yield break;
|
||||
}
|
||||
|
||||
while (_mana < 100)
|
||||
while (_mana < _unit.Data.maxMana)
|
||||
{
|
||||
yield return new WaitForSeconds(1f);
|
||||
_mana += _manaRegen;
|
||||
|
||||
@ -11,12 +11,12 @@ namespace DefaultNamespace
|
||||
get => _instance;
|
||||
private set => _instance = value;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
public VFXController()
|
||||
{
|
||||
Instance ??= this;
|
||||
|
||||
}
|
||||
|
||||
public GameObject PlayEffect(GameObject effect, Vector3 pos)
|
||||
|
||||
@ -107,9 +107,9 @@ Material:
|
||||
- _Parallax: 0.02
|
||||
- _PerspectiveFilter: 0.875
|
||||
- _Reflectivity: 10
|
||||
- _ScaleRatioA: 0.90909094
|
||||
- _ScaleRatioA: 0.9
|
||||
- _ScaleRatioB: 0.73125
|
||||
- _ScaleRatioC: 0.7386364
|
||||
- _ScaleRatioC: 0.73125
|
||||
- _ScaleX: 1
|
||||
- _ScaleY: 1
|
||||
- _ShaderFlags: 0
|
||||
@ -148,6 +148,7 @@ Material:
|
||||
- _ReflectOutlineColor: {r: 0, g: 0, b: 0, a: 1}
|
||||
- _SpecularColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
- _UnderlayColor: {r: 0, g: 0, b: 0, a: 0.5}
|
||||
m_BuildTextureStacks: []
|
||||
--- !u!114 &11400000
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -165,11 +166,11 @@ MonoBehaviour:
|
||||
materialHashCode: 462855346
|
||||
m_Version: 1.1.0
|
||||
m_SourceFontFileGUID: e3265ab4bf004d28a9537516768c1c75
|
||||
m_SourceFontFile_EditorRef: {fileID: 12800000, guid: e3265ab4bf004d28a9537516768c1c75,
|
||||
type: 3}
|
||||
m_SourceFontFile_EditorRef: {fileID: 12800000, guid: e3265ab4bf004d28a9537516768c1c75, type: 3}
|
||||
m_SourceFontFile: {fileID: 12800000, guid: e3265ab4bf004d28a9537516768c1c75, type: 3}
|
||||
m_AtlasPopulationMode: 1
|
||||
m_FaceInfo:
|
||||
m_FaceIndex: 0
|
||||
m_FamilyName: Liberation Sans
|
||||
m_StyleName: Regular
|
||||
m_PointSize: 86
|
||||
@ -313,15 +314,20 @@ Texture2D:
|
||||
Hash: 00000000000000000000000000000000
|
||||
m_ForcedFallbackFormat: 4
|
||||
m_DownscaleFallback: 0
|
||||
m_IsAlphaChannelOptional: 0
|
||||
serializedVersion: 2
|
||||
m_Width: 0
|
||||
m_Height: 0
|
||||
m_CompleteImageSize: 0
|
||||
m_MipsStripped: 0
|
||||
m_TextureFormat: 1
|
||||
m_MipCount: 1
|
||||
m_IsReadable: 1
|
||||
m_IsPreProcessed: 0
|
||||
m_IgnoreMasterTextureLimit: 0
|
||||
m_StreamingMipmaps: 0
|
||||
m_StreamingMipmapsPriority: 0
|
||||
m_VTOnly: 0
|
||||
m_AlphaIsTransparency: 0
|
||||
m_ImageCount: 1
|
||||
m_TextureDimension: 2
|
||||
@ -335,9 +341,11 @@ Texture2D:
|
||||
m_WrapW: 0
|
||||
m_LightmapFormat: 0
|
||||
m_ColorSpace: 0
|
||||
m_PlatformBlob:
|
||||
image data: 0
|
||||
_typelessdata:
|
||||
m_StreamData:
|
||||
serializedVersion: 2
|
||||
offset: 0
|
||||
size: 0
|
||||
path:
|
||||
|
||||
1
JsonDataChosenWeapon.json
Normal file
1
JsonDataChosenWeapon.json
Normal file
@ -0,0 +1 @@
|
||||
{"name":"StandartAttac","icon":{"instanceID":28808},"objectToThrow":{"instanceID":21604},"VFXGameObject":{"instanceID":21378},"modifiedDamage":0,"damage":10,"speed":1.0,"disnatce":5,"reloadTime":3.0,"shots":3,"shotSound":{"instanceID":18618},"hitSound":{"instanceID":19910}}
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Loading…
x
Reference in New Issue
Block a user