From 6cd69ca9e38140b9e5a2c1c5daeed9d1e7ea45d5 Mon Sep 17 00:00:00 2001 From: "PC-20230316NUNE\\Administrator" <2858626794@qq.com> Date: Wed, 29 Nov 2023 18:56:47 +0800 Subject: [PATCH] update --- DataTables/Datas/__tables__.xlsx | Bin 10093 -> 10299 bytes .../Datas/战斗/{ => 角色/属性}/属性.xlsx | Bin .../战斗/角色/{ => 属性}/角色初始属性.xlsx | Bin .../Datas/战斗/角色/属性/角色属性成长.xlsx | Bin 0 -> 9927 bytes .../assets/resources/UICanvas.prefab | 2 +- .../assets/resources/WorldCanvas.prefab | 5 +---- .../prefab/battle/role/GRoleDefault.prefab | 18 ++++++++++-------- .../script/battle/base/role/GRoleBase.ts | 6 ++++-- JisolGameCocos/extensions/ngame | 2 +- 9 files changed, 17 insertions(+), 16 deletions(-) rename DataTables/Datas/战斗/{ => 角色/属性}/属性.xlsx (100%) rename DataTables/Datas/战斗/角色/{ => 属性}/角色初始属性.xlsx (100%) create mode 100644 DataTables/Datas/战斗/角色/属性/角色属性成长.xlsx diff --git a/DataTables/Datas/__tables__.xlsx b/DataTables/Datas/__tables__.xlsx index d883e1322fb233b0a35ec6b610b7f8fdb217032e..cfa5ff01ee17969ef4096748507c1cf59da7ac99 100644 GIT binary patch delta 5822 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 delta 5600 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 diff --git a/DataTables/Datas/战斗/属性.xlsx b/DataTables/Datas/战斗/角色/属性/属性.xlsx similarity index 100% rename from DataTables/Datas/战斗/属性.xlsx rename to DataTables/Datas/战斗/角色/属性/属性.xlsx diff --git a/DataTables/Datas/战斗/角色/角色初始属性.xlsx b/DataTables/Datas/战斗/角色/属性/角色初始属性.xlsx similarity index 100% rename from DataTables/Datas/战斗/角色/角色初始属性.xlsx rename to DataTables/Datas/战斗/角色/属性/角色初始属性.xlsx diff --git a/DataTables/Datas/战斗/角色/属性/角色属性成长.xlsx b/DataTables/Datas/战斗/角色/属性/角色属性成长.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..3af99a739b1bd4814ba175826e5b6e586af43df7 GIT binary patch literal 9927 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 literal 0 HcmV?d00001 diff --git a/JisolGameCocos/assets/resources/UICanvas.prefab b/JisolGameCocos/assets/resources/UICanvas.prefab index 9cc79b76..b432c53d 100644 --- a/JisolGameCocos/assets/resources/UICanvas.prefab +++ b/JisolGameCocos/assets/resources/UICanvas.prefab @@ -81,7 +81,7 @@ "__id__": 1 }, "_children": [], - "_active": true, + "_active": false, "_components": [ { "__id__": 3 diff --git a/JisolGameCocos/assets/resources/WorldCanvas.prefab b/JisolGameCocos/assets/resources/WorldCanvas.prefab index 1ed2a865..09549974 100644 --- a/JisolGameCocos/assets/resources/WorldCanvas.prefab +++ b/JisolGameCocos/assets/resources/WorldCanvas.prefab @@ -157,10 +157,7 @@ "_iso": 0, "_screenScale": 1, "_visibility": 1073741825, - "_targetTexture": { - "__uuid__": "a0d1e275-5512-493e-8e15-7d2db8beb48e", - "__expectedType__": "cc.RenderTexture" - }, + "_targetTexture": null, "_postProcess": null, "_usePostProcess": false, "_cameraType": -1, diff --git a/JisolGameCocos/assets/resources/prefab/battle/role/GRoleDefault.prefab b/JisolGameCocos/assets/resources/prefab/battle/role/GRoleDefault.prefab index 8ea6295c..08a2124e 100644 --- a/JisolGameCocos/assets/resources/prefab/battle/role/GRoleDefault.prefab +++ b/JisolGameCocos/assets/resources/prefab/battle/role/GRoleDefault.prefab @@ -3,6 +3,7 @@ "__type__": "cc.Prefab", "_name": "GRoleDefault", "_objFlags": 0, + "__editorExtras__": {}, "_native": "", "data": { "__id__": 1 @@ -729,21 +730,21 @@ "b": 255, "a": 255 }, - "loop": true, + "_skeletonData": null, + "defaultSkin": "", + "defaultAnimation": "", + "_premultipliedAlpha": true, "_timeScale": 1, - "_useTint": false, "_preCacheMode": 0, "_cacheMode": 0, "_defaultCacheMode": 0, + "_sockets": [], + "_useTint": false, + "_debugMesh": false, "_debugBones": false, "_debugSlots": false, - "_skeletonData": null, - "_premultipliedAlpha": true, - "defaultSkin": "", - "defaultAnimation": "", "_enableBatch": false, - "_sockets": [], - "_debugMesh": false, + "loop": true, "_id": "" }, { @@ -788,6 +789,7 @@ "__type__": "276817jnQlKBr5eca8EUxm4", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, diff --git a/JisolGameCocos/assets/script/battle/base/role/GRoleBase.ts b/JisolGameCocos/assets/script/battle/base/role/GRoleBase.ts index 4618cadc..d731e1ab 100644 --- a/JisolGameCocos/assets/script/battle/base/role/GRoleBase.ts +++ b/JisolGameCocos/assets/script/battle/base/role/GRoleBase.ts @@ -19,6 +19,8 @@ export default abstract class GRoleBase extends GObject{ @property(JNSkeleton) spine:JNSkeleton; + // @property(sp.Skeleton) + // spine:sp.Skeleton; //角色 role:TB.TbGRole; @@ -84,8 +86,8 @@ export default abstract class GRoleBase extends GObject{ //初始化 protected init(role:TB.TbGRole){ - if(this.spine) - this.spine.skeletonData = app.battleRes.roleSpine[role.id]; + console.log("初始化宠物",!!this.spine,!!(app.battleRes.roleSpine[role.id])); + this.spine.skeletonData = app.battleRes.roleSpine[role.id]; } //创建一个状态机 diff --git a/JisolGameCocos/extensions/ngame b/JisolGameCocos/extensions/ngame index 306bd4b5..b8a23be6 160000 --- a/JisolGameCocos/extensions/ngame +++ b/JisolGameCocos/extensions/ngame @@ -1 +1 @@ -Subproject commit 306bd4b593b9164f095ea6abaf291294cc23359f +Subproject commit b8a23be6dffa05a2e8e46fbf0b27e859372ac3be