Test_Project_Cocos/Slash-The-Hordes
1
0
Fork 0
mirror of https://github.com/MartinKral/Slash-The-Hordes synced 2024-12-26 03:38:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16 from MartinKral/UI-Fixes

Browse Source 
UI Fixes
This commit is contained in:
Martin Král 2023-01-02 11:16:17 +01:00 committed by GitHub
commit 0a3ddbf40f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 748 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/Media/Images/Game/UI/ButtonDecL.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 309 B

134
assets/Media/Images/Game/UI/ButtonDecL.png.meta Normal file
View File

@ -0,0 +1,134 @@
{
"ver": "1.0.25",
"importer": "image",
"imported": true,
"uuid": "c5bc59c7-1e72-4f93-a594-2d192f22a4bc",
"files": [
".json",
".png"
],
"subMetas": {
"6c48a": {
"importer": "texture",
"uuid": "c5bc59c7-1e72-4f93-a594-2d192f22a4bc@6c48a",
"displayName": "ButtonDecL",
"id": "6c48a",
"name": "texture",
"userData": {
"wrapModeS": "clamp-to-edge",
"wrapModeT": "clamp-to-edge",
"minfilter": "nearest",
"magfilter": "nearest",
"mipfilter": "none",
"anisotropy": 0,
"isUuid": true,
"imageUuidOrDatabaseUri": "c5bc59c7-1e72-4f93-a594-2d192f22a4bc",
"visible": false
},
"ver": "1.0.22",
"imported": true,
"files": [
".json"
],
"subMetas": {}
},
"f9941": {
"importer": "sprite-frame",
"uuid": "c5bc59c7-1e72-4f93-a594-2d192f22a4bc@f9941",
"displayName": "ButtonDecL",
"id": "f9941",
"name": "spriteFrame",
"userData": {
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 11,
"height": 14,
"rawWidth": 11,
"rawHeight": 14,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"packable": true,
"pixelsToUnit": 100,
"pivotX": 0.5,
"pivotY": 0.5,
"meshType": 0,
"vertices": {
"rawPosition": [
-5.5,
-7,
0,
5.5,
-7,
0,
-5.5,
7,
0,
5.5,
7,
0
],
"indexes": [
0,
1,
2,
2,
1,
3
],
"uv": [
0,
14,
11,
14,
0,
0,
11,
0
],
"nuv": [
0,
0,
1,
0,
0,
1,
1,
1
],
"minPos": [
-5.5,
-7,
0
],
"maxPos": [
5.5,
7,
0
]
},
"isUuid": true,
"imageUuidOrDatabaseUri": "c5bc59c7-1e72-4f93-a594-2d192f22a4bc@6c48a",
"atlasUuid": ""
},
"ver": "1.0.11",
"imported": true,
"files": [
".json"
],
"subMetas": {}
}
},
"userData": {
"type": "sprite-frame",
"fixAlphaTransparencyArtifacts": true,
"hasAlpha": true,
"redirect": "c5bc59c7-1e72-4f93-a594-2d192f22a4bc@f9941"
}
}

BIN
assets/Media/Images/Game/UI/ButtonDecR.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 274 B

134
assets/Media/Images/Game/UI/ButtonDecR.png.meta Normal file
View File

@ -0,0 +1,134 @@
{
"ver": "1.0.25",
"importer": "image",
"imported": true,
"uuid": "c8bd5951-7e9e-4585-a350-6e829f249d13",
"files": [
".json",
".png"
],
"subMetas": {
"6c48a": {
"importer": "texture",
"uuid": "c8bd5951-7e9e-4585-a350-6e829f249d13@6c48a",
"displayName": "ButtonDecR",
"id": "6c48a",
"name": "texture",
"userData": {
"wrapModeS": "clamp-to-edge",
"wrapModeT": "clamp-to-edge",
"minfilter": "nearest",
"magfilter": "nearest",
"mipfilter": "none",
"anisotropy": 0,
"isUuid": true,
"imageUuidOrDatabaseUri": "c8bd5951-7e9e-4585-a350-6e829f249d13",
"visible": false
},
"ver": "1.0.22",
"imported": true,
"files": [
".json"
],
"subMetas": {}
},
"f9941": {
"importer": "sprite-frame",
"uuid": "c8bd5951-7e9e-4585-a350-6e829f249d13@f9941",
"displayName": "ButtonDecR",
"id": "f9941",
"name": "spriteFrame",
"userData": {
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 11,
"height": 14,
"rawWidth": 11,
"rawHeight": 14,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"packable": true,
"pixelsToUnit": 100,
"pivotX": 0.5,
"pivotY": 0.5,
"meshType": 0,
"vertices": {
"rawPosition": [
-5.5,
-7,
0,
5.5,
-7,
0,
-5.5,
7,
0,
5.5,
7,
0
],
"indexes": [
0,
1,
2,
2,
1,
3
],
"uv": [
0,
14,
11,
14,
0,
0,
11,
0
],
"nuv": [
0,
0,
1,
0,
0,
1,
1,
1
],
"minPos": [
-5.5,
-7,
0
],
"maxPos": [
5.5,
7,
0
]
},
"isUuid": true,
"imageUuidOrDatabaseUri": "c8bd5951-7e9e-4585-a350-6e829f249d13@6c48a",
"atlasUuid": ""
},
"ver": "1.0.11",
"imported": true,
"files": [
".json"
],
"subMetas": {}
}
},
"userData": {
"type": "sprite-frame",
"fixAlphaTransparencyArtifacts": true,
"hasAlpha": true,
"redirect": "c8bd5951-7e9e-4585-a350-6e829f249d13@f9941"
}
}

BIN
assets/Media/Images/Game/UI/ButtonMain.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 580 B

134
assets/Media/Images/Game/UI/ButtonMain.png.meta Normal file
View File

@ -0,0 +1,134 @@
{
"ver": "1.0.25",
"importer": "image",
"imported": true,
"uuid": "5e896858-4b94-4c82-9795-5808f957ef1f",
"files": [
".json",
".png"
],
"subMetas": {
"6c48a": {
"importer": "texture",
"uuid": "5e896858-4b94-4c82-9795-5808f957ef1f@6c48a",
"displayName": "ButtonMain",
"id": "6c48a",
"name": "texture",
"userData": {
"wrapModeS": "clamp-to-edge",
"wrapModeT": "clamp-to-edge",
"minfilter": "nearest",
"magfilter": "nearest",
"mipfilter": "none",
"anisotropy": 0,
"isUuid": true,
"imageUuidOrDatabaseUri": "5e896858-4b94-4c82-9795-5808f957ef1f",
"visible": false
},
"ver": "1.0.22",
"imported": true,
"files": [
".json"
],
"subMetas": {}
},
"f9941": {
"importer": "sprite-frame",
"uuid": "5e896858-4b94-4c82-9795-5808f957ef1f@f9941",
"displayName": "ButtonMain",
"id": "f9941",
"name": "spriteFrame",
"userData": {
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 26,
"height": 32,
"rawWidth": 26,
"rawHeight": 32,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 12,
"borderRight": 12,
"packable": true,
"pixelsToUnit": 100,
"pivotX": 0.5,
"pivotY": 0.5,
"meshType": 0,
"vertices": {
"rawPosition": [
-13,
-16,
0,
13,
-16,
0,
-13,
16,
0,
13,
16,
0
],
"indexes": [
0,
1,
2,
2,
1,
3
],
"uv": [
0,
32,
26,
32,
0,
0,
26,
0
],
"nuv": [
0,
0,
1,
0,
0,
1,
1,
1
],
"minPos": [
-13,
-16,
0
],
"maxPos": [
13,
16,
0
]
},
"isUuid": true,
"imageUuidOrDatabaseUri": "5e896858-4b94-4c82-9795-5808f957ef1f@6c48a",
"atlasUuid": ""
},
"ver": "1.0.11",
"imported": true,
"files": [
".json"
],
"subMetas": {}
}
},
"userData": {
"type": "sprite-frame",
"fixAlphaTransparencyArtifacts": true,
"hasAlpha": true,
"redirect": "5e896858-4b94-4c82-9795-5808f957ef1f@f9941"
}
}

BIN
assets/Media/Images/Game/UI/GoldIconSmall.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 186 B

134
assets/Media/Images/Game/UI/GoldIconSmall.png.meta Normal file
View File

@ -0,0 +1,134 @@
{
"ver": "1.0.25",
"importer": "image",
"imported": true,
"uuid": "82c79ffd-6702-4686-b210-908353784323",
"files": [
".json",
".png"
],
"subMetas": {
"6c48a": {
"importer": "texture",
"uuid": "82c79ffd-6702-4686-b210-908353784323@6c48a",
"displayName": "GoldIconSmall",
"id": "6c48a",
"name": "texture",
"userData": {
"wrapModeS": "clamp-to-edge",
"wrapModeT": "clamp-to-edge",
"minfilter": "nearest",
"magfilter": "nearest",
"mipfilter": "none",
"anisotropy": 0,
"isUuid": true,
"imageUuidOrDatabaseUri": "82c79ffd-6702-4686-b210-908353784323",
"visible": false
},
"ver": "1.0.22",
"imported": true,
"files": [
".json"
],
"subMetas": {}
},
"f9941": {
"importer": "sprite-frame",
"uuid": "82c79ffd-6702-4686-b210-908353784323@f9941",
"displayName": "GoldIconSmall",
"id": "f9941",
"name": "spriteFrame",
"userData": {
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 8,
"height": 8,
"rawWidth": 8,
"rawHeight": 8,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"packable": true,
"pixelsToUnit": 100,
"pivotX": 0.5,
"pivotY": 0.5,
"meshType": 0,
"vertices": {
"rawPosition": [
-4,
-4,
0,
4,
-4,
0,
-4,
4,
0,
4,
4,
0
],
"indexes": [
0,
1,
2,
2,
1,
3
],
"uv": [
0,
8,
8,
8,
0,
0,
8,
0
],
"nuv": [
0,
0,
1,
0,
0,
1,
1,
1
],
"minPos": [
-4,
-4,
0
],
"maxPos": [
4,
4,
0
]
},
"isUuid": true,
"imageUuidOrDatabaseUri": "82c79ffd-6702-4686-b210-908353784323@6c48a",
"atlasUuid": ""
},
"ver": "1.0.11",
"imported": true,
"files": [
".json"
],
"subMetas": {}
}
},
"userData": {
"type": "sprite-frame",
"fixAlphaTransparencyArtifacts": true,
"hasAlpha": true,
"redirect": "82c79ffd-6702-4686-b210-908353784323@f9941"
}
}

BIN
assets/Media/Images/Game/UI/Window/WndTitleBg.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 283 B

After

Width:  |  Height:  |  Size: 2.2 KiB

50
assets/Media/Images/Game/UI/Window/WndTitleBg.png.meta
View File

