Implemented starting blackd dice ability.
This commit is contained in:
parent
fdeab50984
commit
91582767ad
6 changed files with 645 additions and 87 deletions
|
|
@ -1068,11 +1068,11 @@ RectTransform:
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_ConstrainProportionsScale: 0
|
m_ConstrainProportionsScale: 0
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 1502981337}
|
m_Father: {fileID: 2063318669}
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||||
m_AnchoredPosition: {x: -1.7771, y: 12.086}
|
m_AnchoredPosition: {x: -1.7771, y: 3.0979633}
|
||||||
m_SizeDelta: {x: 103.5541, y: 24.1728}
|
m_SizeDelta: {x: 103.5541, y: 24.1728}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!114 &281533972
|
--- !u!114 &281533972
|
||||||
|
|
@ -1303,6 +1303,133 @@ MonoBehaviour:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
blockingRoom: {fileID: 0}
|
blockingRoom: {fileID: 0}
|
||||||
number: 12
|
number: 12
|
||||||
|
--- !u!1001 &561226786
|
||||||
|
PrefabInstance:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Modification:
|
||||||
|
serializedVersion: 3
|
||||||
|
m_TransformParent: {fileID: 1848960950}
|
||||||
|
m_Modifications:
|
||||||
|
- target: {fileID: 203272712866963024, guid: 66fcddbe7a3c341c5b9ca4f8801259a6, type: 3}
|
||||||
|
propertyPath: m_Colors.m_ColorMultiplier
|
||||||
|
value: 1
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 203272712866963024, guid: 66fcddbe7a3c341c5b9ca4f8801259a6, type: 3}
|
||||||
|
propertyPath: m_Colors.m_DisabledColor.b
|
||||||
|
value: 0.7924528
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 203272712866963024, guid: 66fcddbe7a3c341c5b9ca4f8801259a6, type: 3}
|
||||||
|
propertyPath: m_Colors.m_DisabledColor.g
|
||||||
|
value: 0.7924528
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 203272712866963024, guid: 66fcddbe7a3c341c5b9ca4f8801259a6, type: 3}
|
||||||
|
propertyPath: m_Colors.m_DisabledColor.r
|
||||||
|
value: 0.7924528
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 1648245930821754079, guid: 66fcddbe7a3c341c5b9ca4f8801259a6, type: 3}
|
||||||
|
propertyPath: m_Interactable
|
||||||
|
value: 1
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 6167039396952026974, guid: 66fcddbe7a3c341c5b9ca4f8801259a6, type: 3}
|
||||||
|
propertyPath: m_Name
|
||||||
|
value: BlackDieAbility 1
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8989188457857827130, guid: 66fcddbe7a3c341c5b9ca4f8801259a6, type: 3}
|
||||||
|
propertyPath: m_Pivot.x
|
||||||
|
value: 0.5
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8989188457857827130, guid: 66fcddbe7a3c341c5b9ca4f8801259a6, type: 3}
|
||||||
|
propertyPath: m_Pivot.y
|
||||||
|
value: 0.5
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8989188457857827130, guid: 66fcddbe7a3c341c5b9ca4f8801259a6, type: 3}
|
||||||
|
propertyPath: m_AnchorMax.x
|
||||||
|
value: 0.5
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8989188457857827130, guid: 66fcddbe7a3c341c5b9ca4f8801259a6, type: 3}
|
||||||
|
propertyPath: m_AnchorMax.y
|
||||||
|
value: 0.5
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8989188457857827130, guid: 66fcddbe7a3c341c5b9ca4f8801259a6, type: 3}
|
||||||
|
propertyPath: m_AnchorMin.x
|
||||||
|
value: 0.5
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8989188457857827130, guid: 66fcddbe7a3c341c5b9ca4f8801259a6, type: 3}
|
||||||
|
propertyPath: m_AnchorMin.y
|
||||||
|
value: 0.5
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8989188457857827130, guid: 66fcddbe7a3c341c5b9ca4f8801259a6, type: 3}
|
||||||
|
propertyPath: m_SizeDelta.x
|
||||||
|
value: 30
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8989188457857827130, guid: 66fcddbe7a3c341c5b9ca4f8801259a6, type: 3}
|
||||||
|
propertyPath: m_SizeDelta.y
|
||||||
|
value: 30
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8989188457857827130, guid: 66fcddbe7a3c341c5b9ca4f8801259a6, type: 3}
|
||||||
|
propertyPath: m_LocalPosition.x
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8989188457857827130, guid: 66fcddbe7a3c341c5b9ca4f8801259a6, type: 3}
|
||||||
|
propertyPath: m_LocalPosition.y
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8989188457857827130, guid: 66fcddbe7a3c341c5b9ca4f8801259a6, type: 3}
|
||||||
|
propertyPath: m_LocalPosition.z
|
||||||
|
value: 1.1596711
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8989188457857827130, guid: 66fcddbe7a3c341c5b9ca4f8801259a6, type: 3}
|
||||||
|
propertyPath: m_LocalRotation.w
|
||||||
|
value: 1
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8989188457857827130, guid: 66fcddbe7a3c341c5b9ca4f8801259a6, type: 3}
|
||||||
|
propertyPath: m_LocalRotation.x
|
||||||
|
value: -0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8989188457857827130, guid: 66fcddbe7a3c341c5b9ca4f8801259a6, type: 3}
|
||||||
|
propertyPath: m_LocalRotation.y
|
||||||
|
value: -0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8989188457857827130, guid: 66fcddbe7a3c341c5b9ca4f8801259a6, type: 3}
|
||||||
|
propertyPath: m_LocalRotation.z
|
||||||
|
value: -0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8989188457857827130, guid: 66fcddbe7a3c341c5b9ca4f8801259a6, type: 3}
|
||||||
|
propertyPath: m_AnchoredPosition.x
|
||||||
|
value: 20.622864
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8989188457857827130, guid: 66fcddbe7a3c341c5b9ca4f8801259a6, type: 3}
|
||||||
|
propertyPath: m_AnchoredPosition.y
|
||||||
|
value: 1.5364685
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8989188457857827130, guid: 66fcddbe7a3c341c5b9ca4f8801259a6, type: 3}
|
||||||
|
propertyPath: m_LocalEulerAnglesHint.x
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8989188457857827130, guid: 66fcddbe7a3c341c5b9ca4f8801259a6, type: 3}
|
||||||
|
propertyPath: m_LocalEulerAnglesHint.y
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8989188457857827130, guid: 66fcddbe7a3c341c5b9ca4f8801259a6, type: 3}
|
||||||
|
propertyPath: m_LocalEulerAnglesHint.z
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
m_RemovedComponents: []
|
||||||
|
m_RemovedGameObjects: []
|
||||||
|
m_AddedGameObjects: []
|
||||||
|
m_AddedComponents: []
|
||||||
|
m_SourcePrefab: {fileID: 100100000, guid: 66fcddbe7a3c341c5b9ca4f8801259a6, type: 3}
|
||||||
|
--- !u!224 &561226787 stripped
|
||||||
|
RectTransform:
|
||||||
|
m_CorrespondingSourceObject: {fileID: 8989188457857827130, guid: 66fcddbe7a3c341c5b9ca4f8801259a6, type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 561226786}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
--- !u!1 &561226788 stripped
|
||||||
|
GameObject:
|
||||||
|
m_CorrespondingSourceObject: {fileID: 6167039396952026974, guid: 66fcddbe7a3c341c5b9ca4f8801259a6, type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 561226786}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
--- !u!1001 &588715899
|
--- !u!1001 &588715899
|
||||||
PrefabInstance:
|
PrefabInstance:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -2058,7 +2185,7 @@ Transform:
|
||||||
m_GameObject: {fileID: 917054543}
|
m_GameObject: {fileID: 917054543}
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||||
m_LocalPosition: {x: -57.19168, y: -76.51468, z: -3.3417058}
|
m_LocalPosition: {x: -57.19168, y: -64.1, z: -3.3417058}
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_ConstrainProportionsScale: 0
|
m_ConstrainProportionsScale: 0
|
||||||
m_Children:
|
m_Children:
|
||||||
|
|
@ -2077,7 +2204,7 @@ MonoBehaviour:
|
||||||
m_GameObject: {fileID: 917054543}
|
m_GameObject: {fileID: 917054543}
|
||||||
m_Enabled: 1
|
m_Enabled: 1
|
||||||
m_EditorHideFlags: 0
|
m_EditorHideFlags: 0
|
||||||
m_Script: {fileID: 11500000, guid: 79af16baa8fbe4744817b63d2b6f2007, type: 3}
|
m_Script: {fileID: 11500000, guid: 04241db9fdb62a147acac6895a47db06, type: 3}
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
abilityUseOne: {fileID: 1015328860}
|
abilityUseOne: {fileID: 1015328860}
|
||||||
|
|
@ -3732,14 +3859,14 @@ RectTransform:
|
||||||
m_ConstrainProportionsScale: 0
|
m_ConstrainProportionsScale: 0
|
||||||
m_Children:
|
m_Children:
|
||||||
- {fileID: 917054544}
|
- {fileID: 917054544}
|
||||||
|
- {fileID: 1848960950}
|
||||||
- {fileID: 2063318669}
|
- {fileID: 2063318669}
|
||||||
- {fileID: 281533971}
|
|
||||||
m_Father: {fileID: 1814492475}
|
m_Father: {fileID: 1814492475}
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 0}
|
m_AnchorMin: {x: 0, y: 0}
|
||||||
m_AnchorMax: {x: 1, y: 1}
|
m_AnchorMax: {x: 1, y: 1}
|
||||||
m_AnchoredPosition: {x: 144.56882, y: 150.47821}
|
m_AnchoredPosition: {x: 144.56882, y: 94.07434}
|
||||||
m_SizeDelta: {x: 115.6624, y: 193.2213}
|
m_SizeDelta: {x: 115.6624, y: 306.029}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!114 &1502981338
|
--- !u!114 &1502981338
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
|
|
@ -4120,6 +4247,254 @@ MonoBehaviour:
|
||||||
m_Script: {fileID: 11500000, guid: 686125cb666fff047a08043aa1feb0a8, type: 3}
|
m_Script: {fileID: 11500000, guid: 686125cb666fff047a08043aa1feb0a8, type: 3}
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
|
--- !u!1 &1762309946
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 1762309947}
|
||||||
|
- component: {fileID: 1762309949}
|
||||||
|
- component: {fileID: 1762309948}
|
||||||
|
m_Layer: 0
|
||||||
|
m_Name: AbilityText
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!224 &1762309947
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1762309946}
|
||||||
|
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||||
|
m_LocalPosition: {x: 0, y: 0, z: 3.3417058}
|
||||||
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
|
m_ConstrainProportionsScale: 0
|
||||||
|
m_Children: []
|
||||||
|
m_Father: {fileID: 1848960950}
|
||||||
|
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: 56.7, y: 32.3}
|
||||||
|
m_SizeDelta: {x: 103.5541, y: 24.1728}
|
||||||
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
--- !u!114 &1762309948
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1762309946}
|
||||||
|
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: Black Dice
|
||||||
|
m_isRightToLeft: 0
|
||||||
|
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
|
||||||
|
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
|
||||||
|
m_fontSharedMaterials: []
|
||||||
|
m_fontMaterial: {fileID: 0}
|
||||||
|
m_fontMaterials: []
|
||||||
|
m_fontColor32:
|
||||||
|
serializedVersion: 2
|
||||||
|
rgba: 4278190080
|
||||||
|
m_fontColor: {r: 0, g: 0, b: 0, 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: 21.8
|
||||||
|
m_fontSizeBase: 21.8
|
||||||
|
m_fontWeight: 400
|
||||||
|
m_enableAutoSizing: 0
|
||||||
|
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_TextWrappingMode: 1
|
||||||
|
m_wordWrappingRatios: 0.4
|
||||||
|
m_overflowMode: 0
|
||||||
|
m_linkedTextComponent: {fileID: 0}
|
||||||
|
parentLinkedComponent: {fileID: 0}
|
||||||
|
m_enableKerning: 0
|
||||||
|
m_ActiveFontFeatures: 6e72656b
|
||||||
|
m_enableExtraPadding: 0
|
||||||
|
checkPaddingRequired: 0
|
||||||
|
m_isRichText: 1
|
||||||
|
m_EmojiFallbackSupport: 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: 0, y: 0, z: 0, 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!222 &1762309949
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1762309946}
|
||||||
|
m_CullTransparentMesh: 1
|
||||||
|
--- !u!1001 &1788355902
|
||||||
|
PrefabInstance:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Modification:
|
||||||
|
serializedVersion: 3
|
||||||
|
m_TransformParent: {fileID: 1848960950}
|
||||||
|
m_Modifications:
|
||||||
|
- target: {fileID: 1648245930821754079, guid: 66fcddbe7a3c341c5b9ca4f8801259a6, type: 3}
|
||||||
|
propertyPath: m_Interactable
|
||||||
|
value: 1
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 6167039396952026974, guid: 66fcddbe7a3c341c5b9ca4f8801259a6, type: 3}
|
||||||
|
propertyPath: m_Name
|
||||||
|
value: BlackDieAbility 2
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8989188457857827130, guid: 66fcddbe7a3c341c5b9ca4f8801259a6, type: 3}
|
||||||
|
propertyPath: m_Pivot.x
|
||||||
|
value: 0.5
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8989188457857827130, guid: 66fcddbe7a3c341c5b9ca4f8801259a6, type: 3}
|
||||||
|
propertyPath: m_Pivot.y
|
||||||
|
value: 0.5
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8989188457857827130, guid: 66fcddbe7a3c341c5b9ca4f8801259a6, type: 3}
|
||||||
|
propertyPath: m_AnchorMax.x
|
||||||
|
value: 0.5
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8989188457857827130, guid: 66fcddbe7a3c341c5b9ca4f8801259a6, type: 3}
|
||||||
|
propertyPath: m_AnchorMax.y
|
||||||
|
value: 0.5
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8989188457857827130, guid: 66fcddbe7a3c341c5b9ca4f8801259a6, type: 3}
|
||||||
|
propertyPath: m_AnchorMin.x
|
||||||
|
value: 0.5
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8989188457857827130, guid: 66fcddbe7a3c341c5b9ca4f8801259a6, type: 3}
|
||||||
|
propertyPath: m_AnchorMin.y
|
||||||
|
value: 0.5
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8989188457857827130, guid: 66fcddbe7a3c341c5b9ca4f8801259a6, type: 3}
|
||||||
|
propertyPath: m_SizeDelta.x
|
||||||
|
value: 30
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8989188457857827130, guid: 66fcddbe7a3c341c5b9ca4f8801259a6, type: 3}
|
||||||
|
propertyPath: m_SizeDelta.y
|
||||||
|
value: 30
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8989188457857827130, guid: 66fcddbe7a3c341c5b9ca4f8801259a6, type: 3}
|
||||||
|
propertyPath: m_LocalPosition.x
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8989188457857827130, guid: 66fcddbe7a3c341c5b9ca4f8801259a6, type: 3}
|
||||||
|
propertyPath: m_LocalPosition.y
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8989188457857827130, guid: 66fcddbe7a3c341c5b9ca4f8801259a6, type: 3}
|
||||||
|
propertyPath: m_LocalPosition.z
|
||||||
|
value: 3.3417058
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8989188457857827130, guid: 66fcddbe7a3c341c5b9ca4f8801259a6, type: 3}
|
||||||
|
propertyPath: m_LocalRotation.w
|
||||||
|
value: 1
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8989188457857827130, guid: 66fcddbe7a3c341c5b9ca4f8801259a6, type: 3}
|
||||||
|
propertyPath: m_LocalRotation.x
|
||||||
|
value: -0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8989188457857827130, guid: 66fcddbe7a3c341c5b9ca4f8801259a6, type: 3}
|
||||||
|
propertyPath: m_LocalRotation.y
|
||||||
|
value: -0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8989188457857827130, guid: 66fcddbe7a3c341c5b9ca4f8801259a6, type: 3}
|
||||||
|
propertyPath: m_LocalRotation.z
|
||||||
|
value: -0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8989188457857827130, guid: 66fcddbe7a3c341c5b9ca4f8801259a6, type: 3}
|
||||||
|
propertyPath: m_AnchoredPosition.x
|
||||||
|
value: 57.622864
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8989188457857827130, guid: 66fcddbe7a3c341c5b9ca4f8801259a6, type: 3}
|
||||||
|
propertyPath: m_AnchoredPosition.y
|
||||||
|
value: 2.0364685
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8989188457857827130, guid: 66fcddbe7a3c341c5b9ca4f8801259a6, type: 3}
|
||||||
|
propertyPath: m_LocalEulerAnglesHint.x
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8989188457857827130, guid: 66fcddbe7a3c341c5b9ca4f8801259a6, type: 3}
|
||||||
|
propertyPath: m_LocalEulerAnglesHint.y
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8989188457857827130, guid: 66fcddbe7a3c341c5b9ca4f8801259a6, type: 3}
|
||||||
|
propertyPath: m_LocalEulerAnglesHint.z
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
m_RemovedComponents:
|
||||||
|
- {fileID: 203272712866963024, guid: 66fcddbe7a3c341c5b9ca4f8801259a6, type: 3}
|
||||||
|
m_RemovedGameObjects: []
|
||||||
|
m_AddedGameObjects: []
|
||||||
|
m_AddedComponents: []
|
||||||
|
m_SourcePrefab: {fileID: 100100000, guid: 66fcddbe7a3c341c5b9ca4f8801259a6, type: 3}
|
||||||
|
--- !u!224 &1788355903 stripped
|
||||||
|
RectTransform:
|
||||||
|
m_CorrespondingSourceObject: {fileID: 8989188457857827130, guid: 66fcddbe7a3c341c5b9ca4f8801259a6, type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 1788355902}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
--- !u!1 &1788355904 stripped
|
||||||
|
GameObject:
|
||||||
|
m_CorrespondingSourceObject: {fileID: 6167039396952026974, guid: 66fcddbe7a3c341c5b9ca4f8801259a6, type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 1788355902}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
--- !u!1001 &1804569631
|
--- !u!1001 &1804569631
|
||||||
PrefabInstance:
|
PrefabInstance:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -4300,6 +4675,57 @@ Transform:
|
||||||
- {fileID: 1993653464}
|
- {fileID: 1993653464}
|
||||||
m_Father: {fileID: 0}
|
m_Father: {fileID: 0}
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
--- !u!1 &1848960949
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 1848960950}
|
||||||
|
- component: {fileID: 1848960951}
|
||||||
|
m_Layer: 0
|
||||||
|
m_Name: StartingBlackDieAbility
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!4 &1848960950
|
||||||
|
Transform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1848960949}
|
||||||
|
serializedVersion: 2
|
||||||
|
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||||
|
m_LocalPosition: {x: -57.19168, y: -132.5, z: -3.3417058}
|
||||||
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
|
m_ConstrainProportionsScale: 0
|
||||||
|
m_Children:
|
||||||
|
- {fileID: 561226787}
|
||||||
|
- {fileID: 1788355903}
|
||||||
|
- {fileID: 2124362955}
|
||||||
|
- {fileID: 1762309947}
|
||||||
|
m_Father: {fileID: 1502981337}
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
--- !u!114 &1848960951
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1848960949}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 79af16baa8fbe4744817b63d2b6f2007, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
abilityUseOne: {fileID: 561226788}
|
||||||
|
abilityUseTwo: {fileID: 1788355904}
|
||||||
|
abilityUseThree: {fileID: 2124362956}
|
||||||
--- !u!1 &1863675729
|
--- !u!1 &1863675729
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -4632,11 +5058,12 @@ RectTransform:
|
||||||
m_Children:
|
m_Children:
|
||||||
- {fileID: 1196747674}
|
- {fileID: 1196747674}
|
||||||
- {fileID: 1981531725}
|
- {fileID: 1981531725}
|
||||||
|
- {fileID: 281533971}
|
||||||
m_Father: {fileID: 1502981337}
|
m_Father: {fileID: 1502981337}
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||||
m_AnchoredPosition: {x: 0, y: 8.988}
|
m_AnchoredPosition: {x: 0, y: 34.64}
|
||||||
m_SizeDelta: {x: 100, y: 82.024}
|
m_SizeDelta: {x: 100, y: 82.024}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!114 &2063318670
|
--- !u!114 &2063318670
|
||||||
|
|
@ -4653,6 +5080,118 @@ MonoBehaviour:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
abilityUseOne: {fileID: 1196747675}
|
abilityUseOne: {fileID: 1196747675}
|
||||||
abilityUseTwo: {fileID: 1981531726}
|
abilityUseTwo: {fileID: 1981531726}
|
||||||
|
--- !u!1001 &2124362954
|
||||||
|
PrefabInstance:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Modification:
|
||||||
|
serializedVersion: 3
|
||||||
|
m_TransformParent: {fileID: 1848960950}
|
||||||
|
m_Modifications:
|
||||||
|
- target: {fileID: 1648245930821754079, guid: 66fcddbe7a3c341c5b9ca4f8801259a6, type: 3}
|
||||||
|
propertyPath: m_Interactable
|
||||||
|
value: 1
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 6167039396952026974, guid: 66fcddbe7a3c341c5b9ca4f8801259a6, type: 3}
|
||||||
|
propertyPath: m_Name
|
||||||
|
value: BlackDieAbility 3
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8989188457857827130, guid: 66fcddbe7a3c341c5b9ca4f8801259a6, type: 3}
|
||||||
|
propertyPath: m_Pivot.x
|
||||||
|
value: 0.5
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8989188457857827130, guid: 66fcddbe7a3c341c5b9ca4f8801259a6, type: 3}
|
||||||
|
propertyPath: m_Pivot.y
|
||||||
|
value: 0.5
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8989188457857827130, guid: 66fcddbe7a3c341c5b9ca4f8801259a6, type: 3}
|
||||||
|
propertyPath: m_AnchorMax.x
|
||||||
|
value: 0.5
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8989188457857827130, guid: 66fcddbe7a3c341c5b9ca4f8801259a6, type: 3}
|
||||||
|
propertyPath: m_AnchorMax.y
|
||||||
|
value: 0.5
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8989188457857827130, guid: 66fcddbe7a3c341c5b9ca4f8801259a6, type: 3}
|
||||||
|
propertyPath: m_AnchorMin.x
|
||||||
|
value: 0.5
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8989188457857827130, guid: 66fcddbe7a3c341c5b9ca4f8801259a6, type: 3}
|
||||||
|
propertyPath: m_AnchorMin.y
|
||||||
|
value: 0.5
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8989188457857827130, guid: 66fcddbe7a3c341c5b9ca4f8801259a6, type: 3}
|
||||||
|
propertyPath: m_SizeDelta.x
|
||||||
|
value: 30
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8989188457857827130, guid: 66fcddbe7a3c341c5b9ca4f8801259a6, type: 3}
|
||||||
|
propertyPath: m_SizeDelta.y
|
||||||
|
value: 30
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8989188457857827130, guid: 66fcddbe7a3c341c5b9ca4f8801259a6, type: 3}
|
||||||
|
propertyPath: m_LocalPosition.x
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8989188457857827130, guid: 66fcddbe7a3c341c5b9ca4f8801259a6, type: 3}
|
||||||
|
propertyPath: m_LocalPosition.y
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8989188457857827130, guid: 66fcddbe7a3c341c5b9ca4f8801259a6, type: 3}
|
||||||
|
propertyPath: m_LocalPosition.z
|
||||||
|
value: 3.3417058
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8989188457857827130, guid: 66fcddbe7a3c341c5b9ca4f8801259a6, type: 3}
|
||||||
|
propertyPath: m_LocalRotation.w
|
||||||
|
value: 1
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8989188457857827130, guid: 66fcddbe7a3c341c5b9ca4f8801259a6, type: 3}
|
||||||
|
propertyPath: m_LocalRotation.x
|
||||||
|
value: -0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8989188457857827130, guid: 66fcddbe7a3c341c5b9ca4f8801259a6, type: 3}
|
||||||
|
propertyPath: m_LocalRotation.y
|
||||||
|
value: -0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8989188457857827130, guid: 66fcddbe7a3c341c5b9ca4f8801259a6, type: 3}
|
||||||
|
propertyPath: m_LocalRotation.z
|
||||||
|
value: -0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8989188457857827130, guid: 66fcddbe7a3c341c5b9ca4f8801259a6, type: 3}
|
||||||
|
propertyPath: m_AnchoredPosition.x
|
||||||
|
value: 94.62286
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8989188457857827130, guid: 66fcddbe7a3c341c5b9ca4f8801259a6, type: 3}
|
||||||
|
propertyPath: m_AnchoredPosition.y
|
||||||
|
value: 2.0364685
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8989188457857827130, guid: 66fcddbe7a3c341c5b9ca4f8801259a6, type: 3}
|
||||||
|
propertyPath: m_LocalEulerAnglesHint.x
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8989188457857827130, guid: 66fcddbe7a3c341c5b9ca4f8801259a6, type: 3}
|
||||||
|
propertyPath: m_LocalEulerAnglesHint.y
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8989188457857827130, guid: 66fcddbe7a3c341c5b9ca4f8801259a6, type: 3}
|
||||||
|
propertyPath: m_LocalEulerAnglesHint.z
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
m_RemovedComponents:
|
||||||
|
- {fileID: 203272712866963024, guid: 66fcddbe7a3c341c5b9ca4f8801259a6, type: 3}
|
||||||
|
m_RemovedGameObjects: []
|
||||||
|
m_AddedGameObjects: []
|
||||||
|
m_AddedComponents: []
|
||||||
|
m_SourcePrefab: {fileID: 100100000, guid: 66fcddbe7a3c341c5b9ca4f8801259a6, type: 3}
|
||||||
|
--- !u!224 &2124362955 stripped
|
||||||
|
RectTransform:
|
||||||
|
m_CorrespondingSourceObject: {fileID: 8989188457857827130, guid: 66fcddbe7a3c341c5b9ca4f8801259a6, type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 2124362954}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
--- !u!1 &2124362956 stripped
|
||||||
|
GameObject:
|
||||||
|
m_CorrespondingSourceObject: {fileID: 6167039396952026974, guid: 66fcddbe7a3c341c5b9ca4f8801259a6, type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 2124362954}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
--- !u!1001 &2949504431378540094
|
--- !u!1001 &2949504431378540094
|
||||||
PrefabInstance:
|
PrefabInstance:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
|
||||||
|
|
@ -1,79 +1,21 @@
|
||||||
using System;
|
using Abilities;
|
||||||
using TMPro;
|
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
using UnityEngine.UI;
|
using UnityEngine.UI;
|
||||||
|
|
||||||
namespace Abilities
|
public class BlackDieAbility: StartingBlackDieAbility
|
||||||
{
|
{
|
||||||
public class BlackDieAbility : MonoBehaviour
|
protected override void OnEnable()
|
||||||
{
|
{
|
||||||
public static event Action AbilitySelected;
|
base.OnEnable();
|
||||||
|
|
||||||
[SerializeField] private GameObject abilityUseOne;
|
|
||||||
[SerializeField] private GameObject abilityUseTwo;
|
|
||||||
[SerializeField] private GameObject abilityUseThree;
|
|
||||||
private int _uses = 3;
|
|
||||||
|
|
||||||
private GameObject[] _usesUsed;
|
|
||||||
private bool _canClick;
|
|
||||||
|
|
||||||
private void OnEnable() {
|
|
||||||
GameManager.StateChanged += HandleStateChanged;
|
|
||||||
ChestRewardSelection.BlackDiceAbilitySelected += HandleBlackDieAbilityGained;
|
ChestRewardSelection.BlackDiceAbilitySelected += HandleBlackDieAbilityGained;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void OnDisable() {
|
protected override void OnDisable()
|
||||||
GameManager.StateChanged -= HandleStateChanged;
|
{
|
||||||
|
base.OnDisable();
|
||||||
ChestRewardSelection.BlackDiceAbilitySelected -= HandleBlackDieAbilityGained;
|
ChestRewardSelection.BlackDiceAbilitySelected -= HandleBlackDieAbilityGained;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void Start() {
|
|
||||||
_usesUsed = new GameObject[_uses];
|
|
||||||
abilityUseOne.GetComponent<Button>().onClick.AddListener(() => UseClicked(abilityUseOne));
|
|
||||||
abilityUseTwo.GetComponent<Button>().onClick.AddListener(() => UseClicked(abilityUseTwo));
|
|
||||||
abilityUseThree.GetComponent<Button>().onClick.AddListener(() => UseClicked(abilityUseThree));
|
|
||||||
}
|
|
||||||
|
|
||||||
private void UseClicked(GameObject abilityUseObject) {
|
|
||||||
if (!_canClick) return;
|
|
||||||
|
|
||||||
if (_uses > 0)
|
|
||||||
{
|
|
||||||
_usesUsed[_uses - 1] = abilityUseObject;
|
|
||||||
MarkUseUsed(abilityUseObject);
|
|
||||||
AbilitySelected?.Invoke();
|
|
||||||
_uses -= 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
_canClick = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
private void MarkUseUsed(GameObject useObject) {
|
|
||||||
useObject.GetComponentInChildren<TextMeshProUGUI>().text = "X";
|
|
||||||
}
|
|
||||||
|
|
||||||
private void UnmarkUseUsed(GameObject useObject) {
|
|
||||||
useObject.GetComponentInChildren<TextMeshProUGUI>().text = string.Empty;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void AbilitySelectedButNotUsed() {
|
|
||||||
UnmarkUseUsed(_usesUsed[_uses - 1]);
|
|
||||||
_uses += 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
private void HandleStateChanged(GameState state) {
|
|
||||||
switch (state)
|
|
||||||
{
|
|
||||||
case GameState.PickDiceOne:
|
|
||||||
case GameState.PickDiceTwo:
|
|
||||||
_canClick = true;
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
_canClick = false;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void HandleBlackDieAbilityGained()
|
private void HandleBlackDieAbilityGained()
|
||||||
{
|
{
|
||||||
abilityUseOne.GetComponent<Button>().interactable = true;
|
abilityUseOne.GetComponent<Button>().interactable = true;
|
||||||
|
|
@ -81,4 +23,3 @@ namespace Abilities
|
||||||
abilityUseThree.GetComponent<Button>().interactable = true;
|
abilityUseThree.GetComponent<Button>().interactable = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
|
||||||
|
|
@ -1,2 +1,2 @@
|
||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
guid: 79af16baa8fbe4744817b63d2b6f2007
|
guid: 04241db9fdb62a147acac6895a47db06
|
||||||
|
|
@ -0,0 +1,75 @@
|
||||||
|
using System;
|
||||||
|
using TMPro;
|
||||||
|
using UnityEngine;
|
||||||
|
using UnityEngine.UI;
|
||||||
|
|
||||||
|
namespace Abilities
|
||||||
|
{
|
||||||
|
public class StartingBlackDieAbility : MonoBehaviour
|
||||||
|
{
|
||||||
|
public static event Action AbilitySelected;
|
||||||
|
|
||||||
|
[SerializeField] protected GameObject abilityUseOne;
|
||||||
|
[SerializeField] protected GameObject abilityUseTwo;
|
||||||
|
[SerializeField] protected GameObject abilityUseThree;
|
||||||
|
private int _uses = 3;
|
||||||
|
|
||||||
|
private GameObject[] _usesUsed;
|
||||||
|
private bool _canClick;
|
||||||
|
|
||||||
|
protected virtual void OnEnable() {
|
||||||
|
GameManager.StateChanged += HandleStateChanged;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected virtual void OnDisable() {
|
||||||
|
GameManager.StateChanged -= HandleStateChanged;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void Start() {
|
||||||
|
_usesUsed = new GameObject[_uses];
|
||||||
|
abilityUseOne.GetComponent<Button>().onClick.AddListener(() => UseClicked(abilityUseOne));
|
||||||
|
abilityUseTwo.GetComponent<Button>().onClick.AddListener(() => UseClicked(abilityUseTwo));
|
||||||
|
abilityUseThree.GetComponent<Button>().onClick.AddListener(() => UseClicked(abilityUseThree));
|
||||||
|
}
|
||||||
|
|
||||||
|
private void UseClicked(GameObject abilityUseObject) {
|
||||||
|
if (!_canClick) return;
|
||||||
|
|
||||||
|
if (_uses > 0)
|
||||||
|
{
|
||||||
|
_usesUsed[_uses - 1] = abilityUseObject;
|
||||||
|
MarkUseUsed(abilityUseObject);
|
||||||
|
AbilitySelected?.Invoke();
|
||||||
|
_uses -= 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
_canClick = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void MarkUseUsed(GameObject useObject) {
|
||||||
|
useObject.GetComponentInChildren<TextMeshProUGUI>().text = "X";
|
||||||
|
}
|
||||||
|
|
||||||
|
private void UnmarkUseUsed(GameObject useObject) {
|
||||||
|
useObject.GetComponentInChildren<TextMeshProUGUI>().text = string.Empty;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void AbilitySelectedButNotUsed() {
|
||||||
|
UnmarkUseUsed(_usesUsed[_uses - 1]);
|
||||||
|
_uses += 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void HandleStateChanged(GameState state) {
|
||||||
|
switch (state)
|
||||||
|
{
|
||||||
|
case GameState.PickDiceOne:
|
||||||
|
case GameState.PickDiceTwo:
|
||||||
|
_canClick = true;
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
_canClick = false;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,2 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 79af16baa8fbe4744817b63d2b6f2007
|
||||||
|
|
@ -25,12 +25,12 @@ public class Die : MonoBehaviour
|
||||||
|
|
||||||
private void OnEnable() {
|
private void OnEnable() {
|
||||||
GameManager.StateChanged += HandleStateChange;
|
GameManager.StateChanged += HandleStateChange;
|
||||||
BlackDieAbility.AbilitySelected += HandleOnBlackDieAbilitySelected;
|
StartingBlackDieAbility.AbilitySelected += HandleOnBlackDieAbilitySelected;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void OnDisable() {
|
private void OnDisable() {
|
||||||
GameManager.StateChanged -= HandleStateChange;
|
GameManager.StateChanged -= HandleStateChange;
|
||||||
BlackDieAbility.AbilitySelected -= HandleOnBlackDieAbilitySelected;
|
StartingBlackDieAbility.AbilitySelected -= HandleOnBlackDieAbilitySelected;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void Start() {
|
private void Start() {
|
||||||
|
|
@ -50,6 +50,7 @@ public class Die : MonoBehaviour
|
||||||
|
|
||||||
public void ResetDie() {
|
public void ResetDie() {
|
||||||
_selected = false;
|
_selected = false;
|
||||||
|
_blackDieAbilityUsed = false;
|
||||||
gameObject.GetComponent<Image>().color = originalColor;
|
gameObject.GetComponent<Image>().color = originalColor;
|
||||||
gameObject.GetComponent<Outline>().enabled = false;
|
gameObject.GetComponent<Outline>().enabled = false;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue