Reworked pooling a little bit, added input restrictions to avoid gaining controls to player while paused/dead
Moreover cleaned-up old code
This commit is contained in:
VladimirPirozhenko
parent
2c5c522ebe
commit
80720c8eb7
@ -1,6 +1,6 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1 &1856934114215259439
|
||||
--- !u!1 &1958915172372443692
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
@ -8,287 +8,9 @@ GameObject:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1856934114215259436}
|
||||
- component: {fileID: 1856934114215259432}
|
||||
- component: {fileID: 1856934114215259435}
|
||||
- component: {fileID: 4920621563898199878}
|
||||
m_Layer: 5
|
||||
m_Name: ScoreboardView
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &1856934114215259436
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1856934114215259439}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 4191864466724401539}
|
||||
- {fileID: 7976700210766193774}
|
||||
- {fileID: 2749335940093869139}
|
||||
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.000030517578, y: 0}
|
||||
m_SizeDelta: {x: 269.4406, y: 425.4521}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1856934114215259432
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1856934114215259439}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &1856934114215259435
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1856934114215259439}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 0.392}
|
||||
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: 10907, 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 &4920621563898199878
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1856934114215259439}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: ca5aee78eb03ef54eb6010fd1883d0b8, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
closeButton: {fileID: 4116145640260839859}
|
||||
cardPrefab: {fileID: 1010394502502236129, guid: 4c5b587097a24ae4798ac097b4ec950d, type: 3}
|
||||
--- !u!1 &3169046466985751354
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 2749335940093869139}
|
||||
- component: {fileID: 5068000570366590165}
|
||||
m_Layer: 5
|
||||
m_Name: VerticalLayout
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &2749335940093869139
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3169046466985751354}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1856934114215259436}
|
||||
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: -0.27999878, y: -25.350006}
|
||||
m_SizeDelta: {x: 269.44, y: 374.2}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &5068000570366590165
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3169046466985751354}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Padding:
|
||||
m_Left: 0
|
||||
m_Right: 0
|
||||
m_Top: 0
|
||||
m_Bottom: 0
|
||||
m_ChildAlignment: 0
|
||||
m_Spacing: 0
|
||||
m_ChildForceExpandWidth: 0
|
||||
m_ChildForceExpandHeight: 0
|
||||
m_ChildControlWidth: 0
|
||||
m_ChildControlHeight: 0
|
||||
m_ChildScaleWidth: 1
|
||||
m_ChildScaleHeight: 1
|
||||
m_ReverseArrangement: 0
|
||||
--- !u!1 &3561160258862776696
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 7976700210766193774}
|
||||
- component: {fileID: 2397978843349273244}
|
||||
- component: {fileID: 7603149642819939035}
|
||||
- component: {fileID: 4116145640260839859}
|
||||
m_Layer: 5
|
||||
m_Name: CloseButton
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &7976700210766193774
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3561160258862776696}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1856934114215259436}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: -10.668, y: -26.53}
|
||||
m_SizeDelta: {x: 50, y: 50}
|
||||
m_Pivot: {x: 0.7866443, y: 0.5}
|
||||
--- !u!222 &2397978843349273244
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3561160258862776696}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &7603149642819939035
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3561160258862776696}
|
||||
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: 0, 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: de5b00281f7577c42a8c1447b19fb868, 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 &4116145640260839859
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3561160258862776696}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Navigation:
|
||||
m_Mode: 3
|
||||
m_WrapAround: 0
|
||||
m_SelectOnUp: {fileID: 0}
|
||||
m_SelectOnDown: {fileID: 0}
|
||||
m_SelectOnLeft: {fileID: 0}
|
||||
m_SelectOnRight: {fileID: 0}
|
||||
m_Transition: 1
|
||||
m_Colors:
|
||||
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||
m_PressedColor: {r: 0, g: 0.76234245, b: 1, 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: 7603149642819939035}
|
||||
m_OnClick:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
--- !u!1 &7557377089629708292
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 4191864466724401539}
|
||||
- component: {fileID: 334265879881338971}
|
||||
- component: {fileID: 3413095558804488338}
|
||||
- component: {fileID: 5323881556523918251}
|
||||
- component: {fileID: 8605756150290334323}
|
||||
- component: {fileID: 6670821465990714042}
|
||||
m_Layer: 5
|
||||
m_Name: ScoreboardText
|
||||
m_TagString: Untagged
|
||||
@ -296,41 +18,41 @@ GameObject:
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &4191864466724401539
|
||||
--- !u!224 &5323881556523918251
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7557377089629708292}
|
||||
m_GameObject: {fileID: 1958915172372443692}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1856934114215259436}
|
||||
m_Father: {fileID: 7641310222228061956}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 107.5, y: -26.529999}
|
||||
m_SizeDelta: {x: 214.44, y: 50}
|
||||
m_AnchoredPosition: {x: 134.72, y: -34.53003}
|
||||
m_SizeDelta: {x: 269.44, y: 50}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &334265879881338971
|
||||
--- !u!222 &8605756150290334323
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7557377089629708292}
|
||||
m_GameObject: {fileID: 1958915172372443692}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &3413095558804488338
|
||||
--- !u!114 &6670821465990714042
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7557377089629708292}
|
||||
m_GameObject: {fileID: 1958915172372443692}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
|
||||
@ -344,17 +66,17 @@ MonoBehaviour:
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_text: Scoreboard
|
||||
m_text: SCOREBOARD
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
|
||||
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
|
||||
m_fontAsset: {fileID: 11400000, guid: 125cb55b44b24c4393181402bc6200e6, type: 2}
|
||||
m_sharedMaterial: {fileID: 2100000, guid: 125cb55b44b24c4393181402bc6200e6, type: 2}
|
||||
m_fontSharedMaterials: []
|
||||
m_fontMaterial: {fileID: 0}
|
||||
m_fontMaterials: []
|
||||
m_fontColor32:
|
||||
serializedVersion: 2
|
||||
rgba: 4294967295
|
||||
m_fontColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
rgba: 4294967040
|
||||
m_fontColor: {r: 0, g: 1, b: 1, a: 1}
|
||||
m_enableVertexGradient: 0
|
||||
m_colorMode: 3
|
||||
m_fontColorGradient:
|
||||
@ -371,10 +93,10 @@ MonoBehaviour:
|
||||
m_faceColor:
|
||||
serializedVersion: 2
|
||||
rgba: 4294967295
|
||||
m_fontSize: 36
|
||||
m_fontSizeBase: 36
|
||||
m_fontSize: 47
|
||||
m_fontSizeBase: 48
|
||||
m_fontWeight: 400
|
||||
m_enableAutoSizing: 0
|
||||
m_enableAutoSizing: 1
|
||||
m_fontSizeMin: 18
|
||||
m_fontSizeMax: 72
|
||||
m_fontStyle: 0
|
||||
@ -407,7 +129,422 @@ MonoBehaviour:
|
||||
m_VertexBufferAutoSizeReduction: 0
|
||||
m_useMaxVisibleDescender: 1
|
||||
m_pageToDisplay: 1
|
||||
m_margin: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_margin: {x: 1.1188736, y: 0, z: -0.0848007, w: 0}
|
||||
m_isUsingLegacyAnimationComponent: 0
|
||||
m_isVolumetricText: 0
|
||||
m_hasFontAssetChanged: 0
|
||||
m_baseMaterial: {fileID: 0}
|
||||
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
|
||||
--- !u!1 &6355971523052331282
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 6190724271798382203}
|
||||
- component: {fileID: 3862790226447527677}
|
||||
m_Layer: 5
|
||||
m_Name: VerticalLayout
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &6190724271798382203
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6355971523052331282}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 7641310222228061956}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: -0.00015258789, y: 17.902588}
|
||||
m_SizeDelta: {x: -18.559998, y: -177.94379}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &3862790226447527677
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6355971523052331282}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Padding:
|
||||
m_Left: 0
|
||||
m_Right: 0
|
||||
m_Top: 0
|
||||
m_Bottom: 0
|
||||
m_ChildAlignment: 1
|
||||
m_Spacing: 0
|
||||
m_ChildForceExpandWidth: 0
|
||||
m_ChildForceExpandHeight: 0
|
||||
m_ChildControlWidth: 0
|
||||
m_ChildControlHeight: 0
|
||||
m_ChildScaleWidth: 1
|
||||
m_ChildScaleHeight: 1
|
||||
m_ReverseArrangement: 0
|
||||
--- !u!1 &7641310222228061959
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 7641310222228061956}
|
||||
- component: {fileID: 7641310222228061952}
|
||||
- component: {fileID: 7641310222228061955}
|
||||
- component: {fileID: 4001390722953211246}
|
||||
m_Layer: 5
|
||||
m_Name: ScoreboardView
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &7641310222228061956
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7641310222228061959}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 5323881556523918251}
|
||||
- {fileID: 6190724271798382203}
|
||||
- {fileID: 8344682562248657286}
|
||||
m_Father: {fileID: 0}
|
||||
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: -530.5594, y: -20.547913}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7641310222228061952
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7641310222228061959}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &7641310222228061955
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7641310222228061959}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 0.392}
|
||||
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: 10907, 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 &4001390722953211246
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7641310222228061959}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: ca5aee78eb03ef54eb6010fd1883d0b8, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
closeButton: {fileID: 0}
|
||||
backButton: {fileID: 8344682562248657285}
|
||||
cardPrefab: {fileID: 1010394502502236129, guid: 4c5b587097a24ae4798ac097b4ec950d, type: 3}
|
||||
--- !u!1 &8344682562248657402
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 8344682562248657286}
|
||||
- component: {fileID: 8344682562248657287}
|
||||
- component: {fileID: 8344682562248657284}
|
||||
- component: {fileID: 8344682562248657285}
|
||||
m_Layer: 5
|
||||
m_Name: Back
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &8344682562248657286
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8344682562248657402}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 8344682562980729122}
|
||||
m_Father: {fileID: 7641310222228061956}
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0}
|
||||
m_AnchorMax: {x: 0.5, y: 0}
|
||||
m_AnchoredPosition: {x: -0.27999878, y: 40}
|
||||
m_SizeDelta: {x: 200.56, y: 44}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &8344682562248657287
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8344682562248657402}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &8344682562248657284
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8344682562248657402}
|
||||
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 &8344682562248657285
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8344682562248657402}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Navigation:
|
||||
m_Mode: 3
|
||||
m_WrapAround: 0
|
||||
m_SelectOnUp: {fileID: 0}
|
||||
m_SelectOnDown: {fileID: 0}
|
||||
m_SelectOnLeft: {fileID: 0}
|
||||
m_SelectOnRight: {fileID: 0}
|
||||
m_Transition: 1
|
||||
m_Colors:
|
||||
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
|
||||
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
|
||||
m_ColorMultiplier: 1
|
||||
m_FadeDuration: 0.1
|
||||
m_SpriteState:
|
||||
m_HighlightedSprite: {fileID: 0}
|
||||
m_PressedSprite: {fileID: 0}
|
||||
m_SelectedSprite: {fileID: 0}
|
||||
m_DisabledSprite: {fileID: 0}
|
||||
m_AnimationTriggers:
|
||||
m_NormalTrigger: Normal
|
||||
m_HighlightedTrigger: Highlighted
|
||||
m_PressedTrigger: Pressed
|
||||
m_SelectedTrigger: Selected
|
||||
m_DisabledTrigger: Disabled
|
||||
m_Interactable: 1
|
||||
m_TargetGraphic: {fileID: 8344682562248657284}
|
||||
m_OnClick:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
--- !u!1 &8344682562980729123
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 8344682562980729122}
|
||||
- component: {fileID: 8344682562980729132}
|
||||
- component: {fileID: 8344682562980729133}
|
||||
m_Layer: 5
|
||||
m_Name: BackText
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &8344682562980729122
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8344682562980729123}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 8344682562248657286}
|
||||
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 &8344682562980729132
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8344682562980729123}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &8344682562980729133
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8344682562980729123}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: Back
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: 125cb55b44b24c4393181402bc6200e6, type: 2}
|
||||
m_sharedMaterial: {fileID: 2100000, guid: 125cb55b44b24c4393181402bc6200e6, type: 2}
|
||||
m_fontSharedMaterials: []
|
||||
m_fontMaterial: {fileID: 0}
|
||||
m_fontMaterials: []
|
||||
m_fontColor32:
|
||||
serializedVersion: 2
|
||||
rgba: 4294967040
|
||||
m_fontColor: {r: 0, g: 1, b: 1, a: 1}
|
||||
m_enableVertexGradient: 0
|
||||
m_colorMode: 3
|
||||
m_fontColorGradient:
|
||||
topLeft: {r: 1, g: 1, b: 1, a: 1}
|
||||
topRight: {r: 1, g: 1, b: 1, a: 1}
|
||||
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
|
||||
bottomRight: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_fontColorGradientPreset: {fileID: 0}
|
||||
m_spriteAsset: {fileID: 0}
|
||||
m_tintAllSprites: 0
|
||||
m_StyleSheet: {fileID: 0}
|
||||
m_TextStyleHashCode: -1183493901
|
||||
m_overrideHtmlColors: 0
|
||||
m_faceColor:
|
||||
serializedVersion: 2
|
||||
rgba: 4294967295
|
||||
m_fontSize: 41.35
|
||||
m_fontSizeBase: 41
|
||||
m_fontWeight: 400
|
||||
m_enableAutoSizing: 1
|
||||
m_fontSizeMin: 18
|
||||
m_fontSizeMax: 72
|
||||
m_fontStyle: 0
|
||||
m_HorizontalAlignment: 2
|
||||
m_VerticalAlignment: 512
|
||||
m_textAlignment: 65535
|
||||
m_characterSpacing: 0
|
||||
m_wordSpacing: 0
|
||||
m_lineSpacing: 0
|
||||
m_lineSpacingMax: 0
|
||||
m_paragraphSpacing: 0
|
||||
m_charWidthMaxAdj: 0
|
||||
m_enableWordWrapping: 1
|
||||
m_wordWrappingRatios: 0.4
|
||||
m_overflowMode: 0
|
||||
m_linkedTextComponent: {fileID: 0}
|
||||
parentLinkedComponent: {fileID: 0}
|
||||
m_enableKerning: 1
|
||||
m_enableExtraPadding: 0
|
||||
checkPaddingRequired: 0
|
||||
m_isRichText: 1
|
||||
m_parseCtrlCharacters: 1
|
||||
m_isOrthographic: 1
|
||||
m_isCullingEnabled: 0
|
||||
m_horizontalMapping: 0
|
||||
m_verticalMapping: 0
|
||||
m_uvLineOffset: 0
|
||||
m_geometrySortingOrder: 0
|
||||
m_IsTextObjectScaleStatic: 0
|
||||
m_VertexBufferAutoSizeReduction: 0
|
||||
m_useMaxVisibleDescender: 1
|
||||
m_pageToDisplay: 1
|
||||
m_margin: {x: 1.1188736, y: 0, z: -0.0848007, w: 0}
|
||||
m_isUsingLegacyAnimationComponent: 0
|
||||
m_isVolumetricText: 0
|
||||
m_hasFontAssetChanged: 0
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 836394c666aa32441be58f91041a5194
|
||||
guid: 99d72c8750358d54c8647747f3a9a236
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
||||
@ -457,7 +457,7 @@ MonoBehaviour:
|
||||
m_EditorClassIdentifier:
|
||||
views:
|
||||
- {fileID: 678372253}
|
||||
- {fileID: 1374720368}
|
||||
- {fileID: 4920621562230953387}
|
||||
- {fileID: 1754320532}
|
||||
- {fileID: 220002226}
|
||||
defaultViews:
|
||||
@ -497,7 +497,7 @@ GameObject:
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!114 &220002226
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -574,7 +574,7 @@ RectTransform:
|
||||
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: -1.0770264}
|
||||
m_AnchoredPosition: {x: 0, y: -1.0768433}
|
||||
m_SizeDelta: {x: -534.24976, y: -25.013092}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &245285642
|
||||
@ -775,7 +775,7 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: 88247dab5e65f5545916ae1311a9367d, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
scoreboardView: {fileID: 1374720368}
|
||||
scoreboardView: {fileID: 4920621562230953387}
|
||||
--- !u!4 &634835459
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -1490,22 +1490,6 @@ CanvasRenderer:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1356270972}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!224 &1374720363 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 1856934114215259436, guid: 836394c666aa32441be58f91041a5194, type: 3}
|
||||
m_PrefabInstance: {fileID: 1688218349}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &1374720368 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 4920621563898199878, guid: 836394c666aa32441be58f91041a5194, type: 3}
|
||||
m_PrefabInstance: {fileID: 1688218349}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: ca5aee78eb03ef54eb6010fd1883d0b8, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1 &1421905533
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -1763,192 +1747,6 @@ CanvasRenderer:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1586236482}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!1001 &1688218349
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
m_TransformParent: {fileID: 1791311983}
|
||||
m_Modifications:
|
||||
- target: {fileID: 1856934114215259436, guid: 836394c666aa32441be58f91041a5194, type: 3}
|
||||
propertyPath: m_Pivot.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1856934114215259436, guid: 836394c666aa32441be58f91041a5194, type: 3}
|
||||
propertyPath: m_Pivot.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1856934114215259436, guid: 836394c666aa32441be58f91041a5194, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1856934114215259436, guid: 836394c666aa32441be58f91041a5194, type: 3}
|
||||
propertyPath: m_AnchorMax.x
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1856934114215259436, guid: 836394c666aa32441be58f91041a5194, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1856934114215259436, guid: 836394c666aa32441be58f91041a5194, type: 3}
|
||||
propertyPath: m_AnchorMin.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1856934114215259436, guid: 836394c666aa32441be58f91041a5194, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1856934114215259436, guid: 836394c666aa32441be58f91041a5194, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: -530.5594
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1856934114215259436, guid: 836394c666aa32441be58f91041a5194, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: -20.547913
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1856934114215259436, guid: 836394c666aa32441be58f91041a5194, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1856934114215259436, guid: 836394c666aa32441be58f91041a5194, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1856934114215259436, guid: 836394c666aa32441be58f91041a5194, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1856934114215259436, guid: 836394c666aa32441be58f91041a5194, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1856934114215259436, guid: 836394c666aa32441be58f91041a5194, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1856934114215259436, guid: 836394c666aa32441be58f91041a5194, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1856934114215259436, guid: 836394c666aa32441be58f91041a5194, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1856934114215259436, guid: 836394c666aa32441be58f91041a5194, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1856934114215259436, guid: 836394c666aa32441be58f91041a5194, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1856934114215259436, guid: 836394c666aa32441be58f91041a5194, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1856934114215259436, guid: 836394c666aa32441be58f91041a5194, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1856934114215259436, guid: 836394c666aa32441be58f91041a5194, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1856934114215259439, guid: 836394c666aa32441be58f91041a5194, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: ScoreboardView
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1856934114215259439, guid: 836394c666aa32441be58f91041a5194, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2749335940093869139, guid: 836394c666aa32441be58f91041a5194, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 615.39
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2749335940093869139, guid: 836394c666aa32441be58f91041a5194, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -25.765
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3413095558804488338, guid: 836394c666aa32441be58f91041a5194, type: 3}
|
||||
propertyPath: m_text
|
||||
value: SCOREBOARD
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3413095558804488338, guid: 836394c666aa32441be58f91041a5194, type: 3}
|
||||
propertyPath: m_fontSize
|
||||
value: 47
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3413095558804488338, guid: 836394c666aa32441be58f91041a5194, type: 3}
|
||||
propertyPath: m_margin.x
|
||||
value: 1.1188736
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3413095558804488338, guid: 836394c666aa32441be58f91041a5194, type: 3}
|
||||
propertyPath: m_margin.z
|
||||
value: -0.0848007
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3413095558804488338, guid: 836394c666aa32441be58f91041a5194, type: 3}
|
||||
propertyPath: m_fontAsset
|
||||
value:
|
||||
objectReference: {fileID: 11400000, guid: 125cb55b44b24c4393181402bc6200e6, type: 2}
|
||||
- target: {fileID: 3413095558804488338, guid: 836394c666aa32441be58f91041a5194, type: 3}
|
||||
propertyPath: m_fontColor.r
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3413095558804488338, guid: 836394c666aa32441be58f91041a5194, type: 3}
|
||||
propertyPath: m_fontSizeBase
|
||||
value: 48
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3413095558804488338, guid: 836394c666aa32441be58f91041a5194, type: 3}
|
||||
propertyPath: m_sharedMaterial
|
||||
value:
|
||||
objectReference: {fileID: 2100000, guid: 125cb55b44b24c4393181402bc6200e6, type: 2}
|
||||
- target: {fileID: 3413095558804488338, guid: 836394c666aa32441be58f91041a5194, type: 3}
|
||||
propertyPath: m_enableAutoSizing
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3413095558804488338, guid: 836394c666aa32441be58f91041a5194, type: 3}
|
||||
propertyPath: m_fontColor32.rgba
|
||||
value: 4294967040
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4191864466724401539, guid: 836394c666aa32441be58f91041a5194, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -26.53003
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5068000570366590165, guid: 836394c666aa32441be58f91041a5194, type: 3}
|
||||
propertyPath: m_ChildAlignment
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7603149642819939035, guid: 836394c666aa32441be58f91041a5194, type: 3}
|
||||
propertyPath: m_Type
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7603149642819939035, guid: 836394c666aa32441be58f91041a5194, type: 3}
|
||||
propertyPath: m_UseSpriteMesh
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7603149642819939035, guid: 836394c666aa32441be58f91041a5194, type: 3}
|
||||
propertyPath: m_RaycastPadding.w
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7976700210766193774, guid: 836394c666aa32441be58f91041a5194, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7976700210766193774, guid: 836394c666aa32441be58f91041a5194, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7976700210766193774, guid: 836394c666aa32441be58f91041a5194, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: -10.667999
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7976700210766193774, guid: 836394c666aa32441be58f91041a5194, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -26.53003
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents:
|
||||
- {fileID: 1856934114215259437, guid: 836394c666aa32441be58f91041a5194, type: 3}
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 836394c666aa32441be58f91041a5194, type: 3}
|
||||
--- !u!224 &1754320530 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 4889749525435056362, guid: 14c24fef9917a7445a67e6acdb9a0c0e, type: 3}
|
||||
@ -2057,7 +1855,7 @@ RectTransform:
|
||||
m_LocalScale: {x: 0, y: 0, z: 0}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 1374720363}
|
||||
- {fileID: 1856934115903457217}
|
||||
m_Father: {fileID: 245285643}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
@ -2703,6 +2501,11 @@ CanvasRenderer:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2086036637}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!224 &1856934115903457217 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 7641310222228061956, guid: 99d72c8750358d54c8647747f3a9a236, type: 3}
|
||||
m_PrefabInstance: {fileID: 8344682562207889605}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &2249596435903131709 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 6873339892592015098, guid: 01fa89ab9028c864b8560621b7d51f50, type: 3}
|
||||
@ -2869,7 +2672,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4889749525435056362, guid: 14c24fef9917a7445a67e6acdb9a0c0e, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -24.999878
|
||||
value: -24.999756
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4889749525435056362, guid: 14c24fef9917a7445a67e6acdb9a0c0e, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
@ -2885,6 +2688,17 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 14c24fef9917a7445a67e6acdb9a0c0e, type: 3}
|
||||
--- !u!114 &4920621562230953387 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 4001390722953211246, guid: 99d72c8750358d54c8647747f3a9a236, type: 3}
|
||||
m_PrefabInstance: {fileID: 8344682562207889605}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: ca5aee78eb03ef54eb6010fd1883d0b8, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1001 &6347578781539172145
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -3031,7 +2845,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6634832998035864265, guid: 68d36a24cad029f4a91d5c8e7aa18281, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0.099975586
|
||||
value: 0.099853516
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6634832998035864265, guid: 68d36a24cad029f4a91d5c8e7aa18281, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
@ -3055,3 +2869,116 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 68d36a24cad029f4a91d5c8e7aa18281, type: 3}
|
||||
--- !u!1001 &8344682562207889605
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
m_TransformParent: {fileID: 1791311983}
|
||||
m_Modifications:
|
||||
- target: {fileID: 6190724271798382203, guid: 99d72c8750358d54c8647747f3a9a236, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: -18.56
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6190724271798382203, guid: 99d72c8750358d54c8647747f3a9a236, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: -146.9753
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6190724271798382203, guid: 99d72c8750358d54c8647747f3a9a236, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: -0.0001373291
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6190724271798382203, guid: 99d72c8750358d54c8647747f3a9a236, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 2.418396
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7641310222228061956, guid: 99d72c8750358d54c8647747f3a9a236, type: 3}
|
||||
propertyPath: m_Pivot.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7641310222228061956, guid: 99d72c8750358d54c8647747f3a9a236, type: 3}
|
||||
propertyPath: m_Pivot.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7641310222228061956, guid: 99d72c8750358d54c8647747f3a9a236, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7641310222228061956, guid: 99d72c8750358d54c8647747f3a9a236, type: 3}
|
||||
propertyPath: m_AnchorMax.x
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7641310222228061956, guid: 99d72c8750358d54c8647747f3a9a236, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7641310222228061956, guid: 99d72c8750358d54c8647747f3a9a236, type: 3}
|
||||
propertyPath: m_AnchorMin.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7641310222228061956, guid: 99d72c8750358d54c8647747f3a9a236, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7641310222228061956, guid: 99d72c8750358d54c8647747f3a9a236, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: -530.5594
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7641310222228061956, guid: 99d72c8750358d54c8647747f3a9a236, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: -20.547913
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7641310222228061956, guid: 99d72c8750358d54c8647747f3a9a236, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7641310222228061956, guid: 99d72c8750358d54c8647747f3a9a236, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7641310222228061956, guid: 99d72c8750358d54c8647747f3a9a236, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7641310222228061956, guid: 99d72c8750358d54c8647747f3a9a236, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7641310222228061956, guid: 99d72c8750358d54c8647747f3a9a236, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7641310222228061956, guid: 99d72c8750358d54c8647747f3a9a236, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7641310222228061956, guid: 99d72c8750358d54c8647747f3a9a236, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7641310222228061956, guid: 99d72c8750358d54c8647747f3a9a236, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7641310222228061956, guid: 99d72c8750358d54c8647747f3a9a236, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7641310222228061956, guid: 99d72c8750358d54c8647747f3a9a236, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7641310222228061956, guid: 99d72c8750358d54c8647747f3a9a236, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7641310222228061956, guid: 99d72c8750358d54c8647747f3a9a236, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7641310222228061959, guid: 99d72c8750358d54c8647747f3a9a236, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: ScoreboardView
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 99d72c8750358d54c8647747f3a9a236, type: 3}
|
||||
|
||||
@ -2,7 +2,7 @@ using System;
|
||||
using UnityEngine;
|
||||
|
||||
[RequireComponent(typeof(BoxCollider))]
|
||||
public class Coin : MonoBehaviour, ICollectable,IResettable
|
||||
public class Coin : PoolingObject<Coin>, ICollectable,IResettable
|
||||
{
|
||||
[SerializeField] private int coinValue;
|
||||
|
||||
|
||||
@ -34,10 +34,15 @@ public class GameSession : MonoBehaviour,IResettable
|
||||
public void PauseSession(bool isPaused)
|
||||
{
|
||||
Time.timeScale = isPaused ? 0 : 1;
|
||||
List<ECommand> commands = new List<ECommand>();
|
||||
ECommand[] commandRange = { ECommand.LEFT,ECommand.RIGHT,ECommand.UP,ECommand.DOWN,ECommand.SHOOT};
|
||||
commands.AddRange(commandRange);
|
||||
InputTranslator.RestictTranslation(commands,isPaused);
|
||||
//List<ECommand> commands = new List<ECommand>();
|
||||
//ECommand[] commandRange = { ECommand.LEFT,ECommand.RIGHT,ECommand.UP,ECommand.DOWN,ECommand.SHOOT};
|
||||
//commands.AddRange(commandRange);
|
||||
RestrictInputs(InputConstants.InGameCommands,isRestricted: isPaused);
|
||||
}
|
||||
|
||||
public void RestrictInputs(List<ECommand> commands,bool isRestricted)
|
||||
{
|
||||
InputTranslator.RestictTranslation(commands, isRestricted);
|
||||
}
|
||||
public void RestartSession()
|
||||
{
|
||||
|
||||
9
Assets/Scripts/Input/InputConstants.cs
Normal file
9
Assets/Scripts/Input/InputConstants.cs
Normal file
@ -0,0 +1,9 @@
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
|
||||
public static class InputConstants
|
||||
{
|
||||
public static readonly List<ECommand> InGameCommands = new List<ECommand> { ECommand.LEFT, ECommand.RIGHT, ECommand.UP,ECommand.DOWN, ECommand.SHOOT };
|
||||
public static readonly List<ECommand> ViewCommands = new List<ECommand> { ECommand.OPEN_SCOREBOARD, ECommand.OPEN_PAUSE_MENU };
|
||||
}
|
||||
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 2abb11f088e64c4488227070b7765d68
|
||||
guid: 2b25f3e4ec0fa6d458ef1f386842d66d
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
@ -3,11 +3,11 @@ using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
|
||||
[RequireComponent(typeof(BoxCollider))]
|
||||
public class Obstacle : MonoBehaviour,IObstacle,IDamageDealer,IResettable,IPoolable<Obstacle>
|
||||
public class Obstacle : PoolingObject<Obstacle>, IObstacle,IDamageDealer,IResettable
|
||||
{
|
||||
[field: SerializeField] public bool IsOnAllLanes { get; private set; }
|
||||
public BoxCollider Collider { get; private set; }
|
||||
public BasePool<Obstacle> OwningPool { private get; set; }
|
||||
//public BasePool<Obstacle> OwningPool { private get; set; }
|
||||
|
||||
private void Awake()
|
||||
{
|
||||
@ -31,8 +31,8 @@ public class Obstacle : MonoBehaviour,IObstacle,IDamageDealer,IResettable,IPoola
|
||||
target.TakeDamage(amount);
|
||||
}
|
||||
|
||||
public void ReturnToPool()
|
||||
{
|
||||
OwningPool.ReturnToPool(this);
|
||||
}
|
||||
//public void ReturnToPool()
|
||||
//{
|
||||
// OwningPool.ReturnToPool(this);
|
||||
//}
|
||||
}
|
||||
|
||||
@ -11,6 +11,7 @@ public class DeadState : PlayerState
|
||||
playerSM.PlayDeadAnimation(true);
|
||||
playerSM.VerticalDeltaPosition = 0;
|
||||
playerSM.HorizontalDeltaPosition = Vector3.zero;
|
||||
GameSession.Instance.RestrictInputs(InputConstants.InGameCommands, true);
|
||||
//Session.ShowGameOverPopUp(true);
|
||||
// Session.SetGameOverState();
|
||||
// Stats.CalculateScore();
|
||||
@ -19,6 +20,7 @@ public class DeadState : PlayerState
|
||||
public override void OnStateExit()
|
||||
{
|
||||
playerSM.PlayDeadAnimation(false);
|
||||
GameSession.Instance.RestrictInputs(InputConstants.InGameCommands, false);
|
||||
// Session.ShowGameOverPopUp(false);
|
||||
//playerSM.ChangeRigWeight(playerSM.RightHandRig,1);
|
||||
}
|
||||
|
||||
@ -13,7 +13,8 @@ public class StartingIdleState : PlayerState
|
||||
playerSM.PlayIdleAnimation(true);
|
||||
//Session.SetPlayingState();
|
||||
//Session.ShowGameOverPopUp(false);
|
||||
playerTransform.position = new Vector3(0, 1, 15);
|
||||
GameSession.Instance.RestrictInputs(InputConstants.InGameCommands,true);
|
||||
playerTransform.position = new Vector3(0, 0.38f, 15);
|
||||
countdownTime = 3;
|
||||
CountdownBeforeTheStart();
|
||||
}
|
||||
@ -22,6 +23,7 @@ public class StartingIdleState : PlayerState
|
||||
playerSM.PlayIdleAnimation(false);
|
||||
playerSM.HorizontalDeltaPosition = Vector3.zero;
|
||||
playerSM.VerticalDeltaPosition = 0f;
|
||||
GameSession.Instance.RestrictInputs(InputConstants.InGameCommands, false);
|
||||
}
|
||||
public override void Tick() {}
|
||||
public async void CountdownBeforeTheStart()
|
||||
|
||||
@ -5,7 +5,7 @@ using UnityEngine;
|
||||
|
||||
public enum EDirection { NORTH, SOUTH, EAST, WEST }
|
||||
[RequireComponent(typeof(BoxCollider))]
|
||||
public abstract class Chunk : MonoBehaviour, IResettable,IPoolable<Chunk>
|
||||
public abstract class Chunk : PoolingObject<Chunk>, IResettable
|
||||
{
|
||||
protected ChunkSpawner spawner;
|
||||
|
||||
@ -16,8 +16,7 @@ public abstract class Chunk : MonoBehaviour, IResettable,IPoolable<Chunk>
|
||||
public List<Coin> Coins { get; private set; }
|
||||
public List<Obstacle> Obstacles { get; private set; }
|
||||
public BoxCollider Collider { get; private set; }
|
||||
public EDirection Direction { get; protected set; }
|
||||
public BasePool<Chunk> OwningPool { private get; set; }
|
||||
//public BasePool<Chunk> OwningPool { private get; set; }
|
||||
|
||||
public readonly List<Vector3> GridPositions = new List<Vector3>();
|
||||
virtual public void Init(ChunkSpawner spawner)
|
||||
@ -78,44 +77,24 @@ public abstract class Chunk : MonoBehaviour, IResettable,IPoolable<Chunk>
|
||||
private void ChangePositionBasedOnPreviousChunk(Chunk previousChunk)
|
||||
{
|
||||
float diffBetweenBeginAndCenter = Begin.localPosition.z;
|
||||
//transform.position = previousChunk.End.position - Begin.localPosition;
|
||||
switch (previousChunk.Direction)
|
||||
{
|
||||
case EDirection.NORTH:
|
||||
transform.position = previousChunk.End.position - Begin.localPosition;
|
||||
break;
|
||||
case EDirection.SOUTH:
|
||||
transform.position = previousChunk.End.position + (diffBetweenBeginAndCenter * Vector3.forward);
|
||||
break;
|
||||
case EDirection.WEST:
|
||||
transform.position = previousChunk.End.position - (Begin.localPosition.x * Vector3.right);
|
||||
break;
|
||||
case EDirection.EAST:
|
||||
transform.position = previousChunk.End.position - (diffBetweenBeginAndCenter * Vector3.right);
|
||||
break;
|
||||
}
|
||||
transform.position = previousChunk.End.position - Begin.localPosition;
|
||||
}
|
||||
private void ChangeRotationBasedOnPreviousChunk(Chunk previousChunk)
|
||||
{
|
||||
switch (previousChunk.Direction)
|
||||
{
|
||||
case EDirection.NORTH:
|
||||
transform.Rotate(0, 0, 0, Space.World);
|
||||
break;
|
||||
case EDirection.SOUTH:
|
||||
transform.Rotate(0, -180, 0, Space.World);
|
||||
break;
|
||||
case EDirection.WEST:
|
||||
transform.Rotate(0, -90, 0, Space.World);
|
||||
break;
|
||||
case EDirection.EAST:
|
||||
transform.Rotate(0, -270, 0, Space.World);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
public void ReturnToPool()
|
||||
{
|
||||
OwningPool.ReturnToPool(this);
|
||||
}
|
||||
//public void ReturnToPool()
|
||||
//{
|
||||
// OwningPool.ReturnToPool(this);
|
||||
//}
|
||||
|
||||
//public void GetOwningPool<T>(BasePool<T> pool) where T : MonoBehaviour, IPoolable
|
||||
//{
|
||||
// throw new NotImplementedException();
|
||||
//}
|
||||
|
||||
//public void SetOwningPool<T>(BasePool<T> pool) where T : MonoBehaviour, IPoolable
|
||||
//{
|
||||
// throw new NotImplementedException();
|
||||
//}
|
||||
}
|
||||
|
||||
@ -1,16 +1,11 @@
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
|
||||
public class StraightChunk : Chunk
|
||||
{
|
||||
public override void Init(ChunkSpawner spawner)
|
||||
{
|
||||
base.Init(spawner);
|
||||
Direction = EDirection.NORTH;
|
||||
}
|
||||
public override void ChangeDirectionBasedOnPreviousChunk(Chunk previousChunk)
|
||||
{
|
||||
Direction = previousChunk.Direction;
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
using System.Collections;
|
||||
using UnityEngine;
|
||||
using UnityEngine;
|
||||
|
||||
|
||||
public class TurningChunk : Chunk
|
||||
@ -9,46 +8,10 @@ public class TurningChunk : Chunk
|
||||
public override void Init(ChunkSpawner spawner)
|
||||
{
|
||||
base.Init(spawner);
|
||||
Direction = EDirection.WEST;
|
||||
}
|
||||
public override void ChangeDirectionBasedOnPreviousChunk(Chunk previousChunk)
|
||||
{
|
||||
if (!isClockwise)
|
||||
{
|
||||
switch (previousChunk.Direction)
|
||||
{
|
||||
case EDirection.NORTH:
|
||||
Direction = EDirection.WEST;
|
||||
break;
|
||||
case EDirection.SOUTH:
|
||||
Direction = EDirection.EAST;
|
||||
break;
|
||||
case EDirection.WEST:
|
||||
Direction = EDirection.SOUTH;
|
||||
break;
|
||||
case EDirection.EAST:
|
||||
Direction = EDirection.NORTH;
|
||||
break;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
switch (previousChunk.Direction)
|
||||
{
|
||||
case EDirection.NORTH:
|
||||
Direction = EDirection.EAST;
|
||||
break;
|
||||
case EDirection.SOUTH:
|
||||
Direction = EDirection.WEST;
|
||||
break;
|
||||
case EDirection.WEST:
|
||||
Direction = EDirection.NORTH;
|
||||
break;
|
||||
case EDirection.EAST:
|
||||
Direction = EDirection.SOUTH;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
using UnityEngine;
|
||||
|
||||
public class BasePool<T> : MonoBehaviour where T : MonoBehaviour,IPoolable<T>
|
||||
public class BasePool<T> : MonoBehaviour where T : PoolingObject<T>
|
||||
{
|
||||
[field: SerializeField] public int Capacity { get; private set; }
|
||||
[SerializeField] private T prefab;
|
||||
|
||||
@ -15,14 +15,6 @@ public class ChunkPool : BasePool<Chunk>
|
||||
protected override void ReturnAction(Chunk chunk)
|
||||
{
|
||||
base.ReturnAction(chunk);
|
||||
//foreach (Coin coin in chunk.Coins)
|
||||
//{
|
||||
// generator.CoinPool.ReturnToPool(coin);
|
||||
//}
|
||||
//foreach (Obstacle obstacle in chunk.Obstacles)
|
||||
//{
|
||||
// generator.ObstaclePool.ReturnToPool(obstacle);
|
||||
//}
|
||||
chunk.ResetToDefault();
|
||||
chunk.Coins.Clear();
|
||||
foreach (var obstacle in chunk.Obstacles)
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
using System;
|
||||
using System.Collections;
|
||||
using UnityEngine;
|
||||
public class CoinPool : BasePool<Chunk>
|
||||
public class CoinPool : BasePool<Coin>
|
||||
{}
|
||||
|
||||
@ -1,8 +0,0 @@
|
||||
|
||||
using UnityEngine;
|
||||
|
||||
public interface IPoolable<T> where T : MonoBehaviour,IPoolable<T>
|
||||
{
|
||||
public BasePool<T> OwningPool { set; }
|
||||
public void ReturnToPool();
|
||||
}
|
||||
11
Assets/Scripts/Road/Pools/PoolingObject.cs
Normal file
11
Assets/Scripts/Road/Pools/PoolingObject.cs
Normal file
@ -0,0 +1,11 @@
|
||||
using UnityEngine;
|
||||
|
||||
public abstract class PoolingObject<T> : MonoBehaviour where T : PoolingObject<T>
|
||||
{
|
||||
public BasePool<T> OwningPool { protected get; set; }
|
||||
|
||||
public void ReturnToPool()
|
||||
{
|
||||
OwningPool.ReturnToPool(this as T);
|
||||
}
|
||||
}
|
||||
11
Assets/Scripts/Road/Pools/PoolingObject.cs.meta
Normal file
11
Assets/Scripts/Road/Pools/PoolingObject.cs.meta
Normal file
@ -0,0 +1,11 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 349f3829e1f89c745b8e9fcb32afaa9c
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -7,11 +7,13 @@ public static class PoolPrefabCreator
|
||||
{
|
||||
private const string POOL_PREFAB_PATH = "Assets/Prefabs/Pools/";
|
||||
|
||||
//[MenuItem("Tools/Prefab/CreatePoolPrefabFromSelected")]
|
||||
//private static void CreatePoolPrefab()
|
||||
//{
|
||||
[MenuItem("Tools/Prefab/CreatePoolPrefabFromSelected")]
|
||||
private static void CreatePoolPrefab()
|
||||
{
|
||||
//TODO: Make tool or inspector GUI to make pool out of IPoolable
|
||||
//}
|
||||
//IPoolable poolable = Selection.activeGameObject.GetComponent<IPoolable>();
|
||||
//poolable.
|
||||
}
|
||||
}
|
||||
|
||||
#endif
|
||||
@ -4,7 +4,7 @@ using UnityEngine.UI;
|
||||
|
||||
public class ScoreboardView : BaseView
|
||||
{
|
||||
[SerializeField] private Button closeButton;
|
||||
[SerializeField] private Button backButton;
|
||||
[SerializeField] private PlayerScoreboardCard cardPrefab;
|
||||
private VerticalLayoutGroup layoutGroup;
|
||||
private readonly Dictionary<string,PlayerScoreboardCard> playerCards = new Dictionary<string, PlayerScoreboardCard>();
|
||||
@ -13,7 +13,7 @@ public class ScoreboardView : BaseView
|
||||
{
|
||||
base.Init();
|
||||
layoutGroup = GetComponentInChildren<VerticalLayoutGroup>();
|
||||
closeButton.onClick.AddListener(() =>
|
||||
backButton.onClick.AddListener(() =>
|
||||
{
|
||||
Show(false);
|
||||
ViewManager.Instance.Show<PausedView>(true);
|
||||
|
||||
File diff suppressed because one or more lines are too long
Loading…
x
Reference in New Issue
Block a user