@ -39,21 +39,21 @@
"id": "f9941",
"name": "spriteFrame",
"userData": {
"trimType": "auto",
"trimType": "none",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 20,
"height": 16,
"rawWidth": 20,
"rawHeight": 16,
"borderTop": 7,
"borderBottom": 7,
"borderLeft": 9,
"borderRight": 9,
"width": 152,
"height": 35,
"rawWidth": 152,
"rawHeight": 35,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 75,
"borderRight": 73,
"packable": true,
"pixelsToUnit": 100,
"pivotX": 0.5,
@ -61,17 +61,17 @@
"meshType": 0,
"vertices": {
"rawPosition": [
-10,
-8,
-76,
-17.5,
0,
10,
-8,
76,
-17.5,
0,
-10,
8,
-76,
17.5,
0,
10,
8,
76,
17.5,
0
],
"indexes": [
@ -84,12 +84,12 @@
],
"uv": [
0,
16,
20,
16,
35,
152,
35,
0,
0,
20,
152,
0
],
"nuv": [
@ -103,13 +103,13 @@
1
],
"minPos": [
-10,
-8,
-76,
-17.5,
0
],
"maxPos": [
10,
8,
76,
17.5,
0
]
},

2
assets/Media/Prefabs/ModalWindows/LevelUp/LevelUpModalWindow.prefab
View File

@ -183,7 +183,7 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 640,
"width": 700,
"height": 960
},
"_anchorPoint": {

2
assets/Media/Prefabs/ModalWindows/Pause/PauseModalWindow.prefab
View File

@ -186,7 +186,7 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 640,
"width": 700,
"height": 960
},
"_anchorPoint": {

206
assets/Media/Prefabs/ModalWindows/Upgrades/UpgradeButton.prefab
View File

@ -43,23 +43,23 @@
"_active": true,
"_components": [
{
"__id__": 73
},
{
"__id__": 75
},
{
"__id__": 77
"__id__": 79
},
{
"__id__": 81
},
{
"__id__": 79
"__id__": 83
},
{
"__id__": 87
},
{
"__id__": 85
}
],
"_prefab": {
"__id__": 83
"__id__": 89
},
"_lpos": {
"__type__": "cc.Vec3",
@ -1180,8 +1180,8 @@
},
"_lpos": {
"__type__": "cc.Vec3",
"x": 2.984,
"y": -18.856,
"x": 0,
"y": -22.053,
"z": 0
},
"_lrot": {
@ -1249,10 +1249,10 @@
"_dstBlendFactor": 4,
"_color": {
"__type__": "cc.Color",
"r": 246,
"g": 173,
"b": 59,
"a": 255
"r": 255,
"g": 255,
"b": 255,
"a": 130
},
"_string": "Max level",
"_horizontalAlign": 1,
@ -1297,23 +1297,27 @@
"_parent": {
"__id__": 1
},
"_children": [],
"_children": [
{
"__id__": 68
}
],
"_active": true,
"_components": [
{
"__id__": 68
"__id__": 74
},
{
"__id__": 70
"__id__": 76
}
],
"_prefab": {
"__id__": 72
"__id__": 78
},
"_lpos": {
"__type__": "cc.Vec3",
"x": 2.984,
"y": -18.856,
"x": -6.766,
"y": -21.962,
"z": 0
},
"_lrot": {
@ -1338,6 +1342,138 @@
},
"_id": ""
},
{
"__type__": "cc.Node",
"_name": "IconGold",
"_objFlags": 0,
"_parent": {
"__id__": 67
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 69
},
{
"__id__": 71
}
],
"_prefab": {
"__id__": 73
},
"_lpos": {
"__type__": "cc.Vec3",
"x": -14,
"y": 0,
"z": 0
},
"_lrot": {
"__type__": "cc.Quat",
"x": 0,
"y": 0,
"z": 0,
"w": 1
},
"_lscale": {
"__type__": "cc.Vec3",
"x": 2,
"y": 2,
"z": 1
},
"_layer": 33554432,
"_euler": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
},
"_id": ""
},
{
"__type__": "cc.UITransform",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 68
},
"_enabled": false,
"__prefab": {
"__id__": 70
},
"_contentSize": {
"__type__": "cc.Size",
"width": 8,
"height": 8
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "94TmLSCppBZ6ae/vLMNt3Y"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 68
},
"_enabled": true,
"__prefab": {
"__id__": 72
},
"_customMaterial": null,
"_srcBlendFactor": 2,
"_dstBlendFactor": 4,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_spriteFrame": {
"__uuid__": "82c79ffd-6702-4686-b210-908353784323@f9941",
"__expectedType__": "cc.SpriteFrame"
},
"_type": 0,
"_fillType": 0,
"_sizeMode": 1,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_useGrayscale": false,
"_atlas": {
"__uuid__": "c4872559-07b2-44e5-9613-5f22506b1989",
"__expectedType__": "cc.SpriteAtlas"
},
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "0d5JpNz+5LToRYp1odOLs1"
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 1
},
"asset": {
"__id__": 0
},
"fileId": "c1lMseFctICoMwl/jONbf9"
},
{
"__type__": "cc.UITransform",
"_name": "",
@ -1345,9 +1481,9 @@
"node": {
"__id__": 67
},
"_enabled": true,
"_enabled": false,
"__prefab": {
"__id__": 69
"__id__": 75
},
"_contentSize": {
"__type__": "cc.Size",
@ -1356,7 +1492,7 @@
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"x": 0,
"y": 0.5
},
"_id": ""
@ -1374,7 +1510,7 @@
},
"_enabled": true,
"__prefab": {
"__id__": 71
"__id__": 77
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@ -1387,14 +1523,14 @@
"a": 255
},
"_string": "300",
"_horizontalAlign": 1,
"_horizontalAlign": 0,
"_verticalAlign": 1,
"_actualFontSize": 20,
"_fontSize": 20,
"_fontFamily": "Century Gothic",
"_lineHeight": 18,
"_overflow": 0,
"_enableWrapText": true,
"_enableWrapText": false,
"_font": {
"__uuid__": "c96b42a9-d20d-4c59-8e99-8ed749a715c8",
"__expectedType__": "cc.BitmapFont"
@ -1431,7 +1567,7 @@
},
"_enabled": true,
"__prefab": {
"__id__": 74
"__id__": 80
},
"_contentSize": {
"__type__": "cc.Size",
@ -1458,7 +1594,7 @@
},
"_enabled": false,
"__prefab": {
"__id__": 76
"__id__": 82
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@ -1502,7 +1638,7 @@
},
"_enabled": true,
"__prefab": {
"__id__": 78
"__id__": 84
},
"levelPointPrefab": {
"__uuid__": "41ca6952-fa32-4e38-8d43-eec2e982533c",
@ -1518,7 +1654,7 @@
"__id__": 19
},
"cost": {
"__id__": 70
"__id__": 76
},
"maxLevel": {
"__id__": 64
@ -1527,7 +1663,7 @@
"__id__": 58
},
"uiButton": {
"__id__": 79
"__id__": 85
},
"_id": ""
},
@ -1544,7 +1680,7 @@
},
"_enabled": true,
"__prefab": {
"__id__": 80
"__id__": 86
},
"_id": ""
},
@ -1561,7 +1697,7 @@
},
"_enabled": true,
"__prefab": {
"__id__": 82
"__id__": 88
},
"clickEvents": [],
"_interactable": true,
@ -1602,7 +1738,7 @@
"_pressedSprite": null,
"_disabledSprite": null,
"_duration": 0.05,
"_zoomScale": 1.05,
"_zoomScale": 0.92,
"_target": null,
"_id": ""
},

28
assets/Media/Prefabs/ModalWindows/Upgrades/UpgradesModalWindow.prefab
View File

@ -186,7 +186,7 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 640,
"width": 700,
"height": 960
},
"_anchorPoint": {
@ -2645,7 +2645,7 @@
"_lpos": {
"__type__": "cc.Vec3",
"x": 0,
"y": 350,
"y": 360,
"z": 0
},
"_lrot": {
@ -2683,8 +2683,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 504.4,
"height": 489.40800000000013
"width": 524.4,
"height": 720
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@ -2716,9 +2716,9 @@
"height": 40
},
"_startAxis": 0,
"_paddingLeft": 0,
"_paddingRight": 0,
"_paddingTop": 0,
"_paddingLeft": 10,
"_paddingRight": 10,
"_paddingTop": 10,
"_paddingBottom": 0,
"_spacingX": 10.6,
"_spacingY": 14.3,
@ -2750,7 +2750,7 @@
"_left": 0,
"_right": 0,
"_top": 0,
"_bottom": 210.59199999999987,
"_bottom": 0,
"_horizontalCenter": 0,
"_verticalCenter": 0,
"_isAbsLeft": true,
@ -2792,8 +2792,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 504.4,
"height": 700
"width": 524.4,
"height": 720
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@ -2915,10 +2915,10 @@
},
"_alignFlags": 45,
"_target": null,
"_left": 27.80000000000001,
"_right": 27.80000000000001,
"_top": 0,
"_bottom": 0,
"_left": 17.80000000000001,
"_right": 17.80000000000001,
"_top": -10,
"_bottom": -10,
"_horizontalCenter": 0,
"_verticalCenter": 0,
"_isAbsLeft": true,