This commit is contained in:
PC-20230316NUNE\Administrator 2023-11-29 18:56:47 +08:00
parent 720542eadd
commit 6cd69ca9e3
9 changed files with 17 additions and 16 deletions

Binary file not shown.

View File

@ -81,7 +81,7 @@
"__id__": 1 "__id__": 1
}, },
"_children": [], "_children": [],
"_active": true, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 3 "__id__": 3

View File

@ -157,10 +157,7 @@
"_iso": 0, "_iso": 0,
"_screenScale": 1, "_screenScale": 1,
"_visibility": 1073741825, "_visibility": 1073741825,
"_targetTexture": { "_targetTexture": null,
"__uuid__": "a0d1e275-5512-493e-8e15-7d2db8beb48e",
"__expectedType__": "cc.RenderTexture"
},
"_postProcess": null, "_postProcess": null,
"_usePostProcess": false, "_usePostProcess": false,
"_cameraType": -1, "_cameraType": -1,

View File

@ -3,6 +3,7 @@
"__type__": "cc.Prefab", "__type__": "cc.Prefab",
"_name": "GRoleDefault", "_name": "GRoleDefault",
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {},
"_native": "", "_native": "",
"data": { "data": {
"__id__": 1 "__id__": 1
@ -729,21 +730,21 @@
"b": 255, "b": 255,
"a": 255 "a": 255
}, },
"loop": true, "_skeletonData": null,
"defaultSkin": "",
"defaultAnimation": "",
"_premultipliedAlpha": true,
"_timeScale": 1, "_timeScale": 1,
"_useTint": false,
"_preCacheMode": 0, "_preCacheMode": 0,
"_cacheMode": 0, "_cacheMode": 0,
"_defaultCacheMode": 0, "_defaultCacheMode": 0,
"_sockets": [],
"_useTint": false,
"_debugMesh": false,
"_debugBones": false, "_debugBones": false,
"_debugSlots": false, "_debugSlots": false,
"_skeletonData": null,
"_premultipliedAlpha": true,
"defaultSkin": "",
"defaultAnimation": "",
"_enableBatch": false, "_enableBatch": false,
"_sockets": [], "loop": true,
"_debugMesh": false,
"_id": "" "_id": ""
}, },
{ {
@ -788,6 +789,7 @@
"__type__": "276817jnQlKBr5eca8EUxm4", "__type__": "276817jnQlKBr5eca8EUxm4",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {},
"node": { "node": {
"__id__": 1 "__id__": 1
}, },

View File

@ -19,6 +19,8 @@ export default abstract class GRoleBase<T> extends GObject<T>{
@property(JNSkeleton) @property(JNSkeleton)
spine:JNSkeleton; spine:JNSkeleton;
// @property(sp.Skeleton)
// spine:sp.Skeleton;
//角色 //角色
role:TB.TbGRole; role:TB.TbGRole;
@ -84,7 +86,7 @@ export default abstract class GRoleBase<T> extends GObject<T>{
//初始化 //初始化
protected init(role:TB.TbGRole){ protected init(role:TB.TbGRole){
if(this.spine) console.log("初始化宠物",!!this.spine,!!(app.battleRes.roleSpine[role.id]));
this.spine.skeletonData = app.battleRes.roleSpine[role.id]; this.spine.skeletonData = app.battleRes.roleSpine[role.id];
} }

@ -1 +1 @@
Subproject commit 306bd4b593b9164f095ea6abaf291294cc23359f Subproject commit b8a23be6dffa05a2e8e46fbf0b27e859372ac3be