Test_Project_Cocos/Slash-The-Hordes
1
0
Fork 0
mirror of https://github.com/MartinKral/Slash-The-Hordes synced 2025-10-09 00:26:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Item refactoring

Browse Source
This commit is contained in:
Martin
2022-12-23 09:22:22 +01:00
parent 1b5b449d0b
commit 4b2d35a733
34 changed files with 618 additions and 578 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
assets/Media/Prefabs/Game/Drops/Chest.prefab
View File

@@ -308,23 +308,6 @@
"__type__": "cc.CompPrefabInfo",
"fileId": "cfXyVJoitMGp/0liEUZfNP"
},
{
"__type__": "7a536G2OudFtpTsoF8yLXiW",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 1
},
"_enabled": true,
"__prefab": {
"__id__": 15
},
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "72AObOIbxCf6LIYsYqoFZF"
},
{
"__type__": "cc.Animation",
"_name": "",
@@ -334,7 +317,7 @@
},
"_enabled": true,
"__prefab": {
"__id__": 17
"__id__": 15
},
"playOnLoad": true,
"_clips": [
@@ -362,10 +345,10 @@
},
"_enabled": true,
"__prefab": {
"__id__": 19
"__id__": 17
},
"tag": 0,
"_group": 1,
"_group": 16,
"_density": 1,
"_sensor": false,
"_friction": 0.2,
@@ -386,6 +369,24 @@
"__type__": "cc.CompPrefabInfo",
"fileId": "b5zZIKDzhK3q3Rd8OiKUPa"
},
{
"__type__": "724bauqfhVH0YWsXug16uHL",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 1
},
"_enabled": true,
"__prefab": {
"__id__": 19
},
"itemType": 4,
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "9eD6pXLdNKw4xswCPxsN+q"
},
{
"__type__": "cc.PrefabInfo",
"root": {

7
assets/Media/Prefabs/Game/Drops/Gold.prefab
View File

@@ -348,7 +348,7 @@
"__id__": 17
},
"tag": 0,
"_group": 128,
"_group": 16,
"_density": 1,
"_sensor": false,
"_friction": 0.2,
@@ -370,7 +370,7 @@
"fileId": "67joCa7ptP34A+uWLWHsEf"
},
{
"__type__": "41f67AOEYRMTLXwNf7CG9iO",
"__type__": "724bauqfhVH0YWsXug16uHL",
"_name": "",
"_objFlags": 0,
"node": {
@@ -380,11 +380,12 @@
"__prefab": {
"__id__": 19
},
"itemType": 1,
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "08V7VtIFBG1bgEhFLO5GoU"
"fileId": "9eg+N94AJL7qX1hwDoulo4"
},
{
"__type__": "cc.PrefabInfo",

10
assets/Media/Prefabs/Game/Drops/HealthPotion.prefab
View File

@@ -320,7 +320,7 @@
"__id__": 15
},
"tag": 0,
"_group": 256,
"_group": 16,
"_density": 1,
"_sensor": false,
"_friction": 0.2,
@@ -366,7 +366,7 @@
"fileId": "3ag4rexLNJW6A/sp6OpwZ8"
},
{
"__type__": "18f8d5p42FOc4uYonNdBzCm",
"__type__": "724bauqfhVH0YWsXug16uHL",
"_name": "",
"_objFlags": 0,
"node": {
@@ -376,14 +376,12 @@
"__prefab": {
"__id__": 19
},
"animation": {
"__id__": 16
},
"itemType": 2,
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "65lXWGNONBy5ucPc5KmOaR"
"fileId": "c3RTRN6tpK45dDIl3T8NlW"
},
{
"__type__": "cc.PrefabInfo",

37
assets/Media/Prefabs/Game/Drops/Magnet.prefab
View File

@@ -306,23 +306,6 @@
"__type__": "cc.CompPrefabInfo",
"fileId": "75WVRoLrtKLrJihCVsxa4D"
},
{
"__type__": "7a536G2OudFtpTsoF8yLXiW",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 1
},
"_enabled": false,
"__prefab": {
"__id__": 15
},
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "72AObOIbxCf6LIYsYqoFZF"
},
{
"__type__": "cc.Animation",
"_name": "",
@@ -332,7 +315,7 @@
},
"_enabled": false,
"__prefab": {
"__id__": 17
"__id__": 15
},
"playOnLoad": true,
"_clips": [
@@ -351,6 +334,24 @@
"__type__": "cc.CompPrefabInfo",
"fileId": "3ag4rexLNJW6A/sp6OpwZ8"
},
{
"__type__": "724bauqfhVH0YWsXug16uHL",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 1
},
"_enabled": true,
"__prefab": {
"__id__": 17
},
"itemType": 3,
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "acBeV6ARtPG5vuHymyG+Tp"
},
{
"__type__": "cc.PrefabInfo",
"root": {

43
assets/Media/Prefabs/Game/Drops/XP.prefab
View File

@@ -337,26 +337,6 @@
"__type__": "cc.CompPrefabInfo",
"fileId": "75WVRoLrtKLrJihCVsxa4D"
},
{
"__type__": "7a536G2OudFtpTsoF8yLXiW",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 1
},
"_enabled": true,
"__prefab": {
"__id__": 17
},
"animation": {
"__id__": 18
},
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "72AObOIbxCf6LIYsYqoFZF"
},
{
"__type__": "cc.Animation",
"_name": "",
@@ -366,7 +346,7 @@
},
"_enabled": true,
"__prefab": {
"__id__": 19
"__id__": 17
},
"playOnLoad": true,
"_clips": [
@@ -385,6 +365,27 @@
"__type__": "cc.CompPrefabInfo",
"fileId": "3ag4rexLNJW6A/sp6OpwZ8"
},
{
"__type__": "801bc1fEuVM5pPn2btm9NKZ",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 1
},
"_enabled": true,
"__prefab": {
"__id__": 19
},
"itemType": 0,
"animation": {
"__id__": 16
},
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "2aiKM2kApHv7jncY6Pmvgt"
},
{
"__type__": "cc.PrefabInfo",
"root": {

109
assets/Media/Prefabs/Game/Player.prefab
View File

@@ -26,22 +26,25 @@
},
{
"__id__": 40
},
{
"__id__": 136
}
],
"_active": true,
"_components": [
{
"__id__": 136
},
{
"__id__": 138
},
{
"__id__": 140
},
{
"__id__": 142
},
{
"__id__": 144
}
],
"_prefab": {
"__id__": 142
"__id__": 146
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -2902,6 +2905,90 @@
},
"fileId": "c6aL8FlztEHJ6sRFCXQnge"
},
{
"__type__": "cc.Node",
"_name": "Magnet",
"_objFlags": 0,
"_parent": {
"__id__": 1
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 137
}
],
"_prefab": {
"__id__": 139
},
"_lpos": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
},
"_lrot": {
"__type__": "cc.Quat",
"x": 0,
"y": 0,
"z": 0,
"w": 1
},
"_lscale": {
"__type__": "cc.Vec3",
"x": 1,
"y": 1,
"z": 1
},
"_layer": 33554432,
"_euler": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
},
"_id": ""
},
{
"__type__": "cc.CircleCollider2D",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 136
},
"_enabled": true,
"__prefab": {
"__id__": 138
},
"tag": 0,
"_group": 1,
"_density": 1,
"_sensor": false,
"_friction": 0.2,
"_restitution": 0,
"_offset": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_radius": 260,
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "2cKwIyAIBAm5fq0pDIOT0e"
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 1
},
"asset": {
"__id__": 0
},
"fileId": "aec1+SeS9G0b8TjOixk1ws"
},
{
"__type__": "cc.UITransform",
"_name": "",
@@ -2911,7 +2998,7 @@
},
"_enabled": false,
"__prefab": {
"__id__": 137
"__id__": 141
},
"_contentSize": {
"__type__": "cc.Size",
@@ -2938,10 +3025,10 @@
},
"_enabled": true,
"__prefab": {
"__id__": 139
"__id__": 143
},
"collider": {
"__id__": 140
"__id__": 144
},
"playerUI": {
"__id__": 37
@@ -2973,7 +3060,7 @@
},
"_enabled": true,
"__prefab": {
"__id__": 141
"__id__": 145
},
"tag": 0,
"_group": 2,

