mirror of
https://github.com/smyalygames/monopoly.git
synced 2025-05-18 06:14:10 +02:00
Made the player selector work in the trade menus.
This commit is contained in:
Anthony Berg
parent
03429a276a
commit
0f3d14cd6a
1
.idea/.idea.Monopoly/.idea/indexLayout.xml
generated
1
.idea/.idea.Monopoly/.idea/indexLayout.xml
generated
@ -20,6 +20,7 @@
|
||||
<Path>.vs</Path>
|
||||
<Path>Library</Path>
|
||||
<Path>Logs</Path>
|
||||
<Path>Temp</Path>
|
||||
<Path>UserSettings</Path>
|
||||
<Path>obj</Path>
|
||||
</explicitExcludes>
|
||||
|
||||
@ -2216,6 +2216,7 @@ RectTransform:
|
||||
m_LocalScale: {x: 0, y: 0, z: 0}
|
||||
m_Children:
|
||||
- {fileID: 1029953937}
|
||||
- {fileID: 839394543}
|
||||
- {fileID: 1111531777}
|
||||
- {fileID: 1871971151}
|
||||
- {fileID: 485577678}
|
||||
@ -2270,6 +2271,8 @@ MonoBehaviour:
|
||||
inventoryText: {fileID: 985089324}
|
||||
card: {fileID: 929752266}
|
||||
cardButton: {fileID: 2007862499}
|
||||
TradeUI: {fileID: 485577677}
|
||||
tradeButton: {fileID: 839394544}
|
||||
--- !u!114 &310476700
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -2338,7 +2341,11 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: 299d2e0b18767d9458154dc94ac7c728, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
player1Properties:
|
||||
PlayerSelector: {fileID: 2063675085}
|
||||
TradeMenu: {fileID: 719353296}
|
||||
playerSelectDropdown: {fileID: 1521863680}
|
||||
playerSelectionNext: {fileID: 901540818}
|
||||
player1PropertiesButtons:
|
||||
- {fileID: 983061173}
|
||||
- {fileID: 175261932}
|
||||
- {fileID: 1788120636}
|
||||
@ -2367,7 +2374,7 @@ MonoBehaviour:
|
||||
- {fileID: 1395621954}
|
||||
- {fileID: 1038120480}
|
||||
- {fileID: 1868813240}
|
||||
player2Properties:
|
||||
player2PropertiesButtons:
|
||||
- {fileID: 21303928}
|
||||
- {fileID: 59538749}
|
||||
- {fileID: 79212101}
|
||||
@ -3187,7 +3194,7 @@ RectTransform:
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 4.700012}
|
||||
m_AnchoredPosition: {x: 0, y: 4.699951}
|
||||
m_SizeDelta: {x: 258.55328, y: 38.5}
|
||||
m_Pivot: {x: 0, y: 0}
|
||||
--- !u!1 &399889870
|
||||
@ -3674,7 +3681,7 @@ GameObject:
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &485577678
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -3689,7 +3696,7 @@ RectTransform:
|
||||
- {fileID: 2063675086}
|
||||
- {fileID: 719353297}
|
||||
m_Father: {fileID: 310476697}
|
||||
m_RootOrder: 3
|
||||
m_RootOrder: 4
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
@ -3876,6 +3883,140 @@ CanvasRenderer:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 505820770}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!1 &507486230
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 507486231}
|
||||
- component: {fileID: 507486233}
|
||||
- component: {fileID: 507486232}
|
||||
m_Layer: 5
|
||||
m_Name: Text (TMP)
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &507486231
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 507486230}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 839394543}
|
||||
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.7701416, y: 0}
|
||||
m_SizeDelta: {x: 158.4598, y: 29.999966}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &507486232
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 507486230}
|
||||
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: Trade
|
||||
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: 4281479730
|
||||
m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, 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: 22.95
|
||||
m_fontSizeBase: 36
|
||||
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: 1
|
||||
m_useMaxVisibleDescender: 1
|
||||
m_pageToDisplay: 1
|
||||
m_margin: {x: 0, y: 1.9317322, z: 0, w: 2.4146423}
|
||||
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 &507486233
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 507486230}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!1 &516041485
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -5526,7 +5667,7 @@ RectTransform:
|
||||
m_Children:
|
||||
- {fileID: 1977242781}
|
||||
m_Father: {fileID: 310476697}
|
||||
m_RootOrder: 5
|
||||
m_RootOrder: 6
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
@ -7526,6 +7667,126 @@ Transform:
|
||||
m_Father: {fileID: 758519666}
|
||||
m_RootOrder: 26
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &839394542
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 839394543}
|
||||
- component: {fileID: 839394546}
|
||||
- component: {fileID: 839394545}
|
||||
- component: {fileID: 839394544}
|
||||
m_Layer: 5
|
||||
m_Name: Trade
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &839394543
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 839394542}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 507486231}
|
||||
m_Father: {fileID: 310476697}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 0.5}
|
||||
m_AnchorMax: {x: 1, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0, y: -23}
|
||||
m_SizeDelta: {x: 160, y: 30}
|
||||
m_Pivot: {x: 1, y: 0.5}
|
||||
--- !u!114 &839394544
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 839394542}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Navigation:
|
||||
m_Mode: 3
|
||||
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: 839394545}
|
||||
m_OnClick:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
--- !u!114 &839394545
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 839394542}
|
||||
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!222 &839394546
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 839394542}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!1 &845172788
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -8121,6 +8382,126 @@ CanvasRenderer:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 894098263}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!1 &901540816
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 901540817}
|
||||
- component: {fileID: 901540820}
|
||||
- component: {fileID: 901540819}
|
||||
- component: {fileID: 901540818}
|
||||
m_Layer: 5
|
||||
m_Name: Next
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &901540817
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 901540816}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 1346826404}
|
||||
m_Father: {fileID: 2063675086}
|
||||
m_RootOrder: 3
|
||||
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, y: 0.3999939}
|
||||
m_SizeDelta: {x: 160, y: 30}
|
||||
m_Pivot: {x: 0.5, y: 0}
|
||||
--- !u!114 &901540818
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 901540816}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Navigation:
|
||||
m_Mode: 3
|
||||
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: 901540819}
|
||||
m_OnClick:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
--- !u!114 &901540819
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 901540816}
|
||||
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!222 &901540820
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 901540816}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!1 &903267643
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -8344,7 +8725,7 @@ RectTransform:
|
||||
m_Children:
|
||||
- {fileID: 1110544714}
|
||||
m_Father: {fileID: 310476697}
|
||||
m_RootOrder: 4
|
||||
m_RootOrder: 5
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
@ -10996,12 +11377,12 @@ RectTransform:
|
||||
- {fileID: 398680387}
|
||||
- {fileID: 609172439}
|
||||
m_Father: {fileID: 310476697}
|
||||
m_RootOrder: 1
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 605}
|
||||
m_AnchoredPosition: {x: 0, y: 0.000061035156}
|
||||
m_SizeDelta: {x: 0, y: 0.000061035156}
|
||||
m_Pivot: {x: 0.5, y: 1}
|
||||
--- !u!1 &1118477032
|
||||
GameObject:
|
||||
@ -12566,7 +12947,7 @@ MonoBehaviour:
|
||||
m_HandleRect: {fileID: 1487663685}
|
||||
m_Direction: 2
|
||||
m_Value: 0
|
||||
m_Size: 0.2
|
||||
m_Size: 1
|
||||
m_NumberOfSteps: 0
|
||||
m_OnValueChanged:
|
||||
m_PersistentCalls:
|
||||
@ -12781,6 +13162,140 @@ RectTransform:
|
||||
m_AnchoredPosition: {x: 263, y: -0.000015258789}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &1346826403
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1346826404}
|
||||
- component: {fileID: 1346826406}
|
||||
- component: {fileID: 1346826405}
|
||||
m_Layer: 5
|
||||
m_Name: Text (TMP)
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &1346826404
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1346826403}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 901540817}
|
||||
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!114 &1346826405
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1346826403}
|
||||
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: Next
|
||||
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: 4281479730
|
||||
m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, 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: 24
|
||||
m_fontSizeBase: 24
|
||||
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_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: 1
|
||||
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 &1346826406
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1346826403}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!1 &1347544946
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -14283,7 +14798,7 @@ RectTransform:
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 0.2}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 20, y: 20}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
@ -15488,7 +16003,7 @@ MonoBehaviour:
|
||||
m_fontMaterials: []
|
||||
m_fontColor32:
|
||||
serializedVersion: 2
|
||||
rgba: 4294967295
|
||||
rgba: 4281479730
|
||||
m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
|
||||
m_enableVertexGradient: 0
|
||||
m_colorMode: 3
|
||||
@ -15501,7 +16016,7 @@ MonoBehaviour:
|
||||
m_spriteAsset: {fileID: 0}
|
||||
m_tintAllSprites: 0
|
||||
m_StyleSheet: {fileID: 0}
|
||||
m_TextStyleHashCode: 0
|
||||
m_TextStyleHashCode: -1183493901
|
||||
m_overrideHtmlColors: 0
|
||||
m_faceColor:
|
||||
serializedVersion: 2
|
||||
@ -16077,9 +16592,9 @@ RectTransform:
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: -18, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!114 &1672643372
|
||||
MonoBehaviour:
|
||||
@ -17917,7 +18432,7 @@ RectTransform:
|
||||
- {fileID: 323029380}
|
||||
- {fileID: 1759702751}
|
||||
m_Father: {fileID: 310476697}
|
||||
m_RootOrder: 2
|
||||
m_RootOrder: 3
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
@ -19533,6 +20048,7 @@ RectTransform:
|
||||
- {fileID: 1922972097}
|
||||
- {fileID: 11503945}
|
||||
- {fileID: 1521863679}
|
||||
- {fileID: 901540817}
|
||||
m_Father: {fileID: 485577678}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
public static class GameSettings
|
||||
{
|
||||
public static int players = 2;
|
||||
public static int players = 5;
|
||||
}
|
||||
|
||||
@ -22,6 +22,12 @@ public class ButtonHandler : MonoBehaviour
|
||||
public GameObject card;
|
||||
public Button cardButton;
|
||||
|
||||
//Trade
|
||||
public GameObject TradeUI;
|
||||
public Button tradeButton;
|
||||
private bool tradeOpen = false;
|
||||
private Trade trade;
|
||||
|
||||
public void DisableRollDice()
|
||||
{
|
||||
rollDice.interactable = false;
|
||||
@ -87,12 +93,42 @@ public class ButtonHandler : MonoBehaviour
|
||||
card.SetActive(false);
|
||||
}
|
||||
|
||||
//Trade
|
||||
|
||||
void OpenTrade()
|
||||
{
|
||||
trade.OpenTrade();
|
||||
GameUI.SetActive(false);
|
||||
TradeUI.SetActive(true);
|
||||
}
|
||||
|
||||
void CloseTrade()
|
||||
{
|
||||
TradeUI.SetActive(false);
|
||||
GameUI.SetActive(true);
|
||||
}
|
||||
|
||||
void ToggleTrade()
|
||||
{
|
||||
if (!tradeOpen)
|
||||
{
|
||||
OpenTrade();
|
||||
tradeOpen = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
CloseTrade();
|
||||
tradeOpen = false;
|
||||
}
|
||||
}
|
||||
|
||||
private Main main;
|
||||
|
||||
void Awake()
|
||||
{
|
||||
main = FindObjectOfType<Main>();
|
||||
inventoryClass = FindObjectOfType<Inventory>();
|
||||
trade = FindObjectOfType<Trade>();
|
||||
}
|
||||
|
||||
void Start()
|
||||
@ -101,6 +137,7 @@ public class ButtonHandler : MonoBehaviour
|
||||
nextTurn.onClick.AddListener(NextTurn);
|
||||
inventory.onClick.AddListener(ToggleInventory);
|
||||
cardButton.onClick.AddListener(CloseCard);
|
||||
tradeButton.onClick.AddListener(ToggleTrade);
|
||||
}
|
||||
|
||||
void BuyPropertyClick() {
|
||||
|
||||
@ -48,13 +48,9 @@ public class Inventory : MonoBehaviour
|
||||
Player currentPlayer = main.board.players[main.board.currentPlayer]; //Initialises the current player to make the code look neater.
|
||||
|
||||
Debug.Log(currentPlayer.ownedProperties.Count);
|
||||
for (int i = 0; i < properties.Length; i++) //Checks through all of the buttons.
|
||||
for (int i = 0; i < properties.Length; i++) //Checks through all of the buttons.
|
||||
{
|
||||
if (currentPlayer.ownedProperties.Count == 0)
|
||||
{
|
||||
properties[i].interactable = false;
|
||||
break;
|
||||
}
|
||||
properties[i].interactable = false;
|
||||
for (int j = 0; j < currentPlayer.ownedProperties.Count; j++) //Checks through all of the owned properties.
|
||||
{
|
||||
if (currentPlayer.ownedProperties[j].property_name == properties[i].name) //Checks if the names of the property is the same as the button name/
|
||||
@ -62,8 +58,6 @@ public class Inventory : MonoBehaviour
|
||||
properties[i].interactable = true; //Makes the button for the property interactable.
|
||||
break; //Stops the j for loop as the owned properties list is in order.
|
||||
}
|
||||
|
||||
properties[i].interactable = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -767,7 +767,7 @@ public class Player
|
||||
{
|
||||
//Player Info
|
||||
public string name; //This is the username of the player.
|
||||
private int playerNumber; //This is the player number in the queue.
|
||||
public int playerNumber; //This is the player number in the queue.
|
||||
|
||||
//Player Variables
|
||||
public int money; //Initializes the variable for money.
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
using System.Collections;
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
using UnityEngine.UI;
|
||||
@ -6,7 +7,101 @@ using TMPro;
|
||||
|
||||
public class Trade : MonoBehaviour
|
||||
{
|
||||
public List<Button> player1Properties;
|
||||
public List<Button> player2Properties;
|
||||
//Essentials
|
||||
private Main main; //This is the main class in the game.
|
||||
|
||||
//Screens
|
||||
public GameObject PlayerSelector; //This is where the current player selects who they want to trade with.
|
||||
public GameObject TradeMenu;
|
||||
|
||||
//Player Selection
|
||||
private int player1; //This is the current player that is playing.
|
||||
private int player2;
|
||||
public TMP_Dropdown playerSelectDropdown; //This lets the player select what player it wants to trade with.
|
||||
public Button playerSelectionNext; //This is a button to click next on the player selection screen.
|
||||
|
||||
//Player information
|
||||
private List<Property> player1Properties; //This creates a list of all the properties from player 1.
|
||||
private List<Property> player2Properties; //This creates a list of all the properties from player 2.
|
||||
|
||||
//Core Trading
|
||||
public List<Button> player1PropertiesButtons; //This is a list for all the buttons for the properties for player 1.
|
||||
public List<Button> player2PropertiesButtons; //This is a list for all the buttons for the properties for player 2.
|
||||
|
||||
//Function when opening the trade UI
|
||||
public void OpenTrade()
|
||||
{
|
||||
PlayerSelector.SetActive(true); //This opens the player selector.
|
||||
player1 = main.board.currentPlayer; //This gets the current player who wants to trade.
|
||||
|
||||
//Editing the dropdown.
|
||||
List<string> playerNames = new List<string>(); //This creates a string of players for the dropdown list.
|
||||
playerSelectDropdown.ClearOptions(); //This clears all the dropdown items.
|
||||
foreach (Player player in main.board.players) //This goes through all of the players on the board
|
||||
{
|
||||
if (player.playerNumber != player1) //This checks so that the player cannot trade with themselves.
|
||||
{
|
||||
playerNames.Add(player.name); //Adds the player to the list of names.
|
||||
}
|
||||
}
|
||||
playerSelectDropdown.AddOptions(playerNames); //Adds all of the player names to the dropdown list.
|
||||
}
|
||||
|
||||
//This function goes to the next screen after the player selection screen.
|
||||
private void PlayerSelectNext()
|
||||
{
|
||||
player2 = playerSelectDropdown.value; //This sets the ID of the player that the current player wants to trade with.
|
||||
if (player1 <= player2) //This accounts for the missing player1.
|
||||
{
|
||||
player2 += 1; //This increments the ID of player2.
|
||||
}
|
||||
|
||||
//Getting the information about both players.
|
||||
player1Properties = main.board.players[player1].ownedProperties; //This gets all the properties owned by player 1.
|
||||
player2Properties = main.board.players[player2].ownedProperties; //This gets all the properties owned by player 2.
|
||||
|
||||
//Player 1 buttons
|
||||
for (int i = 0; i < player1PropertiesButtons.Count; i++) //This goes through all of the buttons for Player 1.
|
||||
{
|
||||
player1PropertiesButtons[i].interactable = false; //This makes all of the buttons inactive.
|
||||
|
||||
foreach (Property property in player1Properties) //This goes through all of player 1's owned properties.
|
||||
{
|
||||
if (player1PropertiesButtons[i].name == property.property_name) //If the property name is the same as the button name then...
|
||||
{
|
||||
player1PropertiesButtons[i].interactable = true; //Make the button interactable.
|
||||
break; //Stop searching for the current button name.
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//Player 2 buttons
|
||||
for (int i = 0; i < player2PropertiesButtons.Count; i++) //This goes through all of the buttons for Player 2.
|
||||
{
|
||||
player2PropertiesButtons[i].interactable = false; //This makes all of the buttons inactive.
|
||||
|
||||
foreach (Property property in player2Properties) //This goes through all of player 2's owned properties.
|
||||
{
|
||||
if (player2PropertiesButtons[i].name == property.property_name) //If the property name is the same as the button name then...
|
||||
{
|
||||
player2PropertiesButtons[i].interactable = true; //Make the button interactable.
|
||||
break; //Stop searching for the current button name.
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//Switching the menus.
|
||||
PlayerSelector.SetActive(false); //This hides the player selector.
|
||||
TradeMenu.SetActive(true); //This opens the trade menu.
|
||||
}
|
||||
|
||||
void Awake()
|
||||
{
|
||||
main = FindObjectOfType<Main>(); //This gets the data from the main file.
|
||||
}
|
||||
|
||||
void Start()
|
||||
{
|
||||
playerSelectionNext.onClick.AddListener(PlayerSelectNext); //This lets the next button work on the player selector.
|
||||
}
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user