Skip to content

Commit 7a7aed9

Browse files
allanjalesallanjales
committed
Limpeza no código, Finalização, God Mode completo e aviso de quem ganhou
1 parent 484b455 commit 7a7aed9

21 files changed

+547
-265
lines changed

‎Assets/Prefabs/Tile.prefab

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ MonoBehaviour:
192192
_WalkableHighlightColor: {r: 0, g: 1, b: 0, a: 0.5882353}
193193
_AttackableHightlightColor: {r: 1, g: 0, b: 0, a: 0.5882353}
194194
_SwapHighlightColor: {r: 0, g: 1, b: 1, a: 0.5882353}
195-
_LastMoveHighlightColor: {r: 0, g: 1, b: 0, a: 0.27450982}
195+
_LastMoveHighlightColor: {r: 0, g: 1, b: 0, a: 0}
196196
_LastAttackerHighlightColor: {r: 1, g: 0, b: 0, a: 0.27450982}
197197
_LastTargetHighlightColor: {r: 1, g: 0, b: 0, a: 0.27450982}
198198
OccupiedUnit: {fileID: 0}

‎Assets/Scenes/GameMain.unity

Lines changed: 101 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1274,7 +1274,7 @@ RectTransform:
12741274
- {fileID: 455752228}
12751275
- {fileID: 1051369930}
12761276
m_Father: {fileID: 2116337179}
1277-
m_RootOrder: 3
1277+
m_RootOrder: 4
12781278
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
12791279
m_AnchorMin: {x: 1, y: 0}
12801280
m_AnchorMax: {x: 1, y: 0}
@@ -1876,7 +1876,6 @@ GameObject:
18761876
serializedVersion: 6
18771877
m_Component:
18781878
- component: {fileID: 955392610}
1879-
- component: {fileID: 955392614}
18801879
m_Layer: 5
18811880
m_Name: TurnInfosHolder
18821881
m_TagString: Untagged
@@ -1912,18 +1911,6 @@ RectTransform:
19121911
m_AnchoredPosition: {x: 0, y: 0}
19131912
m_SizeDelta: {x: 0, y: 0}
19141913
m_Pivot: {x: 0.5, y: 0.5}
1915-
--- !u!114 &955392614
1916-
MonoBehaviour:
1917-
m_ObjectHideFlags: 0
1918-
m_CorrespondingSourceObject: {fileID: 0}
1919-
m_PrefabInstance: {fileID: 0}
1920-
m_PrefabAsset: {fileID: 0}
1921-
m_GameObject: {fileID: 955392609}
1922-
m_Enabled: 1
1923-
m_EditorHideFlags: 0
1924-
m_Script: {fileID: 11500000, guid: 651fa3baba3bb714692abb85977983e4, type: 3}
1925-
m_Name:
1926-
m_EditorClassIdentifier:
19271914
--- !u!1 &974753444
19281915
GameObject:
19291916
m_ObjectHideFlags: 0
@@ -1977,6 +1964,7 @@ MonoBehaviour:
19771964
_BtnDonePositionating: {fileID: 2127308240}
19781965
_CheckImageBtnReadyPositionate: {fileID: 1647638236}
19791966
_BtnDoNotAttack: {fileID: 530394193}
1967+
_WinnerText: {fileID: 1534235934}
19801968
_ListGameStateOwnTurnInfo:
19811969
- {fileID: 876761029}
19821970
- {fileID: 1943410787}
@@ -2322,7 +2310,7 @@ RectTransform:
23222310
m_Children:
23232311
- {fileID: 1821389047}
23242312
m_Father: {fileID: 2116337179}
2325-
m_RootOrder: 4
2313+
m_RootOrder: 5
23262314
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
23272315
m_AnchorMin: {x: 1, y: 1}
23282316
m_AnchorMax: {x: 1, y: 1}
@@ -2814,6 +2802,102 @@ CanvasRenderer:
28142802
m_PrefabAsset: {fileID: 0}
28152803
m_GameObject: {fileID: 1521958911}
28162804
m_CullTransparentMesh: 1
2805+
--- !u!1 &1534235931
2806+
GameObject:
2807+
m_ObjectHideFlags: 0
2808+
m_CorrespondingSourceObject: {fileID: 0}
2809+
m_PrefabInstance: {fileID: 0}
2810+
m_PrefabAsset: {fileID: 0}
2811+
serializedVersion: 6
2812+
m_Component:
2813+
- component: {fileID: 1534235932}
2814+
- component: {fileID: 1534235935}
2815+
- component: {fileID: 1534235934}
2816+
- component: {fileID: 1534235933}
2817+
m_Layer: 5
2818+
m_Name: WinnerText
2819+
m_TagString: Untagged
2820+
m_Icon: {fileID: 0}
2821+
m_NavMeshLayer: 0
2822+
m_StaticEditorFlags: 0
2823+
m_IsActive: 1
2824+
--- !u!224 &1534235932
2825+
RectTransform:
2826+
m_ObjectHideFlags: 0
2827+
m_CorrespondingSourceObject: {fileID: 0}
2828+
m_PrefabInstance: {fileID: 0}
2829+
m_PrefabAsset: {fileID: 0}
2830+
m_GameObject: {fileID: 1534235931}
2831+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
2832+
m_LocalPosition: {x: 0, y: 0, z: 0}
2833+
m_LocalScale: {x: 1, y: 1, z: 1}
2834+
m_ConstrainProportionsScale: 0
2835+
m_Children: []
2836+
m_Father: {fileID: 2116337179}
2837+
m_RootOrder: 2
2838+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
2839+
m_AnchorMin: {x: 1, y: 1}
2840+
m_AnchorMax: {x: 1, y: 1}
2841+
m_AnchoredPosition: {x: -10, y: -70}
2842+
m_SizeDelta: {x: 200, y: 30}
2843+
m_Pivot: {x: 1, y: 1}
2844+
--- !u!114 &1534235933
2845+
MonoBehaviour:
2846+
m_ObjectHideFlags: 0
2847+
m_CorrespondingSourceObject: {fileID: 0}
2848+
m_PrefabInstance: {fileID: 0}
2849+
m_PrefabAsset: {fileID: 0}
2850+
m_GameObject: {fileID: 1534235931}
2851+
m_Enabled: 1
2852+
m_EditorHideFlags: 0
2853+
m_Script: {fileID: 11500000, guid: cfabb0440166ab443bba8876756fdfa9, type: 3}
2854+
m_Name:
2855+
m_EditorClassIdentifier:
2856+
m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5}
2857+
m_EffectDistance: {x: 2, y: -2}
2858+
m_UseGraphicAlpha: 1
2859+
--- !u!114 &1534235934
2860+
MonoBehaviour:
2861+
m_ObjectHideFlags: 0
2862+
m_CorrespondingSourceObject: {fileID: 0}
2863+
m_PrefabInstance: {fileID: 0}
2864+
m_PrefabAsset: {fileID: 0}
2865+
m_GameObject: {fileID: 1534235931}
2866+
m_Enabled: 1
2867+
m_EditorHideFlags: 0
2868+
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
2869+
m_Name:
2870+
m_EditorClassIdentifier:
2871+
m_Material: {fileID: 0}
2872+
m_Color: {r: 1, g: 1, b: 1, a: 1}
2873+
m_RaycastTarget: 1
2874+
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
2875+
m_Maskable: 1
2876+
m_OnCullStateChanged:
2877+
m_PersistentCalls:
2878+
m_Calls: []
2879+
m_FontData:
2880+
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
2881+
m_FontSize: 14
2882+
m_FontStyle: 0
2883+
m_BestFit: 0
2884+
m_MinSize: 10
2885+
m_MaxSize: 40
2886+
m_Alignment: 2
2887+
m_AlignByGeometry: 0
2888+
m_RichText: 1
2889+
m_HorizontalOverflow: 0
2890+
m_VerticalOverflow: 0
2891+
m_LineSpacing: 1
2892+
m_Text: "\xC9 um <color=\"#FF0\">empate</color>!"
2893+
--- !u!222 &1534235935
2894+
CanvasRenderer:
2895+
m_ObjectHideFlags: 0
2896+
m_CorrespondingSourceObject: {fileID: 0}
2897+
m_PrefabInstance: {fileID: 0}
2898+
m_PrefabAsset: {fileID: 0}
2899+
m_GameObject: {fileID: 1534235931}
2900+
m_CullTransparentMesh: 1
28172901
--- !u!1 &1571234390
28182902
GameObject:
28192903
m_ObjectHideFlags: 0
@@ -4124,6 +4208,7 @@ RectTransform:
41244208
m_Children:
41254209
- {fileID: 2092725700}
41264210
- {fileID: 955392610}
4211+
- {fileID: 1534235932}
41274212
- {fileID: 2127308239}
41284213
- {fileID: 530394192}
41294214
- {fileID: 1347047095}
@@ -4230,7 +4315,7 @@ RectTransform:
42304315
- {fileID: 1973712799}
42314316
- {fileID: 310104969}
42324317
m_Father: {fileID: 2116337179}
4233-
m_RootOrder: 2
4318+
m_RootOrder: 3
42344319
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
42354320
m_AnchorMin: {x: 1, y: 0}
42364321
m_AnchorMax: {x: 1, y: 0}