2
assets/Media/Prefabs/ModalWindows/AudioSettings/AudioSettingsModalWindow.prefab
View File

@@ -2317,7 +2317,7 @@
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "96r5a19KlArZj66lP1XbqT"
"fileId": "e4VgJe0ytLH585U+gaoqU4"
},
{
"__type__": "cc.PrefabInfo",

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

@@ -429,34 +429,6 @@
"__type__": "cc.CompPrefabInfo",
"fileId": "2eO+M9deJI1KYyU2Otv4xD"
},
{
"__type__": "f7ac68qK+pC7LXQWJdgAYVs",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 1
},
"_enabled": true,
"__prefab": {
"__id__": 21
},
"animation": {
"__id__": 15
},
"testField": "",
"skillPrefab": {
"__uuid__": "5dccf426-aeb0-4b4e-9e1c-ae9fd74dcf7a",
"__expectedType__": "cc.Prefab"
},
"skillParent": {
"__id__": 9
},
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "2f6poVi1pJKJ3WzVB7L/Nq"
},
{
"__type__": "cc.Widget",
"_name": "",
@@ -467,7 +439,7 @@
},
"_enabled": true,
"__prefab": {
"__id__": 23
"__id__": 21
},
"_alignFlags": 45,
"_target": null,
@@ -493,6 +465,35 @@
"__type__": "cc.CompPrefabInfo",
"fileId": "67Ws0zREFMYKNYvOHw9C0b"
},
{
"__type__": "f7ac68qK+pC7LXQWJdgAYVs",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 1
},
"_enabled": true,
"__prefab": {
"__id__": 23
},
"animation": {
"__id__": 15
},
"closeButton": null,
"backgroundCloseButton": null,
"skillPrefab": {
"__uuid__": "5dccf426-aeb0-4b4e-9e1c-ae9fd74dcf7a",
"__expectedType__": "cc.Prefab"
},
"skillParent": {
"__id__": 9
},
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "00cUXISL9FB7Ezx2pI9k4V"
},
{
"__type__": "cc.PrefabInfo",
"root": {
@@ -502,31 +503,6 @@
"__id__": 0
},
"fileId": "32U/bJCUBDlaQxxGFNXZTu",
"targetOverrides": [
{
"__id__": 25
}
]
},
{
"__type__": "cc.TargetOverrideInfo",
"source": {
"__id__": 20
},
"sourceInfo": null,
"propertyPath": [
"skills",
"2"
],
"target": null,
"targetInfo": {
"__id__": 26
}
},
{
"__type__": "cc.TargetInfo",
"localID": [
"8fXLBTR/JKgZXZPA29Dci3"
]
"targetOverrides": []
}
]

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

@@ -1112,7 +1112,7 @@
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "dcTNwE4SNLOZujvnWi9lB6"
"fileId": "0cPaLYMJxO4aigeWF8icoV"
},
{
"__type__": "cc.PrefabInfo",