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

Merge

Browse Source
This commit is contained in:
Martin 2022-12-20 11:48:06 +01:00
parent a82f0a6360
commit 78b1111043
2 changed files with 8 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -38,13 +38,10 @@
}, },
{ {
"__id__": 18 "__id__": 18
},
{
"__id__": 20
} }
], ],
"_prefab": { "_prefab": {
"__id__": 22 "__id__": 20
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
@ -305,23 +302,6 @@
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "cfXyVJoitMGp/0liEUZfNP" "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", "__type__": "cc.Animation",
"_name": "", "_name": "",
@ -331,7 +311,7 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 17 "__id__": 15
}, },
"playOnLoad": true, "playOnLoad": true,
"_clips": [ "_clips": [
@ -359,7 +339,7 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 19 "__id__": 17
}, },
"tag": 0, "tag": 0,
"_group": 128, "_group": 128,
@ -392,7 +372,7 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 21 "__id__": 19
}, },
"_id": "" "_id": ""
}, },

4
assets/Media/Prefabs/Game/Skeleton.prefab
View File

@ -274,6 +274,10 @@
"sprite": { "sprite": {
"__id__": 5 "__id__": 5
}, },
"defaultMaterial": {
"__uuid__": "fda095cb-831d-4601-ad94-846013963de8",
"__expectedType__": "cc.Material"
},
"whiteMaterial": { "whiteMaterial": {
"__uuid__": "9cb17675-370b-48ed-bfa2-bb613a88af44", "__uuid__": "9cb17675-370b-48ed-bfa2-bb613a88af44",
"__expectedType__": "cc.Material" "__expectedType__": "cc.Material"