‎Assets/Scenes/Menu.unity

Lines changed: 126 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1417,12 +1417,12 @@ RectTransform:
14171417
m_Children:
14181418
- {fileID: 70707792}
14191419
- {fileID: 458644317}
1420-
m_Father: {fileID: 2029659380}
1420+
m_Father: {fileID: 1779700580}
14211421
m_RootOrder: 2
14221422
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
14231423
m_AnchorMin: {x: 0.5, y: 0.5}
14241424
m_AnchorMax: {x: 0.5, y: 0.5}
1425-
m_AnchoredPosition: {x: 0, y: -101}
1425+
m_AnchoredPosition: {x: 0, y: -77.899994}
14261426
m_SizeDelta: {x: 0, y: 0}
14271427
m_Pivot: {x: 0.5, y: 0.5}
14281428
--- !u!1 &637941075
@@ -7331,18 +7331,18 @@ RectTransform:
73317331
m_PrefabInstance: {fileID: 0}
73327332
m_PrefabAsset: {fileID: 0}
73337333
m_GameObject: {fileID: 1269685083}
7334-
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
7334+
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
73357335
m_LocalPosition: {x: 0, y: 0, z: 0}
73367336
m_LocalScale: {x: 1, y: 1, z: 1}
73377337
m_ConstrainProportionsScale: 0
73387338
m_Children:
73397339
- {fileID: 214752118}
7340-
m_Father: {fileID: 2029659380}
7340+
m_Father: {fileID: 1779700580}
73417341
m_RootOrder: 1
73427342
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
73437343
m_AnchorMin: {x: 0.5, y: 0.5}
73447344
m_AnchorMax: {x: 0.5, y: 0.5}
7345-
m_AnchoredPosition: {x: 0, y: -21}
7345+
m_AnchoredPosition: {x: 0, y: 2.100006}
73467346
m_SizeDelta: {x: 300, y: 100}
73477347
m_Pivot: {x: 0.5, y: 0.5}
73487348
--- !u!114 &1269685085
@@ -7636,6 +7636,83 @@ CanvasRenderer:
76367636
m_PrefabAsset: {fileID: 0}
76377637
m_GameObject: {fileID: 1381200280}
76387638
m_CullTransparentMesh: 1
7639+
--- !u!1 &1401136965
7640+
GameObject:
7641+
m_ObjectHideFlags: 0
7642+
m_CorrespondingSourceObject: {fileID: 0}
7643+
m_PrefabInstance: {fileID: 0}
7644+
m_PrefabAsset: {fileID: 0}
7645+
serializedVersion: 6
7646+
m_Component:
7647+
- component: {fileID: 1401136966}
7648+
- component: {fileID: 1401136968}
7649+
- component: {fileID: 1401136967}
7650+
m_Layer: 5
7651+
m_Name: Panel
7652+
m_TagString: Untagged
7653+
m_Icon: {fileID: 0}
7654+
m_NavMeshLayer: 0
7655+
m_StaticEditorFlags: 0
7656+
m_IsActive: 1
7657+
--- !u!224 &1401136966
7658+
RectTransform:
7659+
m_ObjectHideFlags: 0
7660+
m_CorrespondingSourceObject: {fileID: 0}
7661+
m_PrefabInstance: {fileID: 0}
7662+
m_PrefabAsset: {fileID: 0}
7663+
m_GameObject: {fileID: 1401136965}
7664+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
7665+
m_LocalPosition: {x: 0, y: 0, z: 0}
7666+
m_LocalScale: {x: 1, y: 1, z: 1}
7667+
m_ConstrainProportionsScale: 0
7668+
m_Children:
7669+
- {fileID: 1779700580}
7670+
m_Father: {fileID: 2029659380}
7671+
m_RootOrder: 0
7672+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
7673+
m_AnchorMin: {x: 0.5, y: 0.5}
7674+
m_AnchorMax: {x: 0.5, y: 0.5}
7675+
m_AnchoredPosition: {x: 0, y: -25}
7676+
m_SizeDelta: {x: 380, y: 250}
7677+
m_Pivot: {x: 0.5, y: 0.5}
7678+
--- !u!114 &1401136967
7679+
MonoBehaviour:
7680+
m_ObjectHideFlags: 0
7681+
m_CorrespondingSourceObject: {fileID: 0}
7682+
m_PrefabInstance: {fileID: 0}
7683+
m_PrefabAsset: {fileID: 0}
7684+
m_GameObject: {fileID: 1401136965}
7685+
m_Enabled: 1
7686+
m_EditorHideFlags: 0
7687+
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
7688+
m_Name:
7689+
m_EditorClassIdentifier:
7690+
m_Material: {fileID: 0}
7691+
m_Color: {r: 0.5882353, g: 0.5882353, b: 0.5882353, a: 1}
7692+
m_RaycastTarget: 1
7693+
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
7694+
m_Maskable: 1
7695+
m_OnCullStateChanged:
7696+
m_PersistentCalls:
7697+
m_Calls: []
7698+
m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
7699+
m_Type: 1
7700+
m_PreserveAspect: 0
7701+
m_FillCenter: 1
7702+
m_FillMethod: 4
7703+
m_FillAmount: 1
7704+
m_FillClockwise: 1
7705+
m_FillOrigin: 0
7706+
m_UseSpriteMesh: 0
7707+
m_PixelsPerUnitMultiplier: 1
7708+
--- !u!222 &1401136968
7709+
CanvasRenderer:
7710+
m_ObjectHideFlags: 0
7711+
m_CorrespondingSourceObject: {fileID: 0}
7712+
m_PrefabInstance: {fileID: 0}
7713+
m_PrefabAsset: {fileID: 0}
7714+
m_GameObject: {fileID: 1401136965}
7715+
m_CullTransparentMesh: 1
76397716
--- !u!1 &1481422595
76407717
GameObject:
76417718
m_ObjectHideFlags: 0
@@ -7976,7 +8053,7 @@ GameObject:
79768053
m_Icon: {fileID: 0}
79778054
m_NavMeshLayer: 0
79788055
m_StaticEditorFlags: 0
7979-
m_IsActive: 0
8056+
m_IsActive: 1
79808057
--- !u!224 &1656595738
79818058
RectTransform:
79828059
m_ObjectHideFlags: 0
@@ -8233,6 +8310,45 @@ CanvasRenderer:
82338310
m_PrefabAsset: {fileID: 0}
82348311
m_GameObject: {fileID: 1725798664}
82358312
m_CullTransparentMesh: 1
8313+
--- !u!1 &1779700579
8314+
GameObject:
8315+
m_ObjectHideFlags: 0
8316+
m_CorrespondingSourceObject: {fileID: 0}
8317+
m_PrefabInstance: {fileID: 0}
8318+
m_PrefabAsset: {fileID: 0}
8319+
serializedVersion: 6
8320+
m_Component:
8321+
- component: {fileID: 1779700580}
8322+
m_Layer: 5
8323+
m_Name: StartForm
8324+
m_TagString: Untagged
8325+
m_Icon: {fileID: 0}
8326+
m_NavMeshLayer: 0
8327+
m_StaticEditorFlags: 0
8328+
m_IsActive: 1
8329+
--- !u!224 &1779700580
8330+
RectTransform:
8331+
m_ObjectHideFlags: 0
8332+
m_CorrespondingSourceObject: {fileID: 0}
8333+
m_PrefabInstance: {fileID: 0}
8334+
m_PrefabAsset: {fileID: 0}
8335+
m_GameObject: {fileID: 1779700579}
8336+
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
8337+
m_LocalPosition: {x: 0, y: 0, z: 0}
8338+
m_LocalScale: {x: 1, y: 1, z: 1}
8339+
m_ConstrainProportionsScale: 0
8340+
m_Children:
8341+
- {fileID: 1994020246}
8342+
- {fileID: 1269685084}
8343+
- {fileID: 627701824}
8344+
m_Father: {fileID: 1401136966}
8345+
m_RootOrder: 0
8346+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
8347+
m_AnchorMin: {x: 0, y: 0}
8348+
m_AnchorMax: {x: 1, y: 1}
8349+
m_AnchoredPosition: {x: 0, y: 0}
8350+
m_SizeDelta: {x: 0, y: 0}
8351+
m_Pivot: {x: 0.5, y: 0.5}
82368352
--- !u!1 &1843044258
82378353
GameObject:
82388354
m_ObjectHideFlags: 0
@@ -8456,12 +8572,12 @@ RectTransform:
84568572
- {fileID: 771081275}
84578573
- {fileID: 165319304}
84588574
- {fileID: 1217948628}
8459-
m_Father: {fileID: 2029659380}
8575+
m_Father: {fileID: 1779700580}
84608576
m_RootOrder: 0
84618577
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
84628578
m_AnchorMin: {x: 0.5, y: 0.5}
84638579
m_AnchorMax: {x: 0.5, y: 0.5}
8464-
m_AnchoredPosition: {x: 0, y: 58}
8580+
m_AnchoredPosition: {x: 0, y: 81.1}
84658581
m_SizeDelta: {x: 300, y: 30}
84668582
m_Pivot: {x: 0.5, y: 0.5}
84678583
--- !u!1 &2029659379
@@ -8484,7 +8600,7 @@ GameObject:
84848600
m_Icon: {fileID: 0}
84858601
m_NavMeshLayer: 0
84868602
m_StaticEditorFlags: 0
8487-
m_IsActive: 0
8603+
m_IsActive: 1
84888604
--- !u!224 &2029659380
84898605
RectTransform:
84908606
m_ObjectHideFlags: 0
@@ -8497,9 +8613,7 @@ RectTransform:
84978613
m_LocalScale: {x: 0, y: 0, z: 0}
84988614
m_ConstrainProportionsScale: 0
84998615
m_Children:
8500-
- {fileID: 1994020246}
8501-
- {fileID: 1269685084}
8502-
- {fileID: 627701824}
8616+
- {fileID: 1401136966}
85038617
m_Father: {fileID: 762472553}
85048618
m_RootOrder: 3
85058619
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

0 commit comments

Comments
 (0)