diff --git a/DataTables/Datas/__tables__.xlsx b/DataTables/Datas/__tables__.xlsx
index d883e132..cfa5ff01 100644
Binary files a/DataTables/Datas/__tables__.xlsx and b/DataTables/Datas/__tables__.xlsx differ
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 00000000..3af99a73
Binary files /dev/null and b/DataTables/Datas/战斗/角色/属性/角色属性成长.xlsx differ
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<T> extends GObject<T>{
 
     @property(JNSkeleton)
     spine:JNSkeleton;
+    // @property(sp.Skeleton)
+    // spine:sp.Skeleton;
 
     //角色
     role:TB.TbGRole;
@@ -84,8 +86,8 @@ export default abstract class GRoleBase<T> extends GObject<T>{
 
     //初始化
